sandwitches 2.4.1__tar.gz → 2.5.0__tar.gz

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

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

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

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

{sandwitches-2.4.1 → 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:
@@ -114,6 +106,16 @@ class UserProfileForm(forms.ModelForm):
         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)
 
@@ -299,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/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.1 → sandwitches-2.5.0}/src/sandwitches/models.py

@@ -4,7 +4,7 @@ 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
@@ -27,6 +27,18 @@ class Setting(SingletonModel):
     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"
 
@@ -50,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
     )
@@ -61,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)
@@ -173,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."
@@ -282,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.1 → 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.1 → 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.1 → sandwitches-2.5.0}/src/sandwitches/templates/base.html

@@ -47,7 +47,7 @@
     </style>
     {% block extra_head %}{% endblock %}
   </head>
-  <body class="{% block body_class %}{% endblock %}">
+  <body class="{% block body_class %}{% endblock %} {% if user.is_authenticated %}{{ user.theme }}{% endif %}">
     <div id="loading-sandwich" class="loading-sandwich-container">
         <svg class="loading-sandwich-svg" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
             <path d="M2 12s3-7 10-7 10 7 10 7-3 7-10 7-10-7-10-7Z" />

{sandwitches-2.4.1 → sandwitches-2.5.0}/src/sandwitches/templates/base_beer.html

@@ -12,7 +12,6 @@
 
 {% block navbar %}
     {% include "components/navbar.html" %}
-    {% include "components/language_dialog.html" %}
     {% include "components/user_menu.html" %}
     {% include "components/side_menu.html" %}
 {% endblock %}

{sandwitches-2.4.1 → sandwitches-2.5.0}/src/sandwitches/templates/components/navbar.html

@@ -7,12 +7,6 @@
     <img src="{% static 'icons/icon.svg' %}" class="circle small">
   </a>
   <div class="max"></div>
-  <button class="circle transparent" onclick="ui('mode', ui('mode') == 'dark' ? 'light' : 'dark')">
-    <i>dark_mode</i>
-  </button>
-  <button class="circle transparent" data-ui="#language-menu">
-      <i>language</i>
-  </button>
 
   {% if user.is_authenticated %}
     <a href="{% url 'view_cart' %}" class="button circle transparent">

{sandwitches-2.4.1 → sandwitches-2.5.0}/src/sandwitches/templates/components/side_menu.html

@@ -19,6 +19,10 @@
             <i class="extra padding">group</i>
             <span class="large-text">{% trans "Community" %}</span>
         </a>
+        <a href="{% url 'user_settings' %}" class="padding {% if request.resolver_match.url_name == 'user_settings' %}active{% endif %}">
+            <i class="extra padding">settings</i>
+            <span class="large-text">{% trans "Settings" %}</span>
+        </a>
         {% endif %}
         <a href="/api/docs" class="padding">
             <i class="extra padding">api</i>

{sandwitches-2.4.1 → sandwitches-2.5.0}/src/sandwitches/templates/components/user_menu.html

@@ -1,6 +1,7 @@
 {% load i18n %}
 {% if user.is_authenticated %}
 <menu id="user-menu" class="no-wrap left">
+  <a href="{% url 'user_settings' %}" class="row"><i>settings</i>{% trans "Settings" %}</a>
   {% if user.is_staff %}
   <a href="{% url 'admin_dashboard' %}" class="row"><i>admin_panel_settings</i>{% trans "Admin" %}</a>
   <div class="divider"></div>

{sandwitches-2.4.1 → sandwitches-2.5.0}/src/sandwitches/templates/profile.html

@@ -84,6 +84,7 @@
         <div class="large-space"></div>
 
         <nav class="right-align">
+            <a class="button transparent border round" href="{% url 'user_settings' %}"><i>settings</i> {% trans "Settings" %}</a>
             <a class="button transparent border round" href="{% url 'index' %}">{% trans "Cancel" %}</a>
             <button type="submit" class="button primary round">{% trans "Save changes" %}</button>
         </nav>

sandwitches-2.5.0/src/sandwitches/templates/settings.html

@@ -0,0 +1,53 @@
+{% extends "base_beer.html" %}
+{% load static i18n %}
+{% block title %}{% trans "Settings" %}{% endblock %}
+
+{% block content %}
+<div class="large-space"></div>
+
+<div class="grid">
+  <div class="s12 m8 l6 xl4 middle-align center-align" style="margin: 0 auto;">
+    <article class="round elevate">
+      <div class="padding">
+          <h4 class="center-align primary-text">{% trans "User Settings" %}</h4>
+      </div>
+
+      <form method="post" novalidate>
+        {% csrf_token %}
+
+        <div class="field label border round {% if form.language.errors %}error{% endif %}">
+            <select name="{{ form.language.name }}" id="{{ form.language.id_for_label }}">
+                {% for value, label in form.language.field.choices %}
+                <option value="{{ value }}" {% if form.language.value == value %}selected{% endif %}>{{ label }}</option>
+                {% endfor %}
+            </select>
+            <label>{% trans "Preferred Language" %}</label>
+            {% if form.language.errors %}
+                <span class="helper error-text">{{ form.language.errors.0 }}</span>
+            {% endif %}
+        </div>
+
+        <div class="field label border round {% if form.theme.errors %}error{% endif %}">
+            <select name="{{ form.theme.name }}" id="{{ form.theme.id_for_label }}">
+                {% for value, label in form.theme.field.choices %}
+                <option value="{{ value }}" {% if form.theme.value == value %}selected{% endif %}>{{ label }}</option>
+                {% endfor %}
+            </select>
+            <label>{% trans "Preferred Theme" %}</label>
+            {% if form.theme.errors %}
+                <span class="helper error-text">{{ form.theme.errors.0 }}</span>
+            {% endif %}
+        </div>
+
+        <div class="large-space"></div>
+
+        <nav class="right-align">
+            <a class="button transparent border round" href="{% url 'index' %}">{% trans "Cancel" %}</a>
+            <button type="submit" class="button primary round">{% trans "Save changes" %}</button>
+        </nav>
+
+      </form>
+    </article>
+  </div>
+</div>
+{% endblock %}

