sandwitches 2.2.0__tar.gz → 2.3.0__tar.gz

{sandwitches-2.2.0 → sandwitches-2.3.0}/PKG-INFO

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

{sandwitches-2.2.0 → sandwitches-2.3.0}/pyproject.toml

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

{sandwitches-2.2.0 → sandwitches-2.3.0}/src/sandwitches/admin.py

@@ -1,7 +1,7 @@
 from django.contrib import admin
 from django.contrib.auth import get_user_model
 from django.contrib.auth.admin import UserAdmin
-from .models import Recipe, Tag, Rating, Setting
+from .models import Recipe, Tag, Rating, Setting, Order
 from django.utils.html import format_html
 from import_export import resources
 from import_export.admin import ImportExportModelAdmin
@@ -24,6 +24,11 @@ class RatingResource(resources.ModelResource):
         model = Rating
 
 
+class OrderResource(resources.ModelResource):
+    class Meta:
+        model = Order
+
+
 User = get_user_model()
 
 
@@ -42,7 +47,14 @@ class CustomUserAdmin(UserAdmin):
 @admin.register(Recipe)
 class RecipeAdmin(ImportExportModelAdmin):
     resource_classes = [RecipeResource]
-    list_display = ("title", "uploaded_by", "created_at", "is_highlighted", "show_url")
+    list_display = (
+        "title",
+        "uploaded_by",
+        "price",
+        "created_at",
+        "is_highlighted",
+        "show_url",
+    )
     list_editable = ("is_highlighted",)
     readonly_fields = ("created_at", "updated_at")
 
@@ -67,3 +79,12 @@ class TagAdmin(ImportExportModelAdmin):
 @admin.register(Rating)
 class RatingAdmin(ImportExportModelAdmin):
     resource_classes = [RatingResource]
+
+
+@admin.register(Order)
+class OrderAdmin(ImportExportModelAdmin):
+    resource_classes = [OrderResource]
+    list_display = ("id", "user", "recipe", "status", "total_price", "created_at")
+    list_filter = ("status", "created_at")
+    search_fields = ("user__username", "recipe__title")
+    readonly_fields = ("total_price", "created_at", "updated_at")

{sandwitches-2.2.0 → sandwitches-2.3.0}/src/sandwitches/forms.py

@@ -85,6 +85,18 @@ class UserSignupForm(UserCreationForm, BaseUserFormMixin):
         return user
 
 
+class UserProfileForm(forms.ModelForm):
+    class Meta:
+        model = User
+        fields = (
+            "first_name",
+            "last_name",
+            "email",
+            "avatar",
+            "bio",
+        )
+
+
 class UserEditForm(forms.ModelForm):
     class Meta:
         model = User
@@ -124,6 +136,7 @@ class RecipeForm(forms.ModelForm):
             "description",
             "ingredients",
             "instructions",
+            "price",
         ]
         widgets = {
             "image": forms.FileInput(),

sandwitches-2.3.0/src/sandwitches/migrations/0007_historicalrecipe_price_recipe_price_order.py

@@ -0,0 +1,86 @@
+# Generated by Django 6.0.1 on 2026-01-20 10:49
+
+import django.db.models.deletion
+from django.conf import settings
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("sandwitches", "0006_historicalrecipe_is_highlighted_and_more"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="historicalrecipe",
+            name="price",
+            field=models.DecimalField(
+                blank=True,
+                decimal_places=2,
+                max_digits=6,
+                null=True,
+                verbose_name="Price (€)",
+            ),
+        ),
+        migrations.AddField(
+            model_name="recipe",
+            name="price",
+            field=models.DecimalField(
+                blank=True,
+                decimal_places=2,
+                max_digits=6,
+                null=True,
+                verbose_name="Price (€)",
+            ),
+        ),
+        migrations.CreateModel(
+            name="Order",
+            fields=[
+                (
+                    "id",
+                    models.BigAutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                (
+                    "status",
+                    models.CharField(
+                        choices=[
+                            ("PENDING", "Pending"),
+                            ("COMPLETED", "Completed"),
+                            ("CANCELLED", "Cancelled"),
+                        ],
+                        default="PENDING",
+                        max_length=20,
+                    ),
+                ),
+                ("total_price", models.DecimalField(decimal_places=2, max_digits=6)),
+                ("created_at", models.DateTimeField(auto_now_add=True)),
+                ("updated_at", models.DateTimeField(auto_now=True)),
+                (
+                    "recipe",
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE,
+                        related_name="orders",
+                        to="sandwitches.recipe",
+                    ),
+                ),
+                (
+                    "user",
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE,
+                        related_name="orders",
+                        to=settings.AUTH_USER_MODEL,
+                    ),
+                ),
+            ],
+            options={
+                "verbose_name": "Order",
+                "verbose_name_plural": "Orders",
+                "ordering": ("-created_at",),
+            },
+        ),
+    ]

