From 4c77bbb67178c7abd81a681a2d1f04528777a1d2 Mon Sep 17 00:00:00 2001 From: moniyk <142949360+moniyk@users.noreply.github.com> Date: Sun, 22 Oct 2023 11:50:40 -0500 Subject: [PATCH 01/12] New Project --- .idea/.gitignore | 8 +++++ .idea/UNOv2.iml | 30 ++++++++++++++++++ .../inspectionProfiles/profiles_settings.xml | 6 ++++ .idea/misc.xml | 4 +++ .idea/modules.xml | 8 +++++ .idea/vcs.xml | 6 ++++ db.sqlite3 | Bin 331776 -> 331776 bytes manage.py | 2 +- requirements.txt | 4 +-- {djecommerce => unoshop}/__init__.py | 0 {djecommerce => unoshop}/settings/__init__.py | 0 {djecommerce => unoshop}/settings/base.py | 4 +-- .../settings/development.py | 0 .../settings/production.py | 0 {djecommerce => unoshop}/urls.py | 0 {djecommerce => unoshop}/wsgi.py | 2 +- 16 files changed, 68 insertions(+), 6 deletions(-) create mode 100644 .idea/.gitignore create mode 100644 .idea/UNOv2.iml create mode 100644 .idea/inspectionProfiles/profiles_settings.xml create mode 100644 .idea/misc.xml create mode 100644 .idea/modules.xml create mode 100644 .idea/vcs.xml rename {djecommerce => unoshop}/__init__.py (100%) rename {djecommerce => unoshop}/settings/__init__.py (100%) rename {djecommerce => unoshop}/settings/base.py (96%) rename {djecommerce => unoshop}/settings/development.py (100%) rename {djecommerce => unoshop}/settings/production.py (100%) rename {djecommerce => unoshop}/urls.py (100%) rename {djecommerce => unoshop}/wsgi.py (58%) diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 00000000..13566b81 --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,8 @@ +# Default ignored files +/shelf/ +/workspace.xml +# Editor-based HTTP Client requests +/httpRequests/ +# Datasource local storage ignored files +/dataSources/ +/dataSources.local.xml diff --git a/.idea/UNOv2.iml b/.idea/UNOv2.iml new file mode 100644 index 00000000..fbaa885b --- /dev/null +++ b/.idea/UNOv2.iml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/inspectionProfiles/profiles_settings.xml b/.idea/inspectionProfiles/profiles_settings.xml new file mode 100644 index 00000000..105ce2da --- /dev/null +++ b/.idea/inspectionProfiles/profiles_settings.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 00000000..882c1246 --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 00000000..16929234 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 00000000..35eb1ddf --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/db.sqlite3 b/db.sqlite3 index 1491c0762048f010e5f545421bcb083fcaff3cfb..8041a6cc292b6323882485ac046c6fc0e513d32c 100644 GIT binary patch delta 482 zcmZozAkwfvWP&uK#Y7orRtpBbtP2}cmdi7q-^`0&*VGIr@7fsL7I=JQJjUB zp;428Ly^~Z^7(m^^{y2ruI^Exg-(@e87ht;PL7VjX-h>9)D~d6~(HAiE)~#G<17%6x~?y!_n6j6}WElu{!DBV%1d z16?B{1w%6{6LTwLBRyjaGjj{eMrCG@D;zl_H=mtn&d9~gf0u#(JO3O0yPE|I&hzv0 zF)K16%xBsBX1&A*4krGu4E(?OzXFxKI4J-Oa2o;sXhFP z@=RG*Ht;2L5;a7lE3N^2^FF+d{3x^axY?J9!Xh-u_OWMeG95 zxknlJpYxyPKMK^lou7k^nU#Tok%MLW+5ar&K-mur{D1hr@qYlyKH?VuyObG3GBYtV Hb8-RzBj}Pa delta 224 zcmZozAkwfvWP&uK=|mZ4R#OH&=Ytzlmdi6<*vzAl#mC4rxm?eRk$LkbJsw7JQO@N2 zqSW}(;?$yoqWrYXoK$fpW>e1T6C4;tHow%DPT*kTJIuhJ$#;0OV#0R5&4=eXGIB8S zzhU72&i`h!V8H|a&2QFAd|+eb|INVv8z}IepNWBC`|tIPoB=?=mkj(bfr9t>r@!Q9 zk_HOAW8i-W6nMhl{!X3=h?%#)lV=gT05tL}1OIdWvp~6n{L|0=XE6r~ePiJN!~YE^ T^ooD_2Yyx-HfAPfW=>83%~VVG diff --git a/manage.py b/manage.py index cc7ec082..df63853f 100755 --- a/manage.py +++ b/manage.py @@ -3,7 +3,7 @@ import sys if __name__ == '__main__': - os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'djecommerce.settings.development') + os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'unoshop.settings.development') try: from django.core.management import execute_from_command_line except ImportError as exc: diff --git a/requirements.txt b/requirements.txt index e7e0d239..578c6bf1 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,7 +2,7 @@ autopep8==1.4.4 certifi==2019.3.9 chardet==3.0.4 defusedxml==0.6.0 -Django==2.2.14 +Django==2.2 django-allauth==0.39.1 django-countries==5.3.3 django-crispy-forms==1.7.2 @@ -10,7 +10,7 @@ django-debug-toolbar==1.10.1 idna==2.8 oauthlib==3.0.1 pep8==1.7.1 -Pillow==6.2.2 +Pillow==10.1.0 pycodestyle==2.5.0 python-decouple==3.1 python3-openid==3.1.0 diff --git a/djecommerce/__init__.py b/unoshop/__init__.py similarity index 100% rename from djecommerce/__init__.py rename to unoshop/__init__.py diff --git a/djecommerce/settings/__init__.py b/unoshop/settings/__init__.py similarity index 100% rename from djecommerce/settings/__init__.py rename to unoshop/settings/__init__.py diff --git a/djecommerce/settings/base.py b/unoshop/settings/base.py similarity index 96% rename from djecommerce/settings/base.py rename to unoshop/settings/base.py index 52e68c07..42ebf6f3 100644 --- a/djecommerce/settings/base.py +++ b/unoshop/settings/base.py @@ -34,7 +34,7 @@ 'django.middleware.clickjacking.XFrameOptionsMiddleware', ] -ROOT_URLCONF = 'djecommerce.urls' +ROOT_URLCONF = 'unoshop.urls' TEMPLATES = [ { @@ -52,7 +52,7 @@ }, ] -WSGI_APPLICATION = 'djecommerce.wsgi.application' +WSGI_APPLICATION = 'unoshop.wsgi.application' LANGUAGE_CODE = 'en-us' TIME_ZONE = 'UTC' diff --git a/djecommerce/settings/development.py b/unoshop/settings/development.py similarity index 100% rename from djecommerce/settings/development.py rename to unoshop/settings/development.py diff --git a/djecommerce/settings/production.py b/unoshop/settings/production.py similarity index 100% rename from djecommerce/settings/production.py rename to unoshop/settings/production.py diff --git a/djecommerce/urls.py b/unoshop/urls.py similarity index 100% rename from djecommerce/urls.py rename to unoshop/urls.py diff --git a/djecommerce/wsgi.py b/unoshop/wsgi.py similarity index 58% rename from djecommerce/wsgi.py rename to unoshop/wsgi.py index b2e66244..f8192e86 100644 --- a/djecommerce/wsgi.py +++ b/unoshop/wsgi.py @@ -2,6 +2,6 @@ from django.core.wsgi import get_wsgi_application -os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'djecommerce.settings') +os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'unoshop.settings') application = get_wsgi_application() From a2069e1968034a093b4c76daf54e52b00e50ec9e Mon Sep 17 00:00:00 2001 From: moniyk <142949360+moniyk@users.noreply.github.com> Date: Sun, 22 Oct 2023 13:19:57 -0500 Subject: [PATCH 02/12] page name update --- db.sqlite3 | Bin 331776 -> 331776 bytes templates/navbar.html | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/db.sqlite3 b/db.sqlite3 index 8041a6cc292b6323882485ac046c6fc0e513d32c..2c35148d138d454c0ca40f8889371badbf1febd9 100644 GIT binary patch delta 1111 zcmaiyOKcNY6o%){ogsFVnG=vzyA%-<6NR>lGY?PvXi+uPrU{ZAT=_w0TeG)lCf+psgewf4;hqtEfY&u zO7$|_BM!AMkItXzqnH{2S@r=7Os&mZ6AZIpp&4S~P1!iWFvi8lOP2Z5p_y93ArxdT zr5p}6)Y0Nh!ReBP#+0iNXiSZVCB7a_xdK(kbUh!Lj!0b8&EYtU`)Ew2L0=mz{VhQ73RM_apthWFWElz{Kyxo+<-dhs7H+A-Zl zuY^5`fFI>!4lg(ZJ@k*&!vzLqM z&Z8LVF6+Q&1U!Q+9rzRU8nGF@=p;K^>m>7-rH!`<_G>27_g3$Q@%DB3wa$^dIA@%{ zI8D?3Pmao^YH3EvsfyA}WQrMA)7=uC7vI^|XxTlR;FKy?Q5-W))tPUU8m-y0)ntQH zQuU-uYDQWUg1>d55cOtMzc+s_kc&6`xv6~A8{{TKaW3Euih)-ATtx6WqF$dc={;VE zhRV)~f?FF}#U{jSPgZaxbRy$dr?UQBn$u~yh#KMip}Z8B4ix;YbTb+XHzz;%FcjU^|Fqw3CJZnoDoXTK|2#|H|?@?kulUO23}s6#{;R z@8BV<=#X1r*hA3-fef_v@Gt5;U4KfzpYS_u!c$%UVJDXRXo|)NQF!~sB*sSL-%Ub9 A9{>OV delta 458 zcmWlU&ubG=6oucL_u5Qi=A9`96K$#KY|;o;r50LIBuMuK7ZqJhLsQZg(+NX^E3rXB zw+$oALM)|mE3KWy0~P#H0%DNpA23AfLWGoNWflth+}y>-ch0?cV<)k(lh_)j)Af;C zbo%AO?)i~LG9>akexfZ7unSEz;Nmutn8cG{G<`=<<~^9WmgEV}F4Dqkey!-(`9f)B z&A#sxE$`#RQwvps=%V8;*^XOSat*=8^n7J~*)F@Jnv zS1dI!$WbDYGX9QThc{ - DJe-commerce + Underpaid-N-Overworked From 10ade6e00c4182af26240237c1cd8df684d91e2f Mon Sep 17 00:00:00 2001 From: moniyk <142949360+moniyk@users.noreply.github.com> Date: Sun, 22 Oct 2023 15:18:32 -0500 Subject: [PATCH 03/12] updated inventory --- core/models.py | 4 ++-- db.sqlite3 | Bin 331776 -> 331776 bytes templates/home.html | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/core/models.py b/core/models.py index 881088f6..d0948061 100644 --- a/core/models.py +++ b/core/models.py @@ -8,8 +8,8 @@ CATEGORY_CHOICES = ( ('S', 'Shirt'), - ('SW', 'Sport wear'), - ('OW', 'Outwear') + ('SW', 'Hoodie'), + ('OW', 'Cap') ) LABEL_CHOICES = ( diff --git a/db.sqlite3 b/db.sqlite3 index 2c35148d138d454c0ca40f8889371badbf1febd9..63aa21c21e7c383fed75037842e37d7e570136ae 100644 GIT binary patch delta 794 zcmZvZO=uHA7>4I3yW13#FTr9I{x+f7ld8+i#n^K{t9;7FcA{BRM+K5^hhIeMZ_xawLX}0^C?Y^f& zIQMLL9Oqt7RaC63epFv#*Q0vWsz>qj=AZ)o2sU6Bc3>O6z)y(688{6mq2D^OhWEU! z=zA<2R|JYNjIcS(=8$C{Y|2ytvn74S6FqPpa&QUEj=#3;9dK#{<`S4oU@jqK-P*++ zjVhw2CCOx>N8A)&h-J~!$@(lozoWQO7Q%Uqv99UyNKA|9x*RjpM#>&)N;A#4u3w%l zPCt-uH)g8!h1P~j23H!hi+M$L!P4;T2f6I`j~FUvNE%SKre=!`oKAi z-T(AVrV|M@X=n)}nczLgi?w@8!D6XYE(O!_5^IrL*hoOHqIGb3%wumS@xHl3#3WRHlTYZaWMpbC(%)XB&p4?;NSR-sf&U`^d;XXF zkNNNN|K``=)PI7fSG@L;Csf+2F%Lr64Tig znA|rz3Y=owE}_o!QiGd;fq{v?pMn20e?L%ZGe3(J6Bonu$?;5DPQ@9SMI~-U`FSOJ z1$pVlj9d)TjEwyJ;@XOi3Sc=ok>CI@qa-7v>$y{v-N?f>JMSRI%d`G0I@ zU%>R2AHv$e^jDsPiT^DF|6Bg=KuaI;3vx1xGbZIECTBBoFpF~n^>6=opNUOjJ4*ob wPyXpZjqKZ57BFw)2YOI^`bBwWV~9x#%wRKrZD%)tvf9}ln76Y#u>3p^0Ks2p?f?J) diff --git a/templates/home.html b/templates/home.html index 9e56f4e4..b88059cf 100755 --- a/templates/home.html +++ b/templates/home.html @@ -30,10 +30,10 @@ Shirts
  • - Sport wears + Hoodies
  • - Outwears + Caps
    • From 6b34a919fe62644e721bdd1fd6235d6aab93be98 Mon Sep 17 00:00:00 2001 From: pndungutse2 <111838565+pndungutse2@users.noreply.github.com> Date: Sun, 22 Oct 2023 17:17:18 -0500 Subject: [PATCH 04/12] version update --- .idea/UNOv2.iml | 6 +++++- .idea/misc.xml | 2 +- core/migrations/0005_auto_20231022_1706.py | 18 ++++++++++++++++++ db.sqlite3 | Bin 331776 -> 331776 bytes requirements.txt | 3 +++ 5 files changed, 27 insertions(+), 2 deletions(-) create mode 100644 core/migrations/0005_auto_20231022_1706.py diff --git a/.idea/UNOv2.iml b/.idea/UNOv2.iml index fbaa885b..55311e33 100644 --- a/.idea/UNOv2.iml +++ b/.idea/UNOv2.iml @@ -16,9 +16,13 @@ - + + + From c8883c344c118e108aaaf523ccce4ee85b68dc57 Mon Sep 17 00:00:00 2001 From: pndungutse2 <111838565+pndungutse2@users.noreply.github.com> Date: Thu, 26 Oct 2023 15:27:41 -0500 Subject: [PATCH 11/12] database --- db.sqlite3 | Bin 331776 -> 331776 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/db.sqlite3 b/db.sqlite3 index 52131d811372b9193d1c19584332de066a9fd93e..2914fd4cd7e55982d1b894b6555223b6ee77bf26 100644 GIT binary patch delta 613 zcmYL{OK1~O6o&6(Zf5f6+=;2SrKTAQX&cGo&IHqkuSO|Y5Ne4KT*xFQk%n3m(nupN z(sZGls?{KOX$0w}Qj}l=g3nb!kWhq*RDA3UQV=&ToYaboe{s(LAAa~a^R@Q*TKiJB zGYtTkG&NxgnOeT<55x4+#3PE`(q>guhLN;ck1F@2qa$tt_8*C+a)k_I?68r%TFe>)NMcAH0&8GmKV?ku7FsgboW1!|EG{tNJ`N2Hgwn27}8CsrQYmV=&X$DxoGZ!SM$P zxY9UZMk{9>KmmZhr(1NJ{;E4`Z)s!W3(}t)bdXU%dt}4zw=LNe>!P$R&5C0pCaYxB zM641#T_OBa3Hf0k7q6k?WMQ%*i2Pv!y5SkFT}Ljyk$@#`*0}g$8O`!+8L5)*L3YL~J@@o3s{w8ph;_%}QS>k1p?}ZM?b4-u(?C8LTYD|oRT4CxsIQ@X6@G;N E0OVVv-T(jq delta 509 zcmZozAkwfvWP-F{G6MrcAQ1ZlF%u9kny6#Un7lDz2|u$8r|@KU0n5#X3YR%H3rljc z3-BlN_41YTo#6Y#cb6}bFLtw`fg#`KSUq+|Mv2L(`kInOKoeLwcqEwRIg|5?QsXmA zQgg-Gn2i}HALJ39yi4DeQKreD&46*40h59NFMmG+Ge0W>|6YC8(MxLG+*aJq8b;0R~G!tTko zkM%8UILlV%Kg|2LYZWl9<6z15WEbClr-JDMD@#+LBm4A)35+YJ$4p}u-kwv>G$VkA zng1LU|2h6U{BQZcZx&o|h=2Q~`%Fd~q`BCc8TjS+;<L7LItO%PG^>9 z1_6{j-`t6?<(6fxfH;<~zw_KnPJ;=#ILUF}NK znYSxVXL%&S#vs7J!2cW=aCiA7#Ti){3^_TION-;(d@@Weyv<#UbCPm`%eNh1;Z|Vv O0h(pKUEl%B2Ymqj-jNUh From 315aac8d0e28f42acbbb52c2d8861abc24553a43 Mon Sep 17 00:00:00 2001 From: pndungutse2 <111838565+pndungutse2@users.noreply.github.com> Date: Thu, 26 Oct 2023 16:07:04 -0500 Subject: [PATCH 12/12] update --- requirements.txt | Bin 1380 -> 600 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/requirements.txt b/requirements.txt index a31bf3c437b69183fdcbc26d54b736226487ebd5..62326ea22bfea13d661312974a06867e9208d059 100644 GIT binary patch literal 600 zcmZvZQBK1^3`FM}iKFzZKOBGqa0ApdX%m!YLv|w?4iCK94J|@Z6?Hu`w#WAO*FjNd zb(+-Zq(?pIpjk;lBgm+yj2(GTpdFfSMOu`TYM7J}zfR;v{%c)zQJ?W=y`dcF5?0+k z-ofCY%1-sqTU&uXAJbN@*JML!}mbscer`# z!K;k@-N*~5od75Bm zm$Hrjm@E8l^zJ^A*Hg<^^Nn2DPQ5!%=GeYRVqfbO>{p_WtPU3UcObzeC Id)jB@2TQ1G7ytkO literal 1380 zcmZWpO;5s55ZtqgKc%Lnpm6Z!$&&{Y&(QKwtrXjW;*VEnc6cqtG!Vkh&dkof*WaJH zHMX|GYFpaM?(w8{V|VzB?AoquZhLF3vK{I>n>r#vb?hG^GE{0{3iKCVA6aaP&43`+ z%y}|YL!JGJ-Qqhw)i%(nEeBKEd5BRT59*EABiq7HZSUwQq4@3k!8sL^Q&(+Ac&7U` z@N@j$;2$E#z)(FXP|J`n8bs2$qeTdI|-o_%Jm*}J08csBcQdW}x`}XkD0$rd-9TTX~bLuHwb`aSh zsUy@@r<~Qt#QJkF?4zRv=2@eQc~{720jITl)V`UersFv%(NO}I*_&guHzuZ?7npJj z2F}QTr|y=?w|Lmi^vEN3WbgB?x^(+pQK9!xd4CRE3$EOCh8&kCp0msUlk3v`r}rf% z-f*6Ga7EsbAJ0wLm*&*z$u~zAe5}KA@t>v?uMT zpZ^j=y>K)7-4V}DWzm4Og!hmIwZraodYB|nGI!YL#0`ppj