From 42e38c6c19128a660b47ba055ebffef59f6c559c Mon Sep 17 00:00:00 2001 From: Priyatham-sai-chand Date: Wed, 21 Oct 2020 21:29:14 +0530 Subject: [PATCH] add closed bid --- auctions/__pycache__/models.cpython-37.pyc | Bin 2354 -> 2391 bytes auctions/__pycache__/views.cpython-37.pyc | Bin 4624 -> 4756 bytes .../migrations/0002_auctionlisting_closed.py | 18 ++++++ .../0002_auctionlisting_closed.cpython-37.pyc | Bin 0 -> 576 bytes auctions/models.py | 2 +- auctions/templates/auctions/index.html | 2 +- auctions/templates/auctions/layout.html | 54 +++++++++++------- auctions/templates/auctions/listing.html | 40 +++++++++---- auctions/views.py | 11 +++- db.sqlite3 | Bin 245760 -> 253952 bytes 10 files changed, 93 insertions(+), 34 deletions(-) create mode 100644 auctions/migrations/0002_auctionlisting_closed.py create mode 100644 auctions/migrations/__pycache__/0002_auctionlisting_closed.cpython-37.pyc diff --git a/auctions/__pycache__/models.cpython-37.pyc b/auctions/__pycache__/models.cpython-37.pyc index 41702a2b8dfe684314f42c72018455e735b5123d..d3d8c8d39ee88bbe9fdf4e1728046b3a8a88bd86 100644 GIT binary patch delta 254 zcmdlabX|zoiIOoH9U=#vE4n`iPB9qCS?EipjeAwg|btkKHm@-;Tj^&UAid1vRidzB|Yk+idfOYYK d^f47#PF~O9$p$hJ$ZX&cpDfBL#Vjer0RWp}Gwc8W delta 232 zcmcaEv`L89iIGXWX8z{ zm{&7OPtIXcVHBA>k!9NC#T-&xtU$f&KwK;|IgwR_nW>0%vL3tS{CJWElse5D;=O@-P({0agD4swrfXW7L`K!(l3K0aQ?=10q;Jgf58C z0}&vbicBUi;E)wJ2Qt-xxR?V-a4_idjO40{|1- BEc^ff diff --git a/auctions/__pycache__/views.cpython-37.pyc b/auctions/__pycache__/views.cpython-37.pyc index 643b3e8160f7257a42b90b528680afb4618aad99..f6b507042afa65d1b241ab3bd6cd9eff0351ccbf 100644 GIT binary patch delta 701 zcmYk3&uddb5XX1kkIhT+@)DzhKTx44@r5c1t*udGOrpld+Ll@h1qmfDVnRyd=H(!y z^dJ;H1PbHDTMOz%JV-ov6#NfF5Z+(lQF`pjnOBG|>}O|ZX1~nL?wo&f!6_yZF+uBX zX{WY*{Im1kfB?T3H(+M;$H)N8;tA}SdMyGL zqOark$xszW4u3|U%fmZXV|QQ`*s;JT(2wDMUE~qE)xQ?tD5yj5a~ASeqS|I5uZ3& zxQ?%!2`J-7=X9aKxk(0(C7hPJ!WK`^wGOBBPj!jBYtinrj^C;ERhtB5at&5+J&E!b zKg;7ma)@8`#8!^3zGy*98-NEx*wj32pw;w&wrlJO5ChRNcQsGx_^y1}RmK8ig>j0pirB!|A0%w(v{~O4Bq5EdG9&zoVoXXH~RLbU(94umad<}Z}vW2 z_~L(Xs48EbIhyJHcJf5Ca>)b~_KIeK%)AJ9AD2+b027MHJZ&^Pb>;re#++=n@Z<+$Y8IdW}7HhBp{alc0B>2h=@bmOmw&lR$ie4Soa z!7D&0KawxZ*;&?81zMGp)HH?iE%kubB$@u6K{HC!5B3{PUXfqvaVpD@H>IAkH$jWi z^==Hr1J=){K9u*~BdYXHz5A5MeFMX{(A@xTE22c38?}1W-)_`8U9NLM9{b~TS6=xe zRFcpB)ulyvvjAd=)8a`eyd`kYQu;r2Q>)cv`&p~g+Us&t2bye^wq-vn<{mzqmp|E) zFyc`N0tvR*QH?b_YL};E$Z;79a3sl{^F70YYFJz)N`* USOY4+HgE;lk>kFLvYQM40_N~=Y5)KL diff --git a/auctions/migrations/0002_auctionlisting_closed.py b/auctions/migrations/0002_auctionlisting_closed.py new file mode 100644 index 0000000..4d544ab --- /dev/null +++ b/auctions/migrations/0002_auctionlisting_closed.py @@ -0,0 +1,18 @@ +# Generated by Django 3.0.8 on 2020-10-21 11:57 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('auctions', '0001_initial'), + ] + + operations = [ + migrations.AddField( + model_name='auctionlisting', + name='closed', + field=models.BooleanField(default=False), + ), + ] diff --git a/auctions/migrations/__pycache__/0002_auctionlisting_closed.cpython-37.pyc b/auctions/migrations/__pycache__/0002_auctionlisting_closed.cpython-37.pyc new file mode 100644 index 0000000000000000000000000000000000000000..a78b3981084846b935cb8ef3096d71be34598ce1 GIT binary patch literal 576 zcmY*W%}OLO5KcNhJw3xH9`ptFu+Xr`tVa>iS<#bTWG_uah+XBFA)Sn!8N{=D9T0p9 zUny5lzJez!Jr1%JQq*6nzOORb+8Q#F$&Y9G!Wnyu&PGx)PU!ldq<{f8tl=eZk}~1! zf$COXMM;T2WWg9Qya<1IHBu*kwR8-U}XY) z%1eRitQVVOHtRzQy%mRSB`A|apGM?iaJlJCgL1X3*JDQG@%XpYRxh+NVf!m?v|ngD z4OwlRM>sEd=mXxWrCAh$U`A-tss=;a>E5kI16Rc$qZQE|O`J2RY!?bcH^;BFys~ze3Oe<1{pYay>#_CKjjiug zb><$daSD7@yQaam#%jZ}`rd3sj1T1hMCF?2{`|3x9~k%S;~(cDOH-cE>Ec&K8U`>^ gcIx)wrbFK0?ULWX*47@q5Bbr02gi|?k5qTWCo-;_p8x;= literal 0 HcmV?d00001 diff --git a/auctions/models.py b/auctions/models.py index 3ef057c..9c4019d 100644 --- a/auctions/models.py +++ b/auctions/models.py @@ -23,6 +23,7 @@ class AuctionListing(models.Model): picture = models.URLField(default="https://www.riobeauty.co.uk/images/product_image_not_found.gif") category = models.CharField(max_length = 64,choices=category_choices) date_added = models.DateTimeField(auto_now_add=True) + closed = models.BooleanField(default=False) def __str__(self): return f"{self.title}: {self.price},{self.desc},{self.picture},{self.category},{self.date_added}" @@ -43,4 +44,3 @@ class Bids(models.Model): def __str__(self): return '%s - %s - %s' % (self.bid_value, self.user, self.listing) - diff --git a/auctions/templates/auctions/index.html b/auctions/templates/auctions/index.html index 56c904e..e369078 100644 --- a/auctions/templates/auctions/index.html +++ b/auctions/templates/auctions/index.html @@ -4,7 +4,7 @@

