Merge conflict fixed, merge latest develop into adminUI-redesign (#938)

* 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 * Merge conflict error fixed --------- 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>
PalisadoesFoundation · Jul 1, 2023 · a0ab0de · a0ab0de
1 parent 0182ff8
commit a0ab0de
Show file tree

Hide file tree

Showing 35 changed files with 2,919 additions and 14 deletions.
diff --git a/.github/workflows/pull-requests.yml b/.github/workflows/pull-requests.yml
@@ -60,3 +60,25 @@ jobs:
         with:
           path: "./coverage/lcov.info"
           min_coverage: 91.0
+  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
+
+      - 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: Validate Documents
+        run: graphql-inspector validate './src/GraphQl/**/*.ts' github:PalisadoesFoundation/talawa-api#develop:schema.graphql --token '${{secrets.REPO_READ_ONLY}}'
+
+
+
diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
@@ -35,3 +35,4 @@ jobs:
           verbose: true
           fail_ci_if_error: false
           name: '${{env.CODECOV_UNIQUE_NAME}}'
+
diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml
@@ -28,14 +28,14 @@ jobs:
     - uses: actions/stale@v7
       with:
         repo-token: ${{ secrets.GITHUB_TOKEN }}
-        stale-issue-message: 'This issue did not get any activity in the past 10 days and will be closed in 365 days if no update occurs. Please check if the develop branch has fixed it and report again or close the issue.'
-        stale-pr-message: 'This pull request did not get any activity in the past 10 days and will be closed in 365 days if no update occurs. Please verify it has no conflicts with the develop branch and rebase if needed. Mention it now if you need help or give permission to other people to finish your work.'
-        close-issue-message: 'This issue did not get any activity in the past 365 days and thus has been closed. Please check if the newest release or develop branch has it fixed. Please, create a new issue if the issue is not fixed.'
-        close-pr-message: 'This pull request did not get any activity in the past 365 days and thus has been closed.'
+        stale-issue-message: 'This issue did not get any activity in the past 10 days and will be closed in 180 days if no update occurs. Please check if the develop branch has fixed it and report again or close the issue.'
+        stale-pr-message: 'This pull request did not get any activity in the past 10 days and will be closed in 180 days if no update occurs. Please verify it has no conflicts with the develop branch and rebase if needed. Mention it now if you need help or give permission to other people to finish your work.'
+        close-issue-message: 'This issue did not get any activity in the past 180 days and thus has been closed. Please check if the newest release or develop branch has it fixed. Please, create a new issue if the issue is not fixed.'
+        close-pr-message: 'This pull request did not get any activity in the past 180 days and thus has been closed.'
         stale-issue-label: 'no-issue-activity'
         stale-pr-label: 'no-pr-activity'
         days-before-stale: 10
-        days-before-close: 365
+        days-before-close: 180
         remove-stale-when-updated: true
         exempt-all-milestones: true
         exempt-pr-labels: 'wip'

diff --git a/.husky/pre-commit b/.husky/pre-commit
@@ -3,4 +3,6 @@
 
 npm run format:fix
 npm run lint:fix
-npm run typecheck
+npm run typecheck
+
+git add .
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -150,7 +150,7 @@ The process of proposing a change to Talawa Admin can be summarized as:
 
 ## Internships
 
-If you are participating in any of the various internship programs we ar members of then please read the [introduction guides on our documentation website](https://docs.talawa.io/docs/).
+If you are participating in any of the various internship programs we are members of, then please read the [introduction guides on our documentation website](https://docs.talawa.io/docs/).
 
 ## Community
 There are many ways to communicate with the community.

diff --git a/package-lock.json b/package-lock.json
diff --git a/public/locales/en.json b/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"
   }
 }
diff --git a/public/locales/fr.json b/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"
   }
 }
diff --git a/public/locales/hi.json b/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": "सभी को देखें"
   }
 }
diff --git a/public/locales/sp.json b/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"
   }
 }