From cc13e9666d68ce5730ef98f9965cd7ab4fd89dfe Mon Sep 17 00:00:00 2001 From: Priyatham Sai Chand Date: Fri, 15 Jan 2021 22:26:14 +0530 Subject: [PATCH] file upload default --- .gitignore | 1 + .vscode/settings.json | 2 +- auctions/__pycache__/__init__.cpython-37.pyc | Bin 141 -> 132 bytes auctions/__pycache__/admin.cpython-37.pyc | Bin 364 -> 355 bytes auctions/__pycache__/forms.cpython-37.pyc | Bin 0 -> 1610 bytes auctions/__pycache__/forms.cpython-39.pyc | Bin 1596 -> 1640 bytes auctions/__pycache__/models.cpython-37.pyc | Bin 2391 -> 2316 bytes auctions/__pycache__/models.cpython-39.pyc | Bin 2328 -> 2345 bytes auctions/__pycache__/urls.cpython-37.pyc | Bin 814 -> 805 bytes auctions/__pycache__/views.cpython-37.pyc | Bin 5715 -> 4974 bytes auctions/__pycache__/views.cpython-39.pyc | Bin 4969 -> 5154 bytes auctions/forms.py | 10 +++++----- .../__pycache__/0001_initial.cpython-37.pyc | Bin 3549 -> 3540 bytes .../0002_auctionlisting_closed.cpython-37.pyc | Bin 576 -> 567 bytes .../__pycache__/__init__.cpython-37.pyc | Bin 152 -> 143 bytes auctions/models.py | 2 +- auctions/templates/auctions/all_listings.html | 2 +- auctions/templates/auctions/category.html | 2 +- auctions/templates/auctions/index.html | 2 +- auctions/templates/auctions/listing.html | 2 +- auctions/views.py | 9 +++++---- .../__pycache__/azure_storage.cpython-39.pyc | Bin 0 -> 744 bytes .../__pycache__/s3_storage.cpython-39.pyc | Bin 0 -> 407 bytes commerce/__pycache__/settings.cpython-37.pyc | Bin 2301 -> 2891 bytes commerce/__pycache__/settings.cpython-39.pyc | Bin 2337 -> 2392 bytes commerce/__pycache__/urls.cpython-37.pyc | Bin 966 -> 1132 bytes commerce/__pycache__/urls.cpython-39.pyc | Bin 1138 -> 1138 bytes commerce/azure_storage.py | 9 +++++++++ commerce/s3_storage.py | 5 ----- commerce/settings.py | 6 ++++++ commerce/urls.py | 17 ++++++++++++++++- db.sqlite3 | Bin 253952 -> 253952 bytes media/Screenshot_2021-01-12_121010.png | Bin 7313 -> 0 bytes 33 files changed, 48 insertions(+), 21 deletions(-) create mode 100644 .gitignore create mode 100644 auctions/__pycache__/forms.cpython-37.pyc create mode 100644 commerce/__pycache__/azure_storage.cpython-39.pyc create mode 100644 commerce/__pycache__/s3_storage.cpython-39.pyc create mode 100644 commerce/azure_storage.py delete mode 100644 commerce/s3_storage.py delete mode 100644 media/Screenshot_2021-01-12_121010.png diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..07129c0 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +media/ diff --git a/.vscode/settings.json b/.vscode/settings.json index fafb871..fe800d2 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,3 +1,3 @@ { - "python.pythonPath": "C:\\ProgramData\\Anaconda3\\python.exe" + "python.pythonPath": "C:\\Python39\\python.exe" } \ No newline at end of file diff --git a/auctions/__pycache__/__init__.cpython-37.pyc b/auctions/__pycache__/__init__.cpython-37.pyc index 73420462a6caf2a6cdc4cb93ea604b24391236c8..8da1c508252210faac0c2cd1c7d7e6e1fd1a1680 100644 GIT binary patch delta 49 zcmeBWY+>Ya;^pOH0D|MZ3<(o?%q4Z5tzrU-GAk2HG7@vk^NX@$97~f+GV}8$rfL8H DBsmUj delta 58 zcmZo+>}BL};^pOH0D^aS{o*F_m@An%Tg8MHrxq2*B;_S%B*wVpm*?f=C#Dp~B5bpW!^@~->}(YiTAW%`9FvrnoRJvgl3$*elb@JU9Fv@% Oo10pcoI2Tv(GUPB(i5Zr diff --git a/auctions/__pycache__/forms.cpython-37.pyc b/auctions/__pycache__/forms.cpython-37.pyc new file mode 100644 index 0000000000000000000000000000000000000000..48221db09e4273ae4a0b3bbfaee9d6d4dd24fe28 GIT binary patch literal 1610 zcmZ`(OK%)S5bmD$&d#nMJmLftERc{E!3qh91F{gYgTWFqNR9{^84cs<_HM7|vFYxO z?bX7?k#Y*ZAvyAw`pU_FffH3dV?&VWQP=cTRaaNl_x0=!1~Gy0+fVeDEuWA-@#AKo zCGG|3*I9=x4B{Og4 zGj|8jf#}}hHHCe~JrT^fm8ju7UoGZbnkdUeEp(Qd9vHKydAZ;wI2F8P$^_?vO}I9G zuC-Jn&v=TLr*acxdAXc`$Jsf)0kB?{6=kkemi=)7zODg3j}4}3knQy(%>~q@GnaUmZ;kicKQf7 z(*s@1`>Y4+gu5>XuShzy{DQj%{93b|!n>51cu(?NbEMTZgLF*awr$#!450V5&?Sco z-vSfRIGkhwPI04i<()#vo^J^>fzf-4hs>q`?KRQZIr9{zmV=%!^gru;vg#Xeza3dtMM zd+==0ghr0-;35170yfKQI0`F}pMfwQ62>ySZS(DIXwSfKCfaH5+LyRZVOtZ|q5pjX HcQgJQN!))n literal 0 HcmV?d00001 diff --git a/auctions/__pycache__/forms.cpython-39.pyc b/auctions/__pycache__/forms.cpython-39.pyc index ff6697c08420c7518e4d90888f5480174f0e41f4..4fe2dcfcfb0f57898ababbbef0d52ad73fd2ff1d 100644 GIT binary patch delta 299 zcmX|*yGq1R5QZ~3$>w%Wb_)x^3u<>B!CF{5o3)TM8Z*b;BW|+JMi2{agasj0p1?;C zTT5TU)E4>{jzOG(x%}ThFmLips$8kq;dp+Bv&D()8)=YM1R!rz+iegJ;&SFVn1d^;NOet)cj43R= zj47-@8Fru;2UMILD$dc%7{v(`<4WaD;RLdIQkfUgq9Q&NkQi!uvJGV}AQc!En3i%K%{ z(iM_2Q#2XDDl{2yu_tHbXC?#HF;1>yl-S(N!pq2ai^nssBsD#?$SpH9CuQ?p~%S0U%E>g*k<%moZ8R$QDlFP2mHwMN;@v z1X>uPL{kKV88n3^$1wevJfB&STa)n?drE3rVrfpv<^#+QjBH$6z&wBUdAZ?RF*8(6sA<>6y9E@C;=c(FoijV4=5u9 zWDBS8gH?&72&4$MFhq%_2n91}3QzWD`r%z=mr+tuP;8~IUtV6WSCpBbl$uytQmL1m zuUDF_pP8GOo?5J5P?Voinp_eO=Empcm&B*#m*%DDrDvvTGTvfONli;E%_*7e&aAk( fnAw4mg(Eb`XYx*#97dkWYOI?W6*u2xHD(3?JCRHg diff --git a/auctions/__pycache__/models.cpython-39.pyc b/auctions/__pycache__/models.cpython-39.pyc index 209a5ed50c26dabf9ad529348a808a1c1d69090b..5e95a8af17829b72fcda928706fcb08ab14224ec 100644 GIT binary patch delta 142 zcmbOsv{HySk(ZZ?0SFEqXH1yAk@plMW7FgtjGlH`d@0;1JiUxj{HZKitSL;X%qhIR zOi=N(jgnPT@`A1F}U@_)`R07@|Z|1cMngg(k-{{g|B3tjMj&c#AzHH7&6; Zr)2X4=536O9FyHyw=gPh{==%v3;?}LAw&QG diff --git a/auctions/__pycache__/urls.cpython-37.pyc b/auctions/__pycache__/urls.cpython-37.pyc index 4eb3204bcb64bf2cad0ad1f06c40b1c6a7657022..2ea67bfaa76afc1ddbfbb9acd15d98df8576588a 100644 GIT binary patch delta 51 zcmZ3-wv>&>iI1-7fP?TAjSdx*LTb^H(9phMI3_7CIU_N~CBHl`CqFTzI3_ti OH#fB?Id$@5CMN(SWfXD% diff --git a/auctions/__pycache__/views.cpython-37.pyc b/auctions/__pycache__/views.cpython-37.pyc index 13fd5fd94d5a9d2bfa096836852a921ebe797894..015208382b5bf2f2ce639e5eeb8d2a6322d38ee9 100644 GIT binary patch delta 2080 zcma)7O>7%Q6rQnn*K2$2IJOfzN%Pk<37e)Vfl4h&DQ%-RO;iF>Dk@o#%+|AQHeGwe z>?Uc7BTJ-5DizHMi9@1FNSr``IG~<6A#vcg2QHkrw0DpY@69@C8aS}4d2ja3n>TO1 z_p`rFJ|7#un#rUHJoat+;aHiF-|^$%iNoYF4F9*!#@$weCEZNDP$|@ll_Di9#nO*R zrHdIX1H7AMSqJbE%dt-2WtL|J;5}@Fb+PV8w9?B;tPGMq*28*%pJ09L1n_>=&jx@G zut7Eie2@*ZlfZ{qahaH>{y=Zccqk_5lad(=6IUH}-Q)EzHOFl$uyOufN$IEEouJ4y z)KA(6z=-fZB)v!yK+G5)02b=5;|EUTo-fae$VpT} z^?n#WI!9C^rcvGp7H7oQ+R~M7kp0UTKZR2C`K6subsEfm@EQmsOG*kYje(_4ZjFM} zRJegV{=Y@Ta^32I+ix5*JT7kLd&C+2hdxBMV${5P-EIWcJ09CM<6I(Piof-_mOQY8 zM`w|AA(7F@;0zT*#kV$X2^a6c@8lhaRW~hn!!|VuAJ3!iAd*QW6R4GFpLq-kZo=Y4 z7=9555kDr2)D*uYf2OCz7pWWRH$m8jLcB=zj$n8=UhltP<X zU+G@sJgQ&7B|v!CnAf6PiH0$FR@ysMh>$oItCZ{Aa~f65rkZ$W^wSv;8XwRxF`X$z z`;To%!v=37kUKtxV|@h(QFO{@#a8A;UgC*ohN@k+9G71Z53&>VE%7vat~CboB{O{l zc}z^6MuNc!(=}Nv)eYa~d=XVlP@8m3W3e70 zc^o)dOUSv>mZ@#7^$?bLtnI{_u|0jCP!c3TZ(d`lh=vnPe;nV5H{dX8W~@;RhDS>aIfKR@C)XFYsjM z0BACEFM}>Gi`P4glbBFYAZJm6nJU41SU6}gXJr{rtp;_MkBarq;Z~?%7h5tjQ2=we z2OS92>kBupEr+_}W34z$CUt1kT-$2ctja8KN=8P8R2H8M{9y-xmLPkRau*Je)fFbN z^1M51FKcRwW19-KC`a~T?xO*sq-d7v^c;+C7#htf&~Fx?Ej-KNolPpQ7skP&C>KUr zr$HE1?-^Xq9%)AiWDTL6LDEK~wSv zGlsKqBr=IGtN09(StM9&d;tmGO4>W(f%HX2RlivG*oJFgqM+uZ%_21p-!jcnV8isV=>&>-vCR(DVNQXf2(T delta 2859 zcma)8O^h2!6|QP`+wJzxIFrd_oMe(rvYW)aS$nccAPOPL{A`kCVGx^15N1$sk6*=Z zPuuOSYR_aM2OlzGk=P)iW+f1p-3wxGt6gaYf)nD%4NiSPNSu)PIUsRBLgKx$Cz%}~ zM7Qcy^{c8^ufF%!e>?NL^JfB==e%8j%dUenTbZov?g zK-PU9MA-B?LM7H$qn413-Mdqt8h@zsI1sGPfz=J*_0&7;0S5z8J43r}3agz46RfAa zo_U9vtZt)r=_Ir0!>v$unqwiXVT?y6_9S`&o0>-wu_vs}2gV@vea_i{13%0L%ryqA zO)UjRnYGQf1*vNc7)m!+Bv~y<4cC20QXRjG2U@D%6Ed+~*YEm~>n2&8bT_@Ak4QZ5 zMF1*EZ~4#^QDS*fBvr*sOeKN`a+ZXdo^0ZZjV-4MD9n!cGT)6Kh_-5uqj2+NLkIRJFG)kD*+B%QOxcFLH-JDvfce z?&|qx!UfMOf@t_1FK~N-*AS|brK@z&Hh2}sbvq&S0~+UD_wBwH=o!z|y6b}^xoeVN z9!a@H7nWsW6~-57h#+uX`6BW(sc`uMjn5F7L6XO&NL8DgM&8oAPkzB?`E-?*&c&XP?4;~e=&~Np3BpM5^Kwg8m(y(RYbxp2k%|tC8NlThP)nsEA`&%mys{85cxcj z43df=zkpq02fm8@Zd2`(tCy4NT0v&zjWm~6P+B>jwdUf!xw3GPWbGFyZxHv{oyR)* zT@Vk+^+wW6homixrTMEjai(HQ!bAT5Qu7|-yQ}`yeZm*xZ%>rte^{R$B`oWC?KR!V zT@PWql9C#c<@h)0rJ+9X5*zLWb3PK}|6e`z1NL1vO)Ch}jP zm2cq0eQatH2{Ub;Hzv7_@ESaCA;@pUQ`wKt(tQ%Uj{!w)oY*~#v#n49dcoIlO1_C? z1r74o?CtajfcUC&qNb02wqOL>KGQlu*z~(Dh2Tc~U1yfB#y@rL^M&}|&f(GieH(JP zA?!zb#}hnOQFb+L`z5517xNr0%kaxL72k?C2XN zFk_bUR$x#y%glZ&t6?u}P-o=z%w|cEG3KRC|JFO_{sjIbGzlXUN zs$2es-x1(@)lfET^wp!U8hJP7-CES@ch+kcY8NioRzeqZX;Zk~Cfdwf$ISV;`FZ!D zd+G9gby00LYZqR#DtOQ#&;pNrzS))s~mzUUBL?`8vifRSz9X+E|Yc z?$&{t&N9_j)CuIx_@m<7P*N2-9%q&Q(=>|+sf|>&kY`o+O663%H2LEpnK?1(muZyLuaiJsBq__tMIst_ zayz+7?n diff --git a/auctions/__pycache__/views.cpython-39.pyc b/auctions/__pycache__/views.cpython-39.pyc index 04032c73b9ebe76bbe1c48f01d6e886cb9e66e15..10b82a85f644538a1364874b151495a7c0bf7fb1 100644 GIT binary patch delta 2054 zcma)7Uu+ab7~k2u-JS03UH<@WukH1&wEQ`!Efy>a&53_XifF~(#bOnfmRzUqsK!S9jB1)k4eX^M;E-B$dI+Ue2cV>yWs^tsL8}+#VbcVsQKkk#;1d-C(XI#fJZPp z9b5^e{X#tos=EPd%pUGSfn!z{{Z z+jTFDc(3?VA0YcgXKb7};$*Cg42yOnBi@TOUL8P%A%sB$3*ZZ#?*Srd#SbIDwixn# zxTIh|j!?W8zK{ZFhNGJ#{*VuW&4RcYpPk48_pv$t6izprkcMAl-aETtrD-H?H;s&e zk@pJ+P~&NY|I&5bN~QEDHWb}#;-L81_^B5QQFO{dwd&QP(n7$l?6m;2hO3+yHRL~@kOh)OcE z`YT8`v?Yy^i#q=yA~4qBi(S`ONQ11!?`ZtX23azgp4P(GBU6oIX-&~MP;JRlV`H6X zrZr~WGFJ53q5mPh3TBl$s?l5Kir&!I=pBt{QOkx|49H?Fw_+=?Mr?i6Zoo~&5|O!- zSaa@ZKDi#7(<0l~JXTc-8uPCEzBnb2doD9APIm~(S8zBrXiByn4c#`1+A z3g9X@m+E>;HCf(h_V&p~1(n7!_sd>$(cH4gXF*I_%YHek^L3dRpFmyg`sR*|;^=_* zF13GEwPG92RRbHxPs~itN$Q8COK!zy(kWLwx8|`Db0fETI@G2fMHO`uVr8rlF_JO!1b zfcy=Z8F@0B-zf?mpRFE)DIZ1{Lcr6`47%Q6yEXfde`fLx5>K`sYmf4^5oIR~^rHY8xIKMU#Lrd_(sv{5>5& zQq549DF3h_;LGw4)ja=0DJ%_u<(QJ4!C@y&pgJ{b-z?^`kxNzd|O?MhC>nZhNoM64e{lr)BK zY5swhU&Ly#9)uADT#C&B1X`Q-RAy`zj7$7CEk|bg-`X!^f;{H=Bev60 z#CEcysjc)omkW%lyW!MIcO3g}g+DWLC4*eCEFg1@{M+9eILuN+A1zOOdOW|)T3l8`b;X;TyLN?WJ4WjHNS?O}K~)CleC z2NIF|$dMoNYE*wH@5&9iZJjY15{*#9S2v^k=7HppJ$Xg)Q5&VEPxjgx8iPwB&L79m zY>3ighXx9@y-Lya{4&F{TUv8yQQf}f`mX3GD3EC6YljsH)NSTe>_FRgDt?{WEiaj! zLkH~RR^6V%w@L1HO*ciyC2)+Z2I?!X-MqFE=#E#qQ?5Exba-G^s&=_%(-JL1B%<_U z&%_}UJ9~6NwEHtq)?K#6Mvzm3s7vnJ=BYCggrNs|p$QJa$;$vp3SMbC;b#*)qyPs# z%hwVI&2F%;8Gt|rru*8?{EM>->$_|o^=ARBc>5rt;`sD;;ZS5Q3i>(@ZvX`9detra zK^Q|U`zP|jR1TX?)ISCn(s@yNs7BppZy?7_fMTp>-^J~~GJ&D96WKDje9M1Gj*(^l zB>9m@VU_jb>^=ZXI~6e0qUw4!Z5;&>ZtEk^Isjsm-^AH@gwDl+h?tAP`~+4{eB+cj z2@@TVt%6RqNWseUXWd^k$B_W9e1>O~O(TfLz#EEPLb!}@6`_EDxd@gM>xu~Q>k;Tn pTQ03v?TZ9P-UL7|F^`@UNrd$-J*peD0{|hmVfRg|K diff --git a/auctions/forms.py b/auctions/forms.py index 5c754c4..61168a7 100644 --- a/auctions/forms.py +++ b/auctions/forms.py @@ -25,11 +25,11 @@ class BidForm(forms.Form): bid = forms.DecimalField(decimal_places=2) class CreateForm(forms.Form): - title = forms.CharField( max_length=100, widget=forms.TextInput(attrs={'placeholder': 'title'})) - desc= forms.CharField(max_length=100,widget=forms.TextInput(attrs={'placeholder': 'description'})) - starting_bid= forms.IntegerField(widget=forms.TextInput(attrs={'placeholder': 'Starting bid'})) - category = forms.ChoiceField(choices=categories) - photo = forms.ImageField() + title = forms.CharField( max_length=100, widget=forms.TextInput(attrs={'placeholder': 'title'}),required=True) + desc= forms.CharField(max_length=100,widget=forms.TextInput(attrs={'placeholder': 'description'}),required=True) + starting_bid= forms.DecimalField(decimal_places=2,widget=forms.TextInput(attrs={'placeholder': 'Starting bid'}), required=True) + category = forms.ChoiceField(choices=categories,required=True) + photo = forms.ImageField(required=False) def __init__(self, *args, **kwargs): super(CreateForm, self).__init__(*args, **kwargs) diff --git a/auctions/migrations/__pycache__/0001_initial.cpython-37.pyc b/auctions/migrations/__pycache__/0001_initial.cpython-37.pyc index 1fe3eb0271a3f32193cc3f841e0b20ecf115284d..480ffb82972f34b216e19c203fbb4e31aeab5c73 100644 GIT binary patch delta 52 zcmcaBeMOqbiI>oe&8C delta 61 zcmca2eOH>tiIej!DW(&Pa@L$uG~#$xlovj!DkX P%}p&zPTic%lgS7GNQD%6 diff --git a/auctions/migrations/__pycache__/0002_auctionlisting_closed.cpython-37.pyc b/auctions/migrations/__pycache__/0002_auctionlisting_closed.cpython-37.pyc index a78b3981084846b935cb8ef3096d71be34598ce1..2e55e147a8c5521ccd8aff23b8144197fb60f83e 100644 GIT binary patch delta 51 zcmX@WvYmy;iIej!DW(&Pa@L$uG~#$xlovj!DkX O%}p&zPMy4naVh}+-V?C^ diff --git a/auctions/migrations/__pycache__/__init__.cpython-37.pyc b/auctions/migrations/__pycache__/__init__.cpython-37.pyc index 72625fe45c12792a61abe00a3d3dfe8f1c30c2a4..78f580991bd504664aa119fc2c210312c7d4a681 100644 GIT binary patch delta 49 zcmbQi*w4u0#LLUY00hT*84@P)m`hqXTg3zvWmYDZWF+R6=NDziIF=@tWaj5hOf?1o DDVPqJ delta 58 zcmeBYoWaQB#LLUY00fV%dg3SYm@7FtTg8MHrxq2*B;_S%B*wVpm*?f=C#Dp~B;M1& diff --git a/auctions/models.py b/auctions/models.py index 3c1d710..3ce29b2 100644 --- a/auctions/models.py +++ b/auctions/models.py @@ -20,7 +20,7 @@ class AuctionListing(models.Model): user = models.ForeignKey(User,on_delete = models.CASCADE) price = models.DecimalField(max_digits = 10,decimal_places = 2) desc = models.CharField(max_length = 1000) - picture = models.ImageField(); + picture = models.ImageField(default='default.png'); category = models.CharField(max_length = 64,choices=category_choices) date_added = models.DateTimeField(auto_now_add=True) closed = models.BooleanField(default=False) diff --git a/auctions/templates/auctions/all_listings.html b/auctions/templates/auctions/all_listings.html index ba65f56..4f7c714 100644 --- a/auctions/templates/auctions/all_listings.html +++ b/auctions/templates/auctions/all_listings.html @@ -9,7 +9,7 @@
- Preview not found + Preview not found
diff --git a/auctions/templates/auctions/category.html b/auctions/templates/auctions/category.html index c8e873f..9a155f8 100644 --- a/auctions/templates/auctions/category.html +++ b/auctions/templates/auctions/category.html @@ -10,7 +10,7 @@
- Preview not found + Preview not found
diff --git a/auctions/templates/auctions/index.html b/auctions/templates/auctions/index.html index 5ec72b1..3265d9d 100644 --- a/auctions/templates/auctions/index.html +++ b/auctions/templates/auctions/index.html @@ -10,7 +10,7 @@
- Preview not found + Preview not found
diff --git a/auctions/templates/auctions/listing.html b/auctions/templates/auctions/listing.html index 77b02b0..69ca781 100644 --- a/auctions/templates/auctions/listing.html +++ b/auctions/templates/auctions/listing.html @@ -37,7 +37,7 @@ {% if user.is_authenticated and user != Listing.user %}
{% csrf_token %} - {{ bid_form }} + {{ bid_form.as_p }}
diff --git a/auctions/views.py b/auctions/views.py index 8ddbe45..54415d2 100644 --- a/auctions/views.py +++ b/auctions/views.py @@ -7,9 +7,7 @@ from django import forms from .models import User,AuctionListing,Comment,Bids from .forms import BidForm,CreateForm - - - +categories=["Fashion","Electronics","Home","Sports","Toys","Automobile","Books","Videogames","Others"] def watch(request,title): """ @@ -165,7 +163,10 @@ def create(request): if request.method == 'POST': form = CreateForm(request.POST, request.FILES) if form.is_valid(): - listing_obj = AuctionListing(title = form.cleaned_data["title"], desc =form.cleaned_data["desc"], user = request.user,price = form.cleaned_data["starting_bid"], picture = form.cleaned_data["photo"],category= form.cleaned_data["category"]) + if not form.cleaned_data["photo"]: + listing_obj = AuctionListing(title = form.cleaned_data["title"], desc =form.cleaned_data["desc"], user = request.user,price = form.cleaned_data["starting_bid"],category= form.cleaned_data["category"]) + else: + listing_obj = AuctionListing(title = form.cleaned_data["title"], desc =form.cleaned_data["desc"], user = request.user,price = form.cleaned_data["starting_bid"], picture = form.cleaned_data["photo"],category= form.cleaned_data["category"]) listing_obj.save() bid_obj = Bids(bid_value = form.cleaned_data["starting_bid"], listing = listing_obj, user = request.user) bid_obj.save() diff --git a/commerce/__pycache__/azure_storage.cpython-39.pyc b/commerce/__pycache__/azure_storage.cpython-39.pyc new file mode 100644 index 0000000000000000000000000000000000000000..48d3f9919aa503422d338d4e23f395b45098a7d8 GIT binary patch literal 744 zcmbtSO=}x55S8}BHp!Z_IR|<+1>4=y;)bTgjZ115I|-)P2!pDXl)+}1S;*iC4t^LLJz%>^hPry(roSkWe+R(?alz;Mw7>8DRQi)>?&Y@!3e|< zK?qI(Gnn}cFq6ZdCNdPan60>7a+B4jpjE$Bw?GRPPX8(we43?#_?&9zV}ptut0@l@ zaDX5K$Y2ne%s>`1kIj*jF*1=wexW}V#8VD4WvI7 z?$kSZ6TMqqjz(|&qocx(b=b*uy=Y*ZkeFj!>|h+HERXcs!FZLEsMqp{z%)%V5+q!pJ-%KBg6J%;bE(@ Gv)XSj!MDl) literal 0 HcmV?d00001 diff --git a/commerce/__pycache__/s3_storage.cpython-39.pyc b/commerce/__pycache__/s3_storage.cpython-39.pyc new file mode 100644 index 0000000000000000000000000000000000000000..d13b6a403906fd90bed9b30b99e7182ab2af8647 GIT binary patch literal 407 zcmYjNy-ve05Vqq~ib~pvg^e{!7_uRR3P>`Mq_0dU8lB$2csniiCj8zKYA-ic(2zOf>Z zVNR0C4^)wa`gxvRn$Bc-XRLTs6^8eP0$BjuAt*%(DhZ6B1(QJ$N(Q4sAKxlji*bUV zXk^#RWa1;vTcH)_e#*HvvTx9jIe+OzGiIX3RHCa*>*o(OjJx58^m%I;v?3h-C88nSMV1LGj>amNu0*v~ ht#ql&R`>%O;6Cj7-#mB+5cAR5aKbtM#9?h5`~jhRVW$89 literal 0 HcmV?d00001 diff --git a/commerce/__pycache__/settings.cpython-37.pyc b/commerce/__pycache__/settings.cpython-37.pyc index 098eb34ff05e13f0c024e3b613d0fb2e64e39d9f..c0cde0f36d829d6475cfd82287e77b1fcd84dc44 100644 GIT binary patch delta 860 zcmYjP%~IM>6eb}RN&!I-@uvzZ6>9|wRy)pg5kl;sK$L`9&oGllPK4A#9FkVehMB&B zY6y6PLS>uYq{nce{7n4fdcJ?FdM`OdxfU+`DNpZEDZ4)Xl0Qy+f&ul!Lu zNnIriJ@hu+;6WeyaU25}#0d;FUGN0M;Kj+N0~w6q6h?6xXPS&g;p`35q`-%B;K!#p zuTmfBZ{zA1F5J=>yP-7-0vLxNF5(hFFXHmRCI5_k?S=G|b%3Ufj~8>@2Rs9H!tYrePj4>U_ij3-}VVq-+dx5XTKz#8>Kq8b6^) zE{dD5gtX{b-TLv@N4vpon0i-f-npDBOwV$q+bU{G8XgTsYh3x$QfWRu1!-Y`42x>KGf@ z3-FBywYJh!4J(u|QbsPNv=vM5D7|wd)zI7E<&;KC<@Ao()jwIjwsNsf&~ILEZe%hr zHdJCIhr(4Ob*wZ_)ehQB$GWNKQerM|kK&*+)$+GY^UT;zrxS+#Sus+ht#%tKSs;&C zQf1P&M;R?yUB1h>VpOmHxXc%dtX!*>`ktX%6$Ggt5G7VBay!KmFUo~tRfHgWD9S9y z@uDd2@kes80F!n|-$~pQZZXf`&{py*4g2a*BkovS9g5kj6fOM?VNKlPKIX2XzKdTy&EMi<#z_0 N3}wG=r+eUe>Hi>D^zr}z delta 265 zcmX>t_E(V4iIo6irhk` z6!|$!nT$~aDGE`7DT*mdK-G#V%3x9jOsZxwrn5u|rKm*-r>IAXq_9MZrU4{DNMl(nwpzK7zEw#hHKya0SVK{EgV diff --git a/commerce/__pycache__/settings.cpython-39.pyc b/commerce/__pycache__/settings.cpython-39.pyc index 4948a2407be4921216827b4cb4b3c3b6e69345d8..4fc57050ba1d84403978b32bbf090f7f6852db46 100644 GIT binary patch delta 121 zcmZ1|bVGA44SeV ze+97#SMev7CYNO9=N0Q0mn4>CCTq%U_G33^l)fbp9O4+_>Fnm|;~E_A;u#dYlA%Z$ YXmpYCCQa$h`RwM5oGTfM Ulzvbc0A#b~aO84EaWXQb zvZk=5GG%dPaW^vo+3cw-DICp=%}nV`Q9P;aS-eGgsXVEiKo%bm^QUn3GMO_(@uYAC zGiY*e%$dq0rpb7Vqd2vsBr`9)7|3QTE=erOOrFfhEGYuy@}}e`m*%GCmBbh2=a=|t z3QU$|Hq+rw$x6&i&(}-N&r2&}1-dm#97#m4v?!-o4`NOc+hl)c8JAnEF0M|Y?zcF7 zU0pmK<3oddZgD}FLH_20P)%_t^fc4 diff --git a/commerce/__pycache__/urls.cpython-39.pyc b/commerce/__pycache__/urls.cpython-39.pyc index 18ba202cb156adbfdc956292c6cbd674d2dea775..a3f65626eaed0e12c1a0bac1628b7eff2fe83e99 100644 GIT binary patch delta 23 dcmeyw@ri>kk(ZZ?0SIoiGbXHL+sK!~0su_I1|9$a delta 23 dcmeyw@ri>kk(ZZ?0SNM<7!$5AZ{$m10RTt+1+M@A diff --git a/commerce/azure_storage.py b/commerce/azure_storage.py new file mode 100644 index 0000000..2b10d45 --- /dev/null +++ b/commerce/azure_storage.py @@ -0,0 +1,9 @@ + +from storages.backends.azure_storage import AzureStorage + +class AzureMediaStorage(AzureStorage): + account_name = 'auctionimages' # Must be replaced by your + account_key = '3W/fel22r8ExgQMDr8KOxxklp80/slPtAznb+G1Hkq0DWuX2bOIXnQMpgmU/BIJdIWnbDsgMr2SbC5l9qfJJ6g==' # Must be replaced by your + azure_container = 'media' + expiration_secs = None + diff --git a/commerce/s3_storage.py b/commerce/s3_storage.py deleted file mode 100644 index 4325cbf..0000000 --- a/commerce/s3_storage.py +++ /dev/null @@ -1,5 +0,0 @@ -from storages.backends.s3boto3 import S3Boto3Storage - -class MediaStorage(S3Boto3Storage): - location = 'media' - file_overwrite = False \ No newline at end of file diff --git a/commerce/settings.py b/commerce/settings.py index 7dcbf90..3f7f898 100644 --- a/commerce/settings.py +++ b/commerce/settings.py @@ -124,3 +124,9 @@ STATIC_URL = '/static/' MEDIA_URL = '/media/' MEDIA_ROOT = os.path.join(BASE_DIR, 'media') + +STATICFILES_DIRS = [ + os.path.join(BASE_DIR, 'auctions/static'), +] + + diff --git a/commerce/urls.py b/commerce/urls.py index 0bdde9d..91d5a4b 100644 --- a/commerce/urls.py +++ b/commerce/urls.py @@ -24,4 +24,19 @@ urlpatterns = [ ] if settings.DEBUG: # new - urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT) \ No newline at end of file + urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT) + + + + # + # # alternate photo to display + # if photo_url == "": + # photo_url = "https://upload.wikimedia.org/wikipedia/commons/thumb/1/15/No_image_available_600_x_450.svg/1280px-No_image_available_600_x_450.svg.png" + # category_value = request.POST["category"] + # listing_obj = AuctionListing(title = title, desc = desc, user = request.user,price = starting_bid, picture = photo_url,category=category_value) + # 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() + # }) \ No newline at end of file diff --git a/db.sqlite3 b/db.sqlite3 index c5c6ef9489059f2f3ce58de012657065d56de23a..742dc9a92222ce4c59d97a96c1588eed2435bf6d 100644 GIT binary patch delta 2590 zcmai$e{37&8OQJSdyap__c}|HEOn`mrujwE%X{ZL|H}Hqah;!S657(Ht2WnhE{Pl0 z=f+M*8B=N)|FP1pmEN|aP|!3qn4nu!JS0TRL=dD|OQdO?C=3t-6(;C9ZDQK~V6V?E zq+Z4(>p7ow_xXOG_kEw|@sUgD$R%{l37U?t34x|x?SDZ4l_wl+-v_;OTHAA*kthYQ zFQCYRUdgfg^7{57Tyes zGGsvY9wnypV62*ZgZnM_GWQ~Po_m)28TSNtiu(!o=-l1BxhTi#a;z@L>T;|u$Leyd zF30L}tS-mua;z@LZpmGF1^i(xe*pW3Q}O#J5^0~B)S}Vol;|JDvGf%7CKB!k(&V*w z!G(M8-O&|L`nFBQX8QM}aPNlUZt-x}p{~U4@$vh+g1y7LB0Kx1J<~lK)NOTpbq9Q)j4vgD>WDJt`ZvsB|>7T%oKTTy0d{6so8cKN3#x!=Fq+KVV?}?b&)#6rztHFCMvmhR zA0s<`wv6TTJ78?I&w;-}{uy@AaBfXGdWk{*rqG+{6SRcp(M9wU`jE<8Lzm|&Qm2u= zTVEILlD!ZiA}4LU(+JRX}+ zla=}JU5RKqt)?q-XI*f_!J^L?m@{H{LkC&NtzzLP>Kvi=nyo`B>Luq-Mb zk-T#nu0fgUNHWJ_HCqZYht*&a}Q0Dym|_Xn_De0Z9(H6+yyYFUI8347|&pqNS3K1bZe9ihUDb z`Js#M3Q|Z-R;wsEQWWB*AHj_k>~oW!Mxl%R;t*VCj)d-05ReXC)(?c??JK8?(_Htz%@mu2kV=lNdUk=vW7CQB>egR9VG+Qw2db#3I(Ww@&3a8qUj%N+yjNzWoY&C;P0Bp)xr zhfVtpmMTMAh@8Fxo!{8ks;|O&)9x}$4N%%h{~}ylaYxV6d*8)HxXv^I=`;0lvh+Jx zT~Zy?MGd(t134odr65I4UV+c#hw41pd=<`rJyg%4XY)h#t&*WyzHF%4$l3Q`>^~N3 B#Ag5i delta 991 zcmaiyUu;ul7{<@r_nh^d)AhWEj195CjuP0=Z0mYX*KVjyXDWkbZVQVTFhJ=xI;?Bg zb~^Dw&MVO)O4tjFO;cEXPD6Tv)QXF_{<6WWj%!1x?(*xQLoKPb3-p30<}jEs?LdwSQQ9fR?q&b`r|?&bq~qKU`$wChdDp1$m1pV!w|=WVR>HETuk z5~c1pnsj}1I|v;w2x0c^GHBLMU&EaGzX;aCGW>sf*X#oGG(Em1^$xMZs^fwGmYz^>fp|&dIrcN*I$NLT=mMRk zJbhs+7ip4~=tH_?>rJxq)!3`@MIKA=;&tLhtORy5gcY`MAJ8xK1ARp~`k2nq^Yj)y zMf+@Fh(uKtIH-m?7VE@d*^9-#%B(j#G3LEPyj3%P6I<h54&Aq%_37bcEdcq(U z8|@v))?~D(ma^x}e+JL6%`}$s+0Ge!O)@tL@_GoE&Fl%=iMcN0es=#1D(t{> z=n{(09kHFm)n)|cb+BdBV>?Tk_&_?l_O^9t!Pu5>h*-7Iw( nJ?#7}p5V<^kXh(+EZj*tPw$qJ{@qS`(N6kCDQTAf24jB%w2LwM diff --git a/media/Screenshot_2021-01-12_121010.png b/media/Screenshot_2021-01-12_121010.png deleted file mode 100644 index ffe0c71099aad2dd66793414e4b2427d6765b2c5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 7313 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 H