{sandwitches-2.2.0 → sandwitches-2.3.0}/src/sandwitches/models.py

@@ -89,6 +89,9 @@ class Recipe(models.Model):
     ingredients = models.TextField(blank=True)
     instructions = models.TextField(blank=True)
     servings = models.IntegerField(default=1, validators=[MinValueValidator(1)])
+    price = models.DecimalField(
+        max_digits=6, decimal_places=2, null=True, blank=True, verbose_name="Price (€)"
+    )
     uploaded_by = models.ForeignKey(
         settings.AUTH_USER_MODEL,
         related_name="recipes",
@@ -216,3 +219,35 @@ class Rating(models.Model):
 
     def __str__(self):
         return f"{self.recipe} — {self.score} by {self.user}"
+
+
+class Order(models.Model):
+    STATUS_CHOICES = (
+        ("PENDING", "Pending"),
+        ("COMPLETED", "Completed"),
+        ("CANCELLED", "Cancelled"),
+    )
+
+    user = models.ForeignKey(
+        settings.AUTH_USER_MODEL, related_name="orders", on_delete=models.CASCADE
+    )
+    recipe = models.ForeignKey(Recipe, related_name="orders", on_delete=models.CASCADE)
+    status = models.CharField(max_length=20, choices=STATUS_CHOICES, default="PENDING")
+    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)
+
+    class Meta:
+        ordering = ("-created_at",)
+        verbose_name = "Order"
+        verbose_name_plural = "Orders"
+
+    def save(self, *args, **kwargs):
+        if not self.recipe.price:  # ty:ignore[possibly-missing-attribute]
+            raise ValueError("Cannot order a recipe without a price.")
+        if not self.total_price:
+            self.total_price = self.recipe.price  # ty:ignore[possibly-missing-attribute]
+        super().save(*args, **kwargs)
+
+    def __str__(self):
+        return f"Order #{self.pk} - {self.user} - {self.recipe}"

{sandwitches-2.2.0 → sandwitches-2.3.0}/src/sandwitches/templates/components/navbar.html

@@ -15,11 +15,16 @@
   </button>
 
   {% if user.is_authenticated %}
-    {% if user.avatar %}
-    <img src="{{ user.avatar.url }}" class="circle" data-ui="#user-menu">
-    {% else %}
-    <img src="https://www.w3schools.com/howto/img_avatar.png" class="circle" data-ui="#user-menu">
-    {% endif %}
+    <a href="{% url 'user_profile' %}">
+      {% if user.avatar %}
+      <img src="{{ user.avatar.url }}" class="circle">
+      {% else %}
+      <img src="https://www.w3schools.com/howto/img_avatar.png" class="circle">
+      {% endif %}
+    </a>
+    <button class="circle transparent" data-ui="#user-menu">
+      <i>more_vert</i>
+    </button>
   {% else %}
     <a href="{% url 'login' %}"><button class="chip transparent border white-text">{% trans "Login" %}</button></a>
     <a href="{% url 'signup' %}"><button class="chip primary">{% trans "Sign up" %}</button></a>

{sandwitches-2.2.0 → sandwitches-2.3.0}/src/sandwitches/templates/components/recipe_header.html

@@ -30,3 +30,11 @@
         </div>
     {% endif %}
 </div>
+
+<div class="space"></div>
+{% if recipe.price %}
+<div class="row align-center">
+    <i class="primary-text">euro_symbol</i>
+    <h5 class="bold ml-1">{{ recipe.price }}</h5>
+</div>
+{% endif %}

{sandwitches-2.2.0 → sandwitches-2.3.0}/src/sandwitches/templates/partials/recipe_list.html

@@ -26,6 +26,13 @@
        <div class="padding">
          <h5 class="truncate pointer" onclick="location.href='{% url 'recipe_detail' recipe.slug %}';">{{ recipe.title }}</h5>
 
+         {% if recipe.price %}
+         <div class="row align-center mb-1">
+            <i class="small-text primary-text">euro_symbol</i>
+            <span class="bold">{{ recipe.price }}</span>
+         </div>
+         {% endif %}
+
          <div class="row align-center">
             {% if recipe.uploaded_by %}
                 <a href="{% url 'index' %}?uploader={{ recipe.uploaded_by.username|urlencode }}" class="row align-center" style="color: inherit; text-decoration: none;">

