16:00
{{ t('schedule_arrival_title') }}
{{ t('schedule_arrival_text') }}
16:30
{{ t('schedule_ceremony_title') }}
{{ t('schedule_ceremony_text') }}
{{ t('schedule_reception_time') }}
{{ t('schedule_reception_title') }}
{{ t('schedule_reception_text') }}
19:00
{{ t('schedule_buffet_title') }}
{{ t('schedule_buffet_text') }}
{{ t('schedule_cake_time') }}
{{ t('schedule_cake_title') }}
{{ t('schedule_cake_text') }}
{{ t('schedule_afterwards_time') }}
{{ t('schedule_party_title') }}
{{ t('schedule_party_text') }}
@@ -186,7 +186,269 @@ })(); {% elif page == 'taxi' %} -{{ t('taxi_text') }}
+
+
+
+
+
+  }})
+
+
+
+  }})
+
+
+
+  }})
+
+
+
+
+
+
+
{% elif page == 'gifts' %}
+
+
+
+
+ {{ t('culinary_title') }}
+{{ t('culinary_intro') }}
+
+
+
+ {{ t('culinary_menu') }}
+{{ t('culinary_reception_title') }}
+{{ t('culinary_reception_text') }}
+
+
+
+
+
+
+ {{ t('culinary_starter') }}
+{{ t('culinary_starter_title') }}
+{{ t('culinary_starter_text') }}
+
+
+
+
+
+
+ {{ t('culinary_main') }}
+{{ t('culinary_main_title') }}
+ +
+
+
+
+
+
+ {{ t('culinary_dessert') }}
+{{ t('culinary_dessert_title') }}
+
+
+
+
+ {{ t('culinary_cake') }}
+{{ t('culinary_cake_text') }}
+
+
+ {{ t('culinary_dessert_variations') }}
+-
+
- {{ t('culinary_panna_cotta') }} +
- {{ t('culinary_creme_brulee') }} +
- {{ t('culinary_pineapple') }} +
+
+ {{ t('culinary_drinks') }}
+{{ t('drinks_during_celebration') }}
+{{ t('drinks_intro') }}
+
+
+  }})
+
+
+
+  }})
+
+
+
+  }})
+
+
+
+  }})
+
+
+
+
+
+
+
+
+ {{ t('drinks_refreshments') }}
+{{ t('drinks_non_alcoholic') }}
+-
+
- {{ t('drinks_water') }}
- {{ t('drinks_soft') }}
- {{ t('drinks_juices') }} +
+
+
+
+
+
+ {{ t('drinks_wine_beer') }}
+{{ t('drinks_wine_selection') }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ t('drinks_white_wine') }}
+Jung Dahlen
Einklang Riesling
{{ t('drinks_off_dry') }}Domdechant Werner
Riesling
{{ t('drinks_dry') }}{{ t('drinks_rose_wine') }}
+Jung Dahlen
Rosé Sinfonie
{{ t('drinks_red_wine') }}
+Jung Dahlen
Pinot Noir
{{ t('drinks_beer') }}
+{{ t('drinks_beer_selection') }}
+
+
+
+
+
+
+ {{ t('drinks_aperitif_spirits') }}
+{{ t('drinks_bar_classics') }}
+
+
+ {{ t('drinks_aperitif') }}
- Aperol Spritz
- Lillet Wildberry
- Hugo
- {{ t('drinks_sparkling_wine') }}
{{ t('drinks_spirits') }}
{{ t('drinks_spirits_text') }}
+
+
+
+
+
+ {{ t('drinks_evening_bar') }}
+ +{{ t('drinks_longdrinks_cocktails') }}
+
+
+ {{ t('drinks_longdrinks') }}
- Gin & Tonic
- Rum & Cola
- Vodka Orange
- Whisky & Cola
{{ t('drinks_cocktails') }}
- Mojito Razz
- Sex on the Beach
- Bahama Mama
{{ t('gifts_teaser') }}
diff --git a/data/db/app.sqlite3 b/data/db/app.sqlite3 index a682f8d..2e4e476 100644 Binary files a/data/db/app.sqlite3 and b/data/db/app.sqlite3 differ diff --git a/docker-compose.yml b/docker-compose.yml index 181ca2e..423390d 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -8,7 +8,8 @@ services: volumes: - ./frontend/nginx/default.conf:/etc/nginx/conf.d/default.conf:ro depends_on: - - backend + backend: + condition: service_healthy backend: build: ./backend @@ -33,3 +34,9 @@ services: - LOCATION_ADDRESS=${LOCATION_ADDRESS:-Mainzer Str. 22, 65239 Hochheim am Main} - LOCATION_WEBSITE_URL=${LOCATION_WEBSITE_URL:-https://hochheimerterrasse.de/} - GOOGLE_MAPS_EMBED_URL=${GOOGLE_MAPS_EMBED_URL:-https://www.google.com/maps?q=Hochheimer+Terrasse+Mainzer+Str.+22+65239+Hochheim+am+Main&output=embed} + healthcheck: + test: ["CMD", "python", "-c", "import urllib.request; urllib.request.urlopen('http://127.0.0.1:8000/health', timeout=2)"] + interval: 10s + timeout: 3s + retries: 5 + start_period: 15s diff --git a/frontend/nginx/default.conf b/frontend/nginx/default.conf index 30f3058..8751da6 100644 --- a/frontend/nginx/default.conf +++ b/frontend/nginx/default.conf @@ -4,18 +4,18 @@ server { client_max_body_size 256M; client_body_timeout 300s; - send_timeout 300s; + send_timeout 120s; location / { proxy_pass http://backend:8000; proxy_http_version 1.1; - proxy_request_buffering off; + proxy_request_buffering on; proxy_set_header Host $host; proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header X-Forwarded-Proto $scheme; - proxy_read_timeout 300s; - proxy_send_timeout 300s; - proxy_connect_timeout 60s; + proxy_read_timeout 120s; + proxy_send_timeout 120s; + proxy_connect_timeout 10s; } }