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

Redesign & Refac Fund, Campaign & Pledge Screen #2064

Merged
merged 24 commits into from
Jul 21, 2024
Merged
Changes from 15 commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
15316a5
refac/redesign Funds
GlenDsza Jun 19, 2024
abdcbb4
refac/redesign campaigns
GlenDsza Jun 23, 2024
a96d586
Add sort/search in Funds
GlenDsza Jun 24, 2024
6cdb58c
Added breadcrumbs
GlenDsza Jun 24, 2024
80f9e3a
Add sort/search in Campaigns
GlenDsza Jun 24, 2024
b62d30d
Merge branch 'develop' of https://github.com/GlenDsza/talawa-admin in…
GlenDsza Jun 25, 2024
d7b45b7
add tests
GlenDsza Jun 30, 2024
3e96ab0
add translations
GlenDsza Jun 30, 2024
3530262
cleanup
GlenDsza Jun 30, 2024
0e409f4
missing translation
GlenDsza Jun 30, 2024
48e1212
Add progress indicator in pledges screen
GlenDsza Jun 30, 2024
09e37e7
incorp coderab changes
GlenDsza Jun 30, 2024
707e81c
Added popup to view all volunteers
GlenDsza Jul 5, 2024
5f24763
Merge branch 'develop' of https://github.com/PalisadoesFoundation/tal…
GlenDsza Jul 5, 2024
01d5715
Merge branch 'develop' of https://github.com/PalisadoesFoundation/tal…
GlenDsza Jul 5, 2024
85a7b28
Add progress bar for Raised & Pledged
GlenDsza Jul 6, 2024
27a60ee
set raised to 0
GlenDsza Jul 6, 2024
2c17f3b
Merge branch 'develop' of https://github.com/PalisadoesFoundation/tal…
GlenDsza Jul 6, 2024
63afb43
Merge branch 'develop' of https://github.com/PalisadoesFoundation/tal…
GlenDsza Jul 7, 2024
e466954
update test case
GlenDsza Jul 7, 2024
81251b5
Merge branch 'develop' of https://github.com/GlenDsza/talawa-admin in…
GlenDsza Jul 11, 2024
f954f65
rerun
GlenDsza Jul 12, 2024
3688e71
Merge branch 'develop' of https://github.com/GlenDsza/talawa-admin in…
GlenDsza Jul 21, 2024
9eb5c99
removed progressbar animation
GlenDsza Jul 21, 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
3 changes: 2 additions & 1 deletion public/locales/en/common.json
Original file line number Diff line number Diff line change
@@ -76,5 +76,6 @@
"noFiltersApplied": "No filters applied",
"manage": "Manage",
"searchResultsFor": "Search results for {{text}}",
"none": "None"
"none": "None",
"sort": "Sort"
}
43 changes: 21 additions & 22 deletions public/locales/en/translation.json
Original file line number Diff line number Diff line change
@@ -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",
@@ -400,13 +391,18 @@
"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",
@@ -426,12 +422,15 @@
"editPledge": "Edit Pledge",
"deletePledgeMsg": "Are you sure you want to delete this pledge?",
"noPledges": "No Pledges Found",
"sort": "Sort",
"searchVolunteer": "Search By Volunteer",
"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",
"raised": "Raised"
},
"orgPost": {
"title": "Posts",
3 changes: 2 additions & 1 deletion public/locales/fr/common.json
Original file line number Diff line number Diff line change
@@ -76,5 +76,6 @@
"noFiltersApplied": "Aucun filtre appliqué",
"manage": "Gérer",
"searchResultsFor": "Résultats de recherche pour {{text}}",
"none": "Aucun"
"none": "Aucun",
"sort": "Trier"
}
54 changes: 27 additions & 27 deletions public/locales/fr/translation.json
Original file line number Diff line number Diff line change
@@ -366,52 +366,49 @@
"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",
@@ -431,12 +428,15 @@
"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",
"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",
"raised": "Levé"
},
"orgPost": {
"title": "Des postes",
3 changes: 2 additions & 1 deletion public/locales/hi/common.json
Original file line number Diff line number Diff line change
@@ -76,5 +76,6 @@
"noFiltersApplied": "कोई फ़िल्टर लागू नहीं हैं",
"manage": "प्रबंधित करें",
"searchResultsFor": "{{text}} के लिए खोज परिणाम",
"none": "कोई नहीं"
"none": "कोई नहीं",
"sort": "क्रम से लगाना"
}
82 changes: 41 additions & 41 deletions public/locales/hi/translation.json
Original file line number Diff line number Diff line change
@@ -364,54 +364,51 @@
},
"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": "निधि अभियान प्रतिज्ञाएँ",
@@ -431,12 +428,15 @@
"editPledge": "प्रतिज्ञा संपादित करें",
"deletePledgeMsg": "क्या आप वाकई इस प्रतिज्ञा को हटाना चाहते हैं?",
"noPledges": "कोई प्रतिज्ञा नहीं मिली",
"sort": "क्रमबद्ध करें",
"searchVolunteer": "स्वयंसेवक द्वारा खोजें",
"highestAmount": "सबसे अधिक राशि",
"lowestAmount": "सबसे कम राशि",
"latestEndDate": "नवीनतम समाप्ति तिथि",
"earliestEndDate": "सबसे प्रारंभिक समाप्ति तिथि"
"earliestEndDate": "सबसे प्रारंभिक समाप्ति तिथि",
"campaigns": "अभियान",
"pledges": "प्रतिज्ञाएँ",
"endsOn": "पर समाप्त होता है",
"raised": "उठाया गया"
},
"orgPost": {
"title": "पदों",
3 changes: 2 additions & 1 deletion public/locales/sp/common.json
Original file line number Diff line number Diff line change
@@ -76,5 +76,6 @@
"noFiltersApplied": "No se aplicaron filtros",
"manage": "Administrar",
"searchResultsFor": "Resultados de búsqueda para {{text}}",
"none": "Ninguno"
"none": "Ninguno",
"sort": "Ordenar"
}
Loading
Loading