diff --git a/GUESTS.md b/GUESTS.md new file mode 100644 index 0000000..71b10dc --- /dev/null +++ b/GUESTS.md @@ -0,0 +1,49 @@ +# Guests README + +Aktueller Stand der Login-Gruppen aus `backend/app.py` (`DEFAULT_INVITATION_GROUPS`). + +Anzahl Gruppen: **39** + +| Username | Rolle | Passwort | Members | +|---|---|---|---| +| Bubus | admin | `Bubu!Herz24#` | Svenja, Dominic | +| Remi | guest | `Remi#Ring24!` | Remi | +| Chantal | guest | `Chan!Tanz24#` | Chantal | +| Madeleine | guest | `Madi$Rose24!` | Madeleine | +| Julie & Daniel | guest | `Juli&Dan24!#` | Julie, Daniel | +| Tim & Sophie | guest | `Tim+Sofi24!#` | Tim, Sophie | +| Marcel & Kathrin | guest | `Marc&Kath24#` | Marcel, Kathrin | +| Marie & Kai | guest | `Mari&Kai24!#` | Marie, Kai | +| Familie Olsem | guest | `Olse!Fam24#?` | Laura, Sven, Lena, Finn | +| Maxime | guest | `Maxi#Love24!` | Maxime, Freund | +| Familie Löster | guest | `Loes@Ring24#` | Claudia, Mario, Mélodie | +| Familie Thiels | guest | `Thie$Fest24!` | Matthias, Opa Bernd, Oma Heidi | +| Familie Gollor | guest | `Goll%Herz24!` | Michael, Christin, Bruno | +| Monika | guest | `Moni!Rose24#` | Monika | +| Familie Konrad | guest | `Konr#Fest24!` | Michael, Sandra, Christoph, Alexander | +| Mark | guest | `Mark!Gold24#` | Mark | +| Elias | guest | `Elia$Ring24!` | Elias | +| Milan | guest | `Mila#Tanz24!` | Milan | +| Familie Wolff | guest | `Wolf!Herz24#` | Anja, Bodo | +| Anna & Leon | guest | `Anna&Leo24!#` | Anna, Leon | +| Aryan | guest | `Arya!Fest24#` | Aryan | +| Sebastian | guest | `Seba$Ring24!` | Sebastian, Olivia | +| Leander & Heni | guest | `Lea&Heni24!#` | Leander, Heni | +| Flo | guest | `Flo!Liebe24#` | Flo | +| Nico & Pia | guest | `Nico&Pia24!#` | Nico, Pia | +| Kiki | guest | `Kiki!Rose24#` | Kiki | +| Lana & Eric | guest | `Lan&Eric24!#` | Lana, Eric | +| Britta | guest | `Brit!Tanz24#` | Britta | +| Holzi | guest | `Holz!Ring24#` | Holzi | +| Eirene | guest | `Eire$Fest24!` | Eirene | +| Family Hynes | guest | `Hyne#Love24!` | Steven, Martha, William, Tim, Steven Jr. | +| Timbo | guest | `Timb!Rose24#` | Timbo | +| Karen & Jay | guest | `Kare&Jay24!#` | Karen, Jay | +| Alina | guest | `Alin!Gold24#` | Alina | +| Max | guest | `Max!Liebe24#` | Max | +| Paul & Alix | guest | `Paul&Alx24!#` | Paul, Alix | +| Alfred & Nadia | guest | `Alfr&Nad24!#` | Alfred, Nadia | +| Anne-Marie & Erny | guest | `Anne&Ern24!#` | Anne-Marie, Erny | +| Familie Kieffer | guest | `Kief!Fest24#` | Anny, John, Jana | + +Hinweis: Diese Datei enthält Klartext-Passwörter und sollte nicht öffentlich geteilt werden. diff --git a/README.md b/README.md index d58eed9..18d4639 100644 --- a/README.md +++ b/README.md @@ -532,6 +532,9 @@ Mitglieder: Tim, Sophie Marcel & Kathrin Mitglieder: Marcel, Kathrin +Marie & Kai +Mitglieder: Marie, Kai + Familie Olsem Mitglieder: Laura, Sven, Lena, Finn diff --git a/backend/app.py b/backend/app.py index 89396aa..277e7a7 100644 --- a/backend/app.py +++ b/backend/app.py @@ -79,6 +79,12 @@ DEFAULT_INVITATION_GROUPS = [ "role": "guest", "members": ["Marcel", "Kathrin"], }, + { + "name": "Marie & Kai", + "password": "Mari&Kai24!#", + "role": "guest", + "members": ["Marie", "Kai"], + }, { "name": "Familie Olsem", "password": "Olse!Fam24#?", @@ -239,6 +245,7 @@ TEXTS = { "hotels": "Hotels", "taxi": "Taxi", "location": "Location", + "gifts": "Geschenke", "visit_location": "Zur Location-Webseite", "maps_privacy_notice": "Zur Anzeige der Karte werden Daten an Google übertragen.", "maps_load_button": "Google Maps anzeigen", @@ -250,6 +257,7 @@ TEXTS = { "schedule_text": "15:00 Trauung, 17:00 Empfang, 19:00 Dinner.", "hotels_text": "Empfehlungen folgen. Bitte frühzeitig buchen.", "taxi_text": "Taxi-Service: 01234 / 567890 (24/7).", + "gifts_text": "Eure Anwesenheit ist unser schönstes Geschenk. Falls ihr uns trotzdem etwas schenken möchtet, freuen wir uns über einen Beitrag zu unserer Reise nach der Hochzeit.", "gallery_uploaded_by": "von {name}", "gallery_empty": "Noch keine Bilder vorhanden.", "gallery_image_alt": "Upload von {name}", @@ -328,6 +336,7 @@ TEXTS = { "hotels": "Hotels", "taxi": "Taxi", "location": "Location", + "gifts": "Gifts", "visit_location": "Visit location website", "maps_privacy_notice": "To display the map, data will be transferred to Google.", "maps_load_button": "Show Google Maps", @@ -339,6 +348,7 @@ TEXTS = { "schedule_text": "3:00 PM ceremony, 5:00 PM reception, 7:00 PM dinner.", "hotels_text": "Recommendations will follow. Please book early.", "taxi_text": "Taxi service: 01234 / 567890 (24/7).", + "gifts_text": "Your presence is the greatest gift to us. If you would still like to give something, we would appreciate a contribution to our post-wedding trip.", "gallery_uploaded_by": "by {name}", "gallery_empty": "No photos available yet.", "gallery_image_alt": "Uploaded by {name}", @@ -903,9 +913,11 @@ def serve_upload(filename: str): @app.get("/info/") @login_required def info(page: str): - allowed = {"schedule", "hotels", "taxi", "location"} + allowed = {"schedule", "hotels", "taxi", "location", "gifts"} if page not in allowed: return redirect(url_for("guest_area")) + if page == "gifts" and session.get("role") == "admin": + return redirect(url_for("guest_area")) return render_template("info.html", page=page) diff --git a/backend/app.sqlite3 b/backend/app.sqlite3 index 62f8ed5..d5cd24b 100644 Binary files a/backend/app.sqlite3 and b/backend/app.sqlite3 differ diff --git a/backend/templates/guest_area.html b/backend/templates/guest_area.html index 0c0eb74..50c0e1f 100644 --- a/backend/templates/guest_area.html +++ b/backend/templates/guest_area.html @@ -8,6 +8,9 @@ {{ t('hotels') }} {{ t('taxi') }} {{ t('location') }} + {% if not is_admin %} + {{ t('gifts') }} + {% endif %} {% if is_admin %} {{ t('host_area') }} {% endif %} diff --git a/backend/templates/info.html b/backend/templates/info.html index 223f32b..6953b0d 100644 --- a/backend/templates/info.html +++ b/backend/templates/info.html @@ -6,6 +6,7 @@ {% if page == 'hotels' %}{{ t('hotels') }}{% endif %} {% if page == 'taxi' %}{{ t('taxi') }}{% endif %} {% if page == 'location' %}{{ t('location') }}{% endif %} + {% if page == 'gifts' %}{{ t('gifts') }}{% endif %} {% if page == 'schedule' %} @@ -14,6 +15,8 @@

{{ t('hotels_text') }}

{% elif page == 'taxi' %}

{{ t('taxi_text') }}

+ {% elif page == 'gifts' %} +

{{ t('gifts_text') }}

{% elif page == 'location' %}

{{ location_name }}

{{ location_address }}

diff --git a/data/db/app.sqlite3 b/data/db/app.sqlite3 index 070d6b9..48169b8 100644 Binary files a/data/db/app.sqlite3 and b/data/db/app.sqlite3 differ