diff --git a/mysite/db.sqlite3 b/mysite/db.sqlite3 index 8ec908c4e378dfe884c1eb99c603a9cbf7f79871..cd2163af5b3e9685dd850d759667b37e861870a6 100644 Binary files a/mysite/db.sqlite3 and b/mysite/db.sqlite3 differ diff --git a/mysite/themeApp/__pycache__/admin.cpython-312.pyc b/mysite/themeApp/__pycache__/admin.cpython-312.pyc index fbe8f2a237fc31df8b92baccb87644133134def4..24e0b0ca3bc9f606e42073a9f8d4ba625d2c5680 100644 Binary files a/mysite/themeApp/__pycache__/admin.cpython-312.pyc and b/mysite/themeApp/__pycache__/admin.cpython-312.pyc differ diff --git a/mysite/themeApp/__pycache__/models.cpython-312.pyc b/mysite/themeApp/__pycache__/models.cpython-312.pyc index 30e10bfa67b590781680a51d7dccd63fc300c662..1c7ce104d6b8ed5b78cce422c597469e4889f79d 100644 Binary files a/mysite/themeApp/__pycache__/models.cpython-312.pyc and b/mysite/themeApp/__pycache__/models.cpython-312.pyc differ diff --git a/mysite/themeApp/__pycache__/serializers.cpython-312.pyc b/mysite/themeApp/__pycache__/serializers.cpython-312.pyc index 382e09ac021b03532c5108db1fbe434b588aa307..f4e8f148cc1b5a2791f03cc9b58fe9eac7c8b21d 100644 Binary files a/mysite/themeApp/__pycache__/serializers.cpython-312.pyc and b/mysite/themeApp/__pycache__/serializers.cpython-312.pyc differ diff --git a/mysite/themeApp/__pycache__/urls.cpython-312.pyc b/mysite/themeApp/__pycache__/urls.cpython-312.pyc index 8079493aad844ed284f4dc18ec37339e5b3dd5af..a147b499c8ddbb421fa5337143e52f69da02395d 100644 Binary files a/mysite/themeApp/__pycache__/urls.cpython-312.pyc and b/mysite/themeApp/__pycache__/urls.cpython-312.pyc differ diff --git a/mysite/themeApp/__pycache__/views.cpython-312.pyc b/mysite/themeApp/__pycache__/views.cpython-312.pyc index 37ae501e3bd67f39f097208fa619116022f7cd79..027e574acaa2ddcbf605fd201bc06c0c08ef1c63 100644 Binary files a/mysite/themeApp/__pycache__/views.cpython-312.pyc and b/mysite/themeApp/__pycache__/views.cpython-312.pyc differ diff --git a/mysite/themeApp/admin.py b/mysite/themeApp/admin.py index 4423e5b9b77e4702b6826aad3786ebd08aa1fbc0..d84273c03b8ff25ff53205062dc6565cfeba383c 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 6858f6af1626f97ddce7e231ac5b2b66bf3d5e94..c311d29f7a27c4a6d00e8b03a67c3b67cc442f47 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 cbb7c93f290837be63b075e725c0d253fae97457..996280aac38ea8bfea8c27cbfe544ab303a863d2 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 58fa4e91468095fd5d0923ff22604d47c0bdcf8b..ca00546e61d3bf1cce635c2d38ce14a3e3b8230a 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 ca456411cffbc4b24297586677875c660f493387..ac8bd6c28975b78a5097879f515e237ebb28569f 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