Skip to content

Commit

Permalink
Merge latest adminUI-Redesign (#950)
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
  • Loading branch information
rishav-jha-mech authored Aug 12, 2023
1 parent df8bda2 commit 3090757
Show file tree
Hide file tree
Showing 48 changed files with 2,644 additions and 2,362 deletions.
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

35 changes: 25 additions & 10 deletions public/locales/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,36 +34,41 @@
"requests": "Requests",
"logout": "Logout"
},
"leftDrawer": {
"talawaAdminPortal": "Talawa Admin Portal",
"menu": "Menu",
"organizations": "Organizations",
"requests": "Requests",
"roles": "Roles",
"logout": "Logout"
},
"orgList": {
"title": "Talawa Organizations",
"you": "You",
"name": "Name",
"designation": "Designation",
"email": "Email",
"searchByName": "Search By Name",
"organizationList": "Organizations List",
"organizations": "Organizations",
"createOrganization": "Create Organization",
"description": "Description",
"location": "Location",
"isPublic": "Is Public",
"visibleInSearch": "Visible In Search",
"displayImage": "Display Image",
"enterName": "Enter Name",
"sort": "Sort",
"filter": "Filter",
"cancel": "Cancel",
"noOrgErrorTitle": "Organizations Not Found",
"noOrgErrorDescription": "Please create an organization through dashboard"
"noOrgErrorDescription": "Please create an organization through dashboard",
"noResultsFoundFor": "No results found for "
},
"superDashListCard": {
"created": "Created",
"orgListCard": {
"admins": "Admins",
"members": "Members",
"manage": "Manage"
},
"adminDashListCard": {
"created": "Created",
"admins": "Admins",
"members": "Members",
"view": "View"
},
"paginationList": {
"rowsPerPage": "rows per page",
"all": "All"
Expand All @@ -79,8 +84,13 @@
"superAdmin": "SUPERADMIN",
"user": "USER",
"enterName": "Enter Name",
"loadingUsers": "Loading Users...",
"noUserFound": "No User Found",
"sort": "Sort",
"filter": "Filter",
"noOrgError": "Organizations not found, please create an organization through dashboard",
"roleUpdated": "Role Updated.",
"noResultsFoundFor": "No results found for ",
"talawaApiUnavailable": "Talawa-API service is unavailable. Is it running? Check your network connectivity too."
},
"requests": {
Expand All @@ -92,9 +102,14 @@
"accept": "Accept",
"reject": "Reject",
"enterName": "Enter Name",
"loadingRequests": "Loading Requests...",
"noRequestFound": "No Request Found",
"sort": "Sort",
"filter": "Filter",
"noOrgError": "Organizations not found, please create an organization through dashboard",
"userApproved": "User Approved",
"userRejected": "User Rejected",
"noResultsFoundFor": "No results found for ",
"talawaApiUnavailable": "Talawa-API service is unavailable. Is it running? Check your network connectivity too."
},
"adminNavbar": {
Expand Down
37 changes: 27 additions & 10 deletions public/locales/fr.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,34 +34,41 @@
"requests": "Demandes",
"logout": "Se déconnecter"
},
"leftDrawer": {
"talawaAdminPortal": "Portail d'administration Talawa",
"menu": "Menu",
"organizations": "Organisations",
"requests": "Demandes",
"roles": "Rôles",
"logout": "Déconnexion"
},
"orgList": {
"title": "Organisations Talawa",
"you": "Tu",
"name": "Nom",
"designation": "La désignation",
"email": "E-mail",
"searchByName": "Rechercher par nom",
"organizationList": "Liste des organisations",
"organizations": "Organisations",
"createOrganization": "Créer une organisation",
"description": "La description",
"location": "Emplacement",
"isPublic": "Est publique",
"visibleInSearch": "Visible dans la recherche",
"displayImage": "Afficher l'image",
"enterName": "Entrez le nom"
"enterName": "Entrez le nom",
"sort": "Trier",
"filter": "Filtre",
"cancel": "Annuler",
"noOrgErrorTitle": "Organisations non trouvées",
"noOrgErrorDescription": "Veuillez créer une organisation via le tableau de bord",
"noResultsFoundFor": "Aucun résultat trouvé pour "
},
"superDashListCard": {
"created": "Établi",
"orgListCard": {
"admins": "Administrateurs",
"members": "Membres",
"manage": "Faire en sorte"
},
"adminDashListCard": {
"view": "Voir",
"created": "Créé",
"admins": "Admins",
"members": "Membres"
},
"paginationList": {
"rowsPerPage": "lignes par page",
"all": "Tout"
Expand All @@ -77,7 +84,12 @@
"superAdmin": "SUPERADMIN",
"user": "UTILISATEUR",
"enterName": "Entrez le nom",
"loadingUsers": "Chargement des utilisateurs...",
"noUserFound": "Aucun utilisateur trouvé",
"sort": "Trier",
"filter": "Filtre",
"roleUpdated": "Rôle mis à jour.",
"noResultsFoundFor": "Aucun résultat trouvé pour ",
"talawaApiUnavailable": "Le service Talawa-API n'est pas disponible. Est-il en cours d'exécution ? Vérifiez également votre connectivité réseau."
},
"requests": {
Expand All @@ -89,8 +101,13 @@
"accept": "Accepter",
"reject": "Rejeter",
"enterName": "Entrez le nom",
"loadingRequests": "Chargement des demandes...",
"noRequestFound": "Aucune demande trouvée",
"sort": "Trier",
"filter": "Filtre",
"userApproved": "Approuvé par l'utilisateur",
"userRejected": "Utilisateur rejeté",
"noResultsFoundFor": "Aucun résultat trouvé pour ",
"talawaApiUnavailable": "Le service Talawa-API n'est pas disponible. Est-il en cours d'exécution ? Vérifiez également votre connectivité réseau."
},
"adminNavbar": {
Expand Down
37 changes: 27 additions & 10 deletions public/locales/hi.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,34 +34,41 @@
"requests": "अनुरोध",
"logout": "लॉग आउट"
},
"leftDrawer": {
"talawaAdminPortal": "तलावा व्यवस्थापक पोर्टल",
"menu": "मेन्यू",
"organizations": "संगठन",
"requests": "अनुरोध",
"roles": "भूमिकाएँ",
"logout": "लॉग आउट"
},
"orgList": {
"title": "तलवा संगठन",
"you": "आप",
"name": "नाम",
"designation": "पद",
"email": "ईमेल",
"searchByName": "नाम से खोजें",
"organizationList": "संगठनों की सूची",
"organizations": "संगठन",
"createOrganization": "संगठन बनाएं",
"description": "विवरण",
"location": "स्थान",
"isPublic": "सार्वजनिक है",
"visibleInSearch": "खोज में दृश्यमान",
"displayImage": "प्रदर्शन छवि",
"enterName": "नाम दर्ज करें"
"enterName": "नाम दर्ज करें",
"sort": "छांटें",
"filter": "फ़िल्टर",
"cancel": "रद्द करना",
"noOrgErrorTitle": "संगठन नहीं मिला",
"noOrgErrorDescription": "कृपया डैशबोर्ड के माध्यम से एक संगठन बनाएं",
"noResultsFoundFor": "के लिए कोई परिणाम नहीं मिला "
},
"superDashListCard": {
"created": "बनाया था",
"orgListCard": {
"admins": "व्यवस्थापक",
"members": "सदस्य",
"manage": "प्रबंधित करना"
},
"adminDashListCard": {
"view": "देखें",
"created": "बनाया गया",
"admins": "व्यवस्थापक",
"members": "सदस्य"
},
"paginationList": {
"rowsPerPage": "प्रति पृष्ठ पंक्तियाँ",
"all": "सभी"
Expand All @@ -77,7 +84,12 @@
"superAdmin": "सुपरएडमिन",
"user": "उपयोगकर्ता",
"enterName": "नाम दर्ज करें",
"loadingUsers": "उपयोगकर्ता लोड हो रहा है ...",
"noUserFound": "कोई उपयोगकर्ता नहीं मिला।",
"sort": "छांटें",
"filter": "फ़िल्टर",
"roleUpdated": "भूमिका अपडेट की गई।",
"noResultsFoundFor": "के लिए कोई परिणाम नहीं मिला ",
"talawaApiUnavailable": "तलवा-एपीआई सेवा उपलब्ध नहीं है। क्या यह चल रहा है? अपनी नेटवर्क कनेक्टिविटी भी जांचें।"
},
"requests": {
Expand All @@ -89,8 +101,13 @@
"accept": "स्वीकार करना",
"reject": "अस्वीकार",
"enterName": "नाम दर्ज करें",
"loadingRequests": "अनुरोध लोड हो रहा है ...",
"noRequestFound": "कोई अनुरोध नहीं मिला।",
"sort": "छांटें",
"filter": "फ़िल्टर",
"userApproved": "उपयोगकर्ता स्वीकृत",
"userRejected": "उपयोगकर्ता अस्वीकृत",
"noResultsFoundFor": "के लिए कोई परिणाम नहीं मिला ",
"talawaApiUnavailable": "तलवा-एपीआई सेवा उपलब्ध नहीं है। क्या यह चल रहा है? अपनी नेटवर्क कनेक्टिविटी भी जांचें।"
},
"adminNavbar": {
Expand Down
39 changes: 27 additions & 12 deletions public/locales/sp.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,34 +34,41 @@
"requests": "Peticiones",
"logout": "Cerrar sesión"
},
"leftDrawer": {
"talawaAdminPortal": "Portal de administración de Talawa",
"menu": "Menú",
"organizations": "Organizaciones",
"requests": "Solicitudes",
"roles": "Roles",
"logout": "Cerrar sesión"
},
"orgList": {
"title": "Organizaciones Talawa",
"you": "",
"name": "Nombre",
"designation": "Designacion",
"email": "Correo electrónico",
"searchByName": "Buscar por nombre",
"organizationList": "Lista de organizaciones",
"organizations": "Organizaciones",
"createOrganization": "Crear organización",
"description": "Descripción",
"location": "Ubicación",
"isPublic": "Es público",
"visibleInSearch": "Visible en la búsqueda",
"displayImage": "Mostrar imagen",
"enterName": "Ingrese su nombre"
"enterName": "Ingrese su nombre",
"sort": "Ordenar",
"filter": "Filtrar",
"cancel": "Cancelar",
"noOrgErrorTitle": "Organizaciones no encontradas",
"noOrgErrorDescription": "Por favor, crea una organización a través del panel de control",
"noResultsFoundFor": "No se encontraron resultados para "
},
"superDashListCard": {
"created": "Creado",
"orgListCard": {
"admins": "Administradores",
"members": "Miembros",
"manage": "Administrar"
},
"adminDashListCard": {
"view": "Ver",
"created": "Creado",
"admins": "Administradores",
"members": "Miembros"
},
"paginationList": {
"rowsPerPage": "filas por página",
"all": "Todos"
Expand All @@ -77,7 +84,12 @@
"superAdmin": "SUPERADMIN",
"user": "USUARIO",
"enterName": "Ingrese su nombre",
"loadingUsers": "Cargando usuarios ...",
"noUserFound": "No se encontró ningún usuario.",
"sort": "Ordenar",
"filter": "Filtrar",
"roleUpdated": "Rol actualizado.",
"noResultsFoundFor": "No se encontraron resultados para ",
"talawaApiUnavailable": "El servicio Talawa-API no está disponible. ¿Está funcionando? Compruebe también la conectividad de su red."
},
"requests": {
Expand All @@ -89,8 +101,13 @@
"accept": "Aceptar",
"reject": "Rechazar",
"enterName": "Ingrese su nombre",
"loadingRequests": "Cargando solicitudes ...",
"noRequestFound": "No se encontró ninguna solicitud.",
"sort": "Ordenar",
"filter": "Filtrar",
"userApproved": "Aprobado por el usuario",
"userRejected": "Usuario rechazado",
"noResultsFoundFor": "No se encontraron resultados para ",
"talawaApiUnavailable": "El servicio Talawa-API no está disponible. ¿Está funcionando? Compruebe también la conectividad de su red."
},
"adminNavbar": {
Expand Down Expand Up @@ -362,15 +379,13 @@
"saveChanges": "Guardar cambios",
"cancel": "Cancelar"
},

"userPasswordUpdate": {
"previousPassword": "Contraseña anterior",
"newPassword": "Nueva contraseña",
"confirmNewPassword": "Confirmar nueva contraseña",
"saveChanges": "Guardar cambios",
"cancel": "Cancelar"
},

"orgDelete": {
"deleteOrg": "Eliminar organización"
},
Expand Down
Loading

0 comments on commit 3090757

Please sign in to comment.