sandwitches 1.1.0__py3-none-any.whl → 1.3.0__py3-none-any.whl

sandwitches/admin.py

@@ -1,6 +1,26 @@
 from django.contrib import admin
-from .models import Recipe, Tag
+from .models import Recipe, Tag, Rating, Profile
+from django.utils.html import format_html
+
+
+@admin.register(Recipe)
+class RecipeAdmin(admin.ModelAdmin):
+    list_display = ("title", "uploaded_by", "created_at", "show_url")
+    readonly_fields = ("created_at", "updated_at")
+
+    def save_model(self, request, obj, form, change):
+        # set uploaded_by automatically when creating in admin
+        if not change and not obj.uploaded_by:
+            obj.uploaded_by = request.user
+        super().save_model(request, obj, form, change)
+
+    def show_url(self, obj):
+        url = obj.get_absolute_url()
+        return format_html("<a href='{url}'>{url}</a>", url=url)
+
+    show_url.short_description = "Recipe Link"  # ty:ignore[unresolved-attribute]
 
 
-admin.site.register(Recipe)
 admin.site.register(Tag)
+admin.site.register(Rating)
+admin.site.register(Profile)

sandwitches/api.py

@@ -1,5 +1,5 @@
 from ninja import NinjaAPI
-from .models import Recipe
+from .models import Recipe, Tag
 
 from ninja import ModelSchema
 from ninja import Schema
@@ -8,8 +8,11 @@ from django.shortcuts import get_object_or_404
 from datetime import date
 import random
 
+from ninja.security import django_auth
 
-api = NinjaAPI()
+from __init__ import __version__
+
+api = NinjaAPI(version=__version__)
 
 
 class RecipeSchema(ModelSchema):
@@ -18,6 +21,12 @@ class RecipeSchema(ModelSchema):
         fields = "__all__"
 
 
+class TagSchema(ModelSchema):
+    class Meta:
+        model = Tag
+        fields = "__all__"
+
+
 class UserSchema(ModelSchema):
     class Meta:
         model = User
@@ -28,6 +37,16 @@ class Error(Schema):
     message: str
 
 
+class RatingResponseSchema(Schema):
+    average: float
+    count: int
+
+
+@api.get("ping")
+def ping(request):
+    return {"status": "ok", "message": "pong"}
+
+
 @api.get("v1/me", response={200: UserSchema, 403: Error})
 def me(request):
     if not request.user.is_authenticated:
@@ -35,17 +54,14 @@ def me(request):
     return request.user
 
 
-# TODO: enable recipe creation via API
-# @api.post("v1/recipe", auth=django_auth, response=RecipeSchema)
-# def create_recipe(request, payload: RecipeSchema):
-#     recipe = Recipe.objects.create(**payload.dict())
-#     return recipe
+@api.get("v1/users", auth=django_auth, response=list[UserSchema])
+def users(request):
+    return User.objects.all()
 
 
 @api.get("v1/recipes", response=list[RecipeSchema])
 def get_recipes(request):
-    recipes = Recipe.objects.all()
-    return recipes
+    return Recipe.objects.all()  # ty:ignore[unresolved-attribute]
 
 
 @api.get("v1/recipes/{recipe_id}", response=RecipeSchema)
@@ -56,10 +72,30 @@ def get_recipe(request, recipe_id: int):
 
 @api.get("v1/recipe-of-the-day", response=RecipeSchema)
 def get_recipe_of_the_day(request):
-    recipes = list(Recipe.objects.all())
+    recipes = list(Recipe.objects.all())  # ty:ignore[unresolved-attribute]
     if not recipes:
         return None
     today = date.today()
     random.seed(today.toordinal())
     recipe = random.choice(recipes)
     return recipe
+
+
+@api.get("v1/recipes/{recipe_id}/rating", response=RatingResponseSchema)
+def get_recipe_rating(request, recipe_id: int):
+    recipe = get_object_or_404(Recipe, id=recipe_id)
+    return {
+        "average": recipe.average_rating(),
+        "count": recipe.rating_count(),
+    }
+
+
+@api.get("v1/tags", response=list[TagSchema])
+def get_tags(request):
+    return Tag.objects.all()  # ty:ignore[unresolved-attribute]
+
+
+@api.get("v1/tags/{tag_id}", response=TagSchema)
+def get_tag(request, tag_id: int):
+    tag = get_object_or_404(Tag, id=tag_id)
+    return tag

sandwitches/forms.py

@@ -80,10 +80,13 @@ class RecipeForm(forms.ModelForm):
 
 
 class RatingForm(forms.Form):
