Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge latest AdminUI Redesign into Master #1006

Merged
merged 36 commits into from
Oct 31, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
67c82ab
Pagination Done for Orglist
rishav-jha-mech Sep 26, 2023
326af76
Fixed warnings
rishav-jha-mech Sep 26, 2023
0fc6402
Infinite scroll and search working for Requests screen
rishav-jha-mech Sep 29, 2023
a3e2b45
Simplified the code
rishav-jha-mech Sep 29, 2023
44c3b6b
Infinite scroll enabled and functioning on OrgList Requests and Users…
rishav-jha-mech Sep 29, 2023
73cc31c
FIxed warning
rishav-jha-mech Sep 29, 2023
7c7e710
Fixed typo
rishav-jha-mech Sep 29, 2023
9d01192
Fixed bug
rishav-jha-mech Sep 29, 2023
cdca4e3
Joined and Blockedbyorgs screen and mdoal ready
rishav-jha-mech Sep 29, 2023
530b63e
Tables ready !
rishav-jha-mech Sep 30, 2023
2122006
Remove user from organization functionality working well
rishav-jha-mech Sep 30, 2023
07ad7ba
Update user role in organization feature ready
rishav-jha-mech Sep 30, 2023
b6da954
Minor changes
rishav-jha-mech Oct 20, 2023
0e8b319
Done with tests on OrgList
rishav-jha-mech Oct 21, 2023
2c3ad91
Done with testss of Requests screen
rishav-jha-mech Oct 22, 2023
292988c
100% CC achieved for Users screen
rishav-jha-mech Oct 22, 2023
f7ec7e8
Main tests done for UserTableItem
rishav-jha-mech Oct 24, 2023
a22528f
100% Code Coverage Achieved for UserTableItem
rishav-jha-mech Oct 24, 2023
fc7afc3
Removed Redundant Landing Page
rishav-jha-mech Oct 24, 2023
33286ff
100% CC achieved for TableLoader
rishav-jha-mech Oct 24, 2023
e788da0
Translation added for Users Screen
rishav-jha-mech Oct 24, 2023
621561e
Translation done for Requests screen
rishav-jha-mech Oct 24, 2023
d5aa9e8
Translation done for dashboard screen
rishav-jha-mech Oct 24, 2023
9122cfc
Linting and warnings fixed
rishav-jha-mech Oct 24, 2023
486da26
Fixed merge conflict
rishav-jha-mech Oct 24, 2023
23d2317
Improved login page
rishav-jha-mech Oct 27, 2023
dde8409
UI Done for Forgot Password Screen
rishav-jha-mech Oct 27, 2023
c831bb2
Forgot Password Screen Tests done!
rishav-jha-mech Oct 27, 2023
78b3d33
Fixed all pending tests
rishav-jha-mech Oct 27, 2023
72a65f3
Better message for btns and coloring
rishav-jha-mech Oct 27, 2023
11ad503
Linting issues fixed
rishav-jha-mech Oct 27, 2023
34417a7
Fixed code styles
rishav-jha-mech Oct 27, 2023
a57510e
SUPPRESSED UNKNOWN ERROR
rishav-jha-mech Oct 27, 2023
15b3239
Fixed formatting
rishav-jha-mech Oct 27, 2023
9693625
Updated typoed message
rishav-jha-mech Oct 27, 2023
5a60d8d
Fixed failing tests accompanying typo
rishav-jha-mech Oct 27, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
88 changes: 55 additions & 33 deletions package-lock.json

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