Active Listings

{% for listing in Listings %} -
+
diff --git a/auctions/templates/auctions/layout.html b/auctions/templates/auctions/layout.html index fb8be93..8e73546 100644 --- a/auctions/templates/auctions/layout.html +++ b/auctions/templates/auctions/layout.html @@ -9,39 +9,51 @@

Auctions

-
+
{% if user.is_authenticated %} Signed in as {{ user.username }}. {% else %} Not signed in. {% endif %}
- +
    + + {% if not user.is_authenticated %} +
  • + Login +
    • +
  • + Register +
    • + {% else %} +
  • + Logout +
    • + {% endif %} + +
+ +
+
{% block body %} {% endblock %} diff --git a/auctions/templates/auctions/listing.html b/auctions/templates/auctions/listing.html index d972f28..7ee0945 100644 --- a/auctions/templates/auctions/listing.html +++ b/auctions/templates/auctions/listing.html @@ -25,15 +25,29 @@
-

{{Listing.desc}}

+

{{Listing.desc}}

- -

${{bids.bid_value}}

- bids so far + {% if Listing.closed %} +
+

This listing is CLOSED

+
+

This Listing is won by @{{bids.user}} for ${{bids.bid_value}}

+ {% else %} +

${{bids.bid_value}} by @{{bids.user}}

+ +
{% if user.is_authenticated %}
{% csrf_token %} - +
+
+ $ +
+ +
+ .00 +
+

@@ -42,6 +56,7 @@
Log In to bid on this Listing {% endif %} + {% endif %}

Comments ...

@@ -54,7 +69,7 @@ {% else %} {% for comment in Listing.comments.all %} - {{comment.user}} - {{comment.date_added}} + {{comment.user}} - {{comment.date_added}}
{{ comment.body }}
@@ -63,20 +78,25 @@ {% endif %} - {% if user.is_authenticated %} + {% if not Listing.closed%}
Add comment

- + {% csrf_token %} - +

