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

public/locales/en/translation.json

@@ -14,7 +14,8 @@
   "loginPage": {
     "title": "Talawa Admin",
     "fromPalisadoes": "An open source application by Palisadoes Foundation volunteers",
-    "userLogin": "User Login",
+    "userLogin": "Login",
+    "loginSubHead": "Login into your account",
     "adminLogin": "Admin Login",
     "atleast_8_char_long": "Atleast 8 Character long",
     "atleast_6_char_long": "Atleast 6 Character long",
@@ -41,7 +42,7 @@
     "register": "register",
     "firstName": "firstName",
     "lastName": "lastName",
-    "email": "email",
+    "email": "Email Address",
     "password": "password",
     "confirmPassword": "confirmPassword",
     "forgotPassword": "forgotPassword",
@@ -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",

public/locales/es/translation.json

@@ -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",
     "register": "Registro",
     "firstName": "Primer nombre",
@@ -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",

public/locales/fr/translation.json

@@ -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",
@@ -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",

public/locales/hi/translation.json

@@ -14,7 +14,8 @@
   "loginPage": {
     "title": "तालावा व्यवस्थापक",
     "fromPalisadoes": "Palisadoes फाउंडेशन स्वयंसेवकों द्वारा विकसित एक ओपन-सोर्स एप्लिकेशन",
-    "userLogin": "उपयोगकर्ता लॉगिन",
+    "userLogin": "लॉगिन",
+    "loginSubHead": "अपने खाते में लॉगिन करें",
     "adminLogin": "एडमिन लॉगिन",
     "atleast_8_char_long": "कम से कम 8 अक्षर लंबे",
     "atleast_6_char_long": "कम से कम 6 अक्षर लंबे",
@@ -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": "सभी देखें",

public/locales/zh/translation.json

@@ -14,7 +14,8 @@
   "loginPage": {
     "title": "塔拉瓦管理员",
     "fromPalisadoes": "Palisadoes 基金会志愿者开发的开源应用程序",
-    "userLogin": "用户登录",
+    "userLogin": "登录",
+    "loginSubHead": "登录你的账户",
     "adminLogin": "管理员登录",
     "atleast_8_char_long": "至少 8 个字符长",
     "atleast_6_char_long": "至少 6 个字符长",
@@ -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": "查看全部",

src/App.tsx

@@ -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';
@@ -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 />} />