From d8610fb1e381bddb97a36e66569d3613c57d44fd Mon Sep 17 00:00:00 2001 From: Ekaterina Vititneva Date: Fri, 9 Aug 2024 22:22:22 +0200 Subject: [PATCH] Adding to watchlist --- .../templates/auctions/categories.html | 28 ++++++++++++ .../auctions/templates/auctions/layout.html | 4 +- .../auctions/templates/auctions/listing.html | 9 +++- .../templates/auctions/watchlist.html | 28 ++++++++++++ project_2/commerce/auctions/urls.py | 2 + project_2/commerce/auctions/views.py | 43 ++++++++++++++++++- 6 files changed, 108 insertions(+), 6 deletions(-) create mode 100644 project_2/commerce/auctions/templates/auctions/categories.html create mode 100644 project_2/commerce/auctions/templates/auctions/watchlist.html diff --git a/project_2/commerce/auctions/templates/auctions/categories.html b/project_2/commerce/auctions/templates/auctions/categories.html new file mode 100644 index 0000000..8d29efd --- /dev/null +++ b/project_2/commerce/auctions/templates/auctions/categories.html @@ -0,0 +1,28 @@ +{% extends "auctions/layout.html" %} + +{% block body %} +

Active Listings

+ + +
+ {% for listing in listings %} + +
+ {% if listing.imageURL %} + listing image + {% else %} +
+ {% endif %} +
+
{{ listing.title }}
+
Price: {{ listing.bid }}€
+

{{ listing.description }}

+
+
+
Created time: {{ listing.created_at }}
+
+
+ + {% endfor %} +
+{% endblock %} \ No newline at end of file diff --git a/project_2/commerce/auctions/templates/auctions/layout.html b/project_2/commerce/auctions/templates/auctions/layout.html index 98f3e51..2aa6c21 100644 --- a/project_2/commerce/auctions/templates/auctions/layout.html +++ b/project_2/commerce/auctions/templates/auctions/layout.html @@ -21,14 +21,14 @@

Auctions

Active Listings
  • - Categories + Categories
    • {% if user.is_authenticated %}
  • Log Out
  • - Watchlist + Watchlist
  • Create Listing diff --git a/project_2/commerce/auctions/templates/auctions/listing.html b/project_2/commerce/auctions/templates/auctions/listing.html index 240eb58..955dce3 100644 --- a/project_2/commerce/auctions/templates/auctions/listing.html +++ b/project_2/commerce/auctions/templates/auctions/listing.html @@ -35,10 +35,15 @@

    {{ listing.bid }}€

    -
    + {% csrf_token %} - + {% if listing in user.watchlist.all %} + + {% else %} + + {% endif %}
    + {% endif %} diff --git a/project_2/commerce/auctions/templates/auctions/watchlist.html b/project_2/commerce/auctions/templates/auctions/watchlist.html new file mode 100644 index 0000000..0fa1759 --- /dev/null +++ b/project_2/commerce/auctions/templates/auctions/watchlist.html @@ -0,0 +1,28 @@ +{% extends "auctions/layout.html" %} + +{% block body %} +

    Watchlist

    + + +
    + {% for listing in listings %} + +
    + {% if listing.imageURL %} + listing image + {% else %} +
    + {% endif %} +
    +
    {{ listing.title }}
    +
    Price: {{ listing.bid }}€
    +

    {{ listing.description }}

    +
    +
    +
    Created time: {{ listing.created_at }}
    +
    +
    +     + {% endfor %} +
    +{% endblock %} \ No newline at end of file diff --git a/project_2/commerce/auctions/urls.py b/project_2/commerce/auctions/urls.py index 829d2ab..ee9d39e 100644 --- a/project_2/commerce/auctions/urls.py +++ b/project_2/commerce/auctions/urls.py @@ -10,4 +10,6 @@ path("create_listing", views.create_listing, name="create_listing"), path("listing/", views.listing, name="listing"), path("listing//bid/", views.place_bid, name="place_bid"), + path("categories", views.categories, name="categories"), + path("watchlist", views.watchlist, name="watchlist"), ] diff --git a/project_2/commerce/auctions/views.py b/project_2/commerce/auctions/views.py index 62bb34f..da6e6ed 100644 --- a/project_2/commerce/auctions/views.py +++ b/project_2/commerce/auctions/views.py @@ -95,11 +95,25 @@ def listing(request, title): def listing(request, title): listing = get_object_or_404(Listing, title=title) - form = BidForm() + user = request.user + + if request.method == "POST": + if 'add_to_watchlist' in request.POST: + if listing not in user.watchlist.all(): + user.watchlist.add(listing) + messages.success(request, "Listing added to your watchlist.") + else: + messages.info(request, "Listing is already in your watchlist.") + elif 'remove_from_watchlist' in request.POST: + if listing in user.watchlist.all(): + user.watchlist.remove(listing) + messages.success(request, "Listing removed from your watchlist.") + else: + messages.info(request, "Listing was not in your watchlist.") return render(request, "auctions/listing.html", { "listing": listing, - "form": form + "form": BidForm(), # Assuming you're passing a BidForm as well }) def place_bid(request, title): @@ -133,3 +147,28 @@ def place_bid(request, title): return render(request, "auctions/listing.html", {"listing": listing, "form": form}) +def watchlist_add(request, listing_id): + listing = get_object_or_404(Listing, id=listing_id) + user = request.user + + if listing not in user.watchlist.all(): + user.watchlist.add(listing) + messages.success(request, "Listing added to your watchlist.") + else: + messages.info(request, "Listing is already in your watchlist.") + + return redirect('listing', title=listing.title) + +def categories(request): + return render(request, "auctions/categories.html", { + "listings": Listing.objects.all() + }) + +def watchlist(request): + user = request.user + return render(request, "auctions/watchlist.html", { + "listings": user.watchlist.all() + }) + +def add_comment(request): + return render(request, "auctions/listing.html") \ No newline at end of file