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

Add Support For Volunteer & Volunteer Groups in User & Admin Portal #2397

Merged
merged 21 commits into from
Nov 3, 2024
Merged
Show file tree
Hide file tree
Changes from 12 commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
00c05ec
base for vgroup
GlenDsza Oct 5, 2024
309624c
Merge branch 'develop' of https://github.com/GlenDsza/talawa-admin in…
GlenDsza Oct 5, 2024
d900c77
Volunteer Membership Screens in User/Admin Portal
GlenDsza Oct 18, 2024
7dca88b
Add User action item screen and add support to admin action items for…
GlenDsza Oct 19, 2024
2abc317
Adding Leaderboard screens
GlenDsza Oct 25, 2024
6db903f
Merge branch 'vgroup' of https://github.com/GlenDsza/talawa-admin int…
GlenDsza Oct 25, 2024
e6dc7b0
Merge branch 'vgroup' of https://github.com/GlenDsza/talawa-admin int…
GlenDsza Oct 25, 2024
fc17ac3
Add Screens In user portal for volunteer management & Add tests
GlenDsza Nov 1, 2024
2db1105
Merge branch 'develop' of https://github.com/GlenDsza/talawa-admin in…
GlenDsza Nov 1, 2024
18ab3aa
minor improvements
GlenDsza Nov 1, 2024
3e51de2
improvements
GlenDsza Nov 1, 2024
87bb3c9
Modularize mocks and add interface.ts in countline exclusion
GlenDsza Nov 1, 2024
8a1d68d
correct allotedHours to allottedHours
GlenDsza Nov 1, 2024
468cc6a
Add debounced search
GlenDsza Nov 1, 2024
dca3d95
coderabbit suggestions
GlenDsza Nov 2, 2024
d291533
Merge branch 'develop' of https://github.com/PalisadoesFoundation/tal…
GlenDsza Nov 2, 2024
0c6c73f
Merge branch 'develop' of https://github.com/PalisadoesFoundation/tal…
GlenDsza Nov 2, 2024
a653e31
Removed old query and fixed translation
GlenDsza Nov 2, 2024
deade9f
Merge branch 'develop' of https://github.com/PalisadoesFoundation/tal…
GlenDsza Nov 2, 2024
c3ca420
Merge branch 'develop' of https://github.com/PalisadoesFoundation/tal…
GlenDsza Nov 2, 2024
a12bb50
Merge branch 'develop' of https://github.com/PalisadoesFoundation/tal…
GlenDsza Nov 3, 2024
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
2 changes: 1 addition & 1 deletion .github/workflows/pull-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:
- name: Count number of lines
run: |
chmod +x ./.github/workflows/countline.py
./.github/workflows/countline.py --lines 600 --exclude_files src/screens/LoginPage/LoginPage.tsx src/GraphQl/Queries/Queries.ts src/screens/OrgList/OrgList.tsx src/GraphQl/Mutations/mutations.ts src/components/EventListCard/EventListCardModals.tsx src/screens/ManageTag/ManageTag.tsx
./.github/workflows/countline.py --lines 600 --exclude_files src/screens/LoginPage/LoginPage.tsx src/GraphQl/Queries/Queries.ts src/screens/OrgList/OrgList.tsx src/GraphQl/Mutations/mutations.ts src/components/EventListCard/EventListCardModals.tsx src/screens/ManageTag/ManageTag.tsx src/utils/interfaces.ts
GlenDsza marked this conversation as resolved.
Show resolved Hide resolved