-    """Simple form for rating recipes (1-5)."""
-
-    score = forms.ChoiceField(
-        choices=[(str(i), str(i)) for i in range(1, 6)],
-        widget=forms.RadioSelect,
+    """Form for rating recipes (0-10)."""
+
+    score = forms.FloatField(
+        min_value=0.0,
+        max_value=10.0,
+        widget=forms.NumberInput(
+            attrs={"step": "0.1", "min": "0", "max": "10", "class": "slider"}
+        ),
         label="Your rating",
     )

sandwitches/locale/nl/LC_MESSAGES/django.po

@@ -0,0 +1,139 @@
+# Dutch translations for Sandwitches project
+msgid ""
+msgstr ""
+"Project-Id-Version: sandwitches 1.0\n"
+"POT-Creation-Date: 2025-01-01 00:00+0000\n"
+"PO-Revision-Date: 2025-01-01 00:00+0000\n"
+"Language: nl\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+msgid "Sign up"
+msgstr "Aanmelden"
+
+msgid "Sign Up"
+msgstr "Aanmelden"
+
+msgid "Cancel"
+msgstr "Annuleren"
+
+msgid "Username"
+msgstr "Gebruikersnaam"
+
+msgid "Email (optional)"
+msgstr "E-mail (optioneel)"
+
+msgid "First name"
+msgstr "Voornaam"
+
+msgid "Last name"
+msgstr "Achternaam"
+
+msgid "Password"
+msgstr "Wachtwoord"
+
+msgid "Confirm password"
+msgstr "Bevestig wachtwoord"
+
+msgid "Back to all"
+msgstr "Terug naar alles"
+
+msgid "Description"
+msgstr "Beschrijving"
+
+msgid "Ingredients"
+msgstr "Ingrediënten"
+
+msgid "Instructions"
+msgstr "Instructies"
+
+msgid "No description yet."
+msgstr "Nog geen beschrijving."
+
+msgid "No ingredients listed."
+msgstr "Geen ingrediënten vermeld."
+
+msgid "No instructions yet."
+msgstr "Nog geen instructies."
+
+msgid "Rating"
+msgstr "Beoordeling"
+
+msgid "Average:"
+msgstr "Gemiddelde:"
+
+msgid "No ratings yet."
+msgstr "Nog geen beoordelingen."
+
+msgid "Your rating:" 
+msgstr "Jouw beoordeling:"
+
+msgid "What would you rate this sandwich?"
+msgstr "Wat zou je dit broodje geven?"
+
+msgid "Update"
+msgstr "Bijwerken"
+
+msgid "Rate"
+msgstr "Beoordeel"
+
+msgid "Login"
+msgstr "Inloggen"
+
+msgid "to rate this recipe."
+msgstr "om dit recept te beoordelen."
+
+msgid "Docs"
+msgstr "Docs"
+
+msgid "Admin"
+msgstr "Beheer"
+
+msgid "Logout"
+msgstr "Uitloggen"
+
+msgid "Initial setup — Create admin"
+msgstr "Eerste installatie — Beheerder aanmaken"
+
+msgid "Create initial administrator"
+msgstr "Maak de eerste beheerder"
+
+msgid "This page is only available when there are no admin users in the database."
+msgstr "Deze pagina is alleen beschikbaar als er nog geen beheerders in de database zijn."
+
+msgid "After creating the account you will be logged in and redirected to the admin."
+msgstr "Na aanmaken wordt u ingelogd en doorgestuurd naar het beheerpaneel."
+
+msgid "Create admin"
+msgstr "Maak beheerder"
+
+msgid "Account created and signed in."
+msgstr "Account aangemaakt en ingelogd."
+
+msgid "Admin account created and signed in."
+msgstr "Beheerderaccount aangemaakt en ingelogd."
+
+msgid "Your rating has been saved."
+msgstr "Je beoordeling is opgeslagen."
+
+msgid "Could not save rating."
+msgstr "Kon de beoordeling niet opslaan."
+
+msgid "Uploaded by"
+msgstr "Geüpload door"
+
+msgid "Search by title or tag"
+msgstr "Zoek op titel of tag"
+
+msgid "Search"
+msgstr "Zoeken"
+
+msgid "No sandwitches yet, please stay tuned."
+msgstr "Nog geen broodjes, kom later terug."
+
+msgid "Edit"
+msgstr "Bewerk"
+
+msgid "Sandwitches: sandwiches so good, they haunt you!"
+msgstr "Sandwitches: broodjes zo lekker, dat ze je achtervolgen!"

sandwitches/migrations/0004_add_uploaded_by.py

@@ -0,0 +1,25 @@
+# Generated by ChatGPT — add uploaded_by to Recipe
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("sandwitches", "0003_rating"),
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="recipe",
+            name="uploaded_by",
+            field=models.ForeignKey(
+                blank=True,
+                null=True,
+                on_delete=django.db.models.deletion.SET_NULL,
+                related_name="recipes",
+                to=settings.AUTH_USER_MODEL,
+            ),
+        ),
+    ]

