Skip to content

Commit

Permalink
Redesign & Refac Fund, Campaign & Pledge Screen (#2064)
Browse files Browse the repository at this point in the history
* refac/redesign Funds

* refac/redesign campaigns

* Add sort/search in Funds

* Added breadcrumbs

* Add sort/search in Campaigns

* add tests

* add translations

* cleanup

* missing translation

* Add progress indicator in pledges screen

* incorp coderab changes

* Added popup to view all volunteers

* Add progress bar for Raised & Pledged

* set raised to 0

* update test case

* rerun

* removed progressbar animation
  • Loading branch information
GlenDsza authored Jul 21, 2024
1 parent 1b5e335 commit d440ad4
Show file tree
Hide file tree
Showing 39 changed files with 3,531 additions and 2,871 deletions.
1 change: 1 addition & 0 deletions public/locales/en/common.json
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@
"manage": "Manage",
"searchResultsFor": "Search results for {{text}}",
"none": "None",
"sort": "Sort",
"Donate": "Donate",
"addedSuccessfully": "{{item}} added Successfully",
"updatedSuccessfully": "{{item}} updated Successfully",
Expand Down
47 changes: 23 additions & 24 deletions public/locales/en/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -361,33 +361,24 @@
"title": "Funds",
"createFund": "Create Fund",
"fundName": "Fund Name",
"fundId": "Fund ID",
"fundOptions": "Opitons",
"noFunds": "No Funds Found",
"fundDetails": "Fund Details",
"fundId": "Fund (Reference) ID",
"taxDeductible": "Tax Deductible",
"enterfundName": "Enter Fund Name",
"enterfundId": "Enter Fund ID",
"default": "Default Fund",
"default": "Default",
"archived": "Archived",
"nonArchive": "Non-Archived",
"fundCreate": "Create Fund",
"fundUpdate": "Update Fund",
"fundDelete": "Delete Fund",
"manageFund": "Manage Fund",
"searchFullName": "Search By Name",
"noFundsFound": "No Funds Found",
"createdBy": "Created By",
"createdOn": "Created On",
"status": "Status",
"archiveFund": "Archive Fund",
"archiveFundMsg": "On Archiving this fund will remove it from the fund listing.Thisaction can be undone",
"fundCreated": "Fund created successfully",
"fundUpdated": "Fund updated successfully",
"fundDeleted": "Fund deleted successfully",
"fundArchived": "Fund archived successfully",
"fundUnarchived": "Fund unarchived successfully",
"deleteFundMsg": "Do you want to remove this fund?"
"deleteFundMsg": "Are you sure you want to delete this fund?",
"createdLatest": "Created Latest",
"createdEarliest": "Created Earliest",
"viewCampaigns": "View Campaigns"
},
"fundCampaign": {
"title": "Fundraising Campaigns",
Expand All @@ -400,17 +391,21 @@
"deletedCampaign": "Campaign deleted successfully",
"deleteCampaignMsg": "Are you sure you want to delete this campaign?",
"noCampaigns": "No Campaigns Found",
"createCampaign": "Create Fund Campaign",
"updateCampaign": "Update Fund Campaign",
"manageCampaign": "Manage Fund Campaign",
"deleteCampaign": "Delete Fund Campaign",
"createCampaign": "Create Campaign",
"updateCampaign": "Update Campaign",
"deleteCampaign": "Delete Campaign",
"currency": "Currency",
"selectCurrency": "Select Currency",
"searchFullName": "Search By Name"
"searchFullName": "Search By Name",
"viewPledges": "View Pledges",
"noCampaignsFound": "No Campaigns Found",
"latestEndDate": "Latest End Date",
"earliestEndDate": "Earliest End Date",
"lowestGoal": "Lowest Goal",
"highestGoal": "Highest Goal"
},
"pledges": {
"title": "Fund Campaign Pledges",
"volunteers": "Volunteers",
"pledgeAmount": "Pledge Amount",
"pledgeOptions": "Options",
"pledgeCreated": "Pledge created successfully",
Expand All @@ -426,12 +421,16 @@
"editPledge": "Edit Pledge",
"deletePledgeMsg": "Are you sure you want to delete this pledge?",
"noPledges": "No Pledges Found",
"sort": "Sort",
"searchVolunteer": "Search By Volunteer",
"searchPledger": "Search By Pledgers",
"highestAmount": "Highest Amount",
"lowestAmount": "Lowest Amount",
"latestEndDate": "Latest End Date",
"earliestEndDate": "Earliest End Date"
"earliestEndDate": "Earliest End Date",
"campaigns": "Campaigns",
"pledges": "Pledges",
"endsOn": "Ends on",
"raisedAmount": "Raised amount ",
"pledgedAmount": "Pledged amount"
},
"orgPost": {
"title": "Posts",
Expand Down
1 change: 1 addition & 0 deletions public/locales/fr/common.json
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@
"manage": "Gérer",
"searchResultsFor": "Résultats de recherche pour {{text}}",
"none": "Aucun",
"sort": "Trier",
"Donate": "Faire un don",
"addedSuccessfully": "{{item}} ajouté avec succès",
"updatedSuccessfully": "{{item}} mis à jour avec succès",
Expand Down
58 changes: 29 additions & 29 deletions public/locales/fr/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -366,56 +366,52 @@
"title": "Fonds",
"createFund": "Créer un fonds",
"fundName": "Nom du fonds",
"fundId": "ID du fonds",
"fundOptions": "Options",
"noFunds": "Aucun fonds trouvé",
"fundDetails": "Détails du fonds",
"taxDeductible": "Déductible d'impôts",
"enterfundName": "Entrez le nom du fonds",
"enterfundId": "Entrez l'ID du fonds",
"default": "Fonds de défaut",
"fundId": "ID de référence du fonds",
"taxDeductible": "Déductible d'impôt",
"default": "Par défaut",
"archived": "Archivé",
"nonArchive": "Non archivé",
"fundCreate": "Créer un fonds",
"fundUpdate": "Mettre à jour le fonds",
"fundDelete": "Supprimer le fonds",
"manageFund": "Gérer le fonds",
"searchFullName": "Rechercher par nom",
"searchByName": "Rechercher par nom",
"noFundsFound": "Aucun fonds trouvé",
"createdBy": "Créé par",
"createdOn": "Créé sur",
"createdOn": "Créé le",
"status": "Statut",
"archiveFund": "Fonds d'archives",
"archiveFundMsg": "Lors de l'archivage, ce fonds le supprimera de la liste des fonds. Cette action peut être annulée.",
"fundCreated": "Fonds créé avec succès",
"fundUpdated": "Fonds mis à jour avec succès",
"fundDeleted": "Fonds supprimé avec succès",
"fundArchived": "Fonds archivé avec succès",
"fundUnarchived": "Fonds désarchivé avec succès",
"deleteFundMsg": "Voulez-vous supprimer ce fonds ?"
"deleteFundMsg": "Êtes-vous sûr de vouloir supprimer ce fonds ?",
"createdLatest": "Créé le plus récemment",
"createdEarliest": "Créé le plus tôt",
"viewCampaigns": "Voir les campagnes"
},
"fundCampaign": {
"title": "Campagnes de collecte de fonds",
"campaignName": "Nom de la campagne",
"campaignOptions": "Possibilités",
"campaignOptions": "Options",
"fundingGoal": "Objectif de financement",
"addCampaign": "Ajouter une campagne",
"createdCampaign": "Campagne créée avec succès",
"updatedCampaign": "Campagne mise à jour avec succès",
"deletedCampaign": "Campagne supprimée avec succès",
"deleteCampaignMsg": "Êtes-vous sûr de vouloir supprimer cette campagne ?",
"deleteCampaignMsg": "Êtes-vous sûr de vouloir supprimer cette campagne ?",
"noCampaigns": "Aucune campagne trouvée",
"createCampaign": "Créer une campagne de financement",
"updateCampaign": "Mettre à jour la campagne de financement",
"manageCampaign": "Gérer la campagne de financement",
"deleteCampaign": "Supprimer la campagne de financement",
"createCampaign": "Créer une campagne",
"updateCampaign": "Mettre à jour la campagne",
"deleteCampaign": "Supprimer la campagne",
"currency": "Devise",
"selectCurrency": "Sélectionnez la devise",
"searchFullName": "Rechercher par nom"
"selectCurrency": "Sélectionner la devise",
"searchFullName": "Rechercher par nom",
"viewPledges": "Voir les promesses de dons",
"noCampaignsFound": "Aucune campagne trouvée",
"latestEndDate": "Dernière date de fin",
"earliestEndDate": "Date de fin la plus ancienne",
"lowestGoal": "Objectif le plus bas",
"highestGoal": "Objectif le plus élevé"
},
"pledges": {
"title": "Engagements de campagne de financement",
"volunteers": "Bénévoles",
"pledgeAmount": "Montant de la promesse de don",
"pledgeOptions": "Possibilités",
"pledgeCreated": "Engagement créé avec succès",
Expand All @@ -431,12 +427,16 @@
"editPledge": "Modifier l'engagement",
"deletePledgeMsg": "Etes-vous sûr de vouloir supprimer cet engagement ?",
"noPledges": "Aucun engagement trouvé",
"sort": "Trier",
"searchVolunteer": "Rechercher par bénévole",
"searchPledger": "Rechercher par les bailleurs de fonds",
"highestAmount": "Montant le plus élevé",
"lowestAmount": "Montant le plus bas",
"latestEndDate": "Date de fin la plus récente",
"earliestEndDate": "Date de fin la plus proche"
"earliestEndDate": "Date de fin la plus proche",
"campaigns": "Campagnes",
"pledges": "Promesses de dons",
"endsOn": "Se termine le",
"raisedAmount": "Montant collecté",
"pledgedAmount": "Montant promis"
},
"orgPost": {
"title": "Des postes",
Expand Down
1 change: 1 addition & 0 deletions public/locales/hi/common.json
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@
"manage": "प्रबंधित करें",
"searchResultsFor": "{{text}} के लिए खोज परिणाम",
"none": "कोई नहीं",
"sort": "क्रम से लगाना",
"Donate": "दान करें",
"addedSuccessfully": "{{item}} सफलतापूर्वक जोड़ा गया",
"updatedSuccessfully": "{{item}} सफलतापूर्वक अपडेट किया गया",
Expand Down
86 changes: 43 additions & 43 deletions public/locales/hi/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -364,58 +364,54 @@
},
"funds": {
"title": "फंड",
"createFund": "फंड बनाएं",
"createFund": "फंड बनाएँ",
"fundName": "फंड का नाम",
"fundId": "फंड आईडी",
"fundOptions": "Opitons",
"noFunds": "कोई फंड नहीं मिला",
"fundDetails": "फंड विवरण",
"taxDeductible": "कर छूट",
"enterfundName": "फंड का नाम दर्ज करें",
"enterfundId": "फंड आईडी दर्ज करें",
"default": "डिफ़ॉल्ट फंड",
"archived": "संग्रहीत",
"nonArchive": "गैर-अभिलेखित",
"fundCreate": "फंड बनाएं",
"fundUpdate": "अद्यतन निधि",
"fundDelete": "फ़ंड हटाएँ",
"manageFund": "फंड का प्रबंधन करें",
"searchFullName": "नाम से खोजें",
"fundId": "फंड (संदर्भ) आईडी",
"taxDeductible": "कर ड्यूटी कटाई",
"default": "डिफ़ॉल्ट",
"archived": "आर्काइव",
"fundCreate": "फंड बनाएँ",
"fundUpdate": "फंड अपडेट करें",
"fundDelete": "फंड को हटाएँ",
"searchByName": "नाम से खोजें",
"noFundsFound": "कोई फंड नहीं मिला",
"createdBy": "के द्वारा बनाई गई",
"createdOn": "पर बनाया",
"createdBy": "द्वारा बनाया गया",
"createdOn": "पर बनाया गया",
"status": "स्थिति",
"archiveFund": "पुरालेख कोष",
"archiveFundMsg": "इस फंड को संग्रहित करने पर इसे फंड सूची से हटा दिया जाएगा। इस कार्रवाई को पूर्ववत किया जा सकता है",
"fundCreated": "फंड सफलतापूर्वक बनाया गया",
"fundUpdated": "फंड सफलतापूर्वक अपडेट किया गया",
"fundDeleted": "फंड सफलतापूर्वक हटा दिया गया",
"fundArchived": "निधि सफलतापूर्वक संग्रहित की गई",
"fundUnarchived": "फंड सफलतापूर्वक संग्रहित किया गया",
"deleteFundMsg": "क्या आप इस फंड को हटाना चाहते हैं?"
"fundDeleted": "फंड सफलतापूर्वक हटाया गया",
"deleteFundMsg": "क्या आप वाकई इस फंड को हटाना चाहते हैं?",
"createdLatest": "सबसे पहले बनाया",
"createdEarliest": "सबसे जल्दी बनाया",
"viewCampaigns": "कैम्पेंस देखें"
},
"fundCampaign": {
"title": "धन उगाही अभियान",
"campaignName": "अभियान का नाम",
"title": "फंडरेजिंग कैंपेन",
"campaignName": "कैंपेन का नाम",
"campaignOptions": "विकल्प",
"fundingGoal": "वित्त पोषण लक्ष्य",
"addCampaign": "अभियान जोड़ें",
"createdCampaign": "अभियान सफलतापूर्वक बनाया गया",
"updatedCampaign": "अभियान सफलतापूर्वक अपडेट किया गया",
"deletedCampaign": "अभियान सफलतापूर्वक हटा दिया गया",
"deleteCampaignMsg": "क्या आप वाकई इस अभियान को हटाना चाहते हैं?",
"noCampaigns": "कोई अभियान नहीं मिला",
"createCampaign": "फंड अभियान बनाएं",
"updateCampaign": "अद्यतन निधि अभियान",
"manageCampaign": "फंड अभियान प्रबंधित करें",
"deleteCampaign": "फ़ंड अभियान हटाएँ",
"fundingGoal": "फंडिंग उद्देश्य",
"addCampaign": "कैंपेन जोड़ें",
"createdCampaign": "कैंपेन सफलतापूर्वक बनाई गई",
"updatedCampaign": "कैंपेन सफलतापूर्वक अपडेट की गई",
"deletedCampaign": "कैंपेन सफलतापूर्वक हटा दी गई",
"deleteCampaignMsg": "क्या आप वाकई इस कैंपेन को हटाना चाहते हैं?",
"noCampaigns": "कोई कैंपेन नहीं मिली",
"createCampaign": "कैंपेन बनाएँ",
"updateCampaign": "कैंपेन अपडेट करें",
"deleteCampaign": "कैंपेन को हटाएं",
"currency": "मुद्रा",
"selectCurrency": "मुद्रा चुनें",
"searchFullName": "नाम से खोजें"
"selectCurrency": "मुद्रा का चयन करें",
"searchFullName": "नाम से खोजें",
"viewPledges": "प्लेज देखें",
"noCampaignsFound": "कोई कैंपेन नहीं मिली",
"latestEndDate": "अंतिम समाप्ति तिथि",
"earliestEndDate": "सबसे पहली समाप्ति तिथि",
"lowestGoal": "सबसे कम उद्देश्य",
"highestGoal": "सबसे ऊंचा उद्देश्य"
},
"pledges": {
"title": "निधि अभियान प्रतिज्ञाएँ",
"volunteers": "स्वयंसेवकों",
"pledgeAmount": "प्रतिज्ञा राशि",
"pledgeOptions": "विकल्प",
"pledgeCreated": "प्रतिज्ञा सफलतापूर्वक बनाई गई",
Expand All @@ -431,12 +427,16 @@
"editPledge": "प्रतिज्ञा संपादित करें",
"deletePledgeMsg": "क्या आप वाकई इस प्रतिज्ञा को हटाना चाहते हैं?",
"noPledges": "कोई प्रतिज्ञा नहीं मिली",
"sort": "क्रमबद्ध करें",
"searchVolunteer": "स्वयंसेवक द्वारा खोजें",
"searchPledger": "प्लेजर्स के द्वारा खोजें",
"highestAmount": "सबसे अधिक राशि",
"lowestAmount": "सबसे कम राशि",
"latestEndDate": "नवीनतम समाप्ति तिथि",
"earliestEndDate": "सबसे प्रारंभिक समाप्ति तिथि"
"earliestEndDate": "सबसे प्रारंभिक समाप्ति तिथि",
"campaigns": "अभियान",
"pledges": "प्रतिज्ञाएँ",
"endsOn": "पर समाप्त होता है",
"raisedAmount": "उठाया गया राशि",
"pledgedAmount": "प्रतिबद्ध राशि"
},
"orgPost": {
"title": "पदों",
Expand Down
1 change: 1 addition & 0 deletions public/locales/sp/common.json
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@
"manage": "Administrar",
"searchResultsFor": "Resultados de búsqueda para {{text}}",
"none": "Ninguno",
"sort": "Ordenar",
"Donate": "Donar",
"addedSuccessfully": "{{item}} agregado con éxito",
"updatedSuccessfully": "{{item}} actualizado con éxito",
Expand Down
Loading

0 comments on commit d440ad4

Please sign in to comment.