sandwitches 2.3.0__py3-none-any.whl → 2.3.1__py3-none-any.whl

sandwitches/templates/admin/partials/order_rows.html

@@ -0,0 +1,28 @@
+{% load i18n %}
+{% for order in orders %}
+<tr>
+    <td>{{ order.id }}</td>
+    <td>
+        <div class="row align-center">
+            {% if order.user.avatar %}
+            <img src="{{ order.user.avatar.url }}" class="circle tiny">
+            {% else %}
+            <i class="circle tiny">person</i>
+            {% endif %}
+            <span class="max">{{ order.user.username }}</span>
+        </div>
+    </td>
+    <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 %}">
+            {{ order.get_status_display }}
+        </span>
+    </td>
+    <td>{{ order.created_at|date:"d/m/Y H:i" }}</td>
+</tr>
+{% empty %}
+<tr>
+    <td colspan="6" class="center-align">{% trans "No orders found." %}</td>
+</tr>
+{% endfor %}

sandwitches/templates/admin/rating_list.html

@@ -12,6 +12,7 @@
             <th>{% trans "Recipe" %}</th>
             <th>{% trans "User" %}</th>
             <th class="min center-align">{% trans "Score" %}</th>
+            <th>{% trans "Comment" %}</th>
             <th>{% trans "Updated" %}</th>
             <th class="right-align">{% trans "Actions" %}</th>
         </tr>
@@ -27,6 +28,7 @@
                     <span>{{ r.score }}</span>
                 </div>
             </td>
+            <td>{{ r.comment|default:"-"|truncatechars:50 }}</td>
             <td>{{ r.updated_at|date:"SHORT_DATETIME_FORMAT" }}</td>
             <td class="right-align">
                 <a href="{% url 'admin_rating_delete' r.pk %}" class="button circle transparent" title="{% trans 'Delete' %}"><i>delete</i></a>

sandwitches/templates/admin/recipe_form.html

@@ -60,6 +60,32 @@
                     <label>{{ form.uploaded_by.label }}</label>
                     {% if form.uploaded_by.errors %}<span class="error">{{ form.uploaded_by.errors|striptags }}</span>{% endif %}
                 </div>
+
+                <div class="field label border round mt-1">
+                    {{ form.price }}
+                    <label>{{ form.price.label }}</label>
+                    {% if form.price.errors %}<span class="error">{{ form.price.errors|striptags }}</span>{% endif %}
+                </div>
+
+                <div class="field label border round mt-1">
+                    {{ form.max_daily_orders }}
+                    <label>{{ form.max_daily_orders.label }}</label>
+                    {% if form.max_daily_orders.errors %}<span class="error">{{ form.max_daily_orders.errors|striptags }}</span>{% endif %}
+                </div>
+
+                <div class="field middle-align mt-1">
+                    <label class="checkbox">
+                        {{ form.is_highlighted }}
+                        <span>{{ form.is_highlighted.label }}</span>
+                    </label>
+                </div>
+
+                <div class="field middle-align mt-1">
+                    <label class="checkbox">
+                        {{ form.is_approved }}
+                        <span>{{ form.is_approved.label }}</span>
+                    </label>
+                </div>
             </article>
 
             <!-- Description -->

sandwitches/templates/admin/recipe_list.html

@@ -12,21 +12,48 @@
     </a>
 </div>
 
