Skip to content

Commit

Permalink
Merge latest AdminUI Redesign into develop (#972)
Browse files Browse the repository at this point in the history
* Initial Organizations screen done

* Removed yellow scrollbar

* Linting fixed

* Replaced images with svgs for logos

* Styling done for btnsContainer

* Better typechecking and readability

* Animated Drawer working

* Responsive page ready

* OrgCard responsive

* Fixed navbar issue and added webkit keyframes

* LeftDrawer ready

* Translations added

* Added shimmer loading effect

* Styling issue fixed

* Failing tests fixed for OrgList

* Removed unused vars

* Tests done for LeftDrawer

* Succesfully made component without causing any breaking change

* 100% Code coverage achieved for Requests Screen

* Fix alignment

* Roles screen UI done

* Role screen fixed with 100% test coverage

* Changing screen activeness fixed

* Unused vars and Typos fixed

* Language support added

* Linting and typos fixed

* Fixed failing tests for LeftDrawer

* Completed tests of AdminDashListCard with 100% code coverage

* OrgListCard done

* Finalised tests

* Requests user search made functional again !

* Fixed loading on refetch and UX on all screens

* OrgList failing errors fixed

* Fixed all failing tests

* Achieved 100% code coverage for OrgList.tsx

* Wrote tests and mod LeftDrawer for admins

* Minor ui issue fixed

* Fixed failing test

* UI bug dropdown

* Frontend insync with Backend attempt 1

* Introspection fail fix 1

* Introspection error fix 3

* Introspection error fix another attempt

* Another attempt

* Fixed Default Animation on Organizations Screen

* Fixed typo

* Loading data from localstorage functional

* Fixed name conventions

* Fixed typo

* UI Fix

* Changed screen name

* Table Loader added

* Added LeftOrg drawer and Organization screen comp to Screens

* routesReducer tests fixed

* Redundant adminNavbar removed from project

* MemberDetail issue fixed

* Achieved 100% code coverage for LeftDrawerOrg, Added Empty div in images

* Fixed failing tests

* Fix tests

* Fixed warnings

* Linting fixes

* Linting issues fixed

* Achieved 100% code coverage for CollapsibleDropdown

* Achieved 100% CC on IconComponent and removed useless imports

* Achieved 100% cc for LeftDrawer Component

* Achieved 100% CC on SuperAdminScreen Component

* Fixed typo

* Integrated Event Dashboard

* Failing tests for LeftDrawer LeftDrawerOrg OrgList screen fixed

* Removed redundant code

* Removed useless imports

* Linting fixed

* Removed LeftDrawerOrg

* Dashboard screen ui almost ready

* Org Dash ready

* Block/Unblock screen ready

* Organization settings page ready

* Lang changes

* Page refresh on updating org removed

* OrgUpdate tests done

* OrgUpdate 100% test coverage achieved

* OrgSettings Tests done

* Organization Dashboard Cards done

* Organization Dashboard achieved 100% CC

* 100% CC achieved for BlockUser screen

* Finalised changes

* Small change

* Tests fixed

* Separate OrgSettings component made

* Linting fixed

* Formatting fixed
  • Loading branch information
rishav-jha-mech authored Sep 9, 2023
1 parent a6ced9a commit b1f513f
Show file tree
Hide file tree
Showing 60 changed files with 2,116 additions and 2,242 deletions.
35 changes: 19 additions & 16 deletions public/locales/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -152,11 +152,7 @@
"posts": "Posts",
"events": "Events",
"blockedUsers": "Blocked Users",
"membershipRequests": "Membership Requests",
"deleteOrganization": "Delete Organization",
"deleteMsg": "Do you want to delete this organization?",
"no": "No",
"yes": "Yes",
"requests": "Requests",
"talawaApiUnavailable": "Talawa-API service is unavailable. Is it running? Check your network connectivity too."
},
"organizationPeople": {
Expand Down Expand Up @@ -304,6 +300,7 @@
},
"blockUnblockUser": {
"title": "Talawa Block/Unblock User",
"pageName": "Block/Unblock",
"searchByName": "Search By Name",
"listOfUsers": "List of Users who spammed",
"name": "Name",
Expand All @@ -317,8 +314,10 @@
"talawaApiUnavailable": "Talawa-API service is unavailable. Is it running? Check your network connectivity too.",
"allMembers": "All Members",
"blockedUsers": "Blocked Users",
"searchFirstName": "Enter First Name",
"searchLastName": "Enter Last Name"
"searchByFirstName": "Search By First Name",
"searchByLastName": "Search By Last Name",
"noResultsFoundFor": "No results found for",
"noSpammerFound": "No spammer found"
},
"forgotPassword": {
"title": "Talawa Forgot Password",
Expand Down Expand Up @@ -367,13 +366,20 @@
},
"orgSettings": {
"title": "Talawa Setting",
"updateYourDetails": "Update Your Details",
"updateYourPassword": "Update Your Password",
"pageName": "Settings",
"updateOrganization": "Update Organization",
"deleteOrganization": "Delete Organization",
"seeRequest": "See Request",
"settings": "Settings",
"noData": "No data"
"noData": "No data",
"otherSettings": "Other Settings",
"changeLanguage": "Change Language"
},
"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."
},
"userUpdate": {
"firstName": "First Name",
Expand All @@ -388,15 +394,13 @@
"saveChanges": "Save Changes",
"cancel": "Cancel"
},

