sandwitches 2.4.0__tar.gz → 2.5.0__tar.gz

{sandwitches-2.4.0 → sandwitches-2.5.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: sandwitches
-Version: 2.4.0
+Version: 2.5.0
 Summary: Add your description here
 Author: Martyn van Dijke
 Author-email: Martyn van Dijke <martijnvdijke600@gmail.com>

{sandwitches-2.4.0 → sandwitches-2.5.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "sandwitches"
-version = "2.4.0"
+version = "2.5.0"
 description = "Add your description here"
 readme = "README.md"
 authors = [

{sandwitches-2.4.0 → sandwitches-2.5.0}/src/sandwitches/admin.py

@@ -84,7 +84,15 @@ class RatingAdmin(ImportExportModelAdmin):
 @admin.register(Order)
 class OrderAdmin(ImportExportModelAdmin):
     resource_classes = [OrderResource]
-    list_display = ("id", "user", "recipe", "status", "total_price", "created_at")
-    list_filter = ("status", "created_at")
+    list_display = (
+        "id",
+        "user",
+        "recipe",
+        "status",
+        "completed",
+        "total_price",
+        "created_at",
+    )
+    list_filter = ("status", "completed", "created_at")
     search_fields = ("user__username", "recipe__title")
     readonly_fields = ("total_price", "created_at", "updated_at")

{sandwitches-2.4.0 → sandwitches-2.5.0}/src/sandwitches/forms.py

@@ -1,5 +1,4 @@
 from django import forms
-from django.conf import settings
 from django.contrib.auth import get_user_model
 from django.contrib.auth.forms import UserCreationForm
 from django.utils.translation import gettext_lazy as _
@@ -47,11 +46,6 @@ class AdminSetupForm(forms.ModelForm, BaseUserFormMixin):
 
 
 class UserSignupForm(UserCreationForm, BaseUserFormMixin):
-    language = forms.ChoiceField(
-        choices=settings.LANGUAGES,
-        label=_("Preferred language"),
-        initial=settings.LANGUAGE_CODE,
-    )
     avatar = forms.ImageField(label=_("Profile Image"), required=False)
     bio = forms.CharField(
         widget=forms.Textarea(attrs={"rows": 3}), label=_("Bio"), required=False
@@ -64,7 +58,6 @@ class UserSignupForm(UserCreationForm, BaseUserFormMixin):
             "first_name",
             "last_name",
             "email",
-            "language",
             "avatar",
             "bio",
         )
@@ -77,7 +70,6 @@ class UserSignupForm(UserCreationForm, BaseUserFormMixin):
         user.is_superuser = False
         user.is_staff = False
         # Explicitly save the extra fields if they aren't automatically handled by ModelForm save (they should be if in Meta.fields)
-        user.language = self.cleaned_data["language"]
         user.avatar = self.cleaned_data["avatar"]
         user.bio = self.cleaned_data["bio"]
         if commit:
@@ -86,6 +78,8 @@ class UserSignupForm(UserCreationForm, BaseUserFormMixin):
 
 
 class UserProfileForm(forms.ModelForm):
+    image_data = forms.CharField(widget=forms.HiddenInput(), required=False)
+
     class Meta:
         model = User
         fields = (
@@ -96,8 +90,35 @@ class UserProfileForm(forms.ModelForm):
             "bio",
         )
 
+    def save(self, commit=True):
+        user = super().save(commit=False)
+        image_data = self.cleaned_data.get("image_data")
+        if image_data and image_data.startswith("data:image"):
+            import base64
+            from django.core.files.base import ContentFile
+
+            format, imgstr = image_data.split(";base64,")
+            ext = format.split("/")[-1]
+            data = ContentFile(base64.b64decode(imgstr), name=f"avatar.{ext}")
+            user.avatar = data
+        if commit:
+            user.save()
+        return user
+
+
+class UserSettingsForm(forms.ModelForm):
+    class Meta:
+        model = User
+        fields = ("language", "theme")
+        labels = {
+            "language": _("Preferred Language"),
+            "theme": _("Preferred Theme"),
+        }
+
 
 class UserEditForm(forms.ModelForm):
+    image_data = forms.CharField(widget=forms.HiddenInput(), required=False)
+
     class Meta:
         model = User
         fields = (
@@ -112,6 +133,21 @@ class UserEditForm(forms.ModelForm):
             "bio",
         )
 
+    def save(self, commit=True):
+        user = super().save(commit=False)
+        image_data = self.cleaned_data.get("image_data")
+        if image_data and image_data.startswith("data:image"):
+            import base64
+            from django.core.files.base import ContentFile
+
+            format, imgstr = image_data.split(";base64,")
+            ext = format.split("/")[-1]
+            data = ContentFile(base64.b64decode(imgstr), name=f"avatar.{ext}")
+            user.avatar = data
+        if commit:
+            user.save()
+        return user
+
 
 class TagForm(forms.ModelForm):
     class Meta:
@@ -126,6 +162,7 @@ class RecipeForm(forms.ModelForm):
         widget=forms.TextInput(attrs={"placeholder": _("e.g. spicy, vegan, quick")}),
     )
     rotation = forms.IntegerField(widget=forms.HiddenInput(), initial=0, required=False)
+    image_data = forms.CharField(widget=forms.HiddenInput(), required=False)
 
     class Meta:
         model = Recipe
@@ -153,11 +190,22 @@ class RecipeForm(forms.ModelForm):
             )
 
     def save(self, commit=True):
-        recipe = super().save(commit=commit)
+        recipe = super().save(commit=False)
+
+        # Handle base64 image data from cropper
+        image_data = self.cleaned_data.get("image_data")
+        if image_data and image_data.startswith("data:image"):
+            import base64
+            from django.core.files.base import ContentFile
+
+            format, imgstr = image_data.split(";base64,")
+            ext = format.split("/")[-1]
+            data = ContentFile(base64.b64decode(imgstr), name=f"recipe_image.{ext}")
+            recipe.image = data
 
-        # Handle rotation if an image exists and rotation is requested
+        # Handle rotation if an image exists and rotation is requested (fallback for simple rotation)
         rotation = self.cleaned_data.get("rotation", 0)
-        if rotation != 0 and recipe.image:
+        if rotation != 0 and recipe.image and not image_data:
             try:
                 from PIL import Image as PILImage
 
@@ -169,9 +217,9 @@ class RecipeForm(forms.ModelForm):
                 print(f"Error rotating image: {e}")
 
         if commit:
+            recipe.save()
             recipe.set_tags_from_string(self.cleaned_data.get("tags_string", ""))
         else:
-            # We'll need to handle this in the view if commit=False
             self.save_m2m = lambda: recipe.set_tags_from_string(
                 self.cleaned_data.get("tags_string", "")
             )
@@ -184,6 +232,7 @@ class UserRecipeSubmissionForm(forms.ModelForm):
         label=_("Tags (comma separated)"),
         widget=forms.TextInput(attrs={"placeholder": _("e.g. spicy, vegan, quick")}),
     )
