Skip to content
Closed

Dev #1002

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
246ec8b
chore: upgrade Node.js version and optimize Dockerfile; add .dockerig…
tonmoy-selise Apr 21, 2026
c17efc9
fix(construct): fixed layout issue and autofilling issue by browser i…
sangayt1997 Apr 23, 2026
707ab5d
Merge pull request #998 from SELISEdigitalplatforms/pre-dev
nuzattasnim Apr 23, 2026
4ee9118
fix(construct): giving id to remove the sign in banner from cli
sangayt1997 Apr 23, 2026
6c3d3af
Merge pull request #1000 from SELISEdigitalplatforms/pre-dev
sangayt1997 Apr 23, 2026
ff7942d
fix(construct): resolve issue affecting the layout when we remove banner
sangayt1997 Apr 23, 2026
ce7eff5
fix(construct): resolve the banner removed content layout issues
sangayt1997 Apr 23, 2026
b6077fd
fix(construct): fixed layout issue when remove banner from cli
sangayt1997 Apr 23, 2026
f38a43b
Merge pull request #1001 from SELISEdigitalplatforms/pre-dev
sangayt1997 Apr 23, 2026
8646274
skip healthcheck
tonmoy-selise Apr 26, 2026
e29886d
Merge branch 'dev' into dockerfile-upgrade
tonmoy-selise Apr 26, 2026
1009713
Merge pull request #995 from SELISEdigitalplatforms/dockerfile-upgrade
naymulhaque-selise Apr 26, 2026
be7a6c3
fix: align layout
nuzattasnim May 2, 2026
0b23603
fix: navigate to login if signup disabled
nuzattasnim May 2, 2026
c04eda2
Merge branch 'dev' of https://github.com/SELISEdigitalplatforms/block…
nuzattasnim May 2, 2026
a0e8fbe
fix: align input field
nuzattasnim May 2, 2026
4e0a834
fix: enhance divider condition
nuzattasnim May 3, 2026
f959213
fix: update env
nuzattasnim May 7, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .env.dev
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
# Vite environment variables
VITE_API_BASE_URL = https://dev-api.seliseblocks.com
VITE_API_BASE_URL = https://dev-api.blocksdevelopers.com
VITE_X_BLOCKS_KEY = cf18dc87904c4e1485639242cda4a026
VITE_CAPTCHA_SITE_KEY=6LckI90qAAAAAK8RP2t0Nohwii1CeKOETsXPVNQA
VITE_CAPTCHA_TYPE=reCaptcha
VITE_PROJECT_SLUG = ddoxpd

VITE_BLOCKS_OIDC_CLIENT_ID = d45f37a6-7f4a-4f38-9a13-06d74531d7ef
VITE_BLOCKS_OIDC_REDIRECT_URI = https://dev-construct.seliseblocks.com/oidc
VITE_BLOCKS_OIDC_REDIRECT_URI = https://dev-construct.blocksdevelopers.com/oidc
# Build configuration
GENERATE_SOURCEMAP=false

Expand Down
15 changes: 9 additions & 6 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,21 +1,24 @@
FROM node:21.7.0-alpine AS builder
FROM node:22-alpine AS builder

WORKDIR /app

COPY package*.json ./

RUN npm install
RUN npm ci

COPY . .

ARG ci_build

RUN mkdir -p /app/log

RUN NODE_OPTIONS="--max-old-space-size=4096" npm run build:${ci_build}

FROM nginx:stable-alpine
FROM nginxinc/nginx-unprivileged:1.29-alpine

COPY --from=builder /app/build /usr/share/nginx/html

COPY nginx.conf /etc/nginx/conf.d/default.conf
COPY nginx.conf /etc/nginx/conf.d/default.conf

EXPOSE 8080

# HEALTHCHECK --interval=30s --timeout=3s --start-period=5s --retries=3 \
# CMD wget -qO- http://localhost:8080/ || exit 1
Comment on lines +22 to +24

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P2 HEALTHCHECK left commented out

The health check was added but immediately commented out. Without it, the container orchestrator (Kubernetes, ECS, etc.) has no way to detect an unresponsive container and restart it. Uncomment or remove the comment block once the check is validated.