"userPasswordUpdate": {
"previousPassword": "Previous Password",
"newPassword": "New Password",
"confirmNewPassword": "Confirm New Password",
"saveChanges": "Save Changes",
"cancel": "Cancel"
},

"orgDelete": {
"deleteOrg": "Delete Org"
},
Expand All @@ -412,10 +416,9 @@
"description": "Description",
"location": "Location",
"displayImage": "Display Image",
"isPublic": "Is Public",
"isRegistrable": "Is Registrable",
"isPublic": "Public",
"isVisibleInSearch": "Visible in Search",
"saveChanges": "Save Changes",
"cancel": "Cancel",
"enterNameOrganization": "Enter Organization Name",
"successfulUpdated": "Organization updated successfully",
"talawaApiUnavailable": "Talawa-API service is unavailable. Is it running? Check your network connectivity too."
Expand Down
31 changes: 19 additions & 12 deletions public/locales/fr.json
Original file line number Diff line number Diff line change
Expand Up @@ -145,11 +145,7 @@
"posts": "Des postes",
"events": "Événements",
"blockedUsers": "Utilisateurs bloqués",
"membershipRequests": "Demandes d'adhésion",
"deleteOrganization": "Supprimer l'organisation",
"deleteMsg": "Voulez-vous supprimer cette organisation ?",
"no": "Non",
"yes": "Oui",
"requests": "Demandes",
"talawaApiUnavailable": "Le service Talawa-API n'est pas disponible. Est-il en cours d'exécution ? Vérifiez également votre connectivité réseau."
},
"organizationPeople": {
Expand Down Expand Up @@ -297,6 +293,7 @@
},
"blockUnblockUser": {
"title": "Talawa Bloquer/Débloquer l'utilisateur",
"pageName": "Bloquer/Débloquer'",
"searchByName": "Recherche par nom",
"listOfUsers": "Liste des utilisateurs qui ont spammé",
"name": "Nom",
Expand All @@ -310,8 +307,10 @@
"talawaApiUnavailable": "Le service Talawa-API n'est pas disponible. Est-il en cours d'exécution ? Vérifiez également votre connectivité réseau.",
"allMembers": "Tous les membres",
"blockedUsers": "Utilisateurs bloqués",
"searchFirstName": "Entrez votre prénom",
"searchLastName": "Entrer le nom de famille"
"searchByFirstName": "Rechercher par prénom",
"searchByLastName": "Rechercher par nom de famille",
"noResultsFoundFor": "Aucun résultat trouvé pour ",
"noSpammerFound": "Aucun spammeur trouvé"
},
"forgotPassword": {
"title": "Mot de passe oublié Talawa",
Expand Down Expand Up @@ -360,13 +359,22 @@
},
"orgSettings": {
"title": "Paramètre Talawa",
"pageName": "Paramètres",
"updateYourDetails": "Mettre à jour vos informations",
"updateYourPassword": "Mettez à jour votre mot de passe",
"updateOrganization": "Mettre à jour l'organisation",
"deleteOrganization": "Supprimer l'organisation",
"seeRequest": "Voir demande",
"settings": "Réglages",
"noData": "Pas de données"
"noData": "Pas de données",
"otherSettings": "Autres paramètres",
"changeLanguage": "Changer la langue"
},
"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."
},
"userUpdate": {
"firstName": "Prénom",
Expand Down Expand Up @@ -403,10 +411,9 @@
"description": "La description",
"location": "emplacement",
"displayImage": "Afficher l'image",
"isPublic": "Est publique",
"isRegistrable": "Est enregistrable",
"isPublic": "Public",
"isVisibleInSearch": "Visible dans la recherche",
"saveChanges": "Sauvegarder les modifications",
"cancel": "Annuler",
"enterNameOrganization": "Entrez le nom de l'organisation",
"successfulUpdated": "Mise à jour réussie",
"talawaApiUnavailable": "Le service Talawa-API n'est pas disponible. Est-il en cours d'exécution ? Vérifiez également votre connectivité réseau."
Expand Down
30 changes: 19 additions & 11 deletions public/locales/hi.json
Original file line number Diff line number Diff line change
Expand Up @@ -145,11 +145,7 @@
"posts": "पोस्ट",
"events": "आयोजन",
"blockedUsers": "रोके गए उपयोगकर्ता",
"membershipRequests": "सदस्यता अनुरोध",
"deleteOrganization": "संगठन हटाएं",
"deleteMsg": "क्या आप इस संगठन को हटाना चाहते हैं?",
"no": "नहीं",
"yes": "हाँ",
"requests": "अनुरोध",
"talawaApiUnavailable": "तलवा-एपीआई सेवा उपलब्ध नहीं है। क्या यह चल रहा है? अपनी नेटवर्क कनेक्टिविटी भी जांचें।"
},
"organizationPeople": {
Expand Down Expand Up @@ -297,6 +293,7 @@
},
"blockUnblockUser": {
"title": "तलावा ब्लॉक/अनब्लॉक यूजर",
"pageName": "ब्लॉक/अनब्लॉक",
"searchByName": "नाम से खोजें",
"listOfUsers": "स्पैम करने वाले उपयोगकर्ताओं की सूची",
"name": "नाम",
Expand All @@ -310,8 +307,10 @@
"talawaApiUnavailable": "तलवा-एपीआई सेवा उपलब्ध नहीं है। क्या यह चल रहा है? अपनी नेटवर्क कनेक्टिविटी भी जांचें।",
"allMembers": "सभी सदस्य",
"blockedUsers": "रोके गए उपयोगकर्ता",
"searchFirstName": "प्रथम नाम दर्ज करें",
"searchLastName": "अंतिम नाम दर्ज करो"
"searchByFirstName": "पहले नाम से खोजें",
"searchByLastName": "उपनाम से खोजें",
"noResultsFoundFor": "के लिए कोई परिणाम नहीं मिला ",
"noSpammerFound": "कोई स्पैमर नहीं मिला"
},
"forgotPassword": {
"title": "तलवा पासवर्ड भूल गए",
Expand Down Expand Up @@ -360,13 +359,22 @@
},
"orgSettings": {
"title": "तलावा सेटिंग",
"pageName": "सेटिंग्स",
"updateYourDetails": "अपना विवरण अपडेट करें",
"updateYourPassword": "अपना पासवर्ड अपडेट करें",
"updateOrganization": "अद्यतन संगठन",
"deleteOrganization": "संगठन हटाएं",
"seeRequest": "अनुरोध देखें",
"settings": "समायोजन",
"noData": "कोई डेटा नहीं"
"noData": "कोई डेटा नहीं",
"otherSettings": "अन्य सेटिंग्स",
"changeLanguage": "भाषा बदलें"
},
"deleteOrg": {
"deleteOrganization": "संगठन हटाएं",
"deleteMsg": "क्या आप इस संगठन को हटाना चाहते हैं?",
"no": "नहीं",
"yes": "हां",
"longDelOrgMsg": "संगठन हटाने के बटन पर क्लिक करके, संगठन को स्थायित रूप से हटा दिया जाएगा, साथ ही उसके आयोजन, टैग और सभी संबंधित डेटा भी हटा दिया जाएगा।"
},
"userUpdate": {
"firstName": "पहला नाम",
Expand Down Expand Up @@ -403,8 +411,8 @@
"description": "विवरण",
"location": "जगह",
"displayImage": "प्रदर्शन छवि",
"isPublic": "सार्वजनिक है",
"isRegistrable": "पंजीकरण योग्य है",
"isPublic": "सार्वजनिक",
"isVisibleInSearch": "खोज में दिखाए जा सकते हैं",
"saveChanges": "परिवर्तनों को सुरक्षित करें",
"cancel": "रद्द करना",
"enterNameOrganization": "संगठन का नाम दर्ज करें",
Expand Down
30 changes: 19 additions & 11 deletions public/locales/sp.json
Original file line number Diff line number Diff line change
Expand Up @@ -145,11 +145,7 @@
"posts": "Publicaciones",
"events": "Eventos",
"blockedUsers": "Usuarios bloqueados",
"membershipRequests": "Solicitudes de membresía",
"deleteOrganization": "Eliminar Organización",
"deleteMsg": "¿Desea eliminar esta organización?",
"no": "No",
"yes": "",
"requests": "Solicitudes",
"talawaApiUnavailable": "El servicio Talawa-API no está disponible. ¿Está funcionando? Compruebe también la conectividad de su red."
},
"organizationPeople": {
Expand Down Expand Up @@ -297,6 +293,7 @@
},
"blockUnblockUser": {
"title": "Usuario de bloqueo/desbloqueo de Talawa",
"pageName": "Bloqueo/desbloqueo",
"searchByName": "Buscar por nombre",
"listOfUsers": "Lista de Usuarios que enviaron spam",
"name": "Nombre",
Expand All @@ -310,8 +307,10 @@
"talawaApiUnavailable": "El servicio Talawa-API no está disponible. ¿Está funcionando? Compruebe también la conectividad de su red.",
"allMembers": "Todos los miembros",
"blockedUsers": "Usuarios bloqueados",
"searchFirstName": "Ingrese el nombre",
"searchLastName": "Introduzca el apellido"
"searchByFirstName": "Buscar por nombre de pila",
"searchByLastName": "Buscar por apellido",
"noResultsFoundFor": "No se encontraron resultados para ",
"noSpammerFound": "No se encontró ningún spammer"
},
"forgotPassword": {
"title": "Talawa olvidó su contraseña",
Expand Down Expand Up @@ -360,13 +359,22 @@
},
"orgSettings": {
"title": "Configuración Talawa",
"pageName": "Configuración",
"updateYourDetails": "Actualiza tus datos",
"updateYourPassword": "Actualice su contraseña",
"updateOrganization": "Actualizar Organización",
"deleteOrganization": "Eliminar Organización",
"seeRequest": "Ver Solicitud",
"settings": "Ajustes",
"noData": "Sin datos"
"noData": "Sin datos",
"otherSettings": "Otras Configuraciones",
"changeLanguage": "Cambiar Idioma"
},
"deleteOrg": {
"deleteOrganization": "Eliminar organización",
"deleteMsg": "¿Desea eliminar esta organización?",
"no": "No",
"yes": "",
"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."
},
"userUpdate": {
"firstName": "Primer nombre",
Expand Down Expand Up @@ -403,8 +411,8 @@
"description": "Descripción",
"location": "ubicación",
"displayImage": "Mostrar imagen",
"isPublic": "Es público",
"isRegistrable": "Es registrable",
"isPublic": "Público",
"isVisibleInSearch": "Visible en la búsqueda",
"saveChanges": "Guardar cambios",
"cancel": "Cancelar",
"enterNameOrganization": "Ingrese el nombre de la organización",
Expand Down
30 changes: 19 additions & 11 deletions public/locales/zh.json
Original file line number Diff line number Diff line change
Expand Up @@ -145,11 +145,7 @@
"posts": "帖子",
"events": "事件",
"blockedUsers": "被阻止的用戶",
"membershipRequests": "會員申請",
"deleteOrganization": "刪除組織",
"deleteMsg": "您要刪除此組織嗎?",
"no": "",
"yes": "是的",
"requests": "请求",
"talawaApiUnavailable": "服務不可用。它在運行嗎?還要檢查您的網絡連接。"
},
"organizationPeople": {
Expand Down Expand Up @@ -297,6 +293,7 @@
},
"blockUnblockUser": {
"title": "塔拉瓦封鎖/解除封鎖用戶",
"pageName": "封锁/解封",
"searchByName": "按名稱搜索",
"listOfUsers": "發送垃圾郵件的用戶列表",
"name": "姓名",
Expand All @@ -310,8 +307,10 @@
"talawaApiUnavailable": "服務不可用。它在運行嗎?還要檢查您的網絡連接。",
"allMembers": "所有成员",
"blockedUsers": "被阻止的用户",
"searchFirstName": "输入名字",
"searchLastName": "输入姓氏"
"searchByFirstName": "按名字搜索",
"searchByLastName": "按姓氏搜索",
"noResultsFoundFor": "未找到结果 ",
"noSpammerFound": "未发现垃圾邮件发送者"
},
"forgotPassword": {
"title": "塔拉瓦忘記密碼",
Expand Down Expand Up @@ -360,13 +359,22 @@
},
"orgSettings": {
"title": "塔拉瓦設置",
"pageName": "设置",
"updateYourDetails": "更新您的詳細信息",
"updateYourPassword": "更新您的密碼",
"updateOrganization": "更新組織",
"deleteOrganization": "刪除組織",
"seeRequest": "查看請求",
"settings": "設置",
"noData": "沒有數據"
"noData": "沒有數據",
"otherSettings": "其他设置",
"changeLanguage": "更改语言"
},
"deleteOrg": {
"deleteOrganization": "删除组织",
"deleteMsg": "您是否要删除此组织?",
"no": "",
"yes": "",
"longDelOrgMsg": "点击删除组织按钮后,将永久删除该组织以及其活动、标签和所有相关数据。"
},
"userUpdate": {
"firstName": "",
Expand Down Expand Up @@ -403,8 +411,8 @@
"description": "描述",
"location": "地點",
"displayImage": "顯示圖像",
"isPublic": "是公開的",
"isRegistrable": "可註冊",
"isPublic": "公开",
"isVisibleInSearch": "在搜索中可见",
"saveChanges": "保存更改",
"cancel": "取消",
"enterNameOrganization": "輸入組織名稱",
Expand Down
2 changes: 2 additions & 0 deletions src/GraphQl/Queries/Queries.ts
Original file line number Diff line number Diff line change
Expand Up @@ -183,6 +183,8 @@ export const ORGANIZATIONS_LIST = gql`
name
description
location
isPublic
visibleInSearch
members {
_id
firstName
Expand Down
5 changes: 5 additions & 0 deletions src/assets/svgs/admin.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
File renamed without changes
File renamed without changes
3 changes: 3 additions & 0 deletions src/assets/svgs/blockedUser.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
File renamed without changes
Loading

0 comments on commit b1f513f

Please sign in to comment.