From 601def2d773e4460e832eef99142f5fae9d749e7 Mon Sep 17 00:00:00 2001 From: Andreas Date: Thu, 29 Jun 2023 20:43:40 +0200 Subject: [PATCH 01/12] Booking page and general availability (#104) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 🔨 enable booking page for general availability * ❌ revert debugging changes * Replace router.fullPath with window.location.href, as signed urls require a complete url. * ➕ add route checks --------- Co-authored-by: Melissa Autumn --- backend/src/routes/api.py | 2 +- frontend/src/components/BookingModal.vue | 9 +- frontend/src/locales/de.json | 25 +- frontend/src/locales/en.json | 22 +- frontend/src/router.js | 3 +- frontend/src/views/AvailabilityView.vue | 327 ----------------------- frontend/src/views/BookingView.vue | 70 ++++- 7 files changed, 94 insertions(+), 364 deletions(-) delete mode 100644 frontend/src/views/AvailabilityView.vue diff --git a/backend/src/routes/api.py b/backend/src/routes/api.py index 72e5ee0ba..bbfdeb035 100644 --- a/backend/src/routes/api.py +++ b/backend/src/routes/api.py @@ -119,7 +119,7 @@ def refresh_signature(db: Session = Depends(get_db), subscriber: Subscriber = De @router.post("/verify/signature") -def verify_my_signature(url : str = Body(..., embed=True), db: Session = Depends(get_db)): +def verify_my_signature(url: str = Body(..., embed=True), db: Session = Depends(get_db)): """Verify a signed short link""" # Look for a followed by an optional signature that ends the string pattern = r"[\/]([\w\d\-_\.\@]+)[\/]?([\w\d]*)[\/]?$" diff --git a/frontend/src/components/BookingModal.vue b/frontend/src/components/BookingModal.vue index 022533c2d..f2c9ac445 100644 --- a/frontend/src/components/BookingModal.vue +++ b/frontend/src/components/BookingModal.vue @@ -14,10 +14,13 @@
{{ event.title }}:
{{ time }}
-
+
{{ t('label.timeZone') }}: {{ dj.tz.guess() }}
-
+
+ {{ t('text.disclaimerGABooking') }} +
+