-<table class="border striped no-space">
-    <thead>
-        <tr>
-            <th class="min">{% trans "ID" %}</th>
-            <th class="min">{% trans "Image" %}</th>
-            <th class="max">{% trans "Title" %}</th>
-            <th class="min">{% trans "Rating" %}</th>
-            <th class="m l">{% trans "Tags" %}</th>
-            <th>{% trans "Uploader" %}</th>
-            <th>{% trans "Created" %}</th>
-            <th class="right-align">{% trans "Actions" %}</th>
-        </tr>
-    </thead>
-    <tbody>
-        {% for recipe in recipes %}
+    <table class="border striped no-space">
+        <thead>
+            <tr>
+                <th class="min">{% trans "ID" %}</th>
+                <th class="min">{% trans "Image" %}</th>
+                <th class="max">
+                    <a href="?sort={% if current_sort == 'title' %}-title{% else %}title{% endif %}" class="row align-center">
+                        {% trans "Title" %}
+                        {% if current_sort == 'title' %}<i>arrow_upward</i>{% elif current_sort == '-title' %}<i>arrow_downward</i>{% endif %}
+                    </a>
+                </th>
+                <th class="min">
+                    <a href="?sort={% if current_sort == 'price' %}-price{% else %}price{% endif %}" class="row align-center">
+                        {% trans "Price" %}
+                        {% if current_sort == 'price' %}<i>arrow_upward</i>{% elif current_sort == '-price' %}<i>arrow_downward</i>{% endif %}
+                    </a>
+                </th>
+                <th class="min">
+                    <a href="?sort={% if current_sort == 'orders' %}-orders{% else %}orders{% endif %}" class="row align-center">
+                        {% trans "Orders" %}
+                        {% if current_sort == 'orders' %}<i>arrow_upward</i>{% elif current_sort == '-orders' %}<i>arrow_downward</i>{% endif %}
+                    </a>
+                </th>
+                <th class="min">{% trans "Rating" %}</th>
+                <th class="min">{% trans "Approved" %}</th>
+                <th class="m l">{% trans "Tags" %}</th>
+                <th>
+                    <a href="?sort={% if current_sort == 'uploader' %}-uploader{% else %}uploader{% endif %}" class="row align-center">
+                        {% trans "Uploader" %}
+                        {% if current_sort == 'uploader' %}<i>arrow_upward</i>{% elif current_sort == '-uploader' %}<i>arrow_downward</i>{% endif %}
+                    </a>
+                </th>
+                <th>
+                    <a href="?sort={% if current_sort == 'created_at' %}-created_at{% else %}created_at{% endif %}" class="row align-center">
+                        {% trans "Created" %}
+                        {% if current_sort == 'created_at' %}<i>arrow_upward</i>{% elif current_sort == '-created_at' %}<i>arrow_downward</i>{% endif %}
+                    </a>
+                </th>
+                <th class="right-align">{% trans "Actions" %}</th>
+            </tr>
+        </thead>
+        <tbody>        {% for recipe in recipes %}
         <tr class="pointer" onclick="location.href='{% url 'admin_recipe_edit' recipe.pk %}'">
             <td class="min">{{ recipe.id }}</td>
             <td class="min">
@@ -39,14 +66,37 @@
                 {% endif %}
             </td>
             <td class="max">
+                {% if recipe.is_highlighted %}
+                <i class="tiny amber-text">star</i>
+                {% endif %}
                 <b>{{ recipe.title }}</b>
             </td>
+            <td class="min no-wrap">
+                {% if recipe.price %}
+                {{ recipe.price }} €
+                {% else %}
+                -
+                {% endif %}
+            </td>
+            <td class="min no-wrap">
+                {{ recipe.daily_orders_count }} / {{ recipe.max_daily_orders|default:"∞" }}
+            </td>
             <td class="min center-align">
                 <div class="row align-center">
                     <i class="primary-text">star</i>
                     <span>{{ recipe.avg_rating|default:0|floatformat:1 }}</span>
                 </div>
             </td>
+            <td class="min center-align">
+                {% if recipe.is_approved %}
+                <i class="primary-text">check_circle</i>
+                {% else %}
+                <a href="{% url 'admin_recipe_approve' recipe.pk %}" class="button tiny primary round" onclick="event.stopPropagation();">
+                    <i>check</i>
+                    <span>{% trans "Approve" %}</span>
+                </a>
+                {% endif %}
+            </td>
             <td class="m l">
                 {% for tag in recipe.tags.all %}
                 <span class="chip tiny">{{ tag.name }}</span>

sandwitches/templates/base.html

@@ -56,6 +56,18 @@
         </svg>
     </div>
     {% block navbar %}{% endblock %}
+
+    {% if messages %}
+    <div class="padding no-margin">
+        {% for message in messages %}
+        <div class="snackbar active {% if message.tags == 'error' %}error{% else %}primary{% endif %}">
+            <i>{% if message.tags == 'error' %}error{% else %}info{% endif %}</i>
+            <span>{{ message }}</span>
+        </div>
+        {% endfor %}
+    </div>
+    {% endif %}
+
     <main class="container" role="main">{% block content %}{% endblock %}</main>
     {% block footer %}{% endblock %}
     {% block extra_scripts %}{% endblock %}