- name: Get changed TypeScript files
id: changed-files
Expand Down
104 changes: 98 additions & 6 deletions public/locales/en/translation.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,16 @@
{
"leaderboard": {
"title": "Leaderboard",
"searchByVolunteer": "Search By Volunteer",
"mostHours": "Most Hours",
"leastHours": "Least Hours",
"timeFrame": "Time Frame",
"allTime": "All Time",
"weekly": "This Week",
"monthly": "This Month",
"yearly": "This Year",
"noVolunteers": "No Volunteers Found!"
},
"loginPage": {
"title": "Talawa Admin",
"fromPalisadoes": "An open source application by Palisadoes Foundation volunteers",
Expand Down Expand Up @@ -266,7 +278,9 @@
"members": "members",
"admins": "admins",
"requests": "requests",
"talawaApiUnavailable": "talawaApiUnavailable"
"talawaApiUnavailable": "talawaApiUnavailable",
"volunteerRankings": "Volunteer Rankings",
"noVolunteers": "No Volunteers Found!"
},
"organizationPeople": {
"title": "Talawa Members",
Expand Down Expand Up @@ -469,7 +483,12 @@
"close": "close",
"eventActionItems": "eventActionItems",
"no": "no",
"yes": "yes"
"yes": "yes",
"individuals": "Individuals",
"groups": "Groups",
"assignTo": "Assign To",
"volunteers": "Volunteers",
"volunteerGroups": "Volunteer Groups"
},
"organizationAgendaCategory": {
"agendaCategoryDetails": "Agenda Category Details",
Expand Down Expand Up @@ -732,10 +751,11 @@
"title": "Event Management",
"dashboard": "Dashboard",
"registrants": "Registrants",
"eventActions": "Event Actions",
"eventAgendas": "Event Agendas",
"eventStats": "Event Statistics",
"to": "TO"
"actions": "Actions",
"agendas": "Agendas",
"statistics": "Statistics",
"to": "TO",
"volunteers": "Volunteers"
},
"forgotPassword": {
"title": "Talawa Forgot Password",
Expand Down Expand Up @@ -1342,5 +1362,77 @@
},
"userPledges": {
"title": "My Pledges"
},
"eventVolunteers": {
"volunteers": "Volunteers",
"volunteer": "Volunteer",
"volunteerGroups": "Volunteer Groups",
"individuals": "Individuals",
"groups": "Groups",
"status": "Status",
"noVolunteers": "No Volunteers",
"noVolunteerGroups": "No Volunteer Groups",
"add": "Add",
"mostHoursVolunteered": "Most Hours Volunteered",
"leastHoursVolunteered": "Least Hours Volunteered",
"accepted": "Accepted",
"addVolunteer": "Add Volunteer",
"removeVolunteer": "Remove Volunteer",
"volunteerAdded": "Volunteer added successfully",
"volunteerRemoved": "Volunteer removed successfully",
"volunteerGroupCreated": "Volunteer group created successfully",
"volunteerGroupUpdated": "Volunteer group updated successfully",
"volunteerGroupDeleted": "Volunteer group deleted successfully",
"removeVolunteerMsg": "Are you sure you want to remove this Volunteer?",
"deleteVolunteerGroupMsg": "Are you sure you want to delete this Volunteer Group?",
"leader": "Leader",
"group": "Group",
"createGroup": "Create Group",
"updateGroup": "Update Group",
"deleteGroup": "Delete Group",
"volunteersRequired": "Volunteers Required",
"volunteerDetails": "Volunteer Details",
"hoursVolunteered": "Hours Volunteered",
"groupDetails": "Group Details",
"creator": "Creator",
"requests": "Requests",
"noRequests": "No Requests",
"latest": "Latest",
"earliest": "Earliest",
"requestAccepted": "Request accepted successfully",
"requestRejected": "Request rejected successfully",
"details": "Details",
"manageGroup": "Manage Group",
"mostVolunteers": "Most Volunteers",
"leastVolunteers": "Least Volunteers"
},
"userVolunteer": {
"title": "Volunteership",
"name": "Title",
"upcomingEvents": "Upcoming Events",
"requests": "Requests",
"invitations": "Invitations",
"groups": "Volunteer Groups",
"actions": "Actions",
"searchByName": "Search by Name",
"latestEndDate": "Latest End Date",
"earliestEndDate": "Earliest End Date",
"noEvents": "No Upcoming Events",
"volunteer": "Volunteer",
"volunteered": "Volunteered",
"join": "Join",
"joined": "Joined",
"searchByEventName": "Search by Event title",
"filter": "Filter",
"groupInvite": "Group Invite",
"individualInvite": "Individual Invite",
"noInvitations": "No Invitations",
"accept": "Accept",
"reject": "Reject",
"receivedLatest": "Received Latest",
"receivedEarliest": "Received Earliest",
"invitationAccepted": "Invitation accepted successfully",
"invitationRejected": "Invitation rejected successfully",
"volunteerSuccess": "Requested to volunteer successfully"
}
}
178 changes: 135 additions & 43 deletions public/locales/fr/translation.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,16 @@
{
"leaderboard": {
"title": "Tableau des Leaders",
"searchByVolunteer": "Recherche par Bénévole",
"mostHours": "Le Plus d'Heures",
"leastHours": "Le Moins d'Heures",
"timeFrame": "Période",
"allTime": "Tout le Temps",
"weekly": "Cette Semaine",
"monthly": "Ce Mois",
"yearly": "Cette Année",
"noVolunteers": "Aucun Bénévole Trouvé!"
},
"loginPage": {
"title": "Administrateur Talawa",
"fromPalisadoes": "Une application open source réalisée par les bénévoles de la Fondation Palisadoes",
Expand Down Expand Up @@ -266,7 +278,9 @@
"members": "Membres",
"admins": "Administrateurs",
"requests": "Demandes",
"talawaApiUnavailable": "API Talawa indisponible"
"talawaApiUnavailable": "API Talawa indisponible",
"volunteerRankings": "Classement des Bénévoles",
"noVolunteers": "Aucun Bénévole Trouvé!"
},
"organizationPeople": {
"title": "Membres Talawa",
Expand Down Expand Up @@ -426,50 +440,55 @@
"done": "Fait"
},
"organizationActionItems": {
"actionItemCategory": "Catégorie d'élément d'action",
"actionItemDetails": "Détails de l'action",
"actionItemCompleted": "Élément d'action terminé",
"assignee": "Cessionnaire",
"assigner": "Assigner",
"assignmentDate": "Date d'affectation",
"actionItemCategory": "Catégorie de l'Action",
"actionItemDetails": "Détails de l'Action",
"actionItemCompleted": "Action Terminée",
"assignee": "Attribué à",
"assigner": "Assignateur",
"assignmentDate": "Date d'Attribution",
"active": "Actif",
"clearFilters": "Effacer les filtres",
"completionDate": "Date d'achèvement",
"createActionItem": "Créer un élément d'action",
"deleteActionItem": "Supprimer l'élément d'action",
"deleteActionItemMsg": "Voulez-vous supprimer cette action ?",
"clearFilters": "Effacer les Filtres",
"completionDate": "Date de Complétion",
"createActionItem": "Créer une Action",
"deleteActionItem": "Supprimer l'Action",
"deleteActionItemMsg": "Voulez-vous supprimer cette action?",
"details": "Détails",
"dueDate": "Date d'échéance",
"earliest": "Le plus tôt",
"editActionItem": "Modifier l'élément d'action",
"isCompleted": "Complété",
"latest": "Dernier",
"makeActive": "Actif",
"noActionItems": "Aucune action",
"options": "Possibilités",
"preCompletionNotes": "Notes préalables à l'achèvement",
"actionItemActive": "Actif",
"markCompletion": "Marquer l'achèvement",
"actionItemStatus": "Statut de l'action",
"postCompletionNotes": "Notes post-achèvement",
"selectActionItemCategory": "Sélectionnez une catégorie d'élément d'action",
"selectAssignee": "Sélectionnez un responsable",
"dueDate": "Date d'Échéance",
"earliest": "Le Plus Ancien",
"editActionItem": "Modifier l'Action",
"isCompleted": "Terminé",
"latest": "Le Plus Récent",
"makeActive": "Rendre Actif",
"noActionItems": "Aucune Action",
"options": "Options",
"preCompletionNotes": "Notes Pré-Complétion",
"actionItemActive": "Action Active",
"markCompletion": "Marquer comme Terminé",
"actionItemStatus": "État de l'Action",
"postCompletionNotes": "Notes Post-Complétion",
"selectActionItemCategory": "Sélectionnez une Catégorie d'Action",
"selectAssignee": "Sélectionner un Attribué",
"status": "Statut",
"successfulCreation": "Élément d'action créé avec succès",
"successfulUpdation": "Élément d'action mis à jour avec succès",
"successfulDeletion": "Élément d'action supprimé avec succès",
"title": "Éléments d'action",
"successfulCreation": "Action créée avec succès",
"successfulUpdation": "Action mise à jour avec succès",
"successfulDeletion": "Action supprimée avec succès",
"title": "Actions",
"category": "Catégorie",
"allotedHours": "Heures allouées",
"latestDueDate": "Date d'échéance la plus récente",
"earliestDueDate": "Date d'échéance la plus ancienne",
"updateActionItem": "Mettre à jour l'élément d'action",
"noneUpdated": "Aucun des champs n'a été mis à jour",
"updateStatusMsg": "Êtes-vous sûr de vouloir marquer cet élément d'action comme en attente?",
"allotedHours": "Heures Attribuées",
"latestDueDate": "Date d'Échéance la Plus Récente",
"earliestDueDate": "Date d'Échéance la Plus Ancienne",
"updateActionItem": "Mettre à Jour l'Action",
"noneUpdated": "Aucun champ n'a été mis à jour",
"updateStatusMsg": "Voulez-vous vraiment marquer cette action comme en attente?",
"close": "Fermer",
"eventActionItems": "Éléments d'action d'événement",
"eventActionItems": "Actions de l'Événement",
"no": "Non",
"yes": "Oui"
"yes": "Oui",
"individuals": "Individus",
"groups": "Groupes",
"assignTo": "Attribuer à",
"volunteers": "Bénévoles",
"volunteerGroups": "Groupes de Bénévoles"
},
"organizationAgendaCategory": {
"agendaCategoryDetails": "Détails de la catégorie d'ordre du jour",
Expand Down Expand Up @@ -732,10 +751,11 @@
"title": "Gestion d'événements",
"dashboard": "Tableau de bord",
"registrants": "Inscrits",
"eventActions": "Actions d'événement",
"eventAgendas": "Ordres du jour des événements",
"eventStats": "Statistiques des événements",
"to": "À"
"actions": "Actions",
"agendas": "Ordres du jour",
"statistics": "Statistiques",
"to": "À",
"volunteers": "Bénévoles"
},
"forgotPassword": {
"title": "Talawa Mot de passe oublié",
Expand Down Expand Up @@ -1342,5 +1362,77 @@
},
"userPledges": {
"title": "Mes Promesses"
},
"eventVolunteers": {
"volunteers": "Bénévoles",
"volunteer": "Bénévole",
"volunteerGroups": "Groupes de Bénévoles",
"individuals": "Individus",
"groups": "Groupes",
"status": "Statut",
"noVolunteers": "Aucun Bénévole",
"noVolunteerGroups": "Aucun Groupe de Bénévoles",
"add": "Ajouter",
"mostHoursVolunteered": "Le Plus d'Heures de Bénévolat",
"leastHoursVolunteered": "Le Moins d'Heures de Bénévolat",
"accepted": "Accepté",
"addVolunteer": "Ajouter un Bénévole",
"removeVolunteer": "Supprimer le Bénévole",
"volunteerAdded": "Bénévole ajouté avec succès",
"volunteerRemoved": "Bénévole supprimé avec succès",
"volunteerGroupCreated": "Groupe de bénévoles créé avec succès",
"volunteerGroupUpdated": "Groupe de bénévoles mis à jour avec succès",
"volunteerGroupDeleted": "Groupe de bénévoles supprimé avec succès",
"removeVolunteerMsg": "Êtes-vous sûr de vouloir supprimer ce bénévole?",
"deleteVolunteerGroupMsg": "Êtes-vous sûr de vouloir supprimer ce groupe de bénévoles?",
"leader": "Chef",
"group": "Groupe",
"createGroup": "Créer un Groupe",
"updateGroup": "Mettre à Jour le Groupe",
"deleteGroup": "Supprimer le Groupe",
"volunteersRequired": "Bénévoles Requis",
"volunteerDetails": "Détails du Bénévole",
"hoursVolunteered": "Heures de Bénévolat",
"groupDetails": "Détails du Groupe",
"creator": "Créateur",
"requests": "Demandes",
"noRequests": "Aucune Demande",
"latest": "Le Plus Récent",
"earliest": "Le Plus Ancien",
"requestAccepted": "Demande acceptée avec succès",
"requestRejected": "Demande rejetée avec succès",
"details": "Détails",
"manageGroup": "Gérer le Groupe",
"mostVolunteers": "Le plus de bénévoles",
"leastVolunteers": "Le moins de bénévoles"
},
"userVolunteer": {
"title": "Volontariat",
"name": "Titre",
"upcomingEvents": "Événements à Venir",
"requests": "Demandes",
"invitations": "Invitations",
"groups": "Groupes de Bénévoles",
"actions": "Actions",
"searchByName": "Rechercher par Nom",
"latestEndDate": "Date de Fin la Plus Récente",
"earliestEndDate": "Date de Fin la Plus Ancienne",
"noEvents": "Aucun Événement à Venir",
"volunteer": "Bénévole",
"volunteered": "A Bénévolé",
"join": "Rejoindre",
"joined": "Rejoint",
"searchByEventName": "Rechercher par Titre d'Événement",
"filter": "Filtrer",
"groupInvite": "Invitation de Groupe",
"individualInvite": "Invitation Individuelle",
"noInvitations": "Aucune Invitation",
"accept": "Accepter",
"reject": "Rejeter",
"receivedLatest": "Reçu le Plus Récemment",
"receivedEarliest": "Reçu en Premier",
"invitationAccepted": "Invitation acceptée avec succès",
"invitationRejected": "Invitation rejetée avec succès",
"volunteerSuccess": "Demande de bénévolat envoyée avec succès"
}
}
Loading
Loading