1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
27 changes: 22 additions & 5 deletions public/locales/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
Expand All @@ -131,6 +140,7 @@
"accept": "Accept",
"reject": "Reject",
"enterName": "Enter Name",
"endOfResults": "End of results",
"loadingRequests": "Loading Requests...",
"noRequestFound": "No Request Found",
"sort": "Sort",
Expand All @@ -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": {
Expand Down Expand Up @@ -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.",
Expand Down Expand Up @@ -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",
Expand Down
26 changes: 22 additions & 4 deletions public/locales/fr.json
Original file line number Diff line number Diff line change
Expand Up @@ -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 "
Expand All @@ -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",
Expand All @@ -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",
Expand All @@ -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": {
Expand Down Expand Up @@ -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é.",
Expand Down Expand Up @@ -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",
Expand Down
26 changes: 22 additions & 4 deletions public/locales/hi.json
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,7 @@
"sort": "छांटें",
"filter": "फ़िल्टर",
"cancel": "रद्द करना",
"endOfResults": "परिणामों का अंत",
"noOrgErrorTitle": "संगठन नहीं मिला",
"noOrgErrorDescription": "कृपया डैशबोर्ड के माध्यम से एक संगठन बनाएं",
"noResultsFoundFor": "के लिए कोई परिणाम नहीं मिला "
Expand All @@ -104,6 +105,15 @@
"name": "नाम",
"email": "ईमेल",
"roles_userType": "भूमिका/उपयोगकर्ता-प्रकार",
"joined_organizations": "संगठनों में शामिल हुए",
"blocked_organizations": "अवरोधित संगठन",
"endOfResults": "परिणामों का अंत",
"orgJoinedBy": "द्वारा शामिल हुए संगठन",
"orgThatBlocked": "जिन संगठनों ने अवरोधित किया",
"hasNotJoinedAnyOrg": "किसी भी संगठन में शामिल नहीं है",
"isNotBlockedByAnyOrg": "किसी भी संगठन द्वारा अवरोधित नहीं है",
"searchByOrgName": "संगठन के नाम से खोजें",
"view": "देखें",
"admin": "व्यवस्थापक",
"superAdmin": "सुपरएडमिन",
"user": "उपयोगकर्ता",
Expand All @@ -125,6 +135,7 @@
"accept": "स्वीकार करना",
"reject": "अस्वीकार",
"enterName": "नाम दर्ज करें",
"endOfResults": "परिणामों का अंत",
"loadingRequests": "अनुरोध लोड हो रहा है ...",
"noRequestFound": "कोई अनुरोध नहीं मिला।",
"sort": "छांटें",
Expand All @@ -146,6 +157,13 @@
"events": "आयोजन",
"blockedUsers": "रोके गए उपयोगकर्ता",
"requests": "अनुरोध",
"viewAll": "सभी देखें",
"upcomingEvents": "आगामी घटनाएँ",
"noUpcomingEvents": "कोई आगामी घटनाएँ नहीं",
"latestPosts": "नवीनतम पोस्ट",
"noPostsPresent": "कोई पोस्ट नहीं है",
"membershipRequests": "सदस्यता अनुरोध",
"noMembershipRequests": "कोई सदस्यता अनुरोध नहीं",
"talawaApiUnavailable": "तलवा-एपीआई सेवा उपलब्ध नहीं है। क्या यह चल रहा है? अपनी नेटवर्क कनेक्टिविटी भी जांचें।"
},
"organizationPeople": {
Expand Down Expand Up @@ -321,7 +339,7 @@
"enterNewPassword": "नया पासवर्ड दर्ज करें",
"cofirmNewPassword": "नए पासवर्ड की पुष्टि करें",
"changePassword": "पासवर्ड बदलें",
"backToHome": "घर वापिस जा रहा हूँ",
"backToLogin": "लॉगिन पर वापस जाएं",
"userOtp": "उदाहरण के लिए 12345",
"password": "पासवर्ड",
"emailNotRegistered": "ईमेल पंजीकृत नहीं है।",
Expand Down Expand Up @@ -372,9 +390,9 @@
"deleteOrg": {
"deleteOrganization": "संगठन हटाएं",
"deleteMsg": "क्या आप इस संगठन को हटाना चाहते हैं?",
"no": "नहीं",
"yes": "हां",
"longDelOrgMsg": "संगठन हटाने के बटन पर क्लिक करके, संगठन को स्थायित रूप से हटा दिया जाएगा, साथ ही उसके आयोजन, टैग और सभी संबंधित डेटा भी हटा दिया जाएगा।"
"cancel": "रद्द करना",
"confirmDelete": "हटाने की पुष्टि करें",
"longDelOrgMsg": "संगठन को हमेशा के लिए हटा देने के लिए संगठन हटाने के बटन पर क्लिक करके, उसके इवेंट्स, टैग्स और सभी संबंधित डेटा सहित सभी जानकारी हटा दी जाएगी।"
},
"userUpdate": {
"firstName": "पहला नाम",
Expand Down
Loading
Loading