fixed test conflicts

PalisadoesFoundation · Nov 10, 2023 · 76177f9 · 76177f9
2 parents 85510de + 5fc88db
commit 76177f9
Show file tree

Hide file tree

Showing 44 changed files with 3,390 additions and 1,100 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -55,6 +55,7 @@
     "react-dom": "^17.0.2",
     "react-google-recaptcha": "^2.1.0",
     "react-i18next": "^11.18.1",
+    "react-infinite-scroll-component": "^6.1.0",
     "react-redux": "^7.2.5",
     "react-router-dom": "^5.2.0",
     "react-scripts": "5.0.1",

diff --git a/public/locales/en.json b/public/locales/en.json
@@ -86,7 +86,7 @@
     "cancel": "Cancel",
     "noOrgErrorTitle": "Organizations Not Found",
     "noOrgErrorDescription": "Please create an organization through dashboard",
-
+    "endOfResults": "End of results",
     "manageFeatures": "Manage Features",
     "manageFeaturesInfo": "Creation Successful ! Please select features that you want to enale for this organization from the plugin store.",
     "goToStore": "Go to Plugin Store",
@@ -109,6 +109,15 @@
     "name": "Name",
     "email": "Email",
     "roles_userType": "Role/User-Type",
+    "joined_organizations": "Joined Organizations",
+    "blocked_organizations": "Blocked Organizations",
+    "orgJoinedBy": "Organizations Joined By",
+    "orgThatBlocked": "Organizations That Blocked",
+    "endOfResults": "End of results",
+    "hasNotJoinedAnyOrg": "has not joined any organization",
+    "isNotBlockedByAnyOrg": "is not blocked by any organization",
+    "searchByOrgName": "Search By Organization Name",
+    "view": "View",
     "admin": "ADMIN",
     "superAdmin": "SUPERADMIN",
     "user": "USER",
@@ -131,6 +140,7 @@
     "accept": "Accept",
     "reject": "Reject",
     "enterName": "Enter Name",
+    "endOfResults": "End of results",
     "loadingRequests": "Loading Requests...",
     "noRequestFound": "No Request Found",
     "sort": "Sort",
@@ -153,6 +163,13 @@
     "events": "Events",
     "blockedUsers": "Blocked Users",
     "requests": "Requests",
