From 0a27b0677b238740e73673fb4cd10b9ecc31ede3 Mon Sep 17 00:00:00 2001 From: Priyatham-sai-chand Date: Tue, 20 Oct 2020 22:41:58 +0530 Subject: [PATCH] bids improved --- auctions/__pycache__/admin.cpython-37.pyc | Bin 335 -> 364 bytes auctions/__pycache__/models.cpython-37.pyc | Bin 2207 -> 2354 bytes auctions/__pycache__/urls.cpython-37.pyc | Bin 685 -> 774 bytes auctions/__pycache__/views.cpython-37.pyc | Bin 4042 -> 4624 bytes auctions/admin.py | 3 +- auctions/migrations/0001_initial.py | 27 ++++++++-- .../0002_remove_auctionlisting_date_added.py | 17 ------ .../0003_auctionlisting_date_added.py | 20 ------- auctions/migrations/0004_comment.py | 25 --------- .../migrations/0005_auto_20201018_2304.py | 23 -------- .../migrations/0006_auto_20201019_1109.py | 27 ---------- .../migrations/0007_auto_20201019_1723.py | 34 ------------ .../migrations/0008_auto_20201019_1725.py | 18 ------- .../migrations/0009_auto_20201019_1740.py | 18 ------- .../migrations/0010_auto_20201019_1744.py | 18 ------- .../__pycache__/0001_initial.cpython-37.pyc | Bin 2931 -> 3549 bytes auctions/models.py | 3 ++ auctions/templates/auctions/category.html | 5 +- auctions/templates/auctions/index.html | 10 ++-- auctions/templates/auctions/layout.html | 2 +- auctions/templates/auctions/listing.html | 51 +++++++++++++++--- auctions/templates/auctions/watchlist.html | 9 +++- auctions/urls.py | 6 ++- auctions/views.py | 38 +++++++++---- db.sqlite3 | Bin 245760 -> 245760 bytes 25 files changed, 123 insertions(+), 231 deletions(-) delete mode 100644 auctions/migrations/0002_remove_auctionlisting_date_added.py delete mode 100644 auctions/migrations/0003_auctionlisting_date_added.py delete mode 100644 auctions/migrations/0004_comment.py delete mode 100644 auctions/migrations/0005_auto_20201018_2304.py delete mode 100644 auctions/migrations/0006_auto_20201019_1109.py delete mode 100644 auctions/migrations/0007_auto_20201019_1723.py delete mode 100644 auctions/migrations/0008_auto_20201019_1725.py delete mode 100644 auctions/migrations/0009_auto_20201019_1740.py delete mode 100644 auctions/migrations/0010_auto_20201019_1744.py diff --git a/auctions/__pycache__/admin.cpython-37.pyc b/auctions/__pycache__/admin.cpython-37.pyc index dfd5cc25962a4ac56a779c84df76ed9bf9f4e71d..bdfb581390bba6a4e00d4de9bad9e736f6079be4 100644 GIT binary patch delta 152 zcmX@l^oEJoiI5cz8kyny2VWPUGQ7&5)8zVz1V;1`Yj#TD_jBqv!5}Or? z%{H+}O_})?pJQoqNoIbYPiApRW?uR&cIW)u+|<01TP#kQDaC%8oD;X|Fcq;+yeG!S a4Yag~d*Uy50UjWWhmnU-gc(HgFaiJz3ntD0 delta 142 zcmaFEbe@UViIhdn)rnMmU=ViOo8(NlljN z7N28ja!F=>o=;|RNoHR9Eq3Sp+}zZ>5fGBnN0R!latW_8N&o57#OQ~oHA32_2T1;ON!#-{WN(eZ(x^HEwTV91}Q57SzDwF iBESZ)f>q0aQ@L2_ish si+Qz2t#LLUY00f&P`s2-*85kaeI4~dxWHj49ly%vqc% z+)y45kjIt61Lg68d3;bFKaj_rA^_zHqVR-(Jf0L`sGJCp$D1Mw<%t1#d@14}UOI0S ze~LsfgQn!fX91HP7$@7^Vl7WBNzSO^Ps&Wuw<#_uvMR|e$w{@l#S9dv5=_p?FHS`f z=L8GI17-a*1two(j8HA&2YRYV07QVic#FHVD5oH?q$IT{uXrUxktj$)bh0;-n}Q6G N$-~6M%*Tiw0surcOMU%^ zB$i~nWQ1^7%Q92Ti*HSqV>Drn;waB7p6tswgV|4$Z?ZB|gzPQW^2Czlj9c8LML9rS iC8f4no zp9DwY>EaX)3Ew;<+Tm9%Cx{dZ8q4W66DQ?8tI|0}K6W}1XUMt@XBu131pm_m+g@Dq zau(-XSQ5tcC@dFHiM1N5>1_t=30u`;L(O#1ac0CO;(D1e4dJ%Hc%X}0sM%l+YpZ7L zpw8QR+XU;0v1+xg^~{FGwAgKHV58jt=ehpSz_f7rlT-9CDf-d_kBKQfR!|;FxoX&G z_|3Sy5W;7kArx>^@`XL#@$|&Go+czQ7m!t6R^(};g5y2XcA-eDB@r}Zag+=yx0Ds- zC^4hTvY(=FEA&;K)8jv)Rp-covl+wNU>?%cI&vHJqtHyuFXNbP7qiVxo9TEFdCmEr zoss`KS7r#%?En+|UQmyHAufE-3i%-9JcS=W07=nj^+^>8t0mX`y6<+l7QGs@;< z(VdzlnqUg3*i?Op3>jD&^$r(VbP={<a*4J}~A>X@u~D8!j`4!e-)J;d~hl!%k)J~6?Ms!1-2D}s7U8JS$NmhOjfm}nC6 z)8{Ddo}DuDCh945iPcpu;q zD10uGTPhYs#I%4^KcP(??lfQMRcsfvNhBwb_5{dE_yr<4yCS&ysv?4`P=Q=TR5b4iJfVG?+A(3U~!3vB$Hz zFjMIuhoyYeU!eq-mn-#_zYUJUM$nSy_(VM@G;AgX=5`PV!UB5Xdj>J_GR9Gs3Dt2{9*PT^hiWK~OBZOAnzd$#N j4x{L2IV3?&{fCB)0oLnqmph#EKDWsGxy6V1Ab0-*N*BBp delta 1864 zcmZuxOK%)S5T2gb&OSU@){l7owv*VN1bGp*10*2=$FT_n8xc+`q0M@0uxGRDS$cY7 z9MZg}~9e0;{ zdNLY*Up_yq3>TicgY1uIGeMVWkcJFoAqPF+!Uf2~8=L8J@2Um`=snP&*LUlE`$oAR z`k?B%0n;?6Sy)AlQ4z-2wZ~8*pI>$n8tn# zMjmM1>^~HZyu`j`hWvp|$XD!NHX?u0Uv`VA;A12x;yAbL*MerXu@d+V;KQ^&^12wM z=^%N72#h8n8z?UlFXX*NqMX{gCa+zl_oqkr7!i z_SrteSk1NA{A~Tf7aof(5r~E#TfsK?-^gY2)AbZu;%O9~5vRESb=!{wpTT*YY6Ou8 zwl`0OOOeLbPF2*l3OI~%C^VK~F3YpL?lQh0|1&r5y@{*5L}HGFgTmAK+t|g-B65C$|4dL_HYT?a9;@L<%-=dx8rQ;?l-oX|TS2WYXq!t)C(pkCc?H*HXh=Eh)!wDVf?O4XMZcG z+)xy;bc(4 z=uH)R-6pCh^cGkK^vVh+nS+g#ch9AKLRR&LnBYgXI2Va3r>CT{5kT2$ZG|FSdvbeA zh*or?RNC3und3pY;aA&Ycdi!B$-Fx~L+tSEgx6H63Gs=4H9tcEi8Ta9cEmqL1aUjC1PmGX_{8yXo;~cr ztUo~i0Eyx5FYsdGX%pj*@NS&lEd-3tVe&rj^SsY9Z|2v;kLl4;CZi3B)BNh`3*+xc z&!q3t=P&P2e;qbFRF|NP6?vEZr|lVh+r9&pP-iJn^(36MQ}6_2p-PJx1W8DN;>p725Gx;NKMlo>{VSGFuUo=1 zcn(KiLJ0o~gBMX;#97J9xR?KodnH_N!4fRPO0>rHl!F;K{%?$aB}N{^%t0Pr3(Ik_ zlOZN+UII)nVI_~|0V+c|e10ZvC;M-g8=QBX#bUAB?G_lJHEg)NS1@V8Jt>lwVPU7( zVH8}G>k-u3l>*b_CDH~3M&^B8UjKISiO>A;T+r)I( z{kSJ@(H3T_{TQVx9m=@FN&~V=dk$NRfwt;$+M+em#B4ooB}XMZ3*mJ)w8?}d;TUw+!7PwV1e`#v5ztSKri+6cq6FchU$~82G$Os)HMrRb zxj?%t9lxH=qwM*I^e)oWDt^Pu1UJF|sZOR&!{k%{w^~KVenq=Cn?<8&E+HdHx`{MV ePoeApjfJ)EYfH%VziFMZcr=<1udaVEoc#ku@&hmc delta 268 zcmcaB{aK99iIPvl$2^oDWczD~w^#uS%c#x$lB*Hrc_&J?Q@Cos$DUgi|vUgmV>D1{WiU {% if user.is_authenticated %} -
+ {% csrf_token %} {% if user not in list.watchlists.all %} {% else %} - + {% endif %} +
{% else %} log in to watch this listing diff --git a/auctions/templates/auctions/index.html b/auctions/templates/auctions/index.html index 2a4aa48..56c904e 100644 --- a/auctions/templates/auctions/index.html +++ b/auctions/templates/auctions/index.html @@ -4,7 +4,7 @@

Active Listings

{% for listing in Listings %} -
+
@@ -19,7 +19,7 @@ bid price : ${{listing.price}}
created by: {{listing.user}}
- created at {{listing.date_added}} + created on {{listing.date_added}}

@@ -27,13 +27,15 @@
{% if user.is_authenticated %} -
+ {% csrf_token %} {% if user not in listing.watchlists.all %} {% else %} - + {% endif %} + +
{% else %} log in to watch this listing diff --git a/auctions/templates/auctions/layout.html b/auctions/templates/auctions/layout.html index c9a147e..fb8be93 100644 --- a/auctions/templates/auctions/layout.html +++ b/auctions/templates/auctions/layout.html @@ -25,7 +25,7 @@ {% if user.is_authenticated %}
  • - WishList {{ user.watchlist.count }} + WatchList {{ user.watchlist.count }}
  • Create Listing diff --git a/auctions/templates/auctions/listing.html b/auctions/templates/auctions/listing.html index 821fd39..d972f28 100644 --- a/auctions/templates/auctions/listing.html +++ b/auctions/templates/auctions/listing.html @@ -3,39 +3,73 @@ {% block body %}

    Listing : {{ Listing.title}}

    + +
    + {% if user.username|stringformat:"s" == Listing.user|stringformat:"s" %} + + + + Close this Listing + {% endif %} +
    + {% csrf_token %} + {% if user not in Listing.watchlists.all %} + + {% else %} + + {% endif %} + +
    +
    - +

    {{Listing.desc}}

    -

    ${{Listing.price}}

    +

    ${{bids.bid_value}}

    bids so far -
    - -
    - + {% if user.is_authenticated %} +
    + {% csrf_token %} + + +
    + +
    + {% else %} +
    + Log In to bid on this Listing + {% endif %} +
    +

    Comments ...

    {% if not Listing.comments.all %} No comments Yet.... +
    +
    +
    + {% else %} {% for comment in Listing.comments.all %} {{comment.user}} - {{comment.date_added}}
    {{ comment.body }}
    +
    {% endfor %} {% endif %} {% if user.is_authenticated %} -
    add comment..
    +
    Add comment

    {% csrf_token %} +

    @@ -45,4 +79,7 @@ Log In to comment on this listing {% endif %} + + + {% endblock %} \ No newline at end of file diff --git a/auctions/templates/auctions/watchlist.html b/auctions/templates/auctions/watchlist.html index dce261d..effa4c1 100644 --- a/auctions/templates/auctions/watchlist.html +++ b/auctions/templates/auctions/watchlist.html @@ -2,6 +2,7 @@ {% block body %}

    WatchList

    + {% if Watchlistings %}
    {% for listing in Watchlistings %}
    @@ -22,13 +23,15 @@ created at {{listing.date_added}}

    -
    + {% csrf_token %} {% if user not in listing.watchlists.all %} {% else %} {% endif %} + +
    @@ -42,5 +45,9 @@
    {% endfor %}
    + {% else %} +

    There seems to be no listing you are watching !! +

    + {% endif %} {% endblock %} \ No newline at end of file diff --git a/auctions/urls.py b/auctions/urls.py index e3bb470..437e120 100644 --- a/auctions/urls.py +++ b/auctions/urls.py @@ -7,11 +7,13 @@ urlpatterns = [ path("login", views.login_view, name="login"), path("logout", views.logout_view, name="logout"), path("register", views.register, name="register"), - path("watchlist", views.watchlist, name="wishlist"), + path("watchlist", views.watchlist, name="watchlist"), path("create", views.create, name="create"), path("categories", views.category, name="categories"), path("category/",views.category,name="individual_categories"), path("listing/",views.listing,name="listing"), path("category/listing/",views.listing,name="listing"), - path("watch/",views.watch,name="watchlist"), + path("watch/",views.watch,name="watch"), + path("bid/",views.bid,name="bid"), + path("close/",views.close_bid,name="close_bid"), ] diff --git a/auctions/views.py b/auctions/views.py index 06802ff..01934f9 100644 --- a/auctions/views.py +++ b/auctions/views.py @@ -4,7 +4,7 @@ from django.http import HttpResponse, HttpResponseRedirect from django.shortcuts import render from django.urls import reverse from django import forms -from .models import User,AuctionListing,Comment +from .models import User,AuctionListing,Comment,Bids categories = ['Fashion','Electronics','Home','Sports','Toys','Automobile','Books','Videogames', 'Other'] @@ -22,7 +22,9 @@ def watch(request,title): request.user.watchlist.remove(listing) else: request.user.watchlist.add(listing) - return HttpResponseRedirect(reverse("index")) + previous_url = request.POST.get('previous','/') + + return HttpResponseRedirect(previous_url) def watchlist(request): listings = request.user.watchlist.all() @@ -42,14 +44,19 @@ def listing(request,title): """ docstring """ - listings = AuctionListing.objects.get(pk = title) + listing = AuctionListing.objects.get(pk = title) + bids = Bids.objects.get(listing = listing) + print(bids) if request.method == "POST": body = request.POST["comment_body"] - comment = Comment(user=request.user,listing=listings,body = body) + comment = Comment(user=request.user,listing=listing,body = body) comment.save() + + return render(request,"auctions/listing.html",{ - "Listing": listings + "Listing": listing, + "bids" : bids }) def category(request,cat_name = None): @@ -132,11 +139,13 @@ def create(request): desc = request.POST["desc"] starting_bid = request.POST["starting_bid"] photo_url = request.POST["photo"] - if photo_url == None: + if photo_url == "": photo_url = "https://www.riobeauty.co.uk/images/product_image_not_found.gif" category = request.POST["category"] - obj = AuctionListing(title = title, desc = desc, user = request.user,price = starting_bid, picture = photo_url,category=category) - obj.save() + listing_obj = AuctionListing(title = title, desc = desc, user = request.user,price = starting_bid, picture = photo_url,category=category) + listing_obj.save() + bid_obj = Bids(bid_value = starting_bid, listing = listing_obj, user = request.user) + bid_obj.save() return render(request,"auctions/index.html",{ "Listings" : AuctionListing.objects.all() }) @@ -144,6 +153,17 @@ def create(request): return render(request,"auctions/create_listing.html",{ "categories":categories }) - +def bid(request, title): + listing = AuctionListing.objects.get(title=title) + bid = Bids.objects.get(listing = listing) + new_bid_value = request.POST["bid"] + bid.bid_value = new_bid_value + bid.user = request.user + return render(request,"auctions/listing.html",{ + "Listing": listing, + "bids" : bid + }) +def close_bid(request,title): + pass diff --git a/db.sqlite3 b/db.sqlite3 index fb3d5a206bc69c25091be46b46f7f959bf403fc0..e8457ff881073ca4c0c6b1381da19e799263d718 100644 GIT binary patch delta 4653 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