+ {% elif not user.is_authenticated %} +
+
+ Log In to comment on this listing + {% else %}
- Log In to comment on this listing + The Listing is CLOSED for comments {% endif %} diff --git a/auctions/views.py b/auctions/views.py index 01934f9..a901427 100644 --- a/auctions/views.py +++ b/auctions/views.py @@ -164,6 +164,15 @@ def bid(request, title): "bids" : bid }) def close_bid(request,title): - pass + listing = AuctionListing.objects.get(title=title) + listing.closed = True + listing.save() + previous_url = request.POST.get('previous','/') + print(previous_url) + + + return HttpResponseRedirect(previous_url) + + diff --git a/db.sqlite3 b/db.sqlite3 index e8457ff881073ca4c0c6b1381da19e799263d718..9c78f25d18b015fad7173a393ec18440d62068da 100644 GIT binary patch delta 2763 zcmb_ee{2)i9lw|7-%0K{3&FuDX+lDQkvreJ^Y0Wghcv+{HY5xAVO4|kkJuNVeZh8| z#OoRy%0JWofJN#JF|t%l`)6Wn7ilhRq8(bNYOT7io2pJjONE3~q`}ZsP22uh_k1Cc z4x(w&EWPi&d-r+YU!U*$KA%2~PQQiDwKOCsiaJO}HyJf#oIBqofW+%3zmH(2;oT*p zb)d%Z?&^^B>xM&tPCd0V5D;f#1xd-~IgaB`Jb00%d_l@4PsC&;pNR7u&oP)|c-)4u z-{tjlUe=Ahf?HUnZLQ6=j%^mmfDJt-VoD~H$QBxw4mtJ%yrejypmX&@M}JQP+3)lV zoFBVckKl8Axut!|x2)@{UO(?*ss&NH8Q`?K4MQ+5QFQd*% z*9!PE-KmEFn6M@}O*%BmYLd}pmwNce;O9iiF4g!N=&3_rL4M>!EZU29t+sO?tSixJ zN_3hMou)*mDbZ<4bX}GHH^FtQ0nj%n`o?N|+Z*)4VmHu-Ue*WVabJlqOvZgPr($?= zCYG7^;apMl@i}iPo-DZ|eXy} zEQCXu2_ei+@JC0cJwe%*ijNN~FCI)6zLlb3KONY5E>gQ zMf!$Q6C=G-p}w>b85t(ekTX0mm=0#S1M5|T8P2J(uJP+}JH4FKLh2Hrn-sda+A#eg zVmn~S{NHl9zULN&Zml+){us6HgaPx`7JhPCXRU*1jY4baGjs?2ju`qCYOEuMwVzoB z8iDRuBHOOsdAg>BK<`oLp9FdjeM% zA=?NWL6x7%-5zMO67Q}*BnaI?H_=DL!(XFcqU&VO3Tm$Mqi@ipRg*}QbmgNHkhL~j z4Cg7djTY*U*JWxiSXRt0n=Tly7|xSMIAhqexC2|LK+~C>699nCB)I%8OgLk);N_iI z?OuSp7iRJ-=7roOOWK^n>EdQH4kjk&%_8LO!GuOjco}jF?O?V)09&B#Tiw!LU=) z$(~{&cfhUwXaR0lSEA6az7U0IPg&xs;Vd3_LO7h?L{nf!Zp{7y?gnQ=g=%rDuU~~WO@IUHzj}d9{p2cqMg8kF z*sA{K8thPu*We3v>wivmwM7+0t{8s?|DoGnUw?)&)&hXK>2vj;*MhoRb&=XXkX!pt zmIdl^j* zs3IN|ggU(p?e)3^BZ&c*%{CH)y6qA?uJ2WpbY7jh1nsoGtTR|_z*RO^LsU~2;ka>Q z`!6m+JJM6-R=s5h@RWTT;@(BrS*@7xL)d;1+Vwh;trrPvbM<8!5{0|Vj0QjZT^N0c ztosJBs4MTSu{6~<%0uk|U{;rx;k;#3iYJsL>1TQMdQ$VM7g!oW`(j5^6?6D|@Ph8J Rl1ZrdC1?k_AFM#@zX2x?1QP%N delta 946 zcmZ{jU1$_n6vywGv%9n7&diz3*Xl--N#jS0G1*P(CT@buTG<8)r2)SlqA_aFv~DIP zDVSEt-%cbqx70T^H#WAMyy18^97x5mn%bp$0oHq4F2EBrx8I7%_MhQ*u4klr8B#xn z`^n2(gFmc*u!JzLv#G150$cMPRuV=p2Nimd4-fxIur}9W*$ahfF5D-m8c9blf;D>1 zrzo7DJhl)k7E?J>tyD5OFX$C>ujtW&OohI%9T38g06u%+U2WuH z4($@vEC?E>@8~FPr`6`XSzvqT+1`$k^lGoLPigtMM5PHqFKCV)(cknJ-JuC~@C$hp z50y6ib!Yef&zUzvSXo481wE%(j%SQcl3BVuM6j56vnh;N+;3`ef~VYZnjX*;!{g*l zbz!}w`}C}!GPB9psb|^iUfs(c$6RTJp?@gUP$y8EIjRpC|AwYRorcClCZxL<&?2ze z)gWCd4;OF`_~qjh7%k0o4;@b`m!+Wop4_AyrL zZYipmw{WF=`6<3%?0gKPWlK`R-JodYN`u=0=^FXNZ5(1TdlI7+yLu1xIETBlJp*nU zv{I<~vKG?ivV9W2XN|dDjQZN0Y|l@3(5f=HsTMpdC}8e3zSiFioezbzZ?v}H*