From 324df6a00744c99ebc90d9cbac459ab5f9dcae60 Mon Sep 17 00:00:00 2001 From: Max Date: Tue, 15 Oct 2024 00:32:43 +0200 Subject: [PATCH] Some changes from chat gpt --- src/main.py | 18 ++- src/templates/components/wishlist_item.html | 28 ++-- src/templates/wishlist_view.html | 162 ++++++-------------- 3 files changed, 82 insertions(+), 126 deletions(-) diff --git a/src/main.py b/src/main.py index 9c3e6cd..0047ce8 100644 --- a/src/main.py +++ b/src/main.py @@ -1,6 +1,7 @@ import uuid from fastapi import Depends, FastAPI, Request, Response -from fastapi.responses import HTMLResponse +from fastapi.responses import HTMLResponse, JSONResponse +from fastapi.staticfiles import StaticFiles from fastapi.templating import Jinja2Templates from wishlist import ( read_all_wishlists, @@ -26,15 +27,30 @@ async def update_reservation( ), ): global wishlist_cache + + if reservation_request.name.strip() == "": + return Response(status_code=400) + wishlist_dir: str = wishlist_cache[reservation_request.wishlist_id].directory + reserved = None if reservation_request.reserved: new_reservation = ItemReservation() new_reservation.name = reservation_request.name new_reservation.item_id = str(reservation_request.item_id) add_reservation(wishlist_dir, new_reservation) + reserved = True else: + reserved = False remove_reservation(wishlist_dir, reservation_request.item_id) + return JSONResponse( + content={ + "item_id": str(reservation_request.item_id), + "wishlist_id": str(reservation_request.wishlist_id), + "reserved": reserved, + } + ) + @app.get("/{wishlist_id}/view", response_class=HTMLResponse) async def show_wishlist(request: Request, wishlist_id: uuid.UUID): diff --git a/src/templates/components/wishlist_item.html b/src/templates/components/wishlist_item.html index 5c1c3b1..c1ba07a 100644 --- a/src/templates/components/wishlist_item.html +++ b/src/templates/components/wishlist_item.html @@ -1,25 +1,29 @@ -
  • -
    -

    {{ item.name }}{% if item.reservation %} (Reserved){% endif %}

    -

    {{ item.description }}

    +
    +
    +

    {{ item.name }}{% if item.reserved %} (Reserved){% endif %}

    + {{ item.name }}

    €{{ "%.2f"|format(item.price) }}

    - Shop Link +
    + - {{ item.name }} -
  • -
    + +
    +

    {{ item.description }}

    + Shop Link +
    + diff --git a/src/templates/wishlist_view.html b/src/templates/wishlist_view.html index bb37f8c..01d172a 100644 --- a/src/templates/wishlist_view.html +++ b/src/templates/wishlist_view.html @@ -10,149 +10,85 @@ background-color: #1a1a1a; color: #aaa; font-family: "Fira Code", "Fira Mono", "Roboto Mono", "Lucida Console", "Courier New", monospace; - font-size: 16px; - line-height: 1.5; margin: 0; - padding: 0; - } - - h1, h3 { - text-align: center; - color: #fff; - } - - ul { - list-style: none; - padding: 0; - margin: 20px auto; - max-width: 800px; - } - - li { - background-color: #2c2c2c; - margin: 10px 0; padding: 20px; - border-radius: 8px; + } + + h1 { + text-align: center; + } + + .item-grid { display: flex; - justify-content: space-between; + flex-wrap: wrap; + justify-content: space-around; + } + + .item-card { + background: #222; + border-radius: 8px; + margin: 10px; + padding: 15px; + width: 250px; + transition: all 0.3s ease; + position: relative; + overflow: hidden; + cursor: pointer; + } + + .item-card:hover { + background-color: #333; + transform: scale(1.05); + } + + .item-header { + display: flex; + flex-direction: column; align-items: center; } - h2 { - margin: 0; - color: #fff; + .item-description { + max-height: 0; + overflow: hidden; + transition: max-height 0.3s ease; } - p { - color: #888; - font-size: 14px; + .item-description.show { + max-height: 200px; /* Adjust based on expected content */ } - a { - color: #3498db; - text-decoration: none; - transition: background-color 0.2s; - } - - a:hover { - background-color: #444; - padding: 2px 5px; - border-radius: 3px; - } - - .price { - font-weight: bold; - color: #27ae60; - } - - img { - max-width: 100px; - border-radius: 8px; + .item-footer { + margin-top: 10px; } .reserve-button { + padding: 5px 10px; + border: none; background-color: #444; color: white; - border: none; - padding: 8px 15px; cursor: pointer; - border-radius: 5px; - transition: background-color 0.3s; + transition: background-color 0.2s; } .reserve-button:hover { - background-color: #666; + background-color: #555; } - - hr { - border: 0; - border-top: 1px solid #333; - } - - /* Collapsed reserved items */ - .reserved-item { - background-color: #444; - } - - input[type="text"] { - padding: 8px; - background-color: #333; - border: 1px solid #555; - color: #ccc; - border-radius: 4px; - } - - form { - display: flex; - flex-direction: column; - gap: 10px; - } - - /* Collapsible section */ - .collapsible { - background-color: #2c2c2c; - padding: 15px; - text-align: center; - cursor: pointer; - border-radius: 8px; - } - - .collapsible:hover { - background-color: #333; - } - - #reserved-items { - display: none; - } -

    {{ wishlist.config.title }}

    - - - -
    Show Reserved Items
    - +