+    "viewAll": "View All",
+    "upcomingEvents": "Upcoming Events",
+    "noUpcomingEvents": "No Upcoming Events",
+    "latestPosts": "Latest Posts",
+    "noPostsPresent": "No Posts Present",
+    "membershipRequests": "Membership requests",
+    "noMembershipRequests": "No Membership requests present",
     "talawaApiUnavailable": "Talawa-API service is unavailable. Is it running? Check your network connectivity too."
   },
   "organizationPeople": {
@@ -328,7 +345,7 @@
     "enterNewPassword": "Enter New Password",
     "cofirmNewPassword": "Confirm New Password",
     "changePassword": "Change Password",
-    "backToHome": "Back to Home",
+    "backToLogin": "Back to Login",
     "userOtp": "e.g. 12345",
     "password": "Password",
     "emailNotRegistered": "Email is not registered.",
@@ -377,9 +394,9 @@
   "deleteOrg": {
     "deleteOrganization": "Delete Organization",
     "deleteMsg": "Do you want to delete this organization?",
-    "no": "No",
-    "yes": "Yes",
-    "longDelOrgMsg": "By clicking on Delete organization button you will the organization will be permanently deleted along with its events, tags and all related data."
+    "cancel": "Cancel",
+    "confirmDelete": "Confirm Delete",
+    "longDelOrgMsg": "By clicking on Delete Organization button the organization will be permanently deleted along with its events, tags and all related data."
   },
   "userUpdate": {
     "firstName": "First Name",

diff --git a/public/locales/fr.json b/public/locales/fr.json
@@ -84,6 +84,7 @@
     "sort": "Trier",
     "filter": "Filtre",
     "cancel": "Annuler",
+    "endOfResults": "Fin des résultats",
     "noOrgErrorTitle": "Organisations non trouvées",
     "noOrgErrorDescription": "Veuillez créer une organisation via le tableau de bord",
     "noResultsFoundFor": "Aucun résultat trouvé pour "
@@ -104,6 +105,15 @@
     "name": "Nom",
     "email": "E-mail",
     "roles_userType": "Rôle/Type d'utilisateur",
+    "joined_organizations": "Organisations rejointes",
+    "blocked_organizations": "Organisations bloquées",
+    "endOfResults": "Fin des résultats",
+    "orgJoinedBy": "Organisation rejointe par",
+    "orgThatBlocked": "Organisation bloquée par",
+    "hasNotJoinedAnyOrg": "n'a rejoint aucune organisation",
+    "isNotBlockedByAnyOrg": "n'est bloqué par aucune organisation",
+    "searchByOrgName": "Rechercher par nom d'organisation",
+    "view": "Vue",
     "admin": "ADMIN",
     "superAdmin": "SUPERADMIN",
     "user": "UTILISATEUR",
@@ -125,6 +135,7 @@
     "accept": "Accepter",
     "reject": "Rejeter",
     "enterName": "Entrez le nom",
+    "endOfResults": "Fin des résultats",
     "loadingRequests": "Chargement des demandes...",
     "noRequestFound": "Aucune demande trouvée",
     "sort": "Trier",
@@ -146,6 +157,13 @@
     "events": "Événements",
     "blockedUsers": "Utilisateurs bloqués",
     "requests": "Demandes",
+    "viewAll": "Voir tout",
+    "upcomingEvents": "Événements à venir",
+    "noUpcomingEvents": "Aucun événement à venir",
+    "latestPosts": "Derniers messages",
+    "noPostsPresent": "Aucune publication présente",
+    "membershipRequests": "Demandes d'adhésion",
+    "noMembershipRequests": "Aucune demande d'adhésion",
     "talawaApiUnavailable": "Le service Talawa-API n'est pas disponible. Est-il en cours d'exécution ? Vérifiez également votre connectivité réseau."
   },
   "organizationPeople": {
@@ -321,7 +339,7 @@
     "enterNewPassword": "Entrez un nouveau mot de passe",
     "cofirmNewPassword": "Confirmer le nouveau mot de passe",
     "changePassword": "Changer le mot de passe",
-    "backToHome": "De retour à la maison",
+    "backToLogin": "Retour à la connexion",
     "userOtp": "par exemple. 12345",
     "password": "Mot de passe",
     "emailNotRegistered": "L'e-mail n'est pas enregistré.",
@@ -372,9 +390,9 @@
   "deleteOrg": {
     "deleteOrganization": "Supprimer l'organisation",
     "deleteMsg": "Voulez-vous supprimer cette organisation ?",
-    "no": "Non",
-    "yes": "Oui",
-    "longDelOrgMsg": "En cliquant sur le bouton Supprimer l'organisation, l'organisation sera définitivement supprimée, ainsi que ses événements, étiquettes et toutes les données associées."
+    "cancel": "Annuler",
+    "confirmDelete": "Confirmer la suppression",
+    "longDelOrgMsg": "En cliquant sur le bouton Supprimer l'organisation, l'organisation sera définitivement supprimée ainsi que ses événements, balises et toutes les données associées."
   },
   "userUpdate": {
     "firstName": "Prénom",

diff --git a/public/locales/hi.json b/public/locales/hi.json
@@ -84,6 +84,7 @@
     "sort": "छांटें",
     "filter": "फ़िल्टर",
     "cancel": "रद्द करना",
+    "endOfResults": "परिणामों का अंत",
     "noOrgErrorTitle": "संगठन नहीं मिला",
     "noOrgErrorDescription": "कृपया डैशबोर्ड के माध्यम से एक संगठन बनाएं",
     "noResultsFoundFor": "के लिए कोई परिणाम नहीं मिला "
@@ -104,6 +105,15 @@
     "name": "नाम",
     "email": "ईमेल",
     "roles_userType": "भूमिका/उपयोगकर्ता-प्रकार",
+    "joined_organizations": "संगठनों में शामिल हुए",
+    "blocked_organizations": "अवरोधित संगठन",
+    "endOfResults": "परिणामों का अंत",
+    "orgJoinedBy": "द्वारा शामिल हुए संगठन",
+    "orgThatBlocked": "जिन संगठनों ने अवरोधित किया",
+    "hasNotJoinedAnyOrg": "किसी भी संगठन में शामिल नहीं है",
+    "isNotBlockedByAnyOrg": "किसी भी संगठन द्वारा अवरोधित नहीं है",
+    "searchByOrgName": "संगठन के नाम से खोजें",
+    "view": "देखें",
     "admin": "व्यवस्थापक",
     "superAdmin": "सुपरएडमिन",
     "user": "उपयोगकर्ता",
@@ -125,6 +135,7 @@
     "accept": "स्वीकार करना",
     "reject": "अस्वीकार",
     "enterName": "नाम दर्ज करें",
+    "endOfResults": "परिणामों का अंत",
     "loadingRequests": "अनुरोध लोड हो रहा है ...",
     "noRequestFound": "कोई अनुरोध नहीं मिला।",
     "sort": "छांटें",
@@ -146,6 +157,13 @@
     "events": "आयोजन",
     "blockedUsers": "रोके गए उपयोगकर्ता",
     "requests": "अनुरोध",
+    "viewAll": "सभी देखें",
+    "upcomingEvents": "आगामी घटनाएँ",
+    "noUpcomingEvents": "कोई आगामी घटनाएँ नहीं",
+    "latestPosts": "नवीनतम पोस्ट",
+    "noPostsPresent": "कोई पोस्ट नहीं है",
+    "membershipRequests": "सदस्यता अनुरोध",
+    "noMembershipRequests": "कोई सदस्यता अनुरोध नहीं",
     "talawaApiUnavailable": "तलवा-एपीआई सेवा उपलब्ध नहीं है। क्या यह चल रहा है? अपनी नेटवर्क कनेक्टिविटी भी जांचें।"
   },
   "organizationPeople": {
@@ -321,7 +339,7 @@
     "enterNewPassword": "नया पासवर्ड दर्ज करें",
     "cofirmNewPassword": "नए पासवर्ड की पुष्टि करें",
     "changePassword": "पासवर्ड बदलें",
-    "backToHome": "घर वापिस जा रहा हूँ",
+    "backToLogin": "लॉगिन पर वापस जाएं",
     "userOtp": "उदाहरण के लिए 12345",
     "password": "पासवर्ड",
     "emailNotRegistered": "ईमेल पंजीकृत नहीं है।",
@@ -372,9 +390,9 @@
   "deleteOrg": {
     "deleteOrganization": "संगठन हटाएं",
     "deleteMsg": "क्या आप इस संगठन को हटाना चाहते हैं?",
-    "no": "नहीं",
-    "yes": "हां",
-    "longDelOrgMsg": "संगठन हटाने के बटन पर क्लिक करके, संगठन को स्थायित रूप से हटा दिया जाएगा, साथ ही उसके आयोजन, टैग और सभी संबंधित डेटा भी हटा दिया जाएगा।"
+    "cancel": "रद्द करना",
+    "confirmDelete": "हटाने की पुष्टि करें",
+    "longDelOrgMsg": "संगठन को हमेशा के लिए हटा देने के लिए संगठन हटाने के बटन पर क्लिक करके, उसके इवेंट्स, टैग्स और सभी संबंधित डेटा सहित सभी जानकारी हटा दी जाएगी।"
   },
   "userUpdate": {
     "firstName": "पहला नाम",

diff --git a/public/locales/sp.json b/public/locales/sp.json
@@ -84,6 +84,7 @@
     "sort": "Ordenar",
     "filter": "Filtrar",
     "cancel": "Cancelar",
+    "endOfResults": "Fin de los resultados",
     "noOrgErrorTitle": "Organizaciones no encontradas",
     "noOrgErrorDescription": "Por favor, crea una organización a través del panel de control",
     "noResultsFoundFor": "No se encontraron resultados para "
@@ -104,6 +105,15 @@
     "name": "Nombre",
     "email": "Correo electrónico",
     "roles_userType": "Rol/Tipo de usuario",
+    "joined_organizations": "Organizaciones unidas",
+    "blocked_organizations": "Organizaciones bloqueadas",
+    "endOfResults": "Fin de los resultados",
+    "orgJoinedBy": "Organizaciones unidas por",
+    "orgThatBlocked": "Organizaciones bloqueadas por",
+    "hasNotJoinedAnyOrg": "No se ha unido a ninguna organización.",
+    "isNotBlockedByAnyOrg": "No está bloqueado por ninguna organización.",
+    "searchByOrgName": "Buscar por nombre de organización",
+    "view": "Ver",
     "admin": "ADMINISTRACIÓN",
     "superAdmin": "SUPERADMIN",
     "user": "USUARIO",
@@ -125,6 +135,7 @@
     "accept": "Aceptar",
     "reject": "Rechazar",
     "enterName": "Ingrese su nombre",
+    "endOfResults": "Fin de los resultados",
     "loadingRequests": "Cargando solicitudes ...",
     "noRequestFound": "No se encontró ninguna solicitud.",
     "sort": "Ordenar",
@@ -146,6 +157,13 @@
     "events": "Eventos",
     "blockedUsers": "Usuarios bloqueados",
     "requests": "Solicitudes",
+    "viewAll": "Ver Todo",
+    "upcomingEvents": "Próximos Eventos",
+    "noUpcomingEvents": "No Hay Próximos Eventos",
+    "latestPosts": "Últimas Publicaciones",
+    "noPostsPresent": "No Hay Publicaciones Presentes",
+    "membershipRequests": "Solicitudes de Membresía",
+    "noMembershipRequests": "No Hay Solicitudes de Membresía",
     "talawaApiUnavailable": "El servicio Talawa-API no está disponible. ¿Está funcionando? Compruebe también la conectividad de su red."
   },
   "organizationPeople": {
@@ -321,7 +339,7 @@
     "enterNewPassword": "Ingrese nueva clave",
     "cofirmNewPassword": "Confirmar nueva contraseña",
     "changePassword": "Cambia la contraseña",
-    "backToHome": "De vuelta a casa",
+    "backToLogin": "Volver al inicio de sesión",
     "userOtp": "por ejemplo 12345",
     "password": "Contraseña",
     "emailNotRegistered": "El correo electrónico no está registrado.",
@@ -372,9 +390,9 @@
   "deleteOrg": {
     "deleteOrganization": "Eliminar organización",
     "deleteMsg": "¿Desea eliminar esta organización?",
-    "no": "No",
-    "yes": "Sí",
-    "longDelOrgMsg": "Al hacer clic en el botón de Eliminar organización, se eliminará permanentemente la organización junto con sus eventos, etiquetas y todos los datos relacionados."
+    "cancel": "Cancelar",
+    "confirmDelete": "Confirmar eliminación",
+    "longDelOrgMsg": "Al hacer clic en el botón Eliminar organización, la organización se eliminará permanentemente junto con sus eventos, etiquetas y todos los datos relacionados."
   },
   "userUpdate": {
     "firstName": "Primer nombre",

diff --git a/public/locales/zh.json b/public/locales/zh.json
@@ -84,6 +84,7 @@
     "sort": "排序",
     "filter": "過濾",
     "cancel": "取消",
+    "endOfResults": "結果結束",
     "noOrgErrorTitle": "找不到组织",
     "noOrgErrorDescription": "请通过仪表板创建一个组织",
     "noResultsFoundFor": "未找到结果 "
@@ -104,6 +105,15 @@
     "name": "姓名",
     "email": "電子郵件",
     "roles_userType": "角色/用戶類型",
+    "joined_organizations": "加入的組織",
+    "blocked_organizations": "阻止的組織",
+    "endOfResults": "結果結束",
+    "orgJoinedBy": "加入組織",
+    "orgThatBlocked": "阻止組織",
+    "hasNotJoinedAnyOrg": "尚未加入任何組織",
+    "isNotBlockedByAnyOrg": "沒有被任何組織阻止",
+    "searchByOrgName": "按組織名稱搜索",
+    "view": "視圖",
     "admin": "行政",
     "superAdmin": "超級管理員",
     "user": "用戶",
@@ -125,6 +135,7 @@
     "accept": "接受",
     "reject": "拒絕",
     "enterName": "输入名字",
+    "endOfResults": "結果結束",
     "loadingRequests": "正在加載請求...",
     "noRequestFound": "找不到請求。",
     "sort": "排序",
@@ -146,6 +157,13 @@
     "events": "事件",
     "blockedUsers": "被阻止的用戶",
     "requests": "请求",
+    "viewAll": "查看全部",
+    "upcomingEvents": "即将举办的活动",
+    "noUpcomingEvents": "没有即将举办的活动",
+    "latestPosts": "最新帖子",
+    "noPostsPresent": "没有帖子",
+    "membershipRequests": "会员申请",
+    "noMembershipRequests": "没有会员申请",
     "talawaApiUnavailable": "服務不可用。它在運行嗎？還要檢查您的網絡連接。"
   },
   "organizationPeople": {
@@ -321,7 +339,7 @@
     "enterNewPassword": "輸入新密碼",
     "cofirmNewPassword": "確認新密碼",
     "changePassword": "更改密碼",
-    "backToHome": "回到家",
+    "backToLogin": "回到登錄",
     "userOtp": "舉個例子。 12345",
     "password": "密碼",
     "emailNotRegistered": "電子郵件未註冊。",
@@ -372,9 +390,9 @@
   "deleteOrg": {
     "deleteOrganization": "删除组织",
     "deleteMsg": "您是否要删除此组织？",
-    "no": "否",
-    "yes": "是",
-    "longDelOrgMsg": "点击删除组织按钮后，将永久删除该组织以及其活动、标签和所有相关数据。"
+    "cancel": "取消",
+    "confirmDelete": "确认删除",
+    "longDelOrgMsg": "点击删除组织按钮，组织将被永久删除，包括其事件、标签和所有相关数据。"
   },
   "userUpdate": {
     "firstName": "名",