sandwitches 2.3.1__tar.gz → 2.3.2__tar.gz

{sandwitches-2.3.1 → sandwitches-2.3.2}/PKG-INFO

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

{sandwitches-2.3.1 → sandwitches-2.3.2}/pyproject.toml

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

{sandwitches-2.3.1 → sandwitches-2.3.2}/src/sandwitches/forms.py

@@ -138,7 +138,7 @@ class RecipeForm(forms.ModelForm):
             "instructions",
             "price",
             "is_highlighted",
-            "is_approved",
+            "is_community_made",
             "max_daily_orders",
         ]
         widgets = {

sandwitches-2.3.2/src/sandwitches/migrations/0010_rename_is_approved_historicalrecipe_is_community_made_and_more.py

@@ -0,0 +1,22 @@
+# Generated by Django 6.0.1 on 2026-01-24 15:32
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("sandwitches", "0009_historicalrecipe_is_approved_recipe_is_approved"),
+    ]
+
+    operations = [
+        migrations.RenameField(
+            model_name="historicalrecipe",
+            old_name="is_approved",
+            new_name="is_community_made",
+        ),
+        migrations.RenameField(
+            model_name="recipe",
+            old_name="is_approved",
+            new_name="is_community_made",
+        ),
+    ]

sandwitches-2.3.2/src/sandwitches/migrations/0011_alter_historicalrecipe_is_community_made_and_more.py

@@ -0,0 +1,25 @@
+# Generated by Django 6.0.1 on 2026-01-24 16:01
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        (
+            "sandwitches",
+            "0010_rename_is_approved_historicalrecipe_is_community_made_and_more",
+        ),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="historicalrecipe",
+            name="is_community_made",
+            field=models.BooleanField(default=False),
+        ),
+        migrations.AlterField(
+            model_name="recipe",
+            name="is_community_made",
+            field=models.BooleanField(default=False),
+        ),
+    ]

{sandwitches-2.3.1 → sandwitches-2.3.2}/src/sandwitches/models.py

@@ -132,7 +132,7 @@ class Recipe(models.Model):
     )
     tags = models.ManyToManyField(Tag, blank=True, related_name="recipes")
     is_highlighted = models.BooleanField(default=False)
-    is_approved = models.BooleanField(default=True)
+    is_community_made = models.BooleanField(default=False)
     max_daily_orders = models.PositiveIntegerField(
         null=True, blank=True, verbose_name="Max daily orders"
     )

{sandwitches-2.3.1 → sandwitches-2.3.2}/src/sandwitches/templates/admin/admin_base.html

@@ -2,15 +2,15 @@
 {% load i18n static %}
 
 {% block extra_head %}