1 change: 1 addition & 0 deletions nginx.conf
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
server {
listen 8080;
root /usr/share/nginx/html/;
server_tokens off;
client_max_body_size 200m;
Expand Down
556 changes: 302 additions & 254 deletions package-lock.json

Large diffs are not rendered by default.

26 changes: 21 additions & 5 deletions src/components/core/base-password-form/base-password-form.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ export const BasePasswordForm = ({
return (
<Form {...form}>
<form
className="flex flex-col gap-4 max-h-[75vh] overflow-y-auto pr-5"
className="flex flex-col gap-4 max-h-[75vh] overflow-y-auto pr-5 pl-2"
style={{
scrollbarWidth: 'thin',
scrollbarColor: 'hsl(var(--neutral-300)) transparent',
Expand All @@ -178,7 +178,11 @@ export const BasePasswordForm = ({
{t('FIRST_NAME')}
</FormLabel>
<FormControl>
<Input placeholder={t('ENTER_YOUR_FIRST_NAME')} {...field} />
<Input
placeholder={t('ENTER_YOUR_FIRST_NAME')}
autoComplete="first-name"
{...field}
/>
</FormControl>
<FormMessage />
</FormItem>
Expand All @@ -191,7 +195,11 @@ export const BasePasswordForm = ({
<FormItem>
<FormLabel className="text-high-emphasis font-normal">{t('LAST_NAME')}</FormLabel>
<FormControl>
<Input placeholder={t('ENTER_YOUR_LAST_NAME')} {...field} />
<Input
placeholder={t('ENTER_YOUR_LAST_NAME')}
autoComplete="last-name"
{...field}
/>
</FormControl>
<FormMessage />
</FormItem>
Expand All @@ -207,7 +215,11 @@ export const BasePasswordForm = ({
<FormItem>
<FormLabel className="text-high-emphasis font-normal">{t('PASSWORD')}</FormLabel>
<FormControl>
<PasswordInput placeholder={t('ENTER_YOUR_PASSWORD')} {...field} />
<PasswordInput
placeholder={t('ENTER_YOUR_PASSWORD')}
autoComplete="new-password"
{...field}
/>
</FormControl>
<FormMessage />
</FormItem>
Expand All @@ -223,7 +235,11 @@ export const BasePasswordForm = ({
{t('CONFIRM_PASSWORD')}
</FormLabel>
<FormControl>
<PasswordInput placeholder={t('CONFIRM_YOUR_PASSWORD')} {...field} />
<PasswordInput
placeholder={t('CONFIRM_YOUR_PASSWORD')}
autoComplete="new-password"
{...field}
/>
</FormControl>
<FormMessage />
</FormItem>
Expand Down
13 changes: 7 additions & 6 deletions src/modules/auth/components/signin/signin.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ export const Signin = () => {
'dev-construct.seliseblocks.com',
].some((domain) => window.location.hostname === domain);
return (
<div className="flex flex-col gap-6">
<div className="w-full max-w-md flex flex-col gap-6">
<div className="w-32 h-14 mb-2">
<img src={theme == 'dark' ? lightlogo : darklogo} className="w-full h-full" alt="logo" />
</div>
Expand All @@ -53,18 +53,19 @@ export const Signin = () => {
</div>
)}
</div>

{ssoError && (
<div className="w-full">
<div className="rounded-lg bg-error-background border border-error p-4">
<p className="text-xs font-normal text-error-high-emphasis">
{ssoError}
</p>
<p className="text-xs font-normal text-error-high-emphasis">{ssoError}</p>
</div>
</div>
)}

<div className={'w-full ' + (isBannerAllowedToVisible ? 'visible' : 'invisible h-0')}>
<div
id="login-banner"
className={'w-full ' + (isBannerAllowedToVisible ? 'visible' : 'invisible h-0')}
>
<div className="rounded-lg bg-success-background border border-success p-4">
<p className="text-xs font-normal text-success-high-emphasis">
Log in to explore the complete Demo and Documentation. Use the credentials:{' '}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ export const AccountActivationPage = () => {

return (
<div className="flex flex-col gap-6">
<div>
<div className="pl-2">
<div className="text-2xl font-bold text-high-emphasis">{t('COMPLETE_SIGNUP')}</div>
{/* <div className="flex gap-1 mt-1">
<div className="text-sm font-normal text-medium-emphasis">
Expand Down
16 changes: 12 additions & 4 deletions src/modules/auth/pages/signup/signup-page.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Link } from 'react-router-dom';
import { Link, Navigate } from 'react-router-dom';
import { useTranslation } from 'react-i18next';
import darkLogo from '@/assets/images/construct_logo_dark.svg';
import lightLogo from '@/assets/images/construct_logo_light.svg';
Expand All @@ -17,6 +17,16 @@ export const SignupPage = () => {
const isEmailPasswordSignUpEnabled = signupSettings?.isEmailPasswordSignUpEnabled ?? false;
const isSSoSignUpEnabled = signupSettings?.isSSoSignUpEnabled ?? false;

const showDivider =
isEmailPasswordSignUpEnabled &&
isSSoSignUpEnabled &&
loginOption?.ssoInfo &&
loginOption.ssoInfo.length > 0;

if (!isEmailPasswordSignUpEnabled && !isSSoSignUpEnabled) {
return <Navigate to="/login" replace />;
}

return (
<div className="flex flex-col gap-6">
<div className="w-32 h-14 mb-2">
Expand All @@ -38,9 +48,7 @@ export const SignupPage = () => {
</div>
{isEmailPasswordSignUpEnabled && <SignupForm />}
<div>
{isEmailPasswordSignUpEnabled && isSSoSignUpEnabled && (
<Divider text={t('OR_CONTINUE_WITH')} />
)}
{showDivider && <Divider text={t('OR_CONTINUE_WITH')} />}
{isSSoSignUpEnabled && loginOption && <SsoSignin loginOption={loginOption} />}
</div>
</div>
Expand Down
Loading