From 2ded694a903705a4d775eeb03d534ec099261590 Mon Sep 17 00:00:00 2001 From: Nikoloz Naskidashvili Date: Wed, 4 Oct 2023 19:48:11 +0400 Subject: [PATCH] feat: actual booking --- frontend/.gitignore | 2 ++ server/src/api/endpoints/booking.py | 4 +++- server/src/config.py | 4 ++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/frontend/.gitignore b/frontend/.gitignore index a547bf3..50c8dda 100644 --- a/frontend/.gitignore +++ b/frontend/.gitignore @@ -22,3 +22,5 @@ dist-ssr *.njsproj *.sln *.sw? + +.env diff --git a/server/src/api/endpoints/booking.py b/server/src/api/endpoints/booking.py index 0f7cd1d..5dddfac 100644 --- a/server/src/api/endpoints/booking.py +++ b/server/src/api/endpoints/booking.py @@ -53,6 +53,8 @@ async def book_venue(venue_id: int, request: Request): query_id = web_app_init_data.query_id # Answer web app query + confirm_message = f"Booking successful! 🎉\n\nDetails:\nVenue: {db_obj.venue.name}\nAddress: {db_obj.venue.address}, {db_obj.venue.city}\nUnder name: {db_obj.under_name}\nDate: {db_obj.date}\nComment: {db_obj.comment}" + try: await bot.answer_web_app_query( web_app_query_id=query_id, @@ -61,7 +63,7 @@ async def book_venue(venue_id: int, request: Request): id=query_id, title="Booking successful!", input_message_content=InputTextMessageContent( - message_text="Booking successful!" + message_text=confirm_message ) ) ) diff --git a/server/src/config.py b/server/src/config.py index 751ab14..b9ab411 100644 --- a/server/src/config.py +++ b/server/src/config.py @@ -10,8 +10,8 @@ class BaseSettings: SECRET_KEY = secrets.token_urlsafe(32) BOT_TOKEN = "6564109746:AAELai-cCPlj8_Rr7b_6ADpUE8KtOxkSnxA" - FRONT_BASE_URL = "https://dd94-188-121-217-243.ngrok-free.app" - BACK_BASE_URL = "https://4f3f-188-121-217-243.ngrok-free.app" + FRONT_BASE_URL = "https://ba79-188-121-217-243.ngrok-free.app" + BACK_BASE_URL = "https://382d-188-121-217-243.ngrok-free.app" SQLALCHEMY_DATABASE_URI = 'sqlite+aiosqlite:///' + os.path.join(BASE_DIR, 'db.sqlite') SQLALCHEMY_TRACK_MODIFICATIONS = False