-<link href="https://cdn.jsdelivr.net/npm/beercss@3.7.12/dist/cdn/beer.min.css" rel="stylesheet">
-<script type="module" src="https://cdn.jsdelivr.net/npm/beercss@3.7.12/dist/cdn/beer.min.js"></script>
-<script type="module" src="https://cdn.jsdelivr.net/npm/material-dynamic-colors@1.1.2/dist/cdn/material-dynamic-colors.min.js"></script>
-<script src="https://unpkg.com/htmx.org@2.0.8/dist/htmx.min.js"></script>
+<link href="{% static "dist/main.css" %}" rel="stylesheet">
+<script src="{% static "dist/main.js" %}" defer></script>
 <link rel="icon" type="image/svg+xml" href="{% static "icons/favicon.svg" %}">
 <style>
     main.container {
         padding-top: 2rem;
         padding-bottom: 2rem;
+        padding-left: 5%;
+        padding-right: 5%;
     }
     .admin-thumb {
         width: 80px;

{sandwitches-2.3.1 → sandwitches-2.3.2}/src/sandwitches/templates/admin/dashboard.html

@@ -1,9 +1,14 @@
 {% extends "admin/admin_base.html" %}
-{% load i18n %}
+{% load i18n static %}
 
 {% block admin_title %}{% trans "Dashboard" %}{% endblock %}
 
-
+{% block extra_head %}
+{{ block.super }}
+<link href="{% static "dist/main.css" %}" rel="stylesheet">
+<link href="{% static "main.css" %}" rel="stylesheet">
+<script src="{% static "dist/main.js" %}" defer></script>
+{% endblock %}
 
 {% block content %}
 
@@ -318,9 +323,3 @@
 </div>
 
 {% endblock %}
-
-
-
-{% block admin_scripts %}
-<script src="https://cdn.jsdelivr.net/npm/chart.js"></script>
-{% endblock %}

{sandwitches-2.3.1 → sandwitches-2.3.2}/src/sandwitches/templates/admin/recipe_form.html

@@ -82,8 +82,8 @@
 
                 <div class="field middle-align mt-1">
                     <label class="checkbox">
-                        {{ form.is_approved }}
-                        <span>{{ form.is_approved.label }}</span>
+                        {{ form.is_community_made }}
+                        <span>{{ form.is_community_made.label }}</span>
                     </label>
                 </div>
             </article>

{sandwitches-2.3.1 → sandwitches-2.3.2}/src/sandwitches/templates/admin/recipe_list.html

@@ -88,7 +88,7 @@
                 </div>
             </td>
             <td class="min center-align">
-                {% if recipe.is_approved %}
+                {% if recipe.is_community_made %}
                 <i class="primary-text">check_circle</i>
                 {% else %}
                 <a href="{% url 'admin_recipe_approve' recipe.pk %}" class="button tiny primary round" onclick="event.stopPropagation();">

sandwitches-2.3.1/src/sandwitches/templates/recipe_form.html → sandwitches-2.3.2/src/sandwitches/templates/community.html

@@ -1,18 +1,15 @@
 {% extends "base_beer.html" %}
 {% load i18n %}
 
-{% block title %}{% trans "Edit Recipe" %}{% endblock %}
+{% block title %}{% trans "Community" %}{% endblock %}
 
 {% block content %}
+<main class="responsive">
 <div class="large-space"></div>
 <article class="round s12 m10 l8 offset-m1 offset-l2 elevate">
     <div class="padding">
         <h4 class="center-align">
-            {% if recipe.pk %}
-                {% trans "Edit Recipe:" %} {{ recipe.title }}
-            {% else %}
-                {% trans "New Recipe" %}
-            {% endif %}
+            {% trans "Submit a Recipe" %}
         </h4>
         <div class="space"></div>
 
@@ -97,16 +94,27 @@
                 <a href="javascript:history.back()" class="button transparent border round">{% trans "Cancel" %}</a>
                 <button type="submit" class="button primary round">
                     <i class="front">save</i>
-                    <span>{% trans "Save Recipe" %}</span>
+                    <span>{% trans "Submit Recipe" %}</span>
                 </button>
             </div>
         </form>
     </div>
 </article>
+
+
+<div class="large-space"></div>
+
+<h4 class="center-align">{% trans "Community Recipes" %}</h4>
+<div class="space"></div>
+
+{% include "partials/recipe_list.html" %}
+
 <div class="large-space"></div>
 
 {% endblock %}
 
+</main>
+
 {% block page_scripts %}
 <script>
     // Image Preview Logic

{sandwitches-2.3.1 → sandwitches-2.3.2}/src/sandwitches/templates/components/side_menu.html

@@ -15,9 +15,9 @@
             <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 href="{% url 'community' %}" class="padding {% if request.resolver_match.url_name == 'community' %}active{% endif %}">
+            <i class="extra padding">group</i>
+            <span class="large-text">{% trans "Community" %}</span>
         </a>
         {% endif %}
         <a href="/api/docs" class="padding">

{sandwitches-2.3.1 → sandwitches-2.3.2}/src/sandwitches/urls.py

@@ -34,7 +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("community/", views.community, name="community"),
     path("admin/", admin.site.urls),
     path("api/", api.urls),
     path("media/<path:file_path>", views.media, name="media"),

{sandwitches-2.3.1 → sandwitches-2.3.2}/src/sandwitches/views.py

@@ -36,13 +36,13 @@ User = get_user_model()
 
 
 @login_required
-def submit_recipe(request):
+def community(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.is_community_made = True
             recipe.save()
             form.save_m2m()
             messages.success(
@@ -52,10 +52,30 @@ def submit_recipe(request):
             return redirect("user_profile")
     else:
         form = UserRecipeSubmissionForm()
+
+    # Community recipes = non-staff uploaded
+    recipes = Recipe.objects.filter(is_community_made=True).prefetch_related(  # ty:ignore[unresolved-attribute]
+        "favorited_by"
+    )
+
+    if not request.user.is_staff:
+        # Regular users only see approved community recipes or their own
+        recipes = recipes.filter(
+            Q(is_community_made=True) | Q(uploaded_by=request.user)
+        )
+
+    recipes = recipes.order_by("-created_at")
+
     return render(
         request,
-        "recipe_form.html",
-        {"form": form, "title": _("Submit Recipe"), "version": sandwitches_version},
+        "community.html",
+        {
+            "form": form,
+            "recipes": recipes,
+            "title": _("Community"),
+            "version": sandwitches_version,
+            "user": request.user,
+        },
     )
 
 
@@ -134,8 +154,9 @@ def admin_dashboard(request):
     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]
-
+    pending_recipes = Recipe.objects.filter(  # ty:ignore[unresolved-attribute]
+        uploaded_by__is_staff=False, uploaded_by__is_superuser=False
+    ).order_by("-created_at")
     context = {
         "recipe_count": recipe_count,
         "user_count": user_count,
@@ -245,7 +266,7 @@ 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.is_community_made = True
     recipe.save()
     messages.success(
         request, _("Recipe '%(title)s' approved.") % {"title": recipe.title}
@@ -473,7 +494,7 @@ def admin_order_list(request):
 def recipe_detail(request, slug):
     recipe = get_object_or_404(Recipe, slug=slug)
 
-    if not recipe.is_approved:
+    if not recipe.is_community_made:
         if not (
             request.user.is_authenticated
             and (request.user.is_staff or recipe.uploaded_by == request.user)
@@ -647,13 +668,8 @@ def index(request):
 
     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)
+    # Only show "normal" recipes (uploaded by staff or no uploader)
+    recipes = recipes.filter(Q(is_community_made=False))
 
     # Filtering
     q = request.GET.get("q")