+    image_data = forms.CharField(widget=forms.HiddenInput(), required=False)
 
     class Meta:
         model = Recipe
@@ -201,8 +250,21 @@ class UserRecipeSubmissionForm(forms.ModelForm):
         }
 
     def save(self, commit=True):
-        recipe = super().save(commit=commit)
+        recipe = super().save(commit=False)
+
+        # Handle base64 image data from cropper
+        image_data = self.cleaned_data.get("image_data")
+        if image_data and image_data.startswith("data:image"):
+            import base64
+            from django.core.files.base import ContentFile
+
+            format, imgstr = image_data.split(";base64,")
+            ext = format.split("/")[-1]
+            data = ContentFile(base64.b64decode(imgstr), name=f"recipe_image.{ext}")
+            recipe.image = data
+
         if commit:
+            recipe.save()
             recipe.set_tags_from_string(self.cleaned_data.get("tags_string", ""))
         else:
             self.save_m2m = lambda: recipe.set_tags_from_string(
@@ -239,7 +301,10 @@ class SettingForm(forms.ModelForm):
             "ai_connection_point",
             "ai_model",
             "ai_api_key",
+            "gotify_url",
+            "gotify_token",
         ]
         widgets = {
             "ai_api_key": forms.PasswordInput(render_value=True),
+            "gotify_token": forms.PasswordInput(render_value=True),
         }

sandwitches-2.5.0/src/sandwitches/migrations/0015_order_completed_alter_order_status_and_more.py

@@ -0,0 +1,56 @@
+# Generated by Django 6.0.1 on 2026-01-27 08:33
+
+import django.core.validators
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("sandwitches", "0014_ensure_groups_exist"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="order",
+            name="completed",
+            field=models.BooleanField(default=False),
+        ),
+        migrations.AlterField(
+            model_name="order",
+            name="status",
+            field=models.CharField(
+                choices=[
+                    ("PENDING", "Pending"),
+                    ("PREPARING", "Preparing"),
+                    ("MADE", "Made"),
+                    ("SHIPPED", "Shipped"),
+                    ("COMPLETED", "Completed"),
+                    ("CANCELLED", "Cancelled"),
+                ],
+                default="PENDING",
+                max_length=20,
+            ),
+        ),
+        migrations.AlterField(
+            model_name="setting",
+            name="email",
+            field=models.EmailField(
+                blank=True,
+                max_length=254,
+                null=True,
+                validators=[django.core.validators.EmailValidator()],
+            ),
+        ),
+        migrations.AlterField(
+            model_name="user",
+            name="email",
+            field=models.EmailField(
+                max_length=254, validators=[django.core.validators.EmailValidator()]
+            ),
+        ),
+        migrations.AlterField(
+            model_name="user",
+            name="username",
+            field=models.CharField(max_length=150, unique=True),
+        ),
+    ]

