Merge AdminUI-Redesign into Develop

.github/workflows/pull-requests.yml

@@ -66,25 +66,17 @@ jobs:
     steps:
       - name: Checkout the Repository
         uses: actions/checkout@v3
-
 
       - name: Set up Node.js
         uses: actions/setup-node@v3
         with:
           node-version: '16.14.1'
 
-
       - name: resolve dependency
         run: npm install -g @graphql-inspector/cli
 
       - name: Clone API repository
         run: git clone https://github.com/PalisadoesFoundation/talawa-api && ls -a
 
-
       - name: Validate Documents
-        run: graphql-inspector validate './src/GraphQl/**/*.ts' './talawa-api/schema.graphql'
-
-
-
-
-
+        run: graphql-inspector validate './src/GraphQl/**/*.ts' './talawa-api/schema.graphql'

public/locales/en.json

@@ -24,7 +24,9 @@
     "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."
+    "successfullyRegistered": "Successfully Registered. Please wait until you will be approved.",
+    "login_to_admin_portal": "Admin Portal Login",
+    "OR": "OR"
   },
   "listNavbar": {
     "talawa_portal": "Talawa Admin Portal",

public/locales/fr.json

@@ -24,7 +24,9 @@
     "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é."
+    "successfullyRegistered": "Enregistré avec succès. Veuillez patienter jusqu'à ce que vous soyez approuvé.",
+    "login_to_admin_portal": "Connexion à l'administration du portail",
+    "OR": "OU"
   },
   "listNavbar": {
     "talawa_portal": "Portail D'Administrateur Talawa",

public/locales/hi.json

@@ -24,7 +24,9 @@
     "fillCorrectly": "सभी विवरण सही ढंग से भरें।",
     "notAuthorised": "क्षमा करें! आप अधिकृत नहीं हैं!",
     "notFound": "उपयोगकर्ता नहीं मिला!",
-    "successfullyRegistered": "सफलतापूर्वक पंजीकृत। कृपया स्वीकृत होने तक प्रतीक्षा करें।"
+    "successfullyRegistered": "सफलतापूर्वक पंजीकृत। कृपया स्वीकृत होने तक प्रतीक्षा करें।",
+    "login_to_admin_portal": "एडमिन पोर्टल लॉगिन",
+    "OR": "या"
   },
   "listNavbar": {
     "talawa_portal": "तलावा प्रशासन पोर्टल",

public/locales/sp.json

@@ -24,7 +24,9 @@
     "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"
+    "successfullyRegistered": "Registrado con éxito. Espere hasta que sea aprobado",
+    "login_to_admin_portal": "Inicio de sesión en el portal de administración",
+    "OR": "O"
   },
   "listNavbar": {
     "talawa_portal": "Portal De Administración Talawa",

public/locales/zh.json

@@ -24,7 +24,9 @@
     "fillCorrectly": "正確填寫所有細節。",
     "notAuthorised": "抱歉！你沒有被授權！",
     "notFound": "找不到用戶！",
-    "successfullyRegistered": "註冊成功，請等待審核通過。"
+    "successfullyRegistered": "註冊成功，請等待審核通過。",
+    "login_to_admin_portal": " 管理员门户登录 ",
+    "OR": "或者"
   },
   "listNavbar": {
     "talawa_portal": "塔拉瓦管理門戶",

src/App.tsx

@@ -2,8 +2,6 @@ import React from 'react';
 import { Route, Switch } from 'react-router-dom';
 import { useQuery } from '@apollo/client';
 import * as installedPlugins from 'components/plugins/index';
-// import './App.css';
-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';
@@ -22,6 +20,7 @@ import Roles from 'screens/Roles/Roles';
 import Requests from 'screens/Requests/Requests';
 import BlockUser from 'screens/BlockUser/BlockUser';
 import MemberDetail from 'screens/MemberDetail/MemberDetail';
+import Loader from 'components/Loader/Loader';
 
 // User Portal Components
 import UserLoginPage from 'screens/UserPortal/UserLoginPage/UserLoginPage';
@@ -71,7 +70,7 @@ function app(): JSX.Element {
   );
 
   if (loading) {
-    return <div className={styles.loader}></div>;
+    return <Loader />;
   }
 
   if (data) {