From fe6e0d6b62cd65b2311293eab47f627a956325ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maximilian=20Sj=C3=B6str=C3=B6m?= <maximiliansjostrom@outlook.com> Date: Tue, 21 May 2024 19:47:26 +0200 Subject: [PATCH] =?UTF-8?q?kommit=20l=C3=A4ngre=20p=C3=A5=20backend?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mysite/db.sqlite3 | Bin 151552 -> 151552 bytes .../__pycache__/admin.cpython-312.pyc | Bin 329 -> 433 bytes .../__pycache__/models.cpython-312.pyc | Bin 1555 -> 1473 bytes .../__pycache__/serializers.cpython-312.pyc | Bin 690 -> 1084 bytes .../themeApp/__pycache__/urls.cpython-312.pyc | Bin 521 -> 622 bytes .../__pycache__/views.cpython-312.pyc | Bin 650 -> 1022 bytes mysite/themeApp/admin.py | 2 + mysite/themeApp/models.py | 43 ++++++++++-------- mysite/themeApp/serializers.py | 7 +++ mysite/themeApp/urls.py | 2 + mysite/themeApp/views.py | 5 ++ 11 files changed, 40 insertions(+), 19 deletions(-) diff --git a/mysite/db.sqlite3 b/mysite/db.sqlite3 index 8ec908c4e378dfe884c1eb99c603a9cbf7f79871..cd2163af5b3e9685dd850d759667b37e861870a6 100644 GIT binary patch delta 378 zcmZozz}c{XbAmLZ#Y7orMvILJOXMZE_<0!kU-Db>@8&P#@8+Myzk)x7Uzwk0W8()t zaZx^Iea4cE)ZA3Zf`a(u#FEtX{Gv*cW@Y_$Wqro&%KA+A1oZhW83gzR+4y(!ujT*3 zzli@i|5W}q{#*Rz{8{|r{CfO~{DS<a_}%#}A#h{kL%w=GK4u1G@1ny?(n^Z6Gs_aW zd6^kx!xEDdOEUBGIC+>EBs~(#6Eiaz7#R3?85kHOL4*jO2s4ASe|AZJQfg6JYH^7m zH#37~SYl3UUP)$NYO#V#VkI{hGlQ&Kett<(VonY(Co_YhXL727M}Bg4Y9%i_GlODy zMrKKBK|x|sNhLQMGlQ&ST1jeAadsvr3p0bHYhrOpY7q|;GlRTGVopwed1`7N4<j>! zymLlTW^qYwVle{`KQn{8Z)Qqyer|4J5d#A^2Q!1LQ(|&PYEFI;2P-p!xJzbnay|nC R0~a$hgS2ygPEKliDgayxV&MP) delta 64 zcmZozz}c{XbAmLZ`9v9KM)QpcOXS5k`IQ;?U-Db>@8&P#@8+Myzk)x7UwLCACx5fD Ve!H?h<920zrh5XL85{od0{~g<66F8@ diff --git a/mysite/themeApp/__pycache__/admin.cpython-312.pyc b/mysite/themeApp/__pycache__/admin.cpython-312.pyc index fbe8f2a237fc31df8b92baccb87644133134def4..24e0b0ca3bc9f606e42073a9f8d4ba625d2c5680 100644 GIT binary patch delta 222 zcmX@fw2_(jG%qg~0|Ns?@ok^99TRya8K+ECmsLq&N@2-i%4LaSVPr^U%mS+bsY2i^ z-ia}CR=DI4>R_x?meq_9HX}nNt0vpTIyrt###<cDi6yD&`9+m}n(PzjD=`(ZP23mb z!pFeC08(9S#K6Gtftit!@h*eHT?Xm93^ETGSlhW8xvnz^Ut|!T;C_Wc<_3z0$5jT| JA|3_?1_0-PDJuW~ delta 121 zcmdnUe3FUxG%qg~0|Ns?=|!Kk>WRFPj6oCCWhGJ>vp7Jas5pyzVul<`C5tBO!~=57 zewu6(-zrTOVT{!0Wnf@nWME(@mStdI_`uA_$at4Q;Vy&p0|wT1u12ow48j)~geSOP MWsoW2W?*0d0HMnmRR910 diff --git a/mysite/themeApp/__pycache__/models.cpython-312.pyc b/mysite/themeApp/__pycache__/models.cpython-312.pyc index 30e10bfa67b590781680a51d7dccd63fc300c662..1c7ce104d6b8ed5b78cce422c597469e4889f79d 100644 GIT binary patch delta 492 zcmbQtbC8?wG%qg~0|NsC?_HlXE!K&AhZ!v<?`JYrPhoChh+?Z`(PX{F;hb2Knx0=& z`7(upfng=%Ew0?eiujz=y!4Wc$-kLRBv&%}tz^8#l9!m93ZjcsbJB_#85kH8CYv%@ znBHQKk1sAMijS`nfElC*72#!IVED|#z`)SJaD!jCzp}IP0*AzBkaH&AXH*X<VrF1q zxW(z5kyzxGnVOSQ1X5ol2yz5NkuU=TLy-W8V1p4Lj}%KXFfg<*+~Ah(FuTqzeUV#w zLGcxC?FN_6ER3v@MZ%jGFa<F(a!mfrY~x$R4blm+zle{4fdS%Xh?yWus`vwn@>5Ea zOJL5G1}PT;5g^O`G<l0eKpasJAvU?6#a2%o#00tW7E5tvRVvu6MG_!EkPe8^QXnpf z5S;vrrGyPEAvL*#)g>Avh^G1%hfQvNN@-52U6C#W0|O{ji?taT7(OsFGBVy}kh#lX o{6&C;QL>|~zoxV13j+(I<QG0}M#+w}{+!O7uMFIblHia608L$WxBvhE delta 677 zcmX@eJ(-8^G%qg~0|NuY{cfMMM=TTh4%b^TFfdGKNM(p(Oks#(N@qx6T*Mf~%*2q& zk_A=?QjNeVOlz1|GeY=LY?UmUthYFv6H8Ll^NT7q1#WRVXB1@?m*gfE-{SO0%*n|w zPfg9c#qOM+lardBdW+39vA86)=oYI>W^r=<Ee^-DlKRx5;_S>@T;Um+C8-68MJ1KD zIGhrbGg5Q%i>kOhlT#Hk@{_YuD{pbQ<>!|qCFbN*@r5Pkq~?`m=A{-ZxFlBIV)IBW zPt44`#Sxa6oLG{XpI6Gwz`)>Lba+WxNpW^&S>i2D-^`Ta{M_8cqADK$<dXcP)FOqn z)Z&ttDGUM(3@aILapfjf#OI{urI%z(e#WS-e@npGF~rr~KPWQZ*~8z{*)_O`nSp@; z<iErsx6IU>lv^x$iMgpO89sx;Vsa&;g>exZ0|Nt?0EJtz90LPG3&STSK?$}CEFvG& z7<gnl%&v1wU*wivP<(}3yV0dcc5@<A5F@7u0|UcLBL)VB$vTWC37U+4nv6x#3=9mK zjJH^dQ*+XaLE)`X1TydzdwhIxNl|=!6@NfceoAR_i5^ryn}LC$n1_LZp@HEBzi@wL zXXOPBi6U7B1_nP(-XbxO)5Jl9#AI6*TRkZd6J*CNmg3B+)FP1XA{me%NC()eA_Wi^ zL?}*P!BWBomQa|i#Oe|a5=2w|i^C>2KczG$)vm~tfq?<!;$o1YAD9^#8SgU4++{HS mA|S%3(^1x6(^>O{L4;A~iyk+lWJg+mPG`<n25v@4uwwy-cDWY- diff --git a/mysite/themeApp/__pycache__/serializers.cpython-312.pyc b/mysite/themeApp/__pycache__/serializers.cpython-312.pyc index 382e09ac021b03532c5108db1fbe434b588aa307..f4e8f148cc1b5a2791f03cc9b58fe9eac7c8b21d 100644 GIT binary patch delta 578 zcmdnQx`%`BG%qg~0|Ns?)*YX;TE>Zd5{xwy)n)5bm{M4Bm~vU7SQr_Y7~C0BSX&rU z*isp@z=}Z{5O_5+gdN2OR>|JNkitPgC3_{OCf7@lHciG`+{LLynTa`>RjEbAFBusa z7&I9t_Hy!QGT!2FPAo}H&o8RnI8BX_6=XI0<b#Z&5kd?M3`HUg3=DoNS&Dc-99|H? z2O>biMS>s}Sd}n{#Q`JO7#J8ngEX`-d}m@}mHx!Q#423`RtQovahffs5X{brx2@~N zVVq#N6ZL#kOA?E?L6&Q>p<50zzla}Xn*fMFa|YOHQVa|XAlDW{oN+@yqJ#B@pj0Ot z#2Fwpenp}X-8u{m5K*u%BtU{70;ID@48#Mw93<qY$uZfGNr|b5ZE^sUXgbI<MIdps zkod)6lbfGXnv-f*B*(zO01E74BL)VB56p~=j87TV?lMT<Wsv#8!ptZ=gZsLK@kI&a aFAU6#(qDK$BGT6-O)g5Bd<BVs-30){o@VI) delta 276 zcmdnPv5A%MG%qg~0|NsC&o-a5I}8)~BpBT$s>|{*F}O3Nu(U9wu%<F*aZHSpW@W8p z(`28xLS=FRlkH?t#+UV+3=9lx3=9m#JPZsBEetmV#5-7T2ugLb6$vshFcb+hFfjOO zvJ`QHI3OiOydV}xxJUrR0;>`NvDje*E5f+%OiZlOpBR`}r6I<F)c9$#-Qp`sEiQ>q zD@vTaj9FsxVP+v;kPMoMzc_4i^HWN5QtgVw85kHCLB`55Ffe>zW@Kc1%Aj_aLHY{| WGo$nj?&}i97bT3pGB7hj>;V9KZ#3=z diff --git a/mysite/themeApp/__pycache__/urls.cpython-312.pyc b/mysite/themeApp/__pycache__/urls.cpython-312.pyc index 8079493aad844ed284f4dc18ec37339e5b3dd5af..a147b499c8ddbb421fa5337143e52f69da02395d 100644 GIT binary patch delta 299 zcmeBVdB?(gnwOW0fq{YH?OmU=^ohKZjE5$w>(-|*r?BR*=CVhzGcqtSq_V6ADPdq> zh~h})$P$Kfkf;>4RJPSj5CKL89BSB8*%4}(7*ZKiIG7kxnNm5jL?Alh<iy2dtlX8H znp_k2+39IA-r{#oEJ;nzFRBd7Of3&iExE-}P?Voinp{$Riz^u-m6=+6i@{HmXEHaV z15**lWDmvyM==Hl21W)3hT;GQ28IvJjEs!W8C35w7~Ex0yvv~UkW;K%zJcuq16w<P dBmV^M8F5z_bYMK*8TD5f^e4Yylw|=q4gh6%K5hU2 delta 185 zcmaFI(#gVmnwOW0fq{XcZJSS;&_rHI#z_;^bsd-(Qdw4mgc%qZqS#Z}vjm|WBr1h9 zm2EW>M1YZji6NCSg^h_Jl_`}yOK9Q|RaUM_c1@0n@9g+*aTFBgr<5j_6yIX-)8w8U z#pp13K4Y$d2m=EHBLf3Nu{{F=!v|(YM#kq1s&^R-?lLGo<P__cZ(zH@z}C*+$UlL5 SM%)z!oyopTvMfRj3=9CROeRtQ diff --git a/mysite/themeApp/__pycache__/views.cpython-312.pyc b/mysite/themeApp/__pycache__/views.cpython-312.pyc index 37ae501e3bd67f39f097208fa619116022f7cd79..027e574acaa2ddcbf605fd201bc06c0c08ef1c63 100644 GIT binary patch delta 434 zcmeBT{m0IGnwOW0fq{Wx${nAya}#+b8K+EC*HlYkN@2}m%4LgUV`NBSN@2@k$z_jX zXJlYvaA!ziZ(&H`NM+0tm>4I`&j}XdY+*>@f(o&6RdQ?cOsq4L&}6*D;hb2Knx0=& zsmXXt2*%#HN`#RMWNQ(K;Fx@ZQJGVifq?<cowy~jo*$+%EHkw{IJLx2le35$q<{xR z@PY_-5Wxo`_(6mKh~NMbf*?W&M1YMH0kOnj1W0SK3<Cp03&Rb5@$3BZ7y0F{^DAHE zSH8@z+Td|RT=OD}ND&WMCrFc@Cimp;j3)I(VCz8U-{SGjPf5*zIt=XMB9O`=R4adR z*yQG?l;)(`6-hHNFfcMOFce!bFfe>zW@Kc1%AkCgLHaI()?EgfyA0Z2SeO_!Cq!Hq l)w(FE^@V|nQS%EI6QkCIjO$|B7sa%{GBB|-Y88Rp1OT!^Uts_M delta 186 zcmeyz-o?s$nwOW0fq{Xc{g_W0%S2vD#-NGnntV(Q?hGlcEet7asf<}X6BkIcvRATe za!fp6wpoIai;;_ifq|h2M6gZPVN&K1gmL{eIVQU>o5bJZ@y$<3%?Zm)Ee}pD0jn$$ z04V~i6k=dt_{Cw9o1apelWJEa&cMLH$iTo*tiZs)@PV0;k?|>m@?8e$y9`=iSeO_! VCq!Hq)w(FE^_78%QL_kS0sv>qC;R{a diff --git a/mysite/themeApp/admin.py b/mysite/themeApp/admin.py index 4423e5b..d84273c 100644 --- a/mysite/themeApp/admin.py +++ b/mysite/themeApp/admin.py @@ -1,4 +1,6 @@ from django.contrib import admin from .models import Product +from .models import Category # Register your models here. admin.site.register(Product) +admin.site.register(Category) diff --git a/mysite/themeApp/models.py b/mysite/themeApp/models.py index 6858f6a..c311d29 100644 --- a/mysite/themeApp/models.py +++ b/mysite/themeApp/models.py @@ -8,27 +8,11 @@ from django.contrib.auth.models import AbstractUser class Category(models.Model): - CATEGORY_CHOICES = [ - "Christmas", - "Halloween", - "College", - "Easter", - "Disco", - "Afterski", - "Whiteparty", - "Bachelor", - "Ice hockey", - "Football", - "Valentines Day", - "Hawaii", - "Vacation", - "Kräftskiva", - "Midsommar", - "October fest" - ] - name = models.CharField(max_length=100) + def __str__(self): + return self.name + class Product(models.Model): # user_id = models.ForeignKey(CustomUser, on_delete=models.CASCADE) @@ -42,3 +26,24 @@ class Product(models.Model): def __str__(self): return self.name + + + +# CATEGORY_CHOICES = [ +# "Christmas", +# "Halloween", +# "College", +# "Easter", +# "Disco", +# "Afterski", +# "Whiteparty", +# "Bachelor", +# "Ice hockey", +# "Football", +# "Valentines Day", +# "Hawaii", +# "Vacation", +# "Kräftskiva", +# "Midsommar", +# "October fest" +# ] \ No newline at end of file diff --git a/mysite/themeApp/serializers.py b/mysite/themeApp/serializers.py index cbb7c93..996280a 100644 --- a/mysite/themeApp/serializers.py +++ b/mysite/themeApp/serializers.py @@ -1,8 +1,15 @@ # myapp/serializers.py from rest_framework import serializers from .models import Product +from .models import Category class ProductSerializer(serializers.ModelSerializer): class Meta: model = Product fields = '__all__' + + +class CategorySerializer(serializers.ModelSerializer): + class Meta: + model = Category + fields = '__all__' diff --git a/mysite/themeApp/urls.py b/mysite/themeApp/urls.py index 58fa4e9..ca00546 100644 --- a/mysite/themeApp/urls.py +++ b/mysite/themeApp/urls.py @@ -2,9 +2,11 @@ from django.urls import path, include from rest_framework.routers import DefaultRouter from .views import ProductViewSet +from .views import CategoryViewSet router = DefaultRouter() router.register(r'products', ProductViewSet) +router.register(r'categories', CategoryViewSet) urlpatterns = [ path('', include(router.urls)), diff --git a/mysite/themeApp/views.py b/mysite/themeApp/views.py index ca45641..ac8bd6c 100644 --- a/mysite/themeApp/views.py +++ b/mysite/themeApp/views.py @@ -2,9 +2,14 @@ from rest_framework import viewsets from .models import Product from .serializers import ProductSerializer +from .models import Category +from .serializers import CategorySerializer class ProductViewSet(viewsets.ModelViewSet): queryset = Product.objects.all() serializer_class = ProductSerializer +class CategoryViewSet(viewsets.ModelViewSet): + queryset = Category.objects.all() + serializer_class = CategorySerializer \ No newline at end of file -- GitLab