From 9c03e359a4e8f43452475b02bcabcb354987ab75 Mon Sep 17 00:00:00 2001 From: Philipp Dormann Date: Mon, 28 Apr 2025 11:05:40 +0200 Subject: [PATCH] feat: anonymous donations commit 8c56aa3c460595a5706d5c0d4bf020d74d5cdd67 Merge: f642849d 1505080a Author: Philipp Dormann Date: Mon Apr 28 10:57:14 2025 +0200 Merge branch 'dev' into feature/anonyme-spende commit f642849dbbd6e68198937fe2d9e588e0ddeb9fdb Author: Philipp Dormann Date: Mon Apr 28 10:56:45 2025 +0200 wip commit 7ac92ae6ca310c9e4d5ed3fb38f8b5eb93949809 Author: Philipp Dormann Date: Mon Apr 28 10:45:47 2025 +0200 wip commit 95af9f9914883e3d8a272f89b7c11c4a6802a416 Author: Philipp Dormann Date: Mon Apr 28 10:44:02 2025 +0200 i18n commit 1004aee16c61411489f0231366ee94fdc16f21b2 Author: Philipp Dormann Date: Mon Apr 28 10:40:23 2025 +0200 implement DonationDonor commit 0baf2fc460178cf8c6fa193547417e8d25f227a1 Author: Philipp Dormann Date: Mon Apr 28 10:38:27 2025 +0200 wip commit 09b59175eeffe6026a4b48ee3d2f94a83f9dbf09 Author: Philipp Dormann Date: Mon Apr 28 10:35:45 2025 +0200 wip commit a21f61f3f390d506a9046e17f9f49ba70cfc04b6 Author: Philipp Dormann Date: Mon Apr 28 10:24:07 2025 +0200 wip --- .../donations/AddDonationModal.svelte | 708 ++++++++++-------- src/components/donations/DonationDonor.svelte | 27 +- src/locales/de.json | 4 + src/locales/en.json | 4 + src/style.css | 6 + 5 files changed, 405 insertions(+), 344 deletions(-) diff --git a/src/components/donations/AddDonationModal.svelte b/src/components/donations/AddDonationModal.svelte index ed05c51d..5fc59599 100644 --- a/src/components/donations/AddDonationModal.svelte +++ b/src/components/donations/AddDonationModal.svelte @@ -1,340 +1,384 @@ {#if modal_open} -
{ - modal_open = false; - }} - > -
- {/if} - - diff --git a/src/components/donations/DonationDonor.svelte b/src/components/donations/DonationDonor.svelte index 29b61340..f28a97d3 100644 --- a/src/components/donations/DonationDonor.svelte +++ b/src/components/donations/DonationDonor.svelte @@ -1,18 +1,21 @@ {#if !donor || donor.firstname == 0} - {$_("donor-has-no-associated-donations")} + {$_('anonymer_sponsor')} {:else} - + {/if} diff --git a/src/locales/de.json b/src/locales/de.json index 4a39cd9c..81b9d992 100644 --- a/src/locales/de.json +++ b/src/locales/de.json @@ -41,6 +41,8 @@ "already-paid": "Bereits bezahlt", "amount": "Anzahl", "amount-per-kilometer": "Betrag pro Kilometer", + "anonyme_spende": "Anonyme Spende", + "anonymer_sponsor": "👻 Anonymer Sponsor", "apartment-suite-etc": "Apartment, Wohnung, etc.", "api-endpoint": "API-Endpunkt", "application_name": "Lauf für Kaya! - Admin", @@ -224,6 +226,7 @@ "error_on_login": "😢Fehler beim Login", "everything-concerning-your-profile": "Alles zu deinem Profil", "faq": "FAQ", + "festbetrag": "Festbetrag", "filename_sponsoringquittungsliste": "SponsoringQuittungsListe", "filter-by-organization-team": "Filtern nach Organisation / Team", "first-name": "Vorname", @@ -418,6 +421,7 @@ "settings": "Einstellungen", "settings-for-your-profile": "Die Einstellungen deines Accounts", "something-about-the-group": "Infos zur Gruppe", + "spende_pro_km": "Spende pro km", "sponsoring-quittungs-liste_herunterladen": "Sponsoring-Quittungs-Liste herunterladen", "sponsorings": "Sponsoringerklaerungen", "station-deleted": "Scannerstation gelöscht", diff --git a/src/locales/en.json b/src/locales/en.json index a3d082b3..fca1cb17 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -41,6 +41,8 @@ "already-paid": "Already paid", "amount": "Amount", "amount-per-kilometer": "Amount per kilometer", + "anonyme_spende": "Anonymous Donation", + "anonymer_sponsor": "👻 Anonymous Donor", "apartment-suite-etc": "Apartment, suite, etc.", "api-endpoint": "API-Endpoint", "application_name": "Lauf für Kaya! - Admin", @@ -224,6 +226,7 @@ "error_on_login": "Error on login", "everything-concerning-your-profile": "Everything concerning your profile", "faq": "FAQ", + "festbetrag": "Fixed Donation", "filename_sponsoringquittungsliste": "DonorReceiptList", "filter-by-organization-team": "Filter by Organization/ Team", "first-name": "First name", @@ -418,6 +421,7 @@ "settings": "Settings", "settings-for-your-profile": "Settings for your profile", "something-about-the-group": "Something about the group...", + "spende_pro_km": "donation per km", "sponsoring-quittungs-liste_herunterladen": "Download donor receipt list", "sponsorings": "Sponsorings", "station-deleted": "station deleted", diff --git a/src/style.css b/src/style.css index 39f7e203..1bc948b5 100644 --- a/src/style.css +++ b/src/style.css @@ -25,3 +25,9 @@ #html5-qrcode-button-camera-stop { @apply px-2 inline-flex text-lg leading-5 font-semibold rounded-md border border-current bg-red-100 text-red-800 mb-2 cursor-pointer; } +.donation_inactive_tab { + @apply min-w-0 flex-1 bg-white first:border-s-0 border-s border-b-2 border-neutral-200 py-4 px-4 text-neutral-800 hover:text-neutral-700 text-sm font-medium text-center overflow-hidden hover:bg-neutral-200 cursor-pointer focus:z-10 focus:outline-hidden focus:bg-neutral-200 disabled:opacity-50 disabled:pointer-events-none; +} +.donation_active_tab { + @apply min-w-0 flex-1 bg-blue-400 text-white first:border-s-0 border-s border-b-2 border-neutral-200 py-4 px-4 text-sm font-medium text-center overflow-hidden cursor-pointer focus:outline-hidden; +}