From 64d90894dc83c40bc76432e728a531e95ea02370 Mon Sep 17 00:00:00 2001 From: Aryaman Kumar Sharma Date: Tue, 11 Mar 2025 13:01:24 +0530 Subject: [PATCH 1/2] Fix: Login/Register UI Screens --- src/Pages/Auth/Login/Login.jsx | 2 +- src/Pages/Auth/Register/Register.jsx | 10 +++++----- src/Pages/Auth/Register/StepOne/index.jsx | 2 +- src/Pages/Auth/Register/StepThree/index.jsx | 2 +- src/Pages/Auth/Register/StepTwo/index.jsx | 2 +- src/locales/gb.json | 2 ++ 6 files changed, 11 insertions(+), 9 deletions(-) diff --git a/src/Pages/Auth/Login/Login.jsx b/src/Pages/Auth/Login/Login.jsx index 60aaed6ba..c13218018 100644 --- a/src/Pages/Auth/Login/Login.jsx +++ b/src/Pages/Auth/Login/Login.jsx @@ -142,7 +142,7 @@ const Login = () => { overflow="hidden" sx={{ "& h1": { - color: theme.palette.primary.main, + color: theme.palette.primary.contrastText, fontWeight: 600, fontSize: 28, }, diff --git a/src/Pages/Auth/Register/Register.jsx b/src/Pages/Auth/Register/Register.jsx index 021cda18a..e35f70b27 100644 --- a/src/Pages/Auth/Register/Register.jsx +++ b/src/Pages/Auth/Register/Register.jsx @@ -83,7 +83,7 @@ const LandingPage = ({ isSuperAdmin, onSignup }) => { }, }} > - Terms of Service + {t("authRegisterTerms")} {" "} and{" "} { }, }} > - Privacy Policy. + {t("authRegisterPrivacy")} @@ -283,7 +283,7 @@ const Register = ({ isSuperAdmin }) => { overflow="hidden" sx={{ "& h1": { - color: theme.palette.primary.main, + color: theme.palette.primary.contrastText, fontWeight: 600, fontSize: 28, }, @@ -370,7 +370,7 @@ const Register = ({ isSuperAdmin }) => { p={theme.spacing(12)} > - {t("authRegisterAlreadyHaveAccount")} - + {t("authRegisterAlreadyHaveAccount")} { onClick={() => { navigate("/login"); }} - sx={{ userSelect: "none", color: theme.palette.primary.main }} + sx={{ userSelect: "none", color: theme.palette.accent.main }} > {t("authLoginTitle")} diff --git a/src/Pages/Auth/Register/StepOne/index.jsx b/src/Pages/Auth/Register/StepOne/index.jsx index 248f57f69..e55213b8b 100644 --- a/src/Pages/Auth/Register/StepOne/index.jsx +++ b/src/Pages/Auth/Register/StepOne/index.jsx @@ -45,7 +45,7 @@ function StepOne({ form, errors, onSubmit, onChange, onBack }) { textAlign="center" > - {t("signUp")} + {t("signUP")} {t("authRegisterStepOnePersonalDetails")} diff --git a/src/Pages/Auth/Register/StepThree/index.jsx b/src/Pages/Auth/Register/StepThree/index.jsx index eb05f843a..9b5f066d7 100644 --- a/src/Pages/Auth/Register/StepThree/index.jsx +++ b/src/Pages/Auth/Register/StepThree/index.jsx @@ -39,7 +39,7 @@ function StepThree({ onSubmit, onBack }) { textAlign="center" > - {t("signUp")} + {t("signUP")} {t("createPassword")} - {t("signUp")} + {t("signUP")} {t("enterEmail")} diff --git a/src/locales/gb.json b/src/locales/gb.json index 60d0899cb..eeb20a5d7 100644 --- a/src/locales/gb.json +++ b/src/locales/gb.json @@ -38,6 +38,8 @@ "commonAppName": "Checkmate", "authLoginEnterEmail": "Enter your email", "authRegisterTitle": "Create an account", + "authRegisterTerms": "Terms of Service", + "authRegisterPrivacy": "Privacy Policy.", "authRegisterStepOneTitle": "Create your account", "authRegisterStepOnePersonalDetails": "Enter your personal details", "authRegisterStepOneDescription": "Enter your details to get started", From d5c593abb571a937409b8d84d166ed6df8b4def2 Mon Sep 17 00:00:00 2001 From: Aryaman Kumar Sharma Date: Wed, 12 Mar 2025 01:43:42 +0530 Subject: [PATCH 2/2] Fix: Login/Register UI Screens --- src/Pages/Auth/Register/Register.jsx | 4 ++-- src/Pages/Auth/Register/StepOne/index.jsx | 2 +- src/Pages/Auth/Register/StepThree/index.jsx | 2 +- src/Pages/Auth/Register/StepTwo/index.jsx | 2 +- src/locales/gb.json | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/Pages/Auth/Register/Register.jsx b/src/Pages/Auth/Register/Register.jsx index e35f70b27..afb05435c 100644 --- a/src/Pages/Auth/Register/Register.jsx +++ b/src/Pages/Auth/Register/Register.jsx @@ -35,7 +35,7 @@ const LandingPage = ({ isSuperAdmin, onSignup }) => { textAlign="center" > - {t("signUP")} + {t("signUp")} {isSuperAdmin ? t("authRegisterCreateSuperAdminAccount") @@ -85,7 +85,7 @@ const LandingPage = ({ isSuperAdmin, onSignup }) => { > {t("authRegisterTerms")} {" "} - and{" "} + {t("and")}{" "} { diff --git a/src/Pages/Auth/Register/StepOne/index.jsx b/src/Pages/Auth/Register/StepOne/index.jsx index e55213b8b..248f57f69 100644 --- a/src/Pages/Auth/Register/StepOne/index.jsx +++ b/src/Pages/Auth/Register/StepOne/index.jsx @@ -45,7 +45,7 @@ function StepOne({ form, errors, onSubmit, onChange, onBack }) { textAlign="center" > - {t("signUP")} + {t("signUp")} {t("authRegisterStepOnePersonalDetails")} diff --git a/src/Pages/Auth/Register/StepThree/index.jsx b/src/Pages/Auth/Register/StepThree/index.jsx index 9b5f066d7..eb05f843a 100644 --- a/src/Pages/Auth/Register/StepThree/index.jsx +++ b/src/Pages/Auth/Register/StepThree/index.jsx @@ -39,7 +39,7 @@ function StepThree({ onSubmit, onBack }) { textAlign="center" > - {t("signUP")} + {t("signUp")} {t("createPassword")} - {t("signUP")} + {t("signUp")} {t("enterEmail")} diff --git a/src/locales/gb.json b/src/locales/gb.json index eeb20a5d7..3ebd3d953 100644 --- a/src/locales/gb.json +++ b/src/locales/gb.json @@ -1,5 +1,6 @@ { "dontHaveAccount": "Don't have account", + "and": "and", "https": "HTTPS", "http": "HTTP", "monitor": "monitor", @@ -7,8 +8,7 @@ "email": "E-mail", "forgotPassword": "Forgot Password", "password": "password", - "signUp": "Sign up", - "signUP": "Sign Up", + "signUp": "Sign Up", "submit": "Submit", "title": "Title", "continue": "Continue",