Merge Revamped Homepage into adminUI-redesign (#942)

* Merge latest adminUI-Redesign into Develop (#927) * Updated CODE_STYLE.md * Updated CODE_STYLE.md (#917) * Updated CODE_STYLE.md * Import section update * Upgrade and Migrate from Bootstrap 4 to Bootstrap 5 (#925) * Updated CODE_STYLE.md * Latest Boostrap v5.3.0 & react-bootstrap v2.7.4 installed * Buttons replaced from normal ones to Bootstrap ones * Import section update * Error fixed for Buttons * Language dropdowns and Change language * InputBoxes & Checkboxes fixed and imported from BS * Removed unused package popper.js * Replaced react-modal with Bootstrap one in Login Page * Modals converted to React Bootstrap one * Completely replaced react-modal with react-bootstrap/Modal from the project * Removed react-modal from the project * Removed classbased modal and unused images * Notification navbar migrated * Modal migration * Modal migration * Modal migration done for OrgPostCard * Empty commit to make workflow run * Empty commit to make workflow run * Empty commit to run the workflow --------- Co-authored-by: Anwer Sayeed <deeyasrewna@gmail.com> * Introduces API versioning check in CI/CD (#924) * a random change * husky precommit * one more try * one more try * one more try * one more try * one more try * one more try * second try * removed unwanted deps * removed unwanted deps * resolved the error * updated variable name * rerun test * rerun test * added test to pull.yml * removed push check * resolved conflict * Sass filed added with documentation * Linting fixed * Fixed the folder structure and naming convention * Update stale.yml * Typo fix * Update CONTRIBUTING.md * Merge talawa-user-portal into develop (#935) * Create login and register page for user portal * Lint public locales * Create tests for login page components * Add react import in tests * Create organizations screen for user portal * Fix failing tests and lint code * fix failing tests * Add tests for organization screen and componenets * Fix non-null assertions * Fix non-null assertions in organizations test * Fix bootstrap migration changes * Initial login page work * Merge conflict error fixed * Theming modified and Added Loader over every screen * Fixed UI issue for navbar and login * Fixed production bug * Removed unused variable * Tests fixed * Added Change Language Btn dropdown * Merge latest Admin UI Redesign into Develop (#934) * Updated CODE_STYLE.md * Updated CODE_STYLE.md (#917) * Updated CODE_STYLE.md * Import section update * Upgrade and Migrate from Bootstrap 4 to Bootstrap 5 (#925) * Updated CODE_STYLE.md * Latest Boostrap v5.3.0 & react-bootstrap v2.7.4 installed * Buttons replaced from normal ones to Bootstrap ones * Import section update * Error fixed for Buttons * Language dropdowns and Change language * InputBoxes & Checkboxes fixed and imported from BS * Removed unused package popper.js * Replaced react-modal with Bootstrap one in Login Page * Modals converted to React Bootstrap one * Completely replaced react-modal with react-bootstrap/Modal from the project * Removed react-modal from the project * Removed classbased modal and unused images * Notification navbar migrated * Modal migration * Modal migration * Modal migration done for OrgPostCard * Empty commit to make workflow run * Empty commit to make workflow run * Empty commit to run the workflow * Sass filed added with documentation * Linting fixed * Fixed the folder structure and naming convention * Customised Bootstrap (#929) * Sass filed added with documentation * Linting fixed * Fixed the folder structure and naming convention * Assets typo fixed * Typo fix * Merge conflict error fixed --------- Co-authored-by: Anwer Sayeed <deeyasrewna@gmail.com> * test PR for API versioning check (#932) * testPR * test2 * testing the change * testing it again * test--no-verify * test--no-verify * echo token * test-again * test-again * test * test * read-only * clone * clone * Random checkout * redesigned newsfeed (#939) * Design ready for homescreen * Login page 100% code c=coverage * Login page icon adjustment * Added translations * Fixed the failing tests * Revert to older version of loader * Revert "redesigned newsfeed (#939)" (#943) This reverts commit a645eca. * Animation added fixed warnings * Fixed accessability * Mutations and Tests foxed --------- Co-authored-by: Anwer Sayeed <deeyasrewna@gmail.com> Co-authored-by: Kanishka Bansode <96020697+kb-0311@users.noreply.github.com> Co-authored-by: Peter Harrison <16875803+palisadoes@users.noreply.github.com> Co-authored-by: Noble Mittal <62551163+beingnoble03@users.noreply.github.com> Co-authored-by: Aashima wadhwa <73706697+aashimawadhwa@users.noreply.github.com>
PalisadoesFoundation · Jul 17, 2023 · 9671ba0 · 9671ba0
1 parent a0ab0de
commit 9671ba0
Show file tree

Hide file tree

Showing 45 changed files with 920 additions and 1,131 deletions.
diff --git a/.github/workflows/pull-requests.yml b/.github/workflows/pull-requests.yml
@@ -63,7 +63,6 @@ jobs:
   Graphql-Inspector:
     name: Runs Introspection on the github talawa-api repo on the schema.graphql file
     runs-on: ubuntu-latest
-
     steps:
       - name: Checkout the Repository
         uses: actions/checkout@v3
@@ -76,9 +75,8 @@ jobs:
       - name: resolve dependency
         run: npm install -g @graphql-inspector/cli
 
-
-      - name: Validate Documents
-        run: graphql-inspector validate './src/GraphQl/**/*.ts' github:PalisadoesFoundation/talawa-api#develop:schema.graphql --token '${{secrets.REPO_READ_ONLY}}'
+      - 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'
diff --git a/public/locales/en.json b/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",

diff --git a/public/locales/fr.json b/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",

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

diff --git a/public/locales/sp.json b/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",

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

diff --git a/src/App.module.css b/src/App.module.css
diff --git a/src/App.test.tsx b/src/App.test.tsx
@@ -5,7 +5,6 @@ import { MockedProvider } from '@apollo/react-testing';
 import { BrowserRouter } from 'react-router-dom';
 import { I18nextProvider } from 'react-i18next';
 import 'jest-location-mock';
-
 import App from './App';
 import { store } from 'state/store';
 import { CHECK_AUTH } from 'GraphQl/Queries/Queries';

diff --git a/src/App.tsx b/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';
@@ -69,7 +68,7 @@ function app(): JSX.Element {
   );
 
   if (loading) {
-    return <div className={styles.loader}></div>;
+    return <Loader />;
   }
 
   if (data) {

diff --git a/src/GraphQl/Mutations/mutations.ts b/src/GraphQl/Mutations/mutations.ts
@@ -352,7 +352,7 @@ export const REJECT_ADMIN_MUTATION = gql`
  */
 export const UPDATE_INSTALL_STATUS_PLUGIN_MUTATION = gql`
   mutation update_install_status_plugin_mutation($id: ID!, $status: Boolean!) {
-    updateTempPluginStatus(id: $id, status: $status) {
+    updatePluginStatus(id: $id, status: $status) {
       _id
       pluginName
       pluginCreatedBy
@@ -368,7 +368,7 @@ export const UPDATE_INSTALL_STATUS_PLUGIN_MUTATION = gql`
  */
 export const UPDATE_ORG_STATUS_PLUGIN_MUTATION = gql`
   mutation update_install_status_plugin_mutation($id: ID!, $orgId: ID!) {
-    updateTempPluginInstalledOrgs(id: $id, orgId: $orgId) {
+    updatePluginInstalledOrgs(id: $id, orgId: $orgId) {
       _id
       pluginName
       pluginCreatedBy