Merge talawa-user-portal into develop

public/locales/en.json

@@ -445,6 +445,64 @@
     "membershipRequests": "Membership requests",
     "adminForEvents": "Admin for events",
     "addedAsAdmin": "User is added as admin.",
-    "talawaApiUnavailable": "Talawa-API service is unavailable. Is it running? Check your network connectivity too."
+    "talawaApiUnavailable": "Talawa-API service is unavailable. Kindly check your network connection and wait for a while."
+  },
+  "userLogin": {
+    "login": "Login",
+    "forgotPassword": "Forgot Password?",
+    "loginIntoYourAccount": "Login into your account",
+    "emailAddress": "Email Address",
+    "enterEmail": "Enter your email address",
+    "password": "Password",
+    "enterPassword": "Enter your password",
+    "register": "Register",
+    "invalidDetailsMessage": "Please enter a valid email and password.",
+    "notAuthorised": "Sorry! you are not Authorised!",
+    "invalidCredentials": "Entered credentials are incorrect. Please enter valid credentials.",
+    "talawaApiUnavailable": "Talawa-API service is unavailable. Kindly check your network connection and wait for a while."
+  },
+  "userRegister": {
+    "register": "Register",
+    "firstName": "First Name",
+    "enterFirstName": "Enter your first name",
+    "lastName": "Last Name",
+    "enterLastName": "Enter your last name",
+    "emailAddress": "Email Address",
+    "enterEmail": "Enter your email address",
+    "password": "Password",
+    "enterPassword": "Enter your password",
+    "confirmPassword": "Confirm Password",
+    "enterConfirmPassword": "Enter your password to confirm",
+    "alreadyhaveAnAccount": "Already have an account?",
+    "login": "Login",
+    "afterRegister": "Successfully registered. Please wait for admin to approve your request.",
+    "passwordNotMatch": "Password doesn't match. Confirm Password and try again.",
+    "invalidDetailsMessage": "Please enter valid details.",
+    "talawaApiUnavailable": "Talawa-API service is unavailable. Kindly check your network connection and wait for a while."
+  },
+  "userNavbar": {
+    "talawa": "Talawa",
+    "home": "Home",
+    "people": "People",
+    "events": "Events",
+    "chat": "Chat",
+    "donate": "Donate",
+    "myTasks": "My Tasks",
+    "settings": "Settings",
+    "language": "Language",
+    "logout": "Logout",
+    "close": "Close"
+  },
+  "userOrganizations": {
+    "allOrganizations": "All Organizations",
+    "joinedOrganizations": "Joined Organizations",
+    "createdOrganizations": "Created Organizations",
+    "search": "Search",
+    "nothingToShow": "Nothing to show here."
+  },
+  "userSidebar": {
+    "yourOrganizations": "Your Organizations",
+    "noOrganizations": "You haven't joined any organization yet.",
+    "viewAll": "View all"
   }
 }

public/locales/fr.json

@@ -439,6 +439,64 @@
     "membershipRequests": "Demandes d'adhésion",
     "adminForEvents": "Administrateur pour les événements",
     "addedAsAdmin": "L'utilisateur est ajouté en tant qu'administrateur.",