sandwitches-2.3.0/src/sandwitches/templates/profile.html

@@ -0,0 +1,95 @@
+{% extends "base.html" %}
+{% load static i18n %}
+{% block title %}{% trans "Your Profile" %}{% endblock %}
+
+{% block content %}
+<div class="large-space"></div>
+
+<div class="grid">
+  <div class="s12 m10 l8 xl6 middle-align center-align" style="margin: 0 auto;">
+    <article class="round elevate">
+      <div class="padding">
+          <h4 class="center-align primary-text">{% trans "Edit your profile" %}</h4>
+      </div>
+
+      <form method="post" enctype="multipart/form-data" novalidate>
+        {% csrf_token %}
+
+        {% if form.non_field_errors %}
+          <div class="padding error surface round mb">
+             {% for err in form.non_field_errors %}
+                <div class="row align-center">
+                    <i class="error-text">warning</i>
+                    <span class="error-text">{{ err }}</span>
+                </div>
+             {% endfor %}
+          </div>
+        {% endif %}
+
+        <div class="grid">
+            <div class="s12 m6">
+                <div class="field label border round {% if form.first_name.errors %}error{% endif %}">
+                    <input type="text" name="{{ form.first_name.name }}" id="{{ form.first_name.id_for_label }}" value="{{ form.first_name.value|default:'' }}">
+                    <label>{% trans "First name" %}</label>
+                    {% if form.first_name.errors %}
+                        <span class="helper error-text">{{ form.first_name.errors.0 }}</span>
+                    {% endif %}
+                </div>
+            </div>
+             <div class="s12 m6">
+                <div class="field label border round {% if form.last_name.errors %}error{% endif %}">
+                    <input type="text" name="{{ form.last_name.name }}" id="{{ form.last_name.id_for_label }}" value="{{ form.last_name.value|default:'' }}">
+                    <label>{% trans "Last name" %}</label>
+                     {% if form.last_name.errors %}
+                        <span class="helper error-text">{{ form.last_name.errors.0 }}</span>
+                    {% endif %}
+                </div>
+            </div>
+        </div>
+
+        <div class="field label border round {% if form.email.errors %}error{% endif %}">
+            <input type="email" name="{{ form.email.name }}" id="{{ form.email.id_for_label }}" value="{{ form.email.value|default:'' }}">
+            <label>{% trans "Email" %}</label>
+            {% if form.email.errors %}
+                <span class="helper error-text">{{ form.email.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>
+            {% if form.bio.errors %}
+                 <span class="helper error-text">{{ form.bio.errors.0 }}</span>
+            {% endif %}
+        </div>
+
+        <div class="field middle-align {% if form.avatar.errors %}error{% endif %}">
+             <nav>
+                <div class="max">
+                    <label class="button border transparent round">
+                        <input type="file" name="{{ form.avatar.name }}" id="{{ form.avatar.id_for_label }}" accept="image/*">
+                        <i>upload</i>
+                        <span>{% trans "Upload Profile Picture" %}</span>
+                    </label>
+                </div>
+                 {% if user.avatar %}
+                    <img src="{{ user.avatar.url }}" class="circle small">
+                 {% endif %}
+            </nav>
+            {% if form.avatar.errors %}
+                 <span class="helper error-text">{{ form.avatar.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.2.0 → sandwitches-2.3.0}/src/sandwitches/urls.py

@@ -33,6 +33,7 @@ urlpatterns = [
     path("signup/", views.signup, name="signup"),
     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("admin/", admin.site.urls),
     path("api/", api.urls),
     path("media/<path:file_path>", views.media, name="media"),

{sandwitches-2.2.0 → sandwitches-2.3.0}/src/sandwitches/views.py

@@ -14,6 +14,7 @@ from .forms import (
     RatingForm,
     UserEditForm,
     TagForm,
+    UserProfileForm,
 )
 from django.http import HttpResponseBadRequest
 from django.conf import settings
@@ -645,3 +646,18 @@ def media(request, file_path=None):
 
     response = FileResponse(open(full_path, "rb"), as_attachment=True)
     return response
+
+
+@login_required
+def user_profile(request):
+    if request.method == "POST":
+        form = UserProfileForm(request.POST, request.FILES, instance=request.user)
+        if form.is_valid():
+            form.save()
+            messages.success(request, _("Profile updated successfully."))
+            return redirect("user_profile")
+    else:
+        form = UserProfileForm(instance=request.user)
+    return render(
+        request, "profile.html", {"form": form, "version": sandwitches_version}
+    )