sandwitches/migrations/0005_historicalrecipe_uploaded_by.py

@@ -0,0 +1,27 @@
+# Generated by Django 6.0 on 2025-12-28 18:36
+
+import django.db.models.deletion
+from django.conf import settings
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("sandwitches", "0004_add_uploaded_by"),
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="historicalrecipe",
+            name="uploaded_by",
+            field=models.ForeignKey(
+                blank=True,
+                db_constraint=False,
+                null=True,
+                on_delete=django.db.models.deletion.DO_NOTHING,
+                related_name="+",
+                to=settings.AUTH_USER_MODEL,
+            ),
+        ),
+    ]

sandwitches/migrations/0006_profile.py

@@ -0,0 +1,48 @@
+# Generated by Django 6.0 on 2025-12-29 17:38
+
+import django.db.models.deletion
+from django.conf import settings
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("sandwitches", "0005_historicalrecipe_uploaded_by"),
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name="Profile",
+            fields=[
+                (
+                    "id",
+                    models.BigAutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                (
+                    "avatar",
+                    models.ImageField(blank=True, null=True, upload_to="avatars"),
+                ),
+                ("bio", models.TextField(blank=True)),
+                ("created_at", models.DateTimeField(auto_now_add=True)),
+                ("updated_at", models.DateTimeField(auto_now=True)),
+                (
+                    "user",
+                    models.OneToOneField(
+                        on_delete=django.db.models.deletion.CASCADE,
+                        related_name="profile",
+                        to=settings.AUTH_USER_MODEL,
+                    ),
+                ),
+            ],
+            options={
+                "verbose_name": "Profile",
+                "verbose_name_plural": "Profiles",
+            },
+        ),
+    ]

sandwitches/migrations/0007_alter_rating_score.py

@@ -0,0 +1,23 @@
+# Generated by Django 6.0 on 2025-12-29 17:58
+
+import django.core.validators
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("sandwitches", "0006_profile"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="rating",
+            name="score",
+            field=models.FloatField(
+                validators=[
+                    django.core.validators.MinValueValidator(0.0),
+                    django.core.validators.MaxValueValidator(10.0),
+                ]
+            ),
+        ),
+    ]

sandwitches/models.py

@@ -1,16 +1,44 @@
 from django.db import models
-from django.urls import reverse
 from django.utils.text import slugify
 from .storage import HashedFilenameStorage
 from simple_history.models import HistoricalRecords
 from django.contrib.auth import get_user_model
 from django.db.models import Avg
+from .tasks import email_users
+from django.conf import settings
+from django.core.validators import MinValueValidator, MaxValueValidator
+import logging
+from django.urls import reverse
+
+from imagekit.models import ImageSpecField
+from imagekit.processors import ResizeToFill
 
 hashed_storage = HashedFilenameStorage()
 
 User = get_user_model()
 
 
+class Profile(models.Model):
+    user = models.OneToOneField(User, on_delete=models.CASCADE, related_name="profile")
+    avatar = models.ImageField(upload_to="avatars", blank=True, null=True)
+    avatar_thumbnail = ImageSpecField(
+        source="avatar",
+        processors=[ResizeToFill(100, 50)],
+        format="JPEG",
+        options={"quality": 60},
+    )
+    bio = models.TextField(blank=True)
+    created_at = models.DateTimeField(auto_now_add=True)
+    updated_at = models.DateTimeField(auto_now=True)
+
+    class Meta:
+        verbose_name = "Profile"
+        verbose_name_plural = "Profiles"
+
+    def __str__(self):
+        return f"{self.user.username}'s Profile"  # ty:ignore[possibly-missing-attribute]
+
+
 class Tag(models.Model):
     name = models.CharField(max_length=50, unique=True)
     slug = models.SlugField(max_length=60, unique=True, blank=True)
@@ -25,7 +53,7 @@ class Tag(models.Model):
             base = slugify(self.name)[:55]
             slug = base
             n = 1
-            while Tag.objects.filter(slug=slug).exclude(pk=self.pk).exists():
+            while Tag.objects.filter(slug=slug).exclude(pk=self.pk).exists():  # ty:ignore[unresolved-attribute]
                 slug = f"{base}-{n}"
                 n += 1
             self.slug = slug
@@ -41,16 +69,44 @@ class Recipe(models.Model):
     description = models.TextField(blank=True)
     ingredients = models.TextField(blank=True)
     instructions = models.TextField(blank=True)
+    uploaded_by = models.ForeignKey(
+        User,
+        related_name="recipes",
+        on_delete=models.SET_NULL,
+        null=True,
+        blank=True,
+    )
     image = models.ImageField(
-        upload_to="recipes/",  # storage will replace with hashed path
+        upload_to="recipes/",
         storage=hashed_storage,
         blank=True,
         null=True,
     )