sandwitches/templates/components/recipe_header.html

@@ -36,5 +36,14 @@
 <div class="row align-center">
     <i class="primary-text">euro_symbol</i>
     <h5 class="bold ml-1">{{ recipe.price }}</h5>
+    {% if user.is_authenticated %}
+    <form action="{% url 'order_recipe' recipe.pk %}" method="post" class="ml-2">
+        {% csrf_token %}
+        <button type="submit" class="button primary round">
+            <i>shopping_cart</i>
+            <span>{% trans "Order Now" %}</span>
+        </button>
+    </form>
+    {% endif %}
 </div>
 {% endif %}

sandwitches/templates/components/side_menu.html

@@ -15,6 +15,10 @@
             <i class="extra padding">favorite</i>
             <span class="large-text">{% trans "Favorites" %}</span>
         </a>
+        <a href="{% url 'submit_recipe' %}" class="padding {% if request.resolver_match.url_name == 'submit_recipe' %}active{% endif %}">
+            <i class="extra padding">add_circle</i>
+            <span class="large-text">{% trans "Submit Recipe" %}</span>
+        </a>
         {% endif %}
         <a href="/api/docs" class="padding">
             <i class="extra padding">api</i>

sandwitches/templates/profile.html

@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "base_beer.html" %}
 {% load static i18n %}
 {% block title %}{% trans "Your Profile" %}{% endblock %}
 

sandwitches/templates/recipe_form.html

@@ -68,9 +68,23 @@
                     </div>
                 </div>
 
+                <div class="s12 m6">
+                    <div class="field label border round">
+                        {{ form.price }}
+                        <label>{% trans "Price" %}</label>
+                    </div>
+                </div>
+
+                <div class="s12 m6">
+                    <div class="field label border round">
+                        {{ form.servings }}
+                        <label>{% trans "Servings" %}</label>
+                    </div>
+                </div>
+
                 <div class="s12">
                     <div class="field label border round">
-                        {{ form.tags }}
+                        {{ form.tags_string }}
                         <label>{% trans "Tags (comma separated)" %}</label>
                     </div>
                 </div>

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("submit-recipe/", views.submit_recipe, name="submit_recipe"),
     path("admin/", admin.site.urls),
     path("api/", api.urls),
     path("media/<path:file_path>", views.media, name="media"),