-    "talawaApiUnavailable": "Le service Talawa-API n'est pas disponible. Est-il en cours d'exécution ? Vérifiez également votre connectivité réseau."
+    "talawaApiUnavailable": "Le service Talawa-API n'est pas disponible. Veuillez vérifier votre connexion réseau et attendre un moment."
+  },
+  "userLogin": {
+    "login": "Connexion",
+    "forgotPassword": "Mot de passe oublié?",
+    "loginIntoYourAccount": "Connectez-vous à votre compte",
+    "emailAddress": "Email Address",
+    "enterEmail": "Entrez votre adresse email",
+    "password": "Mot de passe",
+    "enterPassword": "Tapez votre mot de passe",
+    "register": "Enregistrer",
+    "invalidDetailsMessage": "Veuillez saisir un e-mail et un mot de passe valides.",
+    "notAuthorised": "Désolé! vous n'êtes pas autorisé !",
+    "invalidCredentials": "Les informations d'identification saisies sont incorrectes. Veuillez entrer des informations d'identification valides.",
+    "talawaApiUnavailable": "Le service Talawa-API n'est pas disponible. Veuillez vérifier votre connexion réseau et attendre un moment."
+  },
+  "userRegister": {
+    "register": "Enregistrer",
+    "firstName": "Prénom",
+    "enterFirstName": "Entrez votre prénom",
+    "lastName": "Nom de famille",
+    "enterLastName": "Entrez votre nom de famille",
+    "emailAddress": "Email Address",
+    "enterEmail": "Entrez votre adresse email",
+    "password": "Mot de passe",
+    "enterPassword": "Tapez votre mot de passe",
+    "confirmPassword": "Confirmez le mot de passe",
+    "enterConfirmPassword": "Entrez votre mot de passe pour confirmer",
+    "alreadyhaveAnAccount": "Vous avez déjà un compte?",
+    "login": "Connexion",
+    "afterRegister": "Enregistré avec succès. Veuillez attendre que l'administrateur approuve votre demande.",
+    "passwordNotMatch": "Le mot de passe ne correspond pas. Confirmez le mot de passe et réessayez.",
+    "invalidDetailsMessage": "Veuillez entrer des détails valides.",
+    "talawaApiUnavailable": "Le service Talawa-API n'est pas disponible. Veuillez vérifier votre connexion réseau et attendre un moment."
+  },
+  "userNavbar": {
+    "talawa": "Talawa",
+    "home": "Maison",
+    "people": "Personnes",
+    "events": "Événements",
+    "chat": "Discuter",
+    "donate": "Donner",
+    "myTasks": "Mes tâches",
+    "settings": "Paramètres",
+    "language": "Langue",
+    "logout": "Se déconnecter",
+    "close": "Fermer"
+  },
+  "userOrganizations": {
+    "allOrganizations": "Toutes les organisations",
+    "joinedOrganizations": "Organisations jointes",
+    "createdOrganizations": "Organisations créées",
+    "search": "Recherche",
+    "nothingToShow": "Rien à montrer ici."
+  },
+  "userSidebar": {
+    "yourOrganizations": "Vos organisations",
+    "noOrganizations": "Vous n'avez encore rejoint aucune organisation.",
+    "viewAll": "Voir tout"
   }
 }

public/locales/hi.json

@@ -439,6 +439,64 @@
     "membershipRequests": "सदस्यता अनुरोध",
     "adminForEvents": "घटनाओं के लिए व्यवस्थापक",
     "addedAsAdmin": "उपयोगकर्ता को व्यवस्थापक के रूप में जोड़ा गया है।",
-    "talawaApiUnavailable": "तलवा-एपीआई सेवा उपलब्ध नहीं है। क्या यह चल रहा है? अपनी नेटवर्क कनेक्टिविटी भी जांचें।"
+    "talawaApiUnavailable": "तलवा-एपीआई सेवा उपलब्ध नहीं है। कृपया अपना नेटवर्क कनेक्शन जांचें और कुछ देर प्रतीक्षा करें।"
+  },
+  "userLogin": {
+    "login": "लॉगिन",
+    "forgotPassword": "पासवर्ड भूल गए ?",
+    "loginIntoYourAccount": "अपने खाते में प्रवेश करें",
+    "emailAddress": "ईमेल एड्रेस",
+    "enterEmail": "अपना ईमेल पता दर्ज करें",
+    "password": "पासवर्ड",
+    "enterPassword": "अपना पासवर्ड डालें",
+    "register": "रजिस्टर करें",
+    "invalidDetailsMessage": "कृपया एक वैध ईमेल और पासवर्ड दर्ज करें।",
+    "notAuthorised": "क्षमा मांगना! आप अधिकृत नहीं हैं!",
+    "invalidCredentials": "दर्ज क्रेडेंशियल्स गलत हैं। कृपया मान्य क्रेडेंशियल दर्ज करें।",
+    "talawaApiUnavailable": "तलवा-एपीआई सेवा उपलब्ध नहीं है। कृपया अपना नेटवर्क कनेक्शन जांचें और कुछ देर प्रतीक्षा करें।"
+  },
+  "userRegister": {
+    "register": "रजिस्टर करें",
+    "firstName": "पहला नाम",
+    "enterFirstName": "अपना पहला नाम दर्ज करें",
+    "lastName": "अंतिम नाम",
+    "enterLastName": "अपना अंतिम नाम दर्ज करें",
+    "emailAddress": "ईमेल एड्रेस",
+    "enterEmail": "अपना ईमेल पता दर्ज करें",
+    "password": "पासवर्ड",
+    "enterPassword": "अपना पासवर्ड डालें",
+    "confirmPassword": "पासवर्ड की पुष्टि कीजिये",
+    "enterConfirmPassword": "पुष्टि करने के लिए अपना पासवर्ड दर्ज करें",
+    "alreadyhaveAnAccount": "क्या आपके पास पहले से एक खाता मौजूद है?",
+    "login": "लॉगिन",
+    "afterRegister": "पंजीकरण सफलतापूर्वक हो गया है। कृपया आपके अनुरोध को स्वीकार करने के लिए व्यवस्थापक की प्रतीक्षा करें।",
+    "passwordNotMatch": "पासवर्ड मेल नहीं खाता. पासवर्ड की पुष्टि करें और पुनः प्रयास करें।",
+    "invalidDetailsMessage": "कृपया मान्य विवरण दर्ज करें।",
+    "talawaApiUnavailable": "तलवा-एपीआई सेवा उपलब्ध नहीं है। कृपया अपना नेटवर्क कनेक्शन जांचें और कुछ देर प्रतीक्षा करें।"
+  },
+  "userNavbar": {
+    "talawa": "तलावा",
+    "home": "घर",
+    "people": "लोग",
+    "events": "आयोजन",
+    "chat": "बातचीत",
+    "donate": "दान देना",
+    "myTasks": "मेरा काम",
+    "settings": "समायोजन",
+    "language": "भाषा",
+    "logout": "लॉग आउट",
+    "close": "बंद करना"
+  },
+  "userOrganizations": {
+    "allOrganizations": "सभी संगठन",
+    "joinedOrganizations": "संगठन शामिल हुए",
+    "createdOrganizations": "संगठन बनाये गये",
+    "search": "खोज",
+    "nothingToShow": "यहां दिखाने के लिए कुछ भी नहीं है."
+  },
+  "userSidebar": {
+    "yourOrganizations": "आपके संगठन",
+    "noOrganizations": "आप अभी तक किसी संगठन में शामिल नहीं हुए हैं.",
+    "viewAll": "सभी को देखें"
   }
 }