-
-    # ManyToMany: tags are reusable and shared between recipes
+    image_thumbnail = ImageSpecField(
+        source="image",
+        processors=[ResizeToFill(150, 150)],
+        format="JPEG",
+        options={"quality": 70},
+    )
+    image_small = ImageSpecField(
+        source="image",
+        processors=[ResizeToFill(400, 300)],
+        format="JPEG",
+        options={"quality": 75},
+    )
+    image_medium = ImageSpecField(
+        source="image",
+        processors=[ResizeToFill(700, 500)],
+        format="JPEG",
+        options={"quality": 85},
+    )
+    image_large = ImageSpecField(
+        source="image",
+        processors=[ResizeToFill(1200, 800)],
+        format="JPEG",
+        options={"quality": 95},
+    )
     tags = models.ManyToManyField(Tag, blank=True, related_name="recipes")
-
     created_at = models.DateTimeField(auto_now_add=True)
     updated_at = models.DateTimeField(auto_now=True)
     history = HistoricalRecords()
@@ -61,19 +117,39 @@ class Recipe(models.Model):
         verbose_name_plural = "Recipes"
 
     def save(self, *args, **kwargs):
+        is_new = self._state.adding
+
         if not self.slug:
             base = slugify(self.title)[:240]
             slug = base
             n = 1
-            while Recipe.objects.filter(slug=slug).exclude(pk=self.pk).exists():
+            while Recipe.objects.filter(slug=slug).exclude(pk=self.pk).exists():  # ty:ignore[unresolved-attribute]
                 slug = f"{base}-{n}"
                 n += 1
             self.slug = slug
+
         super().save(*args, **kwargs)
 
+        send_email = getattr(settings, "SEND_EMAIL")
+        logging.debug(f"SEND_EMAIL is set to {send_email}")
+
+        if is_new or settings.DEBUG:
+            if send_email:
+                email_users.enqueue(recipe_id=self.pk)
+            else:
+                logging.warning(
+                    "Email sending is disabled; not sending email notification, make sure SEND_EMAIL is set to True in settings."
+                )
+        else:
+            logging.debug(
+                "Existing recipe saved (update); skipping email notification."
+            )
+
+    def get_absolute_url(self):
+        return reverse("recipe_detail", kwargs={"slug": self.slug})
+
     def tag_list(self):
-        # returns list of tag names
-        return list(self.tags.values_list("name", flat=True))
+        return list(self.tags.values_list("name", flat=True))  # ty:ignore[possibly-missing-attribute]
 
     def set_tags_from_string(self, tag_string):
         """
@@ -83,24 +159,19 @@ class Recipe(models.Model):
         names = [t.strip() for t in (tag_string or "").split(",") if t.strip()]
         tags = []
         for name in names:
-            tag = Tag.objects.filter(name__iexact=name).first()
+            tag = Tag.objects.filter(name__iexact=name).first()  # ty:ignore[unresolved-attribute]
             if not tag:
-                tag = Tag.objects.create(name=name)
+                tag = Tag.objects.create(name=name)  # ty:ignore[unresolved-attribute]
             tags.append(tag)
-        # replace existing tags with these
-        self.tags.set(tags)
-        return self.tags.all()
+        self.tags.set(tags)  # ty:ignore[possibly-missing-attribute]
+        return self.tags.all()  # ty:ignore[possibly-missing-attribute]
 
-    # add helper methods for ratings
     def average_rating(self):
-        agg = self.ratings.aggregate(avg=Avg("score"))
+        agg = self.ratings.aggregate(avg=Avg("score"))  # ty:ignore[unresolved-attribute]
         return agg["avg"] or 0
 
     def rating_count(self):
-        return self.ratings.count()
-
-    def get_absolute_url(self):
-        return reverse("recipe_detail", kwargs={"pk": self.pk, "slug": self.slug})
+        return self.ratings.count()  # ty:ignore[unresolved-attribute]
 
     def __str__(self):
         return self.title
@@ -109,7 +180,9 @@ class Recipe(models.Model):
 class Rating(models.Model):
     recipe = models.ForeignKey(Recipe, related_name="ratings", on_delete=models.CASCADE)
     user = models.ForeignKey(User, related_name="ratings", on_delete=models.CASCADE)
-    score = models.PositiveSmallIntegerField(choices=[(i, i) for i in range(1, 6)])
+    score = models.FloatField(
+        validators=[MinValueValidator(0.0), MaxValueValidator(10.0)]
+    )
     created_at = models.DateTimeField(auto_now_add=True)
     updated_at = models.DateTimeField(auto_now=True)