sandwitches-2.5.0/src/sandwitches/migrations/0016_user_theme.py

@@ -0,0 +1,21 @@
+# Generated by Django 6.0.1 on 2026-01-28 09:08
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("sandwitches", "0015_order_completed_alter_order_status_and_more"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="user",
+            name="theme",
+            field=models.CharField(
+                choices=[("light", "Light"), ("dark", "Dark")],
+                default="light",
+                max_length=10,
+            ),
+        ),
+    ]

sandwitches-2.5.0/src/sandwitches/migrations/0017_setting_gotify_token_setting_gotify_url.py

@@ -0,0 +1,31 @@
+# Generated by Django 6.0.1 on 2026-01-28 12:45
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("sandwitches", "0016_user_theme"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="setting",
+            name="gotify_token",
+            field=models.CharField(
+                blank=True,
+                help_text="The application token for Gotify",
+                max_length=255,
+                null=True,
+            ),
+        ),
+        migrations.AddField(
+            model_name="setting",
+            name="gotify_url",
+            field=models.URLField(
+                blank=True,
+                help_text="The URL of your Gotify server (e.g., https://gotify.example.com)",
+                null=True,
+            ),
+        ),
+    ]

{sandwitches-2.4.0 → sandwitches-2.5.0}/src/sandwitches/models.py

@@ -4,13 +4,14 @@ from .storage import HashedFilenameStorage
 from simple_history.models import HistoricalRecords
 from django.contrib.auth.models import AbstractUser
 from django.db.models import Avg
-from .tasks import email_users, notify_order_submitted
+from .tasks import email_users, notify_order_submitted, send_gotify_notification
 from django.conf import settings
 from django.core.validators import MinValueValidator, MaxValueValidator
 import logging
 from django.urls import reverse
 from solo.models import SingletonModel
 from django.core.exceptions import ValidationError
+from django.core.validators import EmailValidator
 
 from imagekit.models import ImageSpecField
 from imagekit.processors import ResizeToFill
@@ -21,11 +22,23 @@ hashed_storage = HashedFilenameStorage()
 class Setting(SingletonModel):
     site_name = models.CharField(max_length=255, default="Sandwitches")
     site_description = models.TextField(blank=True, null=True)
-    email = models.EmailField(blank=True, null=True)
+    email = models.EmailField(blank=True, null=True, validators=[EmailValidator()])
     ai_connection_point = models.URLField(blank=True, null=True)
     ai_model = models.CharField(max_length=255, blank=True, null=True)
     ai_api_key = models.CharField(max_length=255, blank=True, null=True)
 
+    gotify_url = models.URLField(
+        blank=True,
+        null=True,
+        help_text="The URL of your Gotify server (e.g., https://gotify.example.com)",
+    )
+    gotify_token = models.CharField(
+        max_length=255,
+        blank=True,
+        null=True,
+        help_text="The application token for Gotify",
+    )
+
     def __str__(self):
         return "Site Settings"
 
@@ -34,6 +47,8 @@ class Setting(SingletonModel):
 
 
 class User(AbstractUser):
+    username = models.CharField(max_length=150, unique=True)
+    email = models.EmailField(validators=[EmailValidator()])
     avatar = models.ImageField(upload_to="avatars", blank=True, null=True)
     avatar_thumbnail = ImageSpecField(
         source="avatar",
@@ -47,6 +62,11 @@ class User(AbstractUser):
         choices=settings.LANGUAGES,
         default=settings.LANGUAGE_CODE,
     )
+    theme = models.CharField(
+        max_length=10,
+        choices=[("light", "Light"), ("dark", "Dark")],
+        default="light",
+    )
     favorites = models.ManyToManyField(
         "Recipe", related_name="favorited_by", blank=True
     )
@@ -58,6 +78,16 @@ class User(AbstractUser):
     def __str__(self):
         return self.username
 
+    def save(self, *args, **kwargs):
+        is_new = self.pk is None
+        super().save(*args, **kwargs)
+        if is_new:
+            send_gotify_notification.enqueue(
+                title="New User Created",
+                message=f"User {self.username} has joined Sandwitches!",
+                priority=4,
+            )
+
 
 class Tag(models.Model):
     name = models.CharField(max_length=50, unique=True)