public/locales/sp.json

@@ -441,6 +441,64 @@
     "membershipRequests": "Solicitudes de membresía",
     "adminForEvents": "Administrador de eventos",
     "addedAsAdmin": "El usuario se agrega como administrador.",
-    "talawaApiUnavailable": "El servicio Talawa-API no está disponible. ¿Está funcionando? Compruebe también la conectividad de su red."
+    "talawaApiUnavailable": "El servicio Talawa-API no está disponible. Compruebe amablemente su conexión de red y espere un momento."
+  },
+  "userLogin": {
+    "login": "Acceso",
+    "forgotPassword": "Has olvidado tu contraseña ?",
+    "loginIntoYourAccount": "Inicie sesión en su cuenta",
+    "emailAddress": "correo electrónico",
+    "enterEmail": "Ingrese su dirección de correo electrónico",
+    "password": "Contraseña",
+    "enterPassword": "Ingresa tu contraseña",
+    "register": "Registro",
+    "invalidDetailsMessage": "Por favor, introduzca un correo electrónico y una contraseña válidos.",
+    "notAuthorised": "¡Lo siento! usted no está autorizado!",
+    "invalidCredentials": "Las credenciales ingresadas son incorrectas. Ingrese credenciales válidas.",
+    "talawaApiUnavailable": "El servicio Talawa-API no está disponible. Compruebe amablemente su conexión de red y espere un momento."
+  },
+  "userRegister": {
+    "register": "Registro",
+    "firstName": "Nombre de pila",
+    "enterFirstName": "Ponga su primer nombre",
+    "lastName": "Apellido",
+    "enterLastName": "Ingresa tu apellido",
+    "emailAddress": "correo electrónico",
+    "enterEmail": "Ingrese su dirección de correo electrónico",
+    "password": "Contraseña",
+    "enterPassword": "Ingresa tu contraseña",
+    "confirmPassword": "confirmar Contraseña",
+    "enterConfirmPassword": "Ingrese su contraseña para confirmar",
+    "alreadyhaveAnAccount": "¿Ya tienes una cuenta?",
+    "login": "Acceso",
+    "afterRegister": "Registrado exitosamente. Espere a que el administrador apruebe su solicitud.",
+    "passwordNotMatch": "La contraseña no coincide. Confirme la contraseña y vuelva a intentarlo.",
+    "invalidDetailsMessage": "Ingrese detalles válidos.",
+    "talawaApiUnavailable": "El servicio Talawa-API no está disponible. Compruebe amablemente su conexión de red y espere un momento."
+  },
+  "userNavbar": {
+    "talawa": "Talawa",
+    "home": "Hogar",
+    "people": "Gente",
+    "events": "Eventos",
+    "chat": "Charlar",
+    "donate": "Donar",
+    "myTasks": "Mis tareas",
+    "settings": "Ajustes",
+    "language": "Idioma",
+    "logout": "Cerrar sesión",
+    "close": "Cerca"
+  },
+  "userOrganizations": {
+    "allOrganizations": "Todas las organizaciones",
+    "joinedOrganizations": "Organizaciones unidas",
+    "createdOrganizations": "Organizaciones creadas",
+    "search": "Buscar",
+    "nothingToShow": "Nada que mostrar aquí."
+  },
+  "userSidebar": {
+    "yourOrganizations": "Tus Organizaciones",
+    "noOrganizations": "Aún no te has unido a ninguna organización.",
+    "viewAll": "Ver todo"
   }
 }