@@ -49,6 +50,7 @@ urlpatterns += i18n_patterns(
     path("recipes/<slug:slug>/", views.recipe_detail, name="recipe_detail"),
     path("setup/", views.setup, name="setup"),
     path("recipes/<int:pk>/rate/", views.recipe_rate, name="recipe_rate"),
+    path("recipes/<int:pk>/order/", views.order_recipe, name="order_recipe"),
     path("recipes/<int:pk>/favorite/", views.toggle_favorite, name="toggle_favorite"),
     path("dashboard/", views.admin_dashboard, name="admin_dashboard"),
     path("dashboard/recipes/", views.admin_recipe_list, name="admin_recipe_list"),
@@ -63,6 +65,11 @@ urlpatterns += i18n_patterns(
         views.admin_recipe_delete,
         name="admin_recipe_delete",
     ),
+    path(
+        "dashboard/recipes/<int:pk>/approve/",
+        views.admin_recipe_approve,
+        name="admin_recipe_approve",
+    ),
     path(
         "dashboard/recipes/<int:pk>/rotate/",
         views.admin_recipe_rotate,
@@ -99,6 +106,7 @@ urlpatterns += i18n_patterns(
         views.admin_rating_delete,
         name="admin_rating_delete",
     ),
+    path("dashboard/orders/", views.admin_order_list, name="admin_order_list"),
     prefix_default_language=True,
 )
 

sandwitches/views.py

@@ -1,3 +1,5 @@
+import logging
+from django.core.exceptions import ValidationError
 from django.shortcuts import render, get_object_or_404, redirect
 from django.urls import reverse
 from django.contrib import messages
@@ -6,7 +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 .models import Recipe, Rating, Tag
+from .models import Recipe, Rating, Tag, Order
 from .forms import (
     RecipeForm,
     AdminSetupForm,
@@ -15,10 +17,11 @@ from .forms import (
     UserEditForm,
     TagForm,
     UserProfileForm,
+    UserRecipeSubmissionForm,
 )
-from django.http import HttpResponseBadRequest
+from django.http import HttpResponseBadRequest, Http404
 from django.conf import settings
-from django.http import FileResponse, Http404
+from django.http import FileResponse
 from pathlib import Path
 import mimetypes
 from PIL import Image
@@ -32,6 +35,30 @@ from sandwitches import __version__ as sandwitches_version
 User = get_user_model()
 
 
+@login_required
+def submit_recipe(request):
+    if request.method == "POST":
+        form = UserRecipeSubmissionForm(request.POST, request.FILES)
+        if form.is_valid():
+            recipe = form.save(commit=False)
+            recipe.uploaded_by = request.user
+            recipe.is_approved = False  # Explicitly set to False just in case
+            recipe.save()
+            form.save_m2m()
+            messages.success(
+                request,
+                _("Your recipe has been submitted and is awaiting admin approval."),
+            )
+            return redirect("user_profile")
+    else:
+        form = UserRecipeSubmissionForm()
+    return render(
+        request,
+        "recipe_form.html",
+        {"form": form, "title": _("Submit Recipe"), "version": sandwitches_version},
+    )
+
+
 class CustomLoginView(LoginView):
     template_name = "login.html"
     redirect_authenticated_user = True
@@ -88,6 +115,15 @@ def admin_dashboard(request):
         .order_by("date")
     )
 
+    # Orders over time
+    order_data = (
+        Order.objects.filter(created_at__date__range=(start_date, end_date))  # ty:ignore[unresolved-attribute]
+        .annotate(date=TruncDate("created_at"))
+        .values("date")
+        .annotate(count=Count("id"))
+        .order_by("date")
+    )
+
     # Prepare labels and data for JS
     recipe_labels = [d["date"].strftime("%d/%m/%Y") for d in recipe_data]
     recipe_counts = [d["count"] for d in recipe_data]
@@ -95,36 +131,71 @@ def admin_dashboard(request):
     rating_labels = [d["date"].strftime("%d/%m/%Y") for d in rating_data]
     rating_avgs = [float(d["avg"]) for d in rating_data]
 
+    order_labels = [d["date"].strftime("%d/%m/%Y") for d in order_data]
+    order_counts = [d["count"] for d in order_data]
+
+    pending_recipes = Recipe.objects.filter(is_approved=False).order_by("-created_at")  # ty:ignore[unresolved-attribute]
+
+    context = {
+        "recipe_count": recipe_count,
+        "user_count": user_count,
+        "tag_count": tag_count,
+        "recent_recipes": recent_recipes,
+        "pending_recipes": pending_recipes,
+        "recipe_labels": recipe_labels,
+        "recipe_counts": recipe_counts,
+        "rating_labels": rating_labels,
+        "rating_avgs": rating_avgs,
+        "order_labels": order_labels,
+        "order_counts": order_counts,
+        "start_date": start_date.strftime("%Y-%m-%d"),
+        "end_date": end_date.strftime("%Y-%m-%d"),
+        "version": sandwitches_version,
+    }
+
+    if request.headers.get("HX-Request"):
+        return render(request, "admin/partials/dashboard_charts.html", context)
+
     return render(
         request,
         "admin/dashboard.html",
-        {
-            "recipe_count": recipe_count,
-            "user_count": user_count,
-            "tag_count": tag_count,
-            "recent_recipes": recent_recipes,
-            "recipe_labels": recipe_labels,
-            "recipe_counts": recipe_counts,
-            "rating_labels": rating_labels,
-            "rating_avgs": rating_avgs,
-            "start_date": start_date.strftime("%Y-%m-%d"),
-            "end_date": end_date.strftime("%Y-%m-%d"),
-            "version": sandwitches_version,
-        },
+        context,
     )
 
 
 @staff_member_required
 def admin_recipe_list(request):
+    sort_param = request.GET.get("sort", "-created_at")
+    allowed_sorts = {
+        "title": "title",
+        "-title": "-title",
+        "created_at": "created_at",
+        "-created_at": "-created_at",
+        "uploader": "uploaded_by__username",
+        "-uploader": "-uploaded_by__username",
+        "price": "price",
+        "-price": "-price",
+        "orders": "daily_orders_count",
+        "-orders": "-daily_orders_count",
+        "rating": "avg_rating",
+        "-rating": "-avg_rating",
+    }
+
+    order_by = allowed_sorts.get(sort_param, "-created_at")
+
     recipes = (
         Recipe.objects.annotate(avg_rating=Avg("ratings__score"))  # ty:ignore[unresolved-attribute]
         .prefetch_related("tags")
-        .all()
+        .order_by(order_by)
     )
     return render(
         request,
         "admin/recipe_list.html",
-        {"recipes": recipes, "version": sandwitches_version},
+        {
+            "recipes": recipes,
+            "version": sandwitches_version,
+            "current_sort": sort_param,
+        },
     )
 
 
@@ -171,6 +242,17 @@ def admin_recipe_edit(request, pk):
     )
 
 