@@ -170,6 +200,12 @@ class Recipe(models.Model):
                 logging.warning(
                     "Email sending is disabled; not sending email notification, make sure SEND_EMAIL is set to True in settings."
                 )
+
+            send_gotify_notification.enqueue(
+                title="New Recipe Uploaded",
+                message=f"A new recipe '{self.title}' has been uploaded by {self.uploaded_by or 'Unknown'}.",
+                priority=5,
+            )
         else:
             logging.debug(
                 "Existing recipe saved (update); skipping email notification."
@@ -230,6 +266,9 @@ class Rating(models.Model):
 class Order(models.Model):
     STATUS_CHOICES = (
         ("PENDING", "Pending"),
+        ("PREPARING", "Preparing"),
+        ("MADE", "Made"),
+        ("SHIPPED", "Shipped"),
         ("COMPLETED", "Completed"),
         ("CANCELLED", "Cancelled"),
     )
@@ -239,6 +278,7 @@ class Order(models.Model):
     )
     recipe = models.ForeignKey(Recipe, related_name="orders", on_delete=models.CASCADE)
     status = models.CharField(max_length=20, choices=STATUS_CHOICES, default="PENDING")
+    completed = models.BooleanField(default=False)
     total_price = models.DecimalField(max_digits=6, decimal_places=2)
     created_at = models.DateTimeField(auto_now_add=True)
     updated_at = models.DateTimeField(auto_now=True)
@@ -275,6 +315,11 @@ class Order(models.Model):
 
         if is_new:
             notify_order_submitted.enqueue(order_id=self.pk)
+            send_gotify_notification.enqueue(
+                title="New Order Received",
+                message=f"Order #{self.pk} for '{self.recipe.title}' by {self.user.username}. Total: {self.total_price}€",
+                priority=6,
+            )
 
     def __str__(self):
         return f"Order #{self.pk} - {self.user} - {self.recipe}"

{sandwitches-2.4.0 → sandwitches-2.5.0}/src/sandwitches/tasks.py

@@ -1,5 +1,5 @@
-# from gunicorn.http.wsgi import log
 import logging
+import requests
 
 # from django.core.mail import send_mail
 from django_tasks import task
@@ -109,6 +109,36 @@ def notify_order_submitted(order_id):
     logging.info(f"Order confirmation email sent to {user.email} for order {order.id}")
 
 
+@task(priority=1, queue_name="emails")
+def send_gotify_notification(title, message, priority=5):
+    from .models import Setting
+
+    config = Setting.get_solo()
+    url = config.gotify_url
+    token = config.gotify_token
+
+    if not url or not token:
+        logging.debug("Gotify URL or Token not configured. Skipping notification.")
+        return False
+
+    try:
+        response = requests.post(
+            f"{url.rstrip('/')}/message?token={token}",
+            json={
+                "title": title,
+                "message": message,
+                "priority": priority,
+            },
+            timeout=10,
+        )
+        response.raise_for_status()
+        logging.info(f"Gotify notification sent: {title}")
+        return True
+    except Exception as e:
+        logging.error(f"Failed to send Gotify notification: {e}")
+        return False
+
+
 def send_emails(recipe_id, emails):
     from .models import Recipe
 

{sandwitches-2.4.0 → sandwitches-2.5.0}/src/sandwitches/templates/admin/admin_base.html

@@ -30,9 +30,6 @@
     <h6 class="max">{% block admin_title %}{% trans "Sandwitches Admin" %}{% endblock %}</h6>
   </a>
   <div class="max"></div>
-  <button class="circle transparent" onclick="toggleMode()">
-    <i>dark_mode</i>
-  </button>
 
   {% if user.avatar %}
   <img src="{{ user.avatar.url }}" class="circle" data-ui="#user-menu">

{sandwitches-2.4.0 → sandwitches-2.5.0}/src/sandwitches/templates/admin/partials/order_rows.html

@@ -15,7 +15,7 @@
     <td>{{ order.recipe.title }}</td>
     <td>{{ order.total_price }} €</td>
     <td>
-        <span class="chip {% if order.status == 'PENDING' %}surface-variant{% elif order.status == 'COMPLETED' %}primary{% else %}error{% endif %}">
+        <span class="chip {% if order.status == 'PENDING' %}surface-variant{% elif order.status == 'COMPLETED' %}primary{% elif order.status == 'CANCELLED' %}error{% else %}secondary{% endif %}">
             {{ order.get_status_display }}
         </span>
     </td>