public/locales/zh.json

@@ -441,6 +441,64 @@
     "membershipRequests": "会员申请",
     "adminForEvents": "事件管理员",
     "addedAsAdmin": "用戶被添加為管理員。",
-    "talawaApiUnavailable": "服務不可用。它在運行嗎？還要檢查您的網絡連接。"
+    "talawaApiUnavailable": "Talawa-API 服務不可用。 請檢查您的網絡連接並稍等片刻。"
+  },
+  "userLogin": {
+    "login": "登錄",
+    "forgotPassword": "忘記密碼 ？",
+    "loginIntoYourAccount": "登錄您的賬戶",
+    "emailAddress": "電子郵件地址",
+    "enterEmail": "輸入你的電子郵箱地址",
+    "password": "密碼",
+    "enterPassword": "輸入您的密碼",
+    "register": "登記",
+    "invalidDetailsMessage": "請輸入有效的電子郵件和密碼",
+    "notAuthorised": "對不起！ 你沒有被授權！",
+    "invalidCredentials": "輸入的憑據不正確。 請輸入有效憑據。",
+    "talawaApiUnavailable": "Talawa-API 服務不可用。 請檢查您的網絡連接並稍等片刻。"
+  },
+  "userRegister": {
+    "register": "登記",
+    "firstName": "名",
+    "enterFirstName": "輸入您的名字",
+    "lastName": "姓",
+    "enterLastName": "輸入您的姓氏",
+    "emailAddress": "電子郵件地址",
+    "enterEmail": "輸入你的電子郵箱地址",
+    "password": "密碼",
+    "enterPassword": "輸入您的密碼",
+    "confirmPassword": "確認密碼",
+    "enterConfirmPassword": "輸入您的密碼以確認",
+    "alreadyhaveAnAccount": "已有帳戶？",
+    "login": "登錄",
+    "afterRegister": "註冊成功。 請等待管理員批准您的請求。",
+    "passwordNotMatch": "密碼不匹配。 確認密碼並重試。",
+    "invalidDetailsMessage": "請輸入有效的詳細信息。",
+    "talawaApiUnavailable": "Talawa-API 服務不可用。 請檢查您的網絡連接並稍等片刻。"
+  },
+  "userNavbar": {
+    "talawa": "塔拉瓦",
+    "home": "家",
+    "people": "人們",
+    "events": "活動",
+    "chat": "聊天",
+    "donate": "捐",
+    "myTasks": "我的任務",
+    "settings": "設置",
+    "language": "語言",
+    "logout": "登出",
+    "close": "關閉"
+  },
+  "userOrganizations": {
+    "allOrganizations": "所有組織",
+    "joinedOrganizations": "加入組織",
+    "createdOrganizations": "創建的組織",
+    "search": "搜索",
+    "nothingToShow": "這裡沒有什麼可展示的。"
+  },
+  "userSidebar": {
+    "yourOrganizations": "您的組織",
+    "noOrganizations": "您還沒有加入任何組織。",
+    "viewAll": "查看全部"
   }
 }

src/App.tsx

@@ -6,6 +6,7 @@ import * as installedPlugins from 'components/plugins/index';
 import styles from './App.module.css';
 import { CHECK_AUTH } from 'GraphQl/Queries/Queries';
 import SecuredRoute from 'components/SecuredRoute/SecuredRoute';
+import SecuredRouteForUser from 'components/UserPortal/SecuredRouteForUser/SecuredRouteForUser';
 import LoginPage from 'screens/LoginPage/LoginPage';
 import OrganizationEvents from 'screens/OrganizationEvents/OrganizationEvents';
 import OrganizationPeople from 'screens/OrganizationPeople/OrganizationPeople';
@@ -22,6 +23,10 @@ import Requests from 'screens/Requests/Requests';
 import BlockUser from 'screens/BlockUser/BlockUser';
 import MemberDetail from 'screens/MemberDetail/MemberDetail';
 
+// User Portal Components
+import UserLoginPage from 'screens/UserPortal/UserLoginPage/UserLoginPage';
+import Organizations from 'screens/UserPortal/Organizations/Organizations';
+
 function app(): JSX.Element {
   /*const { updatePluginLinks, updateInstalled } = bindActionCreators(
     actionCreators,
@@ -98,6 +103,14 @@ function app(): JSX.Element {
         <SecuredRoute path="/blockuser" component={BlockUser} />
         {extraRoutes}
         <Route exact path="/forgotPassword" component={ForgotPassword} />
+
+        {/* User Portal Routes */}
+        <Route exact path="/user" component={UserLoginPage} />
+        <SecuredRouteForUser
+          path="/user/organizations"
+          component={Organizations}
+        />
+
         <Route exact path="*" component={PageNotFound} />
       </Switch>
     </>