+@staff_member_required
+def admin_recipe_approve(request, pk):
+    recipe = get_object_or_404(Recipe, pk=pk)
+    recipe.is_approved = True
+    recipe.save()
+    messages.success(
+        request, _("Recipe '%(title)s' approved.") % {"title": recipe.title}
+    )
+    return redirect("admin_recipe_list")
+
+
 @staff_member_required
 def admin_recipe_delete(request, pk):
     recipe = get_object_or_404(Recipe, pk=pk)
@@ -366,8 +448,38 @@ def admin_rating_delete(request, pk):
     )
 
 
+@staff_member_required
+def admin_order_list(request):
+    orders = (
+        Order.objects.select_related("user", "recipe")  # ty:ignore[unresolved-attribute]
+        .all()
+        .order_by("-created_at")
+    )
+
+    if request.headers.get("HX-Request"):
+        return render(
+            request,
+            "admin/partials/order_rows.html",
+            {"orders": orders, "version": sandwitches_version},
+        )
+
+    return render(
+        request,
+        "admin/order_list.html",
+        {"orders": orders, "version": sandwitches_version},
+    )
+
+
 def recipe_detail(request, slug):
     recipe = get_object_or_404(Recipe, slug=slug)
+
+    if not recipe.is_approved:
+        if not (
+            request.user.is_authenticated
+            and (request.user.is_staff or recipe.uploaded_by == request.user)
+        ):
+            raise Http404("Recipe not found or pending approval.")
+
     avg = recipe.average_rating()
     count = recipe.rating_count()
     user_rating = None
@@ -401,6 +513,28 @@ def recipe_detail(request, slug):
     )
 
 
+@login_required
+def order_recipe(request, pk):
+    """
+    Create an order for the given recipe by the logged-in user.
+    """
+    recipe = get_object_or_404(Recipe, pk=pk)
+    if request.method != "POST":
+        return redirect("recipe_detail", slug=recipe.slug)
+
+    try:
+        order = Order.objects.create(user=request.user, recipe=recipe)  # ty:ignore[unresolved-attribute]
+        logging.debug(f"Created {order}")
+        messages.success(
+            request,
+            _("Your order for %(title)s has been submitted!") % {"title": recipe.title},
+        )
+    except (ValidationError, ValueError) as e:
+        messages.error(request, str(e))
+
+    return redirect("recipe_detail", slug=recipe.slug)
+
+
 @login_required
 def recipe_rate(request, pk):
     """
@@ -510,9 +644,16 @@ def favorites(request):
 def index(request):
     if not User.objects.filter(is_superuser=True).exists():
         return redirect("setup")
-    recipes = (
-        Recipe.objects.all().prefetch_related("favorited_by")  # ty:ignore[unresolved-attribute]
-    )  # Start with all, order later
+
+    recipes = Recipe.objects.all().prefetch_related("favorited_by")  # ty:ignore[unresolved-attribute]
+
+    if not (request.user.is_authenticated and request.user.is_staff):
+        if request.user.is_authenticated:
+            # Show approved recipes OR recipes uploaded by the current user
+            recipes = recipes.filter(Q(is_approved=True) | Q(uploaded_by=request.user))
+        else:
+            # Show only approved recipes for anonymous users
+            recipes = recipes.filter(is_approved=True)
 
     # Filtering
     q = request.GET.get("q")

{sandwitches-2.3.0.dist-info → sandwitches-2.3.1.dist-info}/METADATA

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