Skip to content

Commit

Permalink
Changed User Login and User Register component (#1368)
Browse files Browse the repository at this point in the history
* Added tests for Advertisements.tsx

* Added tests for Advertisement.tsx

* Added Filtering Functionality

* fixed tests

* changed name of test

* Changed the user login and register portal to be consistent

* Added tests
  • Loading branch information
aarishshahmohsin authored Jan 6, 2024
1 parent 6ba8db0 commit b231da8
Show file tree
Hide file tree
Showing 8 changed files with 1,523 additions and 135 deletions.
30 changes: 30 additions & 0 deletions public/locales/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,36 @@
"login_to_admin_portal": "Admin Portal Login",
"OR": "OR"
},
"userLoginPage": {
"title": "Talawa Admin",
"fromPalisadoes": "An open source application by Palisadoes Foundation volunteers",
"talawa_portal": "Talawa Admin Portal",
"login": "Login",
"register": "Register",
"firstName": "First Name",
"lastName": "Last Name",
"email": "Email",
"password": "Password",
"atleast_8_char_long": "Atleast 8 Character long",
"Password_and_Confirm_password_mismatches.": "Password and Confirm password mismatches.",
"confirmPassword": "Confirm Password",
"forgotPassword": "Forgot Password ?",
"enterEmail": "Enter Email",
"enterPassword": "Enter Password",
"doNotOwnAnAccount": "Do not own an account?",
"talawaApiUnavailable": "Talawa-API service is unavailable. Is it running? Check your network connectivity too.",
"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.",
"notAuthorised": "Sorry! you are not Authorised!",
"notFound": "User not found!",
"successfullyRegistered": "Successfully Registered. Please wait until you will be approved.",
"userLogin": "User Login",
"afterRegister": "Successfully registered. Please wait for admin to approve your request.",
"OR": "OR"
},
"latestEvents": {
"eventCardTitle": "Upcoming Events",
"eventCardSeeAll": "See All",
Expand Down
30 changes: 30 additions & 0 deletions public/locales/fr.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,36 @@
"login_to_admin_portal": "Connexion à l'administration du portail",
"OR": "OU"
},
"userLoginPage": {
"title": "Administrateur Talawa",
"talawa_portal": "Portail D'Administrateur Talawa",
"fromPalisadoes": "Une application open source par les volontaires de la Fondation Palissades",
"login": "Connexion",
"register": "S'inscrire",
"firstName": "Prénom",
"lastName": "Nom de famille",
"email": "E-mail",
"password": "Mot de passe",
"atleast_8_char_long": "Au moins 8 caractères",
"Password_and_Confirm_password_mismatches.": "Le mot de passe et la confirmation du mot de passe ne correspondent pas.",
"confirmPassword": "Confirmez le mot de passe",
"forgotPassword": "Mot de passe oublié ?",
"enterEmail": "entrez l'e-mail",
"enterPassword": "Entrer le mot de passe",
"doNotOwnAnAccount": "Vous n'avez pas de compte ?",
"talawaApiUnavailable": "Le service Talawa-API n'est pas disponible. Est-il en cours d'exécution ? Vérifiez également votre connectivité réseau.",
"captchaError": "Erreur de captcha !",
"Please_check_the_captcha": "Veuillez vérifier le captcha.",
"Something_went_wrong": "Quelque chose s'est mal passé, veuillez réessayer plus tard.",
"passwordMismatches": "Le mot de passe et la confirmation du mot de passe ne correspondent pas.",
"fillCorrectly": "Remplissez tous les détails correctement.",
"notAuthorised": "Désolé ! vous n'êtes pas autorisé !",
"notFound": "Utilisateur introuvable !",
"successfullyRegistered": "Enregistré avec succès. Veuillez patienter jusqu'à ce que vous soyez approuvé.",
"userLogin": "Utilisateur en ligne",
"afterRegister": "Enregistré avec succès. Veuillez attendre que l'administrateur approuve votre demande.",
"OR": "OU"
},
"latestEvents": {
"eventCardTitle": "Événements à venir",
"eventCardSeeAll": "Voir Tout",
Expand Down
30 changes: 30 additions & 0 deletions public/locales/hi.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,36 @@
"login_to_admin_portal": "एडमिन पोर्टल लॉगिन",
"OR": "या"
},
"userLoginPage": {
"title": "तलवा व्यवस्थापक",
"fromPalisadoes": "पलिसाडो के स्वयंसेवकों द्वारा एक खुला स्रोत अनुप्रयोग",
"talawa_portal": "तलावा प्रशासन पोर्टल",
"login": "लॉग इन करें",
"register": "पंजीकरण करवाना",
"firstName": "पहला नाम",
"lastName": "उपनाम",
"email": "ईमेल",
"password": "पासवर्ड",
"atleast_8_char_long": "कम से कम 8 कैरेक्टर लंबा",
"Password_and_Confirm_password_mismatches.": "पासवर्ड और पुष्टि पासवर्ड बेमेल।",
"confirmPassword": "पासवर्ड की पुष्टि कीजिये",
"forgotPassword": "पासवर्ड भूल गए ?",
"enterEmail": "ईमेल दर्ज करें",
"enterPassword": "पास वर्ड दर्ज करें",
"doNotOwnAnAccount": "क्या आपके पास खाता नहीं है?",
"talawaApiUnavailable": "तलावा-एपीआई सेवा उपलब्ध नहीं है। क्या यह चल रही है? अपनी नेटवर्क कनेक्टिविटी की भी जाँच करें।",
"captchaError": "कैप्चा त्रुटि!",
"Please_check_the_captcha": "कृपया, कैप्चा जांचें।",
"Something_went_wrong": "कुछ गलत हुआ, कृपया कुछ समय बाद प्रयास करें।",
"passwordMismatches": "पासवर्ड और पुष्टि पासवर्ड मेल नहीं खाते।",
"fillCorrectly": "सभी विवरण सही ढंग से भरें।",
"notAuthorised": "क्षमा करें! आप अधिकृत नहीं हैं!",
"notFound": "उपयोगकर्ता नहीं मिला!",
"successfullyRegistered": "सफलतापूर्वक पंजीकृत। कृपया स्वीकृत होने तक प्रतीक्षा करें।",
"afterRegister": "पंजीकरण सफलतापूर्वक हो गया है। कृपया आपके अनुरोध को स्वीकार करने के लिए व्यवस्थापक की प्रतीक्षा करें।",
"userLogin": "उपयोगकर्ता लॉगिन",
"OR": "या"
},
"latestEvents": {
"eventCardTitle": "आगामी घटनाएँ",
"eventCardSeeAll": "सभी देखें",
Expand Down
30 changes: 30 additions & 0 deletions public/locales/sp.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,36 @@
"login_to_admin_portal": "Inicio de sesión en el portal de administración",
"OR": "O"
},
"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"
},
"latestEvents": {
"eventCardTitle": "Próximos Eventos",
"eventCardSeeAll": "Ver Todos",
Expand Down
30 changes: 30 additions & 0 deletions public/locales/zh.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,36 @@
"login_to_admin_portal": " 管理员门户登录 ",
"OR": "或者"
},
"userLoginPage": {
"title": "塔拉瓦管理員",
"fromPalisadoes": "柵欄 基金会志愿者的开源应用程序",
"talawa_portal": "塔拉瓦管理門戶",
"login": "登錄",
"register": "登記",
"firstName": "",
"lastName": "",
"email": "電子郵件",
"password": "密碼",
"atleast_8_char_long": "至少 8 個字符長",
"Password_and_Confirm_password_mismatches.": "密碼和確認密碼不匹配。",
"confirmPassword": "確認密碼",
"forgotPassword": "忘記密碼 ?",
"enterEmail": "输入电子邮件",
"enterPassword": "输入密码",
"doNotOwnAnAccount": "沒有帳戶嗎?",
"talawaApiUnavailable": "服務不可用。它正在運行嗎?還要檢查您的網絡連接。",
"captchaError": "驗證碼錯誤!",
"Please_check_the_captcha": "請檢查驗證碼。",
"Something_went_wrong": "出了點問題,請稍後再試。",
"passwordMismatches": "密碼和確認密碼不匹配。",
"fillCorrectly": "正確填寫所有細節。",
"notAuthorised": "抱歉!你沒有被授權!",
"notFound": "找不到用戶!",
"successfullyRegistered": "註冊成功,請等待審核通過。",
"userLogin": "用户登录",
"afterRegister": "註冊成功。 請等待管理員批准您的請求。",
"OR": "或者"
},
"latestEvents": {
"eventCardTitle": "即将举行的活动",
"eventCardSeeAll": "查看全部",
Expand Down
Loading

0 comments on commit b231da8

Please sign in to comment.