From 192defed3b18acc667f99167d3013c1edc541ec8 Mon Sep 17 00:00:00 2001 From: Priyatham-sai-chand Date: Sun, 18 Oct 2020 21:57:28 +0530 Subject: [PATCH] add category --- .vscode/settings.json | 2 +- auctions/__pycache__/admin.cpython-37.pyc | Bin 348 -> 303 bytes auctions/__pycache__/models.cpython-37.pyc | Bin 1618 -> 1185 bytes auctions/__pycache__/urls.cpython-37.pyc | Bin 576 -> 576 bytes auctions/__pycache__/views.cpython-37.pyc | Bin 3154 -> 3644 bytes auctions/admin.py | 3 +- auctions/migrations/0001_initial.py | 15 ++++--- .../migrations/0002_auto_20201011_2323.py | 20 ---------- .../0002_remove_auctionlisting_date_added.py | 17 ++++++++ .../0003_auctionlisting_date_added.py | 20 ++++++++++ .../migrations/0003_auto_20201012_0007.py | 18 --------- .../migrations/0004_auto_20201013_0925.py | 18 --------- .../migrations/0005_auto_20201016_1630.py | 28 ------------- .../0006_auctionlisting_category.py | 18 --------- .../__pycache__/0001_initial.cpython-37.pyc | Bin 2896 -> 2931 bytes ...002_auctionlisting_username.cpython-37.pyc | Bin 692 -> 0 bytes .../0002_auto_20201003_2319.cpython-37.pyc | Bin 1243 -> 0 bytes .../0002_auto_20201011_2158.cpython-37.pyc | Bin 539 -> 0 bytes .../0002_auto_20201011_2206.cpython-37.pyc | Bin 584 -> 0 bytes .../0002_auto_20201011_2323.cpython-37.pyc | Bin 741 -> 0 bytes ...e_auctionlisting_date_added.cpython-37.pyc | Bin 0 -> 527 bytes .../0002_remove_comments_title.cpython-37.pyc | Bin 505 -> 0 bytes ...3_auctionlisting_date_added.cpython-37.pyc | Bin 0 -> 723 bytes .../0003_auto_20201003_2349.cpython-37.pyc | Bin 1255 -> 0 bytes .../0003_auto_20201011_2155.cpython-37.pyc | Bin 893 -> 0 bytes .../0003_auto_20201011_2208.cpython-37.pyc | Bin 553 -> 0 bytes .../0003_auto_20201011_2211.cpython-37.pyc | Bin 976 -> 0 bytes .../0003_auto_20201012_0007.cpython-37.pyc | Bin 597 -> 0 bytes .../0004_auto_20201013_0925.cpython-37.pyc | Bin 580 -> 0 bytes ...ove_auctionlisting_username.cpython-37.pyc | Bin 534 -> 0 bytes .../0005_auto_20201016_1630.cpython-37.pyc | Bin 1070 -> 0 bytes ...006_auctionlisting_category.cpython-37.pyc | Bin 609 -> 0 bytes .../__pycache__/__init__.cpython-37.pyc | Bin 152 -> 152 bytes auctions/models.py | 20 ++++------ auctions/templates/auctions/category.html | 6 +-- auctions/templates/auctions/index.html | 8 +++- auctions/templates/auctions/layout.html | 2 +- auctions/templates/auctions/listing.html | 1 + auctions/urls.py | 2 +- auctions/views.py | 37 ++++++++++++------ db.sqlite3 | Bin 217088 -> 217088 bytes 41 files changed, 92 insertions(+), 143 deletions(-) delete mode 100644 auctions/migrations/0002_auto_20201011_2323.py create mode 100644 auctions/migrations/0002_remove_auctionlisting_date_added.py create mode 100644 auctions/migrations/0003_auctionlisting_date_added.py delete mode 100644 auctions/migrations/0003_auto_20201012_0007.py delete mode 100644 auctions/migrations/0004_auto_20201013_0925.py delete mode 100644 auctions/migrations/0005_auto_20201016_1630.py delete mode 100644 auctions/migrations/0006_auctionlisting_category.py delete mode 100644 auctions/migrations/__pycache__/0002_auctionlisting_username.cpython-37.pyc delete mode 100644 auctions/migrations/__pycache__/0002_auto_20201003_2319.cpython-37.pyc delete mode 100644 auctions/migrations/__pycache__/0002_auto_20201011_2158.cpython-37.pyc delete mode 100644 auctions/migrations/__pycache__/0002_auto_20201011_2206.cpython-37.pyc delete mode 100644 auctions/migrations/__pycache__/0002_auto_20201011_2323.cpython-37.pyc create mode 100644 auctions/migrations/__pycache__/0002_remove_auctionlisting_date_added.cpython-37.pyc delete mode 100644 auctions/migrations/__pycache__/0002_remove_comments_title.cpython-37.pyc create mode 100644 auctions/migrations/__pycache__/0003_auctionlisting_date_added.cpython-37.pyc delete mode 100644 auctions/migrations/__pycache__/0003_auto_20201003_2349.cpython-37.pyc delete mode 100644 auctions/migrations/__pycache__/0003_auto_20201011_2155.cpython-37.pyc delete mode 100644 auctions/migrations/__pycache__/0003_auto_20201011_2208.cpython-37.pyc delete mode 100644 auctions/migrations/__pycache__/0003_auto_20201011_2211.cpython-37.pyc delete mode 100644 auctions/migrations/__pycache__/0003_auto_20201012_0007.cpython-37.pyc delete mode 100644 auctions/migrations/__pycache__/0004_auto_20201013_0925.cpython-37.pyc delete mode 100644 auctions/migrations/__pycache__/0004_remove_auctionlisting_username.cpython-37.pyc delete mode 100644 auctions/migrations/__pycache__/0005_auto_20201016_1630.cpython-37.pyc delete mode 100644 auctions/migrations/__pycache__/0006_auctionlisting_category.cpython-37.pyc diff --git a/.vscode/settings.json b/.vscode/settings.json index 3c89cbc..f514ed3 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,4 +1,4 @@ { - "python.pythonPath": "C:\\Users\\bncha\\AppData\\Local\\Programs\\Python\\Python38-32\\python.exe", + "python.pythonPath": "C:\\ProgramData\\Anaconda3\\python.exe", "python.dataScience.jupyterServerURI": "local" } \ No newline at end of file diff --git a/auctions/__pycache__/admin.cpython-37.pyc b/auctions/__pycache__/admin.cpython-37.pyc index b0e0c7aec226a7df5fd8e10b9bc92b5f7527796f..84f54ed5085973a9b3aafcf59522366628b9021c 100644 GIT binary patch delta 110 zcmcb^w4RCAiIMf3<)bz~alGLJ=3`Lwk(~3AJvogB#Z~&P+j6lfD!w3N1 CB^hx5 delta 136 zcmZ3_bcc!8iIny+XD7f=7o%K zHVYD)6~scnJ3(z0a=a+lJg zpU@v^5wvLNm(->+dM@8R--G*cKkYZuJ#rjDaDF;30pSyOl^#yYRUOio#5dl@dvuaB z>8<*p+vg+JFeUE@&;WB(7OE5&V2)_RM(zLuf!v+>bmnJ}d+1x}FMtisGifY>i|rY8 zz)Fr!V>9drAiHuP)sR(7G`5@fgD~ia4?z>4MU(I0B-=vN5O)>z%{B|bo=7J(C9|zf z$*YCEygp?6gq_w4a%{Ak19=lhkFfw`NvQ-?<^}4hQ@%x)R1f)@8uQBTI+jOS zykg_};_Rd?yAb6PFQ0hMF}}ZQ_vAd-NP@4V;p-nrLbyq`h%xK{HGj8{KC?6$30 zxGeT&cemP44RXjmG00Wsq5a;B9WWmGVEjLfOVu4C3cemb5WWqCM~Knu+2_UlyQn`S zduqlWw)#|Isi};sm{}|`6>)&PMv|(?!;%+dQGi_wRHN|3i0iZf`Feg!u3tM9%}5sB zaIj0NuQF9Qr1pE`ewJ^`t(Mev9IdYa5&_`BZwJvqj9U3OxqAPT13k0*PCjg&ijBxB z>@3ats<4lBnyA7eHA)KSI8Cy#R(WJL#ijhYxdt2}U&%k3n`_r0r*8lX_vQABC#mX_ zzFAI_UZxI)`mJu}Z>*&}u>47g1y_Wkfe7$~mgYJoi20Zot_?~Vu^=OsTn}XfDg|fx3~eJzn8{ z>nZ~l4c%hkd+6H?D-5fE!b#3f&^4ycfqm(F06u4A0bF=2nTy^g#@yTn_Wa)*ei;dS z71(nMXD=m62M4-=Z~uDY7VAZZt7q&I=gWY9nA5RA9$ZO0506pLZb^rhX diff --git a/auctions/__pycache__/views.cpython-37.pyc b/auctions/__pycache__/views.cpython-37.pyc index 263f813276751b9fbe9d15b830a5d5a79fca1c99..57c37f196cec370c4ed057378753e3c300c816d4 100644 GIT binary patch literal 3644 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 EUoHYdCIA2c delta 1657 zcmZuxOK%)S5T4$7Z13!PZSTwLS9aqV!8pVTBIXSuHY7npwk4Y!hJ&@^L>O zfg~IGKsbN^DVjeJANdd5I7VEMxb%%9ckWO%Yn<57qyD<5y1M$S>gxJ=?zd)nb!^Nv zutm?l-T9^bqAq>I8$*AI2vUwq_`c>hIVpxmnem!dVjcCfB!nKkZ z6J;?jCd8zuh^nad3Vu`6MdPvIPm3wh#BoMk64PSlG4p4|te8W|oR}9EaGVz{(Z=zD zxF{A}oU}w?%kUOc&eV~0GYF-}bY;C0NwF=X!x%bn|3q3`i~CCU75%RN$@=N%n9>7e5YVS3%qlx{0=K$C1>|7TQN0YdgN5 zX!pkF0~JT{E}GZ&Y8)RV4~lmJA>;Nfq?2fSL+wfE(!tbn*lp}<*pnFqW$d%3xntuI zQ|8bROyq_vU|*Z)p1GcOO7-`BenK$uEEvZvIv?-uBdtW6oiGHBA}^=&Any)jqBIXj z{vexp%tujNKBm1*e;| zHNea|M?t$`+za|U_X7Flwe$}@&z94_`O2*pn(<7q&e-+X$mH2r>mr(n2P(7i5pGCm zm%%uLtLekSua%4@(a^SxIzb3asqZea%jq}n^||bzBD{*rkSP*(pmc!g^mq5ln{?YF zC$7;fbN@A(T_HF}g@f#2hDrD&eY<#h_ByJZrZ*X;=&WH+eoT*wz1yNd1>wa4&?`L3 zD;tv?3&AiyN_J7hgs(rSx@~MC?j{PaxtINoC@-YVQtM^9OwWM@9AJfj2xd9a#XLO> zx@rItFZI}JuD~QIR0ygBH3G_4Xb?;xoO!CyL`izD)H53x|8LigyMO0+H1wzE#K)`CJ&CF366OyQq}V$%f^!(buG*fp_cX8uX^# z!9|a)d+l^-Y;ZIw_B;JvyxfgJE`Nb#CjqL@e&av#Wrej6inyr%XK}ZKnOdSnywI$2 zB-)8$A;V;p8kx`ZXh!rYiST&~L~;z439b@Q24o~($dt@ksuG&NheijX{D4YeLeZ+R X5}UyO@5foqM0fL?yH#G}HlO|nkw;{4 diff --git a/auctions/admin.py b/auctions/admin.py index 9c3b6e4..466ccb9 100644 --- a/auctions/admin.py +++ b/auctions/admin.py @@ -1,9 +1,8 @@ from django.contrib import admin from .models import User from .models import AuctionListing -from .models import Comments # Register your models here. admin.site.register(User) admin.site.register(AuctionListing) -admin.site.register(Comments) \ No newline at end of file + diff --git a/auctions/migrations/0001_initial.py b/auctions/migrations/0001_initial.py index 21a43b6..42b85b1 100644 --- a/auctions/migrations/0001_initial.py +++ b/auctions/migrations/0001_initial.py @@ -1,4 +1,4 @@ -# Generated by Django 3.0.8 on 2020-10-11 16:42 +# Generated by Django 3.0.8 on 2020-10-18 16:09 from django.conf import settings import django.contrib.auth.models @@ -50,15 +50,14 @@ class Migration(migrations.Migration): ('price', models.DecimalField(decimal_places=2, max_digits=10)), ('desc', models.CharField(max_length=1000)), ('picture', models.URLField(null=True)), + ('category', models.CharField(max_length=64)), + ('date_added', models.DateTimeField(auto_now_add=True)), ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), ], ), - migrations.CreateModel( - name='Comments', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('comment', models.CharField(max_length=1000)), - ('title', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='auction_title', to='auctions.AuctionListing')), - ], + migrations.AddField( + model_name='user', + name='watchlist', + field=models.ManyToManyField(blank=True, related_name='watchlist', to='auctions.AuctionListing'), ), ] diff --git a/auctions/migrations/0002_auto_20201011_2323.py b/auctions/migrations/0002_auto_20201011_2323.py deleted file mode 100644 index 20fee1c..0000000 --- a/auctions/migrations/0002_auto_20201011_2323.py +++ /dev/null @@ -1,20 +0,0 @@ -# Generated by Django 3.0.8 on 2020-10-11 17:53 - -from django.conf import settings -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('auctions', '0001_initial'), - ] - - operations = [ - migrations.AlterField( - model_name='auctionlisting', - name='user', - field=models.ForeignKey(default=' ', on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL), - ), - ] diff --git a/auctions/migrations/0002_remove_auctionlisting_date_added.py b/auctions/migrations/0002_remove_auctionlisting_date_added.py new file mode 100644 index 0000000..1a79224 --- /dev/null +++ b/auctions/migrations/0002_remove_auctionlisting_date_added.py @@ -0,0 +1,17 @@ +# Generated by Django 3.0.8 on 2020-10-18 16:16 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('auctions', '0001_initial'), + ] + + operations = [ + migrations.RemoveField( + model_name='auctionlisting', + name='date_added', + ), + ] diff --git a/auctions/migrations/0003_auctionlisting_date_added.py b/auctions/migrations/0003_auctionlisting_date_added.py new file mode 100644 index 0000000..c762cb7 --- /dev/null +++ b/auctions/migrations/0003_auctionlisting_date_added.py @@ -0,0 +1,20 @@ +# Generated by Django 3.0.8 on 2020-10-18 16:18 + +from django.db import migrations, models +import django.utils.timezone + + +class Migration(migrations.Migration): + + dependencies = [ + ('auctions', '0002_remove_auctionlisting_date_added'), + ] + + operations = [ + migrations.AddField( + model_name='auctionlisting', + name='date_added', + field=models.DateTimeField(auto_now_add=True, default=django.utils.timezone.now), + preserve_default=False, + ), + ] diff --git a/auctions/migrations/0003_auto_20201012_0007.py b/auctions/migrations/0003_auto_20201012_0007.py deleted file mode 100644 index 4131ec2..0000000 --- a/auctions/migrations/0003_auto_20201012_0007.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 3.0.8 on 2020-10-11 18:37 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('auctions', '0002_auto_20201011_2323'), - ] - - operations = [ - migrations.AlterField( - model_name='auctionlisting', - name='picture', - field=models.ImageField(null=True, upload_to=''), - ), - ] diff --git a/auctions/migrations/0004_auto_20201013_0925.py b/auctions/migrations/0004_auto_20201013_0925.py deleted file mode 100644 index 8d060dd..0000000 --- a/auctions/migrations/0004_auto_20201013_0925.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 3.0.8 on 2020-10-13 03:55 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('auctions', '0003_auto_20201012_0007'), - ] - - operations = [ - migrations.AlterField( - model_name='auctionlisting', - name='picture', - field=models.URLField(null=True), - ), - ] diff --git a/auctions/migrations/0005_auto_20201016_1630.py b/auctions/migrations/0005_auto_20201016_1630.py deleted file mode 100644 index ba500a4..0000000 --- a/auctions/migrations/0005_auto_20201016_1630.py +++ /dev/null @@ -1,28 +0,0 @@ -# Generated by Django 3.0.8 on 2020-10-16 11:00 - -from django.conf import settings -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('auctions', '0004_auto_20201013_0925'), - ] - - operations = [ - migrations.AddField( - model_name='user', - name='watchlist', - field=models.ManyToManyField(blank=True, related_name='watchlist', to='auctions.AuctionListing'), - ), - migrations.CreateModel( - name='bidding', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('bid', models.DecimalField(decimal_places=2, max_digits=10)), - ('bidder', models.ForeignKey(default=' ', on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), - ], - ), - ] diff --git a/auctions/migrations/0006_auctionlisting_category.py b/auctions/migrations/0006_auctionlisting_category.py deleted file mode 100644 index 4deb039..0000000 --- a/auctions/migrations/0006_auctionlisting_category.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 3.0.8 on 2020-10-16 16:29 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('auctions', '0005_auto_20201016_1630'), - ] - - operations = [ - migrations.AddField( - model_name='auctionlisting', - name='category', - field=models.CharField(default=' ', max_length=64), - ), - ] diff --git a/auctions/migrations/__pycache__/0001_initial.cpython-37.pyc b/auctions/migrations/__pycache__/0001_initial.cpython-37.pyc index 3b45368aa16839c4c0051f64e79d4d6048b72dab..f117439e7bb53547d5e0e032fbfcb7daa7a29acf 100644 GIT binary patch delta 319 zcmca0_F0VAiI{*;CRw+)sjA=|MZa^Ma3S){p zn5PTmNv85-NoBETNoUEV%4W%>c=R%*F{QJoc=j@-vS!Jr=%#o9Rfz)ic%^u!`1CTT z`1UfVGe;?;_ysd)`fonK6u_!>iz7L)BsD$1sPYz93Xm0_n39s3qRDuRC$Y37KRz$N z93(PXfJ2^(vplgRIU^^txMXqwhm5um(8Wa>AVLdBXfog8%FRzn&56%T%uOva01Dk= zP0LKpN%7NE++54y!zjn$n3CcK61l~dUyxdqSdy8aSG{*hjJXum%>{-%TGO4mzaw)F8 zOleH%tSN52OsT9{Y$@(3EI?HpDU3kKn!=XC-pi84l;Qyt<4kc(aq49R@+?u!N%2ha zO7ZSx2AabRGAErmN7!dQoCYW`16XCe!9UOirv0noPGi^Yh|UQgc#E zQj4^JuGC~IG5}IVhCt#LhjV^zZfagh@h$db2)1;D*&a=XI1v zJou4`bMcWu4B`g^fxJp?<2-@rGg~J2RKu2$pVfNPs!li7`Lu2TjXN*H-6#_>PUyH- zq>$wtSRMi2@H|FQQ8$P&ttOaN(`r^d0s+Zg1Sw4J1m(;jqiIt={WOlDnVIU#{lxit zy?!CJ)ty!*e|(4=?K*8YKI1vG-x;7_G~H04Zvkc^pXxAe3xJG%XJYOz+CWlNZ{Y*-#>vWCZ8;d@+&5fTmJ3KJ_leJH&c2IvWPG1)n1kM$g zw%n@XLvv$IqreqqQ`gv*Sd2Us506w3V=v|ZM9Gn-)$Usx{)+HsZcZwTQz3Xn-xEIE xEK@(-qg}z}u-C9netZZH8?43!+T(yWbbP?Qx1LeVXK(iGy$yu8kaong_#YwI#lHXm diff --git a/auctions/migrations/__pycache__/0002_auto_20201003_2319.cpython-37.pyc b/auctions/migrations/__pycache__/0002_auto_20201003_2319.cpython-37.pyc deleted file mode 100644 index 090008f4da016fd176b6669a4fb9c820bed259a8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1243 zcmY*Z&5qMZ5VqTP;v`NcGYr4W-;rEGW{^N2gb0}(gqA^wpGy>})o~S`4*m&k2bj6S zH4n0nuus4{^py*9*caH-R@*U%j=ED-UG-JhSKWTn?Y1o%-~Rc`|Me{EyHV=llJJ;j zKBNUKuwyH+r*^`o%r-iUovHiO0tei$7Px3Hyf4nw1NPb)cxM!24VZ2xGE$)OU%tQIZAxB#of8AWluvjS^ z*xF53aZCViDiYLaoC(NhWjj=evzm-g$v2Hezdoz}%cwy^x2gh%FfYlg_`3YlIIO-C!@6{J c+Z19l{wk@G?vYLV534pkGPLK$t#A9z|96^dD*ylh diff --git a/auctions/migrations/__pycache__/0002_auto_20201011_2158.cpython-37.pyc b/auctions/migrations/__pycache__/0002_auto_20201011_2158.cpython-37.pyc deleted file mode 100644 index 5dcd71920f3bb97a777b434b9369aa53fcdca373..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 539 zcmYLG!A{&T5Vhm%5|#z2d;;RK7nDS*gsKW5sLBb1sCtPaStc{udga(lyb0=r@+^ZYg_CZthe^+j|Z&DXem{{ za9|Nt?A+?6= O>)PvCRP@o(RJ;RirjYRf diff --git a/auctions/migrations/__pycache__/0002_auto_20201011_2206.cpython-37.pyc b/auctions/migrations/__pycache__/0002_auto_20201011_2206.cpython-37.pyc deleted file mode 100644 index 6079e9a148a34ed363d5ce87b20548eca1e36031..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 584 zcmYLFJ&)8d5VezRF1xo!0aTQ9X-?S)Q6Pj)fS}@pKr~S#%a<7iuN-@c6P>7!mcKyH zUvf*uU!Y=~58YTEznPc3`FMSCv14Svp52Kj5o3Qsuv$XkimrP~4j6FFI$m+k-ZO|G z{=pzdevIzoDuU!Q%Qt`NJC<|5>r~szL0RLPkXkJza7EXZ`Am+@RK)L#qBsa;)S#rU9xQpS+@MVBv(aI1WQYEI zMM6OyQ=b-4i;2pth6NeCT~K4Y4$a_v_GOW{&d+=%CRzx;6M`g0jfD3?d>f?>Vj%)N zp#e0FLf6w~nLq!8fqbV>gWuT`E-U)Y`bWf1?%&5ZFX~Xs)i7lb$s$(Tk=^cD;Y98`B5dLOB*Fofd-p8z1Y44U`xpNw1FHQRnkJLmdSL0G%(hk1 zWJ=cBEtPW9akc0`A}UB^3A&{b13PzwB^bE5Cv5QZUhd{WegggcR5%Yz zxDO2L&V+~PzV6)|p%B+k_GyRO55sW8GnqA6QbcEme38|LqPF)nRFCx4fN4*_CfOH_ z?kUNUC^Vq0M&U`&66Z20LEEi&HW?J+c5tqJ-sU;i0q0n^F972{=im29VQS4zzz(DU znPyN|47=6Aq-da8m|H3{039q;1=&`9fIIDqJdsq%LMh)-gL5@PG<882T1h! zWcBquUoGcf_|2!;{G$%k4h~BHBGpT*Y2D-J=~cYKChK@D({D*UQ$J*(5>dygDodzR zh>u#uPs55)wJ}fjjpE~Q9FD@#h>tJFm&4s%<>1|BY_)k)K67oGTKKhjoWn`SewZq` y>A3a|8L@7g?;3vbKRN8)#qii^_1us*C{Jy4(FNwT|GJa;jS;eT(e>#w>a%~YO3hpV diff --git a/auctions/migrations/__pycache__/0002_remove_auctionlisting_date_added.cpython-37.pyc b/auctions/migrations/__pycache__/0002_remove_auctionlisting_date_added.cpython-37.pyc new file mode 100644 index 0000000000000000000000000000000000000000..d727c804da521b4120691ff1b374f34d567c2a8a GIT binary patch literal 527 zcmY*Vu};G<5Veyuq@hLd3v5}c!iW$;fMB8nh$Tc=ZtfHuB~FP`5HpPMA^eh8CVqj5 zOWLU7qiaP%g_nfisw&}y8;*`?t695BVu#(4|vnvJ;xbF;H`lsz*XREoIRTwH@FBHK0xvn%W@~cKZg)>KQK;7GT3_foqpvtlp*b4t^ibkCHos zwMphWeU!;X^`eVPf=SY5U|tk4nhWp{P53@!ycx_?awTYnN{FDNR5SxW4Cc nhj;8Oa_tausk3SV^X|zVzj@rM+M`7q9It$zw0fqsH*)^~yswY$ literal 0 HcmV?d00001 diff --git a/auctions/migrations/__pycache__/0002_remove_comments_title.cpython-37.pyc b/auctions/migrations/__pycache__/0002_remove_comments_title.cpython-37.pyc deleted file mode 100644 index adefe7c132f9c9a63a9a798db265c3e9b55f0c63..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 505 zcmY*V!Ait15KWr4cIyiI3*LHJR>6yih>D(E#KlV~gl;peUD9N2x{BxZ>WBDCxq9*! zJUPi)76)dSnY?+tm&?7qlwedRYkp4&`Eo-aAvPD7<`9b@f=bfRoKkX2L?GBZ5e(=e zShGA3;gn?2H{wV}ZQ9iHw(M%HOyyR6{38UCQ$g^Q&S}mdTttpkgdYLUv51f`wu8H# zDGO{;t}0JzhvV`1h}Wv_>QdUI(oF-ZGdAk#P69&HMhlQ!l?~X?)k(Hv6YdwB+mv$z ztR!GR8S%5Z<-dKA*Wm5mFjbQ@A;uK%zhhB@l&*Gz1}8mR1|jpSa2!B{(*|M_OdFPF=d5&f>e%aeeypI(_rkZ?-Ru808x-msSEybbbz zdp&5vT)buwg80TjAg`mZVID#7mSxc|%3)dH(ze=ks;`W;E^ZBAV=qhZn`lPDDLwm? z7_yuL%LCvWo`)!EssNa=tH&YwxnW&-Mb$qm5 zuOG_}Tk{F!-r7{Quk=QO>d6Lx;O_tHa_PZ$MfDbH=#A9o)`z{7GE{rZ2f?jhxm?9cmG z&x&^h&=%La{Gf_+bE_Mpz!s%xTkJ|KrX?1K3l_A_C;#8$YWunKKaD@BT@XvcSO^}_ z_kfR{EOzr9-W6Pr(~UFb$9v;A!)h9#JN9^e#RKx4bV4?lJm2l`gcvqa%`gTGlH*a9SFQ$uZF-WgWKeNbP#g`^vFhk(_!ZFTr%$yUQ`JYf zjGJJBg_h5->f8Q;U!(uJZ}|-s|?d&%50X z-rIP-DcL9vLyXcw#7sCIxgkoUu#*IZtd}%AbOD{l%niIGlV7qkO3Krlza@r2t_3=jSt#}sM5KJY>H&%+`|B5>rx;QUm<-~P*}5Gz3(~= zfF_z*wjH`RJiut2UdT%7r2)?S<+*#eR(93t7jhgHjkk5t%8D*#W{C_1=3R(o3LKN5 zjOT4~E^W?fvL*o%u5tcx;s)8SGY{|*Bfx0nVIrtGMJ}9R7+>K*z7^I7$dSk{gR~D~ zf!;WJi?`AQ-;KtxtV~ibNF+x7nwy{Rcee)F$t8nfG`esHd+~J? z#4aR*TxK!CK`Gqe;dTvZkT(7rq!*i=%Ue+)?o7aBiwx6E!%#KV)c&-Zx;~3OMoaTp z&eN{Sg+iLnD2~pHEmvm|80I1uYCf3cd%`z0U>il=|jH9@Hq%Gs>6j TWpT={vU5xrnVQ;CnacEEe{Ng> diff --git a/auctions/migrations/__pycache__/0003_auto_20201011_2155.cpython-37.pyc b/auctions/migrations/__pycache__/0003_auto_20201011_2155.cpython-37.pyc deleted file mode 100644 index 919b31385f2b140fa36021fe14636b64a7a80af8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 893 zcmY*XO>fjN5RKy`>ttJ6ia1n49N?78YIjjD2%&DjK!O(3(n}P{O5^F0D2bOi+p1j4 zwLgTvFd6}F(lxwDab$XyuZ z4E#LEhxr=**YiRCAm4z^{Gssfs2B)#=gjSBOZb>kp#9_idCY|+%e2en$#^`T^3}G; zRGTedDyXZZ1pVNDgJ!+O)YI0$jh|zXov-eNR1XAPCd;DHzN|RM&xzz5m$qJ=ela=sQR-kDmueB{MG&5PF zTzarSJKLWf9M(8Dmfo11e|pQ$&kj%d@rQ%M_d1XZSPA>xs-K~cf!`nZU&d`mRD4mT zpOg4NURQ-ogo;yHmQbe<_cFxyvk{{pFHn$1^67Xwo{T3GKAr6Bj21Vwi?Q1&QCkR% zdX7VE;@K_Q*|F#7ui2|krq`_yiXp6#O~MGHe*pkw0M`Hj diff --git a/auctions/migrations/__pycache__/0003_auto_20201011_2208.cpython-37.pyc b/auctions/migrations/__pycache__/0003_auto_20201011_2208.cpython-37.pyc deleted file mode 100644 index 6f66a25714a26d7ed4cc147c1ce3c07a3e6f254e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 553 zcmZWlJx|;~5Zzt-j4^jdNuSQm$!DS{ilXQg5LBQjQ5wtA%6LYOPxkJ`dk&(8mLI}T zVp}TuRH-uF!=hlM8NHp4H}m%EY!)%HzwdA5BWLVsc#P%~Sdp7|6o3J5Sj#ic**OCN z-W>xE`C8n1nE?L>izm<2$6{`ywywHjTWe*?AvM~Bz>3@~C?Lx?FdF3*&ph4HBM8`MWO~$3ic_4JtrY z)@V9GqU^zUZ1o>JtFZwa=?%X8!vpK)RCnRux06r#PddirSE~F~G! z^HE;@`jt5eJ$@_n<6?8udBh!%n_)@l1-{P(55y2%?K1Z4KCBB>=>=T5Q(gY`s2w__ RaT|W#>HRXWnnBjo`wxo!kWByp diff --git a/auctions/migrations/__pycache__/0003_auto_20201011_2211.cpython-37.pyc b/auctions/migrations/__pycache__/0003_auto_20201011_2211.cpython-37.pyc deleted file mode 100644 index 9fd22aff19a6b62bfdbecf9583e1b6fe495496af..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 976 zcmZuv&2H2%5KiJG>-}pB5+Hiu0+(D?yNkFWgu49$iMAk0FVRX?x}GkH5__=|s`gs0 zeGp!QXW-;3CtiUQ<77iGILc&ZGWPe)=h+<&dk(IjFK*Zm;yAx-&@LaH9enjJ8t!m6 zcM3OlUF&rl2ohbZ`=QxpTsD`pk z#ZpI}=@scxC1omwHen$-)K`c?cl2g8gOElJF&;zr5h9Qvw(Y?K$vxaX5Flp z_3=B%!fcprz-G3^{aeBV9^U$OZHLqU*YYm!@%}BcwzW$yzQ+g1cxbxEEj{E)lWNg0 z-5!s}Q>LJhUx6)TQGh5lE7LNEcw=3ar`k4Y{7Qq0i0N>+NUFRvT`3s$2_+b>l!uXz zBG|^6ND451ZG(#xa&ER(3UD`qw3}&*W`Y{d4A*cC`t_rh<7n29J!)t~zUrcY%F1a5 z3i6}`UL&eLrcR>!hO#k;{bZc`cM$ zz`Rvtem81!yuarxsY=PFtyKCU8cIUncRhTbxS`j2bxqVY z{ieUsLW+xqcXyrP=e0PEB#-|kN6mzf+OE|$V#E*D|7(>-tw=SFj8QBU_H2V?R4@PEImLB0gQqJI>hea5+j$&KaqDMg|yg%{pH4E-E9= z-Z6+k+%OQx_u^WV0^-kXz4$}9Y#sTmYnwrhtu@Xkodwjc4$x7SG_lr;*ll>B6SU_?c!SYrRmO@HRR(|#2Se;s>YN`*7PV+o3q?$%6i@eCU`F1Od zU9t0z?^AT^#?~}`*|+sL4fw?euCbZ4_N%GaR)HMtS`hs}SsK+L!ND%RwW#5enx}G( zOX)KyDR0t9{v#=WOiG8`a0Beo0Ghf*H$*g}&tB^hhl@~U5Od&try86CKC?aEuj`Ht zPYIsQ-;d`ns;>?QS6!Lj*K3;6Lqnb*1w#nVrlqu$kUx@38%o<;j6pb_>DG%ZZzY?MbJ}Ab zAdiq&(lw{NLQfrevxJP$F!Rl5X1>wk+FHU$HaGvuTh7?McUBUTu}{~&Aq5P$VhzuE z6XXGBrwjrRe;5elb8#(l0pWL+jvgqNrGZPDdS=S5Znbq$(*i16`Or!tGWO}(EmFvG z4lECV&v-5{oR55QjOJqqVRXYGx)BtKVN5MzH~F%vO^xERua<2#vMk$`W#6@OnoYBv zY-cJ7dhcF7rl{I>wVt{0qOQ8$;E$BMQ1?oug68!zN?kTcnAfA9H7YnuCoYx)E~QJP zq`Y1s*)OF0-IvPedJk}c8cF;?y*0X#i{sW5$nDzhw diff --git a/auctions/migrations/__pycache__/0004_remove_auctionlisting_username.cpython-37.pyc b/auctions/migrations/__pycache__/0004_remove_auctionlisting_username.cpython-37.pyc deleted file mode 100644 index 196e7fb788e65779b5bd042b970ce794183789ca..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 534 zcmY+Au};G<5Qgm}4QXf*Ozdn~s?c@;A%p(f?M|+}e2%&u;XrL*O>YfnKO;VU4qX6ev0aj^_slEV+QM~P)=DGuGX_L% z4KSp*M9dQzVnGPxCjrqcDydB-DXQQ0O@h`0oXSN~>QK>M;Ow0OA_2{GB3TScE zzp6b^B@;rog&;Yd->L9Q^GWiO}{d$mQlFtI5wl-CZjLgvN!DNM&Hw& zn#Ul_vuTaGb?JdgRlB-kH~u;Y^&f1o;;e2N8YbUALbbL-KJ7iMyY$HPp>RobDZ9u2 E07B$CY5)KL diff --git a/auctions/migrations/__pycache__/0006_auctionlisting_category.cpython-37.pyc b/auctions/migrations/__pycache__/0006_auctionlisting_category.cpython-37.pyc deleted file mode 100644 index bad5db8f24cd4f058e2c4e41ba6273cb1a9181aa..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 609 zcmYLHv2NTj43#XO&v$5wPR-gWz%2(~ir!EZMVb`tlq^LS!+@%ojL!#Kx>`1x%>#9?IZM1bsYXBQt`qU^>a!yF?k_@t( z1Ir`e70(66+lg$O|-v-tAS|0)KPy_0+M%zU+%cUOxKKUM<@Zs!i zqq-2gx!K{Kwco6JN!ef?F3;W;mliu)TkVU z5!l(UF2~K6yW7rx;e^!spCA=U9P@}yxW8D$ZU$SWE3<^F06f4A$tP%!-XXnr>AOb? M-utbr-}Hs}53ir5`2YX_ diff --git a/auctions/migrations/__pycache__/__init__.cpython-37.pyc b/auctions/migrations/__pycache__/__init__.cpython-37.pyc index 4b5437e00ab99d11f251e59f5f170aa381973f1a..72625fe45c12792a61abe00a3d3dfe8f1c30c2a4 100644 GIT binary patch delta 19 ZcmbQiID?VfiI
-

{{ listing.title }}


+

{{ list.title }}


- bid price : ${{listing.price}}
- created by: {{listing.user}} + bid price : ${{list.price}}
+ created by: {{list.user}}

diff --git a/auctions/templates/auctions/index.html b/auctions/templates/auctions/index.html index f7a7ae3..3ab8196 100644 --- a/auctions/templates/auctions/index.html +++ b/auctions/templates/auctions/index.html @@ -20,8 +20,12 @@ created by: {{listing.user}}

- - +
+ {% csrf_token %} + {{ watch_form }} +
+ +
diff --git a/auctions/templates/auctions/layout.html b/auctions/templates/auctions/layout.html index b707942..975338e 100644 --- a/auctions/templates/auctions/layout.html +++ b/auctions/templates/auctions/layout.html @@ -25,7 +25,7 @@ {% if user.is_authenticated %}
  • - WishList{% block watch %}def{% endblock %} + WishList
  • Create Listing diff --git a/auctions/templates/auctions/listing.html b/auctions/templates/auctions/listing.html index ff8b0e1..5fee189 100644 --- a/auctions/templates/auctions/listing.html +++ b/auctions/templates/auctions/listing.html @@ -1,3 +1,4 @@ + {% extends "auctions/layout.html" %} {% block body %} diff --git a/auctions/urls.py b/auctions/urls.py index daee9da..2a59bbc 100644 --- a/auctions/urls.py +++ b/auctions/urls.py @@ -11,5 +11,5 @@ urlpatterns = [ path("create", views.create, name="create"), path("categories", views.category, name="categories"), path("category/",views.category,name="indiv_categories"), - path("listing/",views.listing,name="listing") + path("listing/",views.listing,name="listing") ] diff --git a/auctions/views.py b/auctions/views.py index 4269f53..27d0486 100644 --- a/auctions/views.py +++ b/auctions/views.py @@ -3,28 +3,43 @@ from django.db import IntegrityError from django.http import HttpResponse, HttpResponseRedirect from django.shortcuts import render from django.urls import reverse -from django.core.files import File -from django.core.files.temp import NamedTemporaryFile -from django.core.files.base import ContentFile -import requests -from .models import User,AuctionListing,Comments +from django import forms +from .models import User,AuctionListing categories = ['Fashion','Electronics','Home','Sports','Toys','Automobile','Books','Video Games', 'Other'] +class Watch_Form(forms.Form): + watch_this = forms.BooleanField(required=False) +class Bid_Form(forms.Form): + bid = 0.0 + def __init__(self,bid_value): + self.bid = bid_value + + bid_value = forms.DecimalField(decimal_places=2,min_value= bid + 1) + + def index(request): listings = AuctionListing.objects.all() + watch_form = Watch_Form(request.POST) + if watch_form.is_valid(): + print("asdf") + watch = watch_form.cleaned_data["watch_this"] + print(watch) + + return render(request, "auctions/index.html",{ - "Listings":listings + "Listings":listings, + "watch_form": Watch_Form() }) def listing(request,title): """ docstring """ - listing = AuctionListing.objects.get(pk = title) + listings = AuctionListing.objects.get(pk = title) return render(request,"auctions/listing.html",{ - "Listing": listing + "Listing": listings }) def category(request,cat_name = None): """ @@ -33,11 +48,12 @@ def category(request,cat_name = None): if( cat_name != None): if cat_name.capitalize() in categories: - listings = AuctionListing.objects.get(category=cat_name.capitalize()) + listings = AuctionListing.objects.filter(category=cat_name.capitalize()) print(listings) return render(request, "auctions/category.html",{ - "listings":listings + "listings":listings, + "cat_name": cat_name }) @@ -109,7 +125,6 @@ def create(request): obj.save() return render(request,"auctions/index.html") else: - categories = ['Fashion','Electronics','Home','Sports','Toys','Automobile','Books','Video Games', 'Other'] return render(request,"auctions/create_listing.html",{ "categories":categories }) diff --git a/db.sqlite3 b/db.sqlite3 index 306d0fe51f6c91380ffce6ef1cea565a1a66309b..28f0b1914bdb310af360ba18b1dd169d3542e122 100644 GIT binary patch delta 1888 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