WARNING: THIS SITE IS A MIRROR OF GITHUB.COM / IT CANNOT LOGIN OR REGISTER ACCOUNTS / THE CONTENTS ARE PROVIDED AS-IS / THIS SITE ASSUMES NO RESPONSIBILITY FOR ANY DISPLAYED CONTENT OR LINKS / IF YOU FOUND SOMETHING MAY NOT GOOD FOR EVERYONE, CONTACT ADMIN AT ilovescratch@foxmail.com
Skip to content

fixes: Refactor The Login and Registration Screens (#4818) #4951

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
rasesh-here wants to merge 20 commits into
base: develop
Choose a base branch
from
Open

fixes: Refactor The Login and Registration Screens (#4818) #4951

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
bdcffa5
auth refactor CP-1: reusable components
rasesh-here Dec 4, 2025
d81c92b
auth refactor as per figma
rasesh-here Dec 5, 2025
7a342b5
CR review
rasesh-here Dec 6, 2025
c2fcd35
CR review & improovements
rasesh-here Dec 6, 2025
27bb77f
CR review & fonts refactored
rasesh-here Dec 6, 2025
e46485e
CR review
rasesh-here Dec 6, 2025
241a071
all reviews applied
rasesh-here Dec 7, 2025
034b294
Deleted docs/src/css/custom.css
rasesh-here Dec 7, 2025
5b77773
Deleted index.html
rasesh-here Dec 7, 2025
37e9e59
Merge branch 'develop' into auth-refactor
rasesh-here Dec 7, 2025
f0d09ca
CR reviews applied
rasesh-here Dec 8, 2025
54cf58e
Merge branch 'develop' into auth-refactor
rasesh-here Dec 8, 2025
4cde74a
CR review
rasesh-here Dec 8, 2025
286674c
Merge branch 'auth-refactor' of https://github.com/rasesh-here/talawa…
rasesh-here Dec 8, 2025
6bf87c8
CR review
rasesh-here Dec 8, 2025
6e0b06b
CR reviews applied
rasesh-here Dec 9, 2025
475e7d0
Merge branch 'develop' into auth-refactor
rasesh-here Dec 9, 2025
89e66a8
CR reviews applied
rasesh-here Dec 9, 2025
b1e2fff
CR reviews applied
rasesh-here Dec 9, 2025
3980c91
CR review
rasesh-here Dec 9, 2025
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
44 changes: 9 additions & 35 deletions public/locales/en/translation.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@
"loginPage": {
"title": "Talawa Admin",
"fromPalisadoes": "An open source application by Palisadoes Foundation volunteers",
"userLogin": "User Login",
"userLogin": "Login",
"loginSubHead": "Log in to your account",
"adminLogin": "Admin Login",
"atleast_8_char_long": "Atleast 8 Character long",
"atleast_6_char_long": "Atleast 6 Character long",
Expand All @@ -41,7 +42,7 @@
"register": "register",
"firstName": "firstName",
"lastName": "lastName",
"email": "email",
"email": "Email Address",
"password": "password",
"confirmPassword": "confirmPassword",
"forgotPassword": "forgotPassword",
Expand All @@ -55,38 +56,6 @@
"user": "user",
"loading": "loading"
},
"userLoginPage": {
"title": "Talawa Admin",
"fromPalisadoes": "An open source application by Palisadoes Foundation volunteers",
"atleast_8_char_long": "Atleast 8 Character long",
"Password_and_Confirm_password_mismatches.": "Password and Confirm password mismatches.",
"doNotOwnAnAccount": "Do not own an account?",
"captchaError": "Captcha Error!",
"Please_check_the_captcha": "Please, check the captcha.",
"Something_went_wrong": "Something went wrong, Please try after sometime.",
"passwordMismatches": "Password and Confirm password mismatches.",
"fillCorrectly": "Fill all the Details Correctly.",
"successfullyRegistered": "Successfully Registered. Please wait until you will be approved.",
"userLogin": "User Login",
"afterRegister": "Successfully registered. Please wait for admin to approve your request.",
"selectOrg": "Select an organization",
"talawa_portal": "talawa_portal",
"login": "login",
"register": "register",
"firstName": "firstName",
"lastName": "lastName",
"email": "email",
"password": "password",
"confirmPassword": "confirmPassword",
"forgotPassword": "forgotPassword",
"enterEmail": "enterEmail",
"enterPassword": "enterPassword",
"talawaApiUnavailable": "talawaApiUnavailable",
"notAuthorised": "notAuthorised",
"notFound": "notFound",
"OR": "OR",
"loading": "loading"
},
"latestEvents": {
"eventCardTitle": "Upcoming Events",
"eventCardSeeAll": "See All",
Expand Down Expand Up @@ -1045,7 +1014,7 @@
},
"userLogin": {
"login": "Login",
"loginIntoYourAccount": "Login into your account",
"loginIntoYourAccount": "Log in to your account",
"invalidDetailsMessage": "Please enter a valid email and password.",
"notAuthorised": "Sorry! you are not Authorised!",
"invalidCredentials": "Entered credentials are incorrect. Please enter valid credentials.",
Expand All @@ -1058,6 +1027,11 @@
"talawaApiUnavailable": "talawaApiUnavailable"
},
"userRegister": {
"firstName_invalid": "First name should contain only lower and upper case letters",
"lastName_invalid": "Last name should contain only lower and upper case letters",
"password_invalid": "Password should contain atleast one lowercase letter, one uppercase letter, one numeric value and one special character",
"email_invalid": "Email should have atleast 8 characters",
"Password_and_Confirm_password_mismatches": "Password and Confirm password mismatches.",
"enterFirstName": "Enter your first name",
"enterLastName": "Enter your last name",
"enterConfirmPassword": "Enter Password to confirm",
Expand Down
41 changes: 8 additions & 33 deletions public/locales/es/translation.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@
"fromPalisadoes": "Una aplicación de código abierto de los voluntarios de la Fundación palisados",
"talawa_portal": "Portal De Administración Talawa",
"login": "Acceso",
"userLogin": "Inicio de sesión de usuario",
"userLogin": "Acceso",
"loginSubHead": "Inicio de sesión",
"adminLogin": "Inicio de sesión de administrador",
Copy link
Contributor

@coderabbitai coderabbitai bot Dec 7, 2025

Choose a reason for hiding this comment

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

🧹 Nitpick | 🔵 Trivial

OK: “userLogin” → “Acceso” and added subhead

Consistent with the refactor. Optional: more natural subhead could be “Inicia sesión en tu cuenta”.

🤖 Prompt for AI Agents 
In public/locales/es/translation.json around lines 19 to 21, the "loginSubHead"
value is currently "Inicio de sesión" which is fine but the reviewer suggests a
more natural subhead; update the "loginSubHead" translation to "Inicia sesión en
tu cuenta" (or another preferred natural phrasing) to improve UX consistency
while keeping "userLogin": "Acceso" and "adminLogin": "Inicio de sesión de
administrador" unchanged.

"register": "Registro",
"firstName": "Primer nombre",
Expand Down Expand Up @@ -55,38 +56,6 @@
"selectOrg": "Seleccione una organización",
"afterRegister": "Registro exitoso. Por favor, espere a que el administrador apruebe su solicitud."
},
"userLoginPage": {
"title": "Administrador Talawa",
"fromPalisadoes": "Una aplicación de código abierto de los voluntarios de la Fundación palisados",
"talawa_portal": "Portal De Administración Talawa",
"login": "Acceso",
"register": "Registro",
"firstName": "Primer nombre",
"lastName": "Apellido",
"email": "Correo electrónico",
"password": "Clave",
"atleast_8_char_long": "Al menos 8 caracteres de largo",
"Password_and_Confirm_password_mismatches.": "Contraseña y Confirmar contraseña no coinciden.",
"confirmPassword": "Confirmar contraseña",
"forgotPassword": "Has olvidado tu contraseña ?",
"enterEmail": "ingrese correo electrónico",
"enterPassword": "introducir la contraseña",
"doNotOwnAnAccount": "¿No tienes una cuenta?",
"talawaApiUnavailable": "El servicio Talawa-API no está disponible. ¿Está funcionando? Verifica también la conectividad de tu red.",
"captchaError": "¡Error de captcha!",
"Please_check_the_captcha": "Por favor, revisa el captcha.",
"Something_went_wrong": "Algo salió mal. Inténtalo después de un tiempo",
"passwordMismatches": "Contraseña y Confirmar contraseña no coinciden.",
"fillCorrectly": "Complete todos los detalles correctamente.",
"notAuthorised": "¡Lo siento! ¡No estás autorizado!",
"notFound": "¡Usuario no encontrado!",
"successfullyRegistered": "Registrado con éxito. Espere hasta que sea aprobado",
"userLogin": "Inicio de sesión de usuario",
"afterRegister": "Registrado exitosamente. Espere a que el administrador apruebe su solicitud.",
"OR": "O",
"loading": "Cargando...",
"selectOrg": "Seleccione una organización"
},
"latestEvents": {
"eventCardTitle": "Próximos Eventos",
"eventCardSeeAll": "Ver Todos",
Expand Down Expand Up @@ -1017,6 +986,12 @@
"nothingToShow": "Nada que mostrar aquí."
},
"userRegister": {
"firstName_invalid": "El nombre debe contener solo letras minúsculas y mayúsculas.",
"lastName_invalid": "El apellido debe contener solo letras minúsculas y mayúsculas.",
"password_invalid": "La contraseña debe contener al menos una letra minúscula, una letra mayúscula, un valor numérico y un carácter especial.",
"email_invalid": "El correo electrónico debe tener al menos 8 caracteres.",
"passwordMismatches": "Contraseña y Confirmar contraseña no coinciden.",
"Password_and_Confirm_password_mismatches.": "Contraseña y Confirmar contraseña no coinciden.",
"register": "Registro",
"firstName": "Nombre de pila",
"enterFirstName": "Ponga su primer nombre",
Expand Down
41 changes: 8 additions & 33 deletions public/locales/fr/translation.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@
"loginPage": {
"title": "Administrateur Talawa",
"fromPalisadoes": "Une application open source réalisée par les bénévoles de la Fondation Palisadoes",
"userLogin": "Utilisateur en ligne",
"userLogin": "Connexion",
"loginSubHead": "Connexion à votre compte",
"adminLogin": "Connexion administrateur",
"atleast_8_char_long": "Au moins 8 caractères",
"atleast_6_char_long": "Au moins 6 caractères",
Expand Down Expand Up @@ -55,38 +56,6 @@
"user": "Utilisateur",
"loading": "Chargement"
},
"userLoginPage": {
"title": "Administrateur Talawa",
"fromPalisadoes": "Une application open source réalisée par les bénévoles de la Fondation Palisadoes",
"atleast_8_char_long": "Au moins 8 caractères",
"Password_and_Confirm_password_mismatches.": "Mot de passe et Confirmer les incompatibilités de mot de passe.",
"doNotOwnAnAccount": "Vous ne possédez pas de compte ?",
"captchaError": "Erreur CAPTCHA!",
"Please_check_the_captcha": "S'il vous plaît, vérifiez le captcha.",
"Something_went_wrong": "Quelque chose s'est mal passé. Veuillez réessayer plus tard.",
"passwordMismatches": "Mot de passe et Confirmer les incompatibilités de mot de passe.",
"fillCorrectly": "Remplissez correctement tous les détails.",
"successfullyRegistered": "Enregistré avec succès. ",
"userLogin": "Utilisateur en ligne",
"afterRegister": "Enregistré avec succès. ",
"selectOrg": "Sélectionnez une organisation",
"talawa_portal": "Portail Talawa",
"login": "Connexion",
"register": "S'inscrire",
"firstName": "Prénom",
"lastName": "Nom de famille",
"email": "E-mail",
"password": "Mot de passe",
"confirmPassword": "Confirmer le mot de passe",
"forgotPassword": "Mot de passe oublié",
"enterEmail": "Entrer l'e-mail",
"enterPassword": "Entrer le mot de passe",
"talawaApiUnavailable": "API Talawa indisponible",
"notAuthorised": "Non autorisé",
"notFound": "Non trouvé",
"OR": "OU",
"loading": "Chargement"
},
"latestEvents": {
"eventCardTitle": "évènements à venir",
"eventCardSeeAll": "Voir tout",
Expand Down Expand Up @@ -1017,6 +986,12 @@
"talawaApiUnavailable": "API Talawa non disponible"
},
"userRegister": {
"firstName_invalid": "Le prénom ne doit contenir que des lettres minuscules et majuscules",
"lastName_invalid": "Le nom de famille ne doit contenir que des lettres minuscules et majuscules",
"password_invalid": "Le mot de passe doit contenir au moins une lettre minuscule, une lettre majuscule, une valeur numérique et un caractère spécial",
"email_invalid": "L'e-mail doit contenir au moins 8 caractères",
"Password_and_Confirm_password_mismatches.": "Mot de passe et Confirmer les incompatibilités de mot de passe.",
"passwordMismatches": "Mot de passe et Confirmer les incompatibilités de mot de passe.",
"enterFirstName": "Entrez votre prénom",
"enterLastName": "Entrez votre nom de famille",
"enterConfirmPassword": "Entrez votre mot de passe pour confirmer",
Expand Down
41 changes: 8 additions & 33 deletions public/locales/hi/translation.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@
"loginPage": {
"title": "तालावा व्यवस्थापक",
"fromPalisadoes": "Palisadoes फाउंडेशन स्वयंसेवकों द्वारा विकसित एक ओपन-सोर्स एप्लिकेशन",
"userLogin": "उपयोगकर्ता लॉगिन",
"userLogin": "लॉगिन",
"loginSubHead": "अपने खाते में लॉगिन करें",
"adminLogin": "एडमिन लॉगिन",
"atleast_8_char_long": "कम से कम 8 अक्षर लंबे",
"atleast_6_char_long": "कम से कम 6 अक्षर लंबे",
Expand Down Expand Up @@ -55,38 +56,6 @@
"user": "उपयोगकर्ता",
"loading": "लोड हो रहा है"
},
"userLoginPage": {
"title": "तालावा व्यवस्थापक",
"fromPalisadoes": "Palisadoes फाउंडेशन स्वयंसेवकों द्वारा विकसित एक ओपन-सोर्स एप्लिकेशन",
"atleast_8_char_long": "कम से कम 8 अक्षर लंबे",
"Password_and_Confirm_password_mismatches.": "पासवर्ड और पुष्टि पासवर्ड मेल नहीं खाते।",
"doNotOwnAnAccount": "कोई खाता नहीं है?",
"captchaError": "कैप्चा त्रुटि!",
"Please_check_the_captcha": "कृपया कैप्चा जांचें।",
"Something_went_wrong": "कुछ गलत हो गया, कृपया बाद में पुनः प्रयास करें।",
"passwordMismatches": "पासवर्ड और पुष्टि पासवर्ड मेल नहीं खाते।",
"fillCorrectly": "सभी विवरण सही ढंग से भरें।",
"successfullyRegistered": "सफलतापूर्वक पंजीकृत।",
"userLogin": "उपयोगकर्ता लॉगिन",
"afterRegister": "सफलतापूर्वक पंजीकृत।",
"selectOrg": "एक संगठन चुनें",
"talawa_portal": "तालावा पोर्टल",
"login": "लॉगिन",
"register": "पंजीकरण",
"firstName": "पहला नाम",
"lastName": "अंतिम नाम",
"email": "ईमेल",
"password": "पासवर्ड",
"confirmPassword": "पुष्टि पासवर्ड",
"forgotPassword": "पासवर्ड भूल गए",
"enterEmail": "ईमेल दर्ज करें",
"enterPassword": "पासवर्ड दर्ज करें",
"talawaApiUnavailable": "तालावा एपीआई अनुपलब्ध",
"notAuthorised": "अनधिकृत",
"notFound": "नहीं मिला",
"OR": "या",
"loading": "लोड हो रहा है"
},
"latestEvents": {
"eventCardTitle": "आगामी घटनाएँ",
"eventCardSeeAll": "सभी देखें",
Expand Down Expand Up @@ -1017,6 +986,12 @@
"talawaApiUnavailable": "Talawa API अनुपलब्ध"
},
"userRegister": {
"firstName_invalid": "पहला नाम केवल छोटे और बड़े अक्षरों को शामिल कर सकता है",
"lastName_invalid": "अंतिम नाम केवल छोटे और बड़े अक्षरों को शामिल कर सकता है",
"password_invalid": "पासवर्ड में कम से कम 1 छोटा अक्षर, 1 बड़ा अक्षर, 1 संख्या और 1 विशेष अक्षर होना चाहिए",
"email_invalid": "ईमेल में कम से कम 8 अक्षर होने चाहिए",
"Password_and_Confirm_password_mismatches.": "पासवर्ड और पुष्टि पासवर्ड मेल नहीं खाते।",
"passwordMismatches": "पासवर्ड और पुष्टि पासवर्ड मेल नहीं खाते।",
"enterFirstName": "अपना पहला नाम दर्ज करें",
"enterLastName": "अपना अंतिम नाम दर्ज करें",
"enterConfirmPassword": "पुष्टि करने के लिए अपना पासवर्ड दर्ज करें",
Expand Down
41 changes: 8 additions & 33 deletions public/locales/zh/translation.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@
"loginPage": {
"title": "塔拉瓦管理员",
"fromPalisadoes": "Palisadoes 基金会志愿者开发的开源应用程序",
"userLogin": "用户登录",
"userLogin": "登录",
"loginSubHead": "登录你的账户",
"adminLogin": "管理员登录",
"atleast_8_char_long": "至少 8 个字符长",
"atleast_6_char_long": "至少 6 个字符长",
Expand Down Expand Up @@ -55,38 +56,6 @@
"user": "用户",
"loading": "加载中"
},
"userLoginPage": {
"title": "塔拉瓦管理员",
"fromPalisadoes": "Palisadoes 基金会志愿者开发的开源应用程序",
"atleast_8_char_long": "至少 8 个字符长",
"Password_and_Confirm_password_mismatches.": "密码和确认密码不匹配。",
"doNotOwnAnAccount": "没有帐户？",
"captchaError": "验证码错误！",
"Please_check_the_captcha": "请检查验证码。",
"Something_went_wrong": "出了点问题，请稍后再试。",
"passwordMismatches": "密码和确认密码不匹配。",
"fillCorrectly": "正确填写所有详细信息。",
"successfullyRegistered": "注册成功。",
"userLogin": "用户登录",
"afterRegister": "注册成功。",
"selectOrg": "选择一个组织",
"talawa_portal": "塔拉瓦门户",
"login": "登录",
"register": "注册",
"firstName": "名字",
"lastName": "姓氏",
"email": "电子邮件",
"password": "密码",
"confirmPassword": "确认密码",
"forgotPassword": "忘记密码",
"enterEmail": "输入电子邮件",
"enterPassword": "输入密码",
"talawaApiUnavailable": "塔拉瓦 API 不可用",
"notAuthorised": "未授权",
"notFound": "未找到",
"OR": "或",
"loading": "加载中"
},
"latestEvents": {
"eventCardTitle": "即将举行的活动",
"eventCardSeeAll": "查看全部",
Expand Down Expand Up @@ -1017,6 +986,12 @@
"nothingToShow": "这里没有可显示的内容。"
},
"userRegister": {
"firstName_invalid": "名字只能包含小写和大写字母",
"lastName_invalid": "姓氏只能包含小写和大写字母",
"password_invalid": "密码应至少包含1个小写字母、1个大写字母、1个数字和1个特殊字符",
"email_invalid": "电子邮件应至少包含 8 个字符",
"Password_and_Confirm_password_mismatches.": "密码和确认密码不匹配。",
"passwordMismatches": "密码和确认密码不匹配。",
"enterFirstName": "输入您的名字",
"enterLastName": "输入您的姓氏",
"enterConfirmPassword": "输入您的密码进行确认",
Expand Down
4 changes: 3 additions & 1 deletion src/App.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import SecuredRouteForUser from 'components/UserPortal/SecuredRouteForUser/Secur
import OrganizaitionFundCampiagn from 'screens/OrganizationFundCampaign/OrganizationFundCampagins';
import { CURRENT_USER } from 'GraphQl/Queries/Queries';
import LoginPage from 'screens/LoginPage/LoginPage';
import RegisterPage from 'screens/RegisterPage/RegisterPage';
import { usePluginRoutes, PluginRouteRenderer } from 'plugin';
import { getPluginManager } from 'plugin/manager';
import UserScreen from 'screens/UserPortal/UserScreen/UserScreen';
Expand Down Expand Up @@ -177,8 +178,9 @@ function App(): React.ReactElement {
<Suspense fallback={<Loader />}>
<Routes>
<Route path="/" element={<LoginPage />} />
<Route path="/register" element={<LoginPage />} />
<Route path="/register" element={<RegisterPage />} />
<Route path="/admin" element={<LoginPage />} />
<Route path="/admin/register" element={<RegisterPage />} />
<Route element={<SecuredRoute />}>
<Route element={<SuperAdminScreen />}>
<Route path="/orglist" element={<OrgList />} />
Expand Down
Loading