{sandwitches-2.4.1 → sandwitches-2.5.0}/src/sandwitches/templates/signup.html

@@ -64,18 +64,6 @@
             {% endif %}
         </div>
 
-        <div class="field label border round {% if form.language.errors %}error{% endif %}">
-            <select name="{{ form.language.name }}" id="{{ form.language.id_for_label }}">
-                {% for value, label in form.language.field.choices %}
-                    <option value="{{ value }}" {% if form.language.value == value %}selected{% endif %}>{{ label }}</option>
-                {% endfor %}
-            </select>
-            <label>{% trans "Preferred Language" %}</label>
-            {% if form.language.errors %}
-                 <span class="helper error-text">{{ form.language.errors.0 }}</span>
-            {% endif %}
-        </div>
-
         <div class="field label border round textarea {% if form.bio.errors %}error{% endif %}">
             <textarea name="{{ form.bio.name }}" id="{{ form.bio.id_for_label }}" rows="3">{{ form.bio.value|default:'' }}</textarea>
             <label>{% trans "Bio" %}</label>

{sandwitches-2.4.1 → sandwitches-2.5.0}/src/sandwitches/urls.py

@@ -34,6 +34,7 @@ urlpatterns = [
     path("login/", views.CustomLoginView.as_view(), name="login"),
     path("logout/", LogoutView.as_view(next_page="index"), name="logout"),
     path("profile/", views.user_profile, name="user_profile"),
+    path("settings/", views.user_settings, name="user_settings"),
     path("orders/<int:pk>/", views.user_order_detail, name="user_order_detail"),
     path("community/", views.community, name="community"),
     path("admin/", admin.site.urls),

{sandwitches-2.4.1 → sandwitches-2.5.0}/src/sandwitches/views.py

@@ -8,6 +8,7 @@ from django.contrib.auth import get_user_model
 from django.contrib.auth.decorators import login_required
 from django.contrib.admin.views.decorators import staff_member_required
 from django.utils.translation import gettext as _
+from django.utils import translation
 from .models import Recipe, Rating, Tag, Order, CartItem
 from .forms import (
     RecipeForm,
@@ -18,6 +19,7 @@ from .forms import (
     TagForm,
     UserProfileForm,
     UserRecipeSubmissionForm,
+    UserSettingsForm,
 )
 from django.http import HttpResponseBadRequest, Http404
 from django.conf import settings
@@ -898,6 +900,32 @@ def user_profile(request):
     )
 
 
+@login_required
+def user_settings(request):
+    if request.method == "POST":
+        form = UserSettingsForm(request.POST, instance=request.user)
+        if form.is_valid():
+            user = form.save()
+            # Update language in session and cookie
+            translation.activate(user.language)
+            request.session[translation.LANGUAGE_SESSION_KEY] = user.language  # ty:ignore[unresolved-attribute]
+            messages.success(request, _("Settings updated successfully."))
+            response = redirect("user_settings")
+            response.set_cookie(settings.LANGUAGE_COOKIE_NAME, user.language)
+            return response
+    else:
+        form = UserSettingsForm(instance=request.user)
+
+    return render(
+        request,
+        "settings.html",
+        {
+            "form": form,
+            "version": sandwitches_version,
+        },
+    )
+
+
 @login_required
 def user_order_detail(request, pk):
     order = get_object_or_404(Order, pk=pk, user=request.user)

sandwitches-2.4.1/src/sandwitches/templates/components/language_dialog.html

@@ -1,26 +0,0 @@
-{% load i18n %}
-<dialog id="language-menu">
-    <form method="post" action="{% url 'set_language' %}">
-        {% csrf_token %}
-        <h5 class="center-align">{% trans "Select Language" %}</h5>
-        <div class="grid center-align">
-            {% get_current_language as LANGUAGE_CODE %}
-            {% get_available_languages as LANGUAGES %}
-            {% for code, name in LANGUAGES %}
-            <div class="s6">
-                <button type="submit" name="language" value="{{ code }}" class="circle large {% if code == LANGUAGE_CODE %}primary{% else %}surface{% endif %}">
-                    <span style="font-size: 2rem;">
-                        {% if code == 'en' %}🇬🇧{% elif code == 'nl' %}🇳🇱{% else %}🌐{% endif %}
-                    </span>
-                </button>
-                <div class="small-text">{{ name }}</div>
-            </div>
-            {% endfor %}
-        </div>
-        <input type="hidden" name="next" value="{{ request.get_full_path }}" />
-    </form>
-    <div class="space"></div>
-    <nav class="center-align">
-        <button class="transparent link" data-ui="#language-menu">{% trans "Close" %}</button>
-    </nav>
-</dialog>