sandwitches 1.0.3__tar.gz → 1.1.0__tar.gz

{sandwitches-1.0.3 → sandwitches-1.1.0}/PKG-INFO

@@ -1,14 +1,14 @@
 Metadata-Version: 2.3
 Name: sandwitches
-Version: 1.0.3
+Version: 1.1.0
 Summary: Add your description here
 Author: Martyn van Dijke
 Author-email: Martyn van Dijke <martijnvdijke600@gmail.com>
 Requires-Dist: django-debug-toolbar>=6.1.0
 Requires-Dist: django-filter>=25.2
+Requires-Dist: django-ninja>=1.5.1
 Requires-Dist: django-simple-history>=3.10.1
-Requires-Dist: django>=5.2.7
-Requires-Dist: djangorestframework>=3.16.1
+Requires-Dist: django>=6.0.0
 Requires-Dist: gunicorn>=23.0.0
 Requires-Dist: markdown>=3.10
 Requires-Dist: pillow>=12.0.0

{sandwitches-1.0.3 → sandwitches-1.1.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "sandwitches"
-version = "1.0.3"
+version = "1.1.0"
 description = "Add your description here"
 readme = "README.md"
 authors = [
@@ -12,9 +12,9 @@ requires-python = ">=3.12"
 dependencies = [
     "django-debug-toolbar>=6.1.0",
     "django-filter>=25.2",
+    "django-ninja>=1.5.1",
     "django-simple-history>=3.10.1",
-    "django>=5.2.7",
-    "djangorestframework>=3.16.1",
+    "django>=6.0.0",
     "gunicorn>=23.0.0",
     "markdown>=3.10",
     "pillow>=12.0.0",

sandwitches-1.1.0/src/sandwitches/api.py

@@ -0,0 +1,65 @@
+from ninja import NinjaAPI
+from .models import Recipe
+
+from ninja import ModelSchema
+from ninja import Schema
+from django.contrib.auth.models import User
+from django.shortcuts import get_object_or_404
+from datetime import date
+import random
+
+
+api = NinjaAPI()
+
+
+class RecipeSchema(ModelSchema):
+    class Meta:
+        model = Recipe
+        fields = "__all__"
+
+
+class UserSchema(ModelSchema):
+    class Meta:
+        model = User
+        exclude = ["password", "last_login", "user_permissions"]
+
+
+class Error(Schema):
+    message: str
+
+
+@api.get("v1/me", response={200: UserSchema, 403: Error})
+def me(request):
+    if not request.user.is_authenticated:
+        return 403, {"message": "Please sign in first"}
+    return request.user
+
+
+# TODO: enable recipe creation via API
+# @api.post("v1/recipe", auth=django_auth, response=RecipeSchema)
+# def create_recipe(request, payload: RecipeSchema):
+#     recipe = Recipe.objects.create(**payload.dict())
+#     return recipe
+
+
+@api.get("v1/recipes", response=list[RecipeSchema])
+def get_recipes(request):
+    recipes = Recipe.objects.all()
+    return recipes
+
+
+@api.get("v1/recipes/{recipe_id}", response=RecipeSchema)
+def get_recipe(request, recipe_id: int):
+    recipe = get_object_or_404(Recipe, id=recipe_id)
+    return recipe
+
+
+@api.get("v1/recipe-of-the-day", response=RecipeSchema)
+def get_recipe_of_the_day(request):
+    recipes = list(Recipe.objects.all())
+    if not recipes:
+        return None
+    today = date.today()
+    random.seed(today.toordinal())
+    recipe = random.choice(recipes)
+    return recipe

sandwitches-1.1.0/src/sandwitches/forms.py

@@ -0,0 +1,89 @@
+from django import forms
+from django.contrib.auth import get_user_model
+from django.contrib.auth.forms import UserCreationForm
+from .models import Recipe
+
+User = get_user_model()
+
+
+class BaseUserFormMixin:
+    """Mixin to handle common password validation and user field processing."""
+
+    def clean_passwords(self, cleaned_data):
+        p1 = cleaned_data.get("password1")
+        p2 = cleaned_data.get("password2")
+        if p1 and p2 and p1 != p2:
+            raise forms.ValidationError("Passwords do not match.")
+        return cleaned_data
+
+    def _set_user_attributes(self, user, data):
+        """Helper to apply optional name fields."""
+        user.first_name = data.get("first_name", "")
+        user.last_name = data.get("last_name", "")
+        user.save()
+        return user
+
+
+class AdminSetupForm(forms.ModelForm, BaseUserFormMixin):
+    password1 = forms.CharField(widget=forms.PasswordInput, label="Password")
+    password2 = forms.CharField(widget=forms.PasswordInput, label="Confirm Password")
+
+    class Meta:
+        model = User
+        fields = ("username", "first_name", "last_name", "email")
+
+    def clean(self):
+        cleaned_data = super().clean()
+        return self.clean_passwords(cleaned_data)
+
+    def save(self, commit=True):
+        data = self.cleaned_data
+        user = User.objects.create_superuser(
+            username=data["username"], email=data["email"], password=data["password1"]
+        )
+        return self._set_user_attributes(user, data)
+
+
+class UserSignupForm(UserCreationForm, BaseUserFormMixin):
+    """Refactored Regular User Form inheriting from Django's UserCreationForm"""
+
+    class Meta(UserCreationForm.Meta):
+        model = User
+        fields = ("username", "first_name", "last_name", "email")
+
+    def clean(self):
+        return super().clean()
+
+    def save(self, commit=True):
+        user = super().save(commit=False)
+        user.is_superuser = False
+        user.is_staff = False
+        if commit:
+            user.save()
+        return user
+
+
+class RecipeForm(forms.ModelForm):
+    class Meta:
+        model = Recipe
+        fields = [
+            "title",
+            "description",
+            "ingredients",
+            "instructions",
+            "image",
+            "tags",
+        ]
+        widgets = {
+            "tags": forms.TextInput(attrs={"placeholder": "tag1,tag2"}),
+        }
+
+
+class RatingForm(forms.Form):
+    """Simple form for rating recipes (1-5)."""
+
+    score = forms.ChoiceField(
+        choices=[(str(i), str(i)) for i in range(1, 6)],
+        widget=forms.RadioSelect,
+        label="Your rating",
+    )

sandwitches-1.1.0/src/sandwitches/migrations/0003_rating.py

@@ -0,0 +1,57 @@
+# Generated by Django 6.0 on 2025-12-21 21:17
+
+import django.db.models.deletion
+from django.conf import settings
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("sandwitches", "0002_historicalrecipe"),
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name="Rating",
+            fields=[
+                (
+                    "id",
+                    models.BigAutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                (
+                    "score",
+                    models.PositiveSmallIntegerField(
+                        choices=[(1, 1), (2, 2), (3, 3), (4, 4), (5, 5)]
+                    ),
+                ),
+                ("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="ratings",
+                        to="sandwitches.recipe",
+                    ),
+                ),
+                (
+                    "user",
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE,
+                        related_name="ratings",
+                        to=settings.AUTH_USER_MODEL,
+                    ),
+                ),
+            ],
+            options={
+                "ordering": ("-updated_at",),
+                "unique_together": {("recipe", "user")},
+            },
+        ),
+    ]

{sandwitches-1.0.3 → sandwitches-1.1.0}/src/sandwitches/models.py

@@ -3,9 +3,13 @@ from django.urls import reverse
 from django.utils.text import slugify
 from .storage import HashedFilenameStorage
 from simple_history.models import HistoricalRecords
+from django.contrib.auth import get_user_model
+from django.db.models import Avg
 
 hashed_storage = HashedFilenameStorage()
 
+User = get_user_model()
+
 
 class Tag(models.Model):
     name = models.CharField(max_length=50, unique=True)
@@ -87,8 +91,31 @@ class Recipe(models.Model):
         self.tags.set(tags)
         return self.tags.all()
 
+    # add helper methods for ratings
+    def average_rating(self):
+        agg = self.ratings.aggregate(avg=Avg("score"))
+        return agg["avg"] or 0
+
+    def rating_count(self):
+        return self.ratings.count()
+
     def get_absolute_url(self):
         return reverse("recipe_detail", kwargs={"pk": self.pk, "slug": self.slug})
 
     def __str__(self):
         return self.title
+
+
+class Rating(models.Model):
+    recipe = models.ForeignKey(Recipe, related_name="ratings", on_delete=models.CASCADE)
+    user = models.ForeignKey(User, related_name="ratings", on_delete=models.CASCADE)
+    score = models.PositiveSmallIntegerField(choices=[(i, i) for i in range(1, 6)])
+    created_at = models.DateTimeField(auto_now_add=True)
+    updated_at = models.DateTimeField(auto_now=True)
+
+    class Meta:
+        unique_together = ("recipe", "user")
+        ordering = ("-updated_at",)
+
+    def __str__(self):
+        return f"{self.recipe} — {self.score} by {self.user}"

{sandwitches-1.0.3 → sandwitches-1.1.0}/src/sandwitches/settings.py

@@ -19,11 +19,16 @@ DEBUG = bool(os.environ.get("DEBUG", default=0))
 ALLOWED_HOSTS = os.environ.get("ALLOWED_HOSTS", "127.0.0.1").split(",")
 CSRF_TRUSTED_ORIGINS = os.environ.get("CSRF_TRUSTED_ORIGINS", "").split(",")
 
+# RECAPTCHA_PROXY = {'http': 'http://127.0.0.1:8000', 'https': 'https://127.0.0.1:8000'}
+# RECAPTCHA_PUBLIC_KEY = os.environ.get("RECAPTCHA_PUBLIC_KEY")
+# RECAPTCHA_PRIVATE_KEY = os.environ.get("RECAPTCHA_PRIVATE_KEY")
+
 # Build paths inside the project like this: BASE_DIR / 'subdir'.
 BASE_DIR = Path(__file__).resolve().parent.parent
 
-# Application definition
+TASKS = {"default": {"BACKEND": "django.tasks.backends.immediate.ImmediateBackend"}}
 
+# Application definition
 INSTALLED_APPS = [
     "django.contrib.admin",
     "django.contrib.auth",
@@ -33,6 +38,7 @@ INSTALLED_APPS = [
     "django.contrib.staticfiles",
     "sandwitches",
     "debug_toolbar",
+    # "django_recaptcha",
     "simple_history",
 ]
 

sandwitches-1.1.0/src/sandwitches/tasks.py

@@ -0,0 +1,16 @@
+import logging
+from django.core.mail import send_mail
+from django.tasks import task
+
+
+logger = logging.getLogger(__name__)
+
+
+@task(takes_context=True, priority=2, queue_name="emails")
+def email_users(context, emails, subject, message):
+    logger.debug(
+        f"Attempt {context.attempt} to send user email. Task result id: {context.task_result.id}."
+    )
+    return send_mail(
+        subject=subject, message=message, from_email=None, recipient_list=emails
+    )

{sandwitches-1.0.3 → sandwitches-1.1.0}/src/sandwitches/templates/base_pico.html

@@ -168,11 +168,13 @@
       </li>
     </ul>
     <ul>
+      <li><a href="api/docs">Docs</a></li>
       {% if user.is_authenticated %}
       <li><a href="{% url 'admin:index' %}">Admin</a></li>
       <li><a href="{% url 'admin:logout' %}">Logout</a></li>
       {% else %}
       <li><a href="{% url 'admin:login' %}">Login</a></li>
+      <li><a href="{% url 'signup' %}">Sign up</a></li>
       {% endif %}
     </ul>
   </nav>

sandwitches-1.1.0/src/sandwitches/templates/detail.html

@@ -0,0 +1,104 @@
+{% extends "base_pico.html" %}
+{% block title %}{{ recipe.title }} — Sandwitch{% endblock %}
+
+{% block content %}
+
+{% load markdown_extras %}
+<nav aria-label="breadcrumb" class="container">
+  <a href="{% url 'index' %}">&larr; Back to all</a>
+</nav>
+
+<div class="grid">
+  <article class="card">
+    <figure>
+      {% if recipe.image %}
+        <img src="{{ recipe.image.url }}" alt="{{ recipe.title }}">
+      {% endif %}
+    </figure>
+    <header>
+      {{ recipe.title }}
+    </header>
+      <h4>Description</h4>
+      {{ recipe.description|convert_markdown|safe|default:"No description yet." }}
+
+      <h4>Ingredients</h4>
+      {{ recipe.ingredients|convert_markdown|safe|default:"No ingredients listed." }}
+
+      <h4>Instructions</h4>
+      {{ recipe.instructions|convert_markdown|safe|default:"No instructions yet." }}
+    
+    <div class="tags-row">
+      <div style="margin-top:12px;">
+        {% for tag in recipe.tags.all %}
+          <span class="tag">{{ tag.name }}</span>
+        {% endfor %}
+      </div>
+    </div>
+
+    <div style="margin-top:1rem;">
+      <h4>Rating</h4>
+      {% if rating_count %}
+        <p>Average: {{ avg_rating|floatformat:1 }} ({{ rating_count }} vote{% if rating_count %}s{% endif %})</p>
+      {% else %}
+        <p>No ratings yet.</p>
+      {% endif %}
+
+      {% if user.is_authenticated %}
+          {% if user_rating %}
+            <p>Your rating: {{ user_rating.score }}</p>
+          {% else %}
+            <form method="post" action="{% url 'recipe_rate' pk=recipe.pk %}">
+                      {% csrf_token %}
+
+                      <fieldset>
+                        <legend>What would you rate this sandwich?</legend>
+
+                        {% if rating_form.score.errors %}
+                          <div class="card-panel" role="alert">
+                            <ul>
+                              {% for err in rating_form.score.errors %}
+                                <li>{{ err }}</li>
+                              {% endfor %}
+                            </ul>
+                          </div>
+                        {% endif %}
+
+                        <div class="row">
+                          {% for i in "12345"|make_list %}
+                            <div class="col-sm-2">
+                              <label class="form-check">
+                                <input
+                                  type="radio"
+                                  name="{{ rating_form.score.name }}"
+                                  id="rating-{{ i }}"
+                                  value="{{ i }}"
+                                  {% if user_rating and user_rating.score|stringformat:"s" == i %}
+                                    checked
+                                  {% elif rating_form.score.value == i %}
+                                    checked
+                                  {% endif %}
+                                />
+                                <span>{{ i }}</span>
+                              </label>
+                            </div>
+                          {% endfor %}
+                        </div>
+                      </fieldset>
+                      <p style="margin-top:0.5rem;">
+                        <button type="submit">{% if user_rating %}Update{% else %}Rate{% endif %}</button>
+                      </p>
+                    </form>
+          {% endif %}        
+      {% else %}
+        <p><a href="{% url 'admin:login' %}">Log in</a> to rate this recipe.</p>
+      {% endif %}
+    </div>
+
+      {% if user.is_authenticated and user.is_staff %}
+    <footer>
+        <a href="/admin/sandwitches/recipe/{{ recipe.pk }}/change/">Edit</a>
+    </footer>
+    {% endif %}
+  </article>
+</div>
+{% endblock %}

sandwitches-1.1.0/src/sandwitches/templates/signup.html

@@ -0,0 +1,50 @@
+{% extends "base_pico.html" %}
+{% load static %}
+{% block title %}Sign Up{% endblock %}
+
+{% block content %}
+<div class="container" style="max-width:720px; margin:2rem auto;">
+  <article class="card">
+    <div class="card-body">
+      <h2>Sign up</h2>
+
+      <form method="post" novalidate>
+        {% csrf_token %}
+        {% if form.non_field_errors %}
+          <div class="card-panel" role="alert">
+            <ul>
+              {% for err in form.non_field_errors %}
+                <li>{{ err }}</li>
+              {% endfor %}
+            </ul>
+          </div>
+        {% endif %}
+
+        <label for="{{ form.username.id_for_label }}">Username</label>
+        {{ form.username }}
+
+        <label for="{{ form.email.id_for_label }}">Email (optional)</label>
+        {{ form.email }}
+
+        <label for="{{ form.first_name.id_for_label }}">First name</label>
+        {{ form.first_name }}
+
+        <label for="{{ form.last_name.id_for_label }}">Last name</label>
+        {{ form.last_name }}
+
+        <label for="{{ form.password1.id_for_label }}">Password</label>
+        {{ form.password1 }}
+
+        <label for="{{ form.password2.id_for_label }}">Confirm password</label>
+        {{ form.password2 }}
+
+        <p style="margin-top:1rem;">
+          <button type="submit">Sign Up</button>
+          <a class="contrast" href="{% url 'index' %}">Cancel</a>
+        </p>
+      </form>
+    </div>
+  </article>
+</div>
+
+{% endblock %}

{sandwitches-1.0.3 → sandwitches-1.1.0}/src/sandwitches/urls.py

@@ -18,6 +18,8 @@ Including another URLconf
 from django.contrib import admin
 from django.urls import path
 from . import views
+from .api import api
+
 
 from django.conf import settings
 from django.conf.urls.static import static
@@ -31,6 +33,9 @@ urlpatterns = [
     path("admin/", admin.site.urls),
     path("recipes/<slug:slug>/", views.recipe_detail, name="recipe_detail"),
     path("setup/", views.setup, name="setup"),
+    path("api/", api.urls),
+    path("signup/", views.signup, name="signup"),
+    path("recipes/<int:pk>/rate/", views.recipe_rate, name="recipe_rate"),
 ]
 
 if "test" not in sys.argv or "PYTEST_VERSION" in os.environ:

sandwitches-1.1.0/src/sandwitches/views.py

@@ -0,0 +1,121 @@
+from django.shortcuts import render, get_object_or_404, redirect
+from django.urls import reverse
+from django.contrib import messages
+from django.contrib.auth import login
+from django.contrib.auth import get_user_model
+from django.contrib.auth.decorators import login_required
+
+from .models import Recipe, Rating
+from .forms import RecipeForm, AdminSetupForm, UserSignupForm, RatingForm
+
+User = get_user_model()
+
+
+def recipe_edit(request, pk):
+    recipe = get_object_or_404(Recipe, pk=pk)
+    if request.method == "POST":
+        form = RecipeForm(request.POST, request.FILES, instance=recipe)
+        if form.is_valid():
+            form.save()
+            return redirect("recipes:admin_list")
+    else:
+        form = RecipeForm(instance=recipe)
+    return render(request, "recipe_form.html", {"form": form, "recipe": recipe})
+
+
+def recipe_detail(request, slug):
+    recipe = get_object_or_404(Recipe, slug=slug)
+    avg = recipe.average_rating()
+    count = recipe.rating_count()
+    user_rating = None
+    rating_form = None
+    if request.user.is_authenticated:
+        try:
+            user_rating = Rating.objects.get(recipe=recipe, user=request.user)
+        except Rating.DoesNotExist:
+            user_rating = None
+        # show form prefilled when possible
+        initial = {"score": str(user_rating.score)} if user_rating else None
+        rating_form = RatingForm(initial=initial)
+    return render(
+        request,
+        "detail.html",
+        {
+            "recipe": recipe,
+            "avg_rating": avg,
+            "rating_count": count,
+            "user_rating": user_rating,
+            "rating_form": rating_form,
+        },
+    )
+
+
+@login_required
+def recipe_rate(request, pk):
+    """
+    Create or update a rating 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)
+
+    form = RatingForm(request.POST)
+    if form.is_valid():
+        score = int(form.cleaned_data["score"])
+        Rating.objects.update_or_create(
+            recipe=recipe, user=request.user, defaults={"score": score}
+        )
+        messages.success(request, "Your rating has been saved.")
+    else:
+        messages.error(request, "Could not save rating.")
+    return redirect("recipe_detail", slug=recipe.slug)
+
+
+def index(request):
+    if not User.objects.filter(is_superuser=True).exists():
+        return redirect("setup")
+    recipes = Recipe.objects.order_by("-created_at")
+    return render(request, "index.html", {"recipes": recipes})
+
+
+def setup(request):
+    """
+    First-time setup page: create initial superuser if none exists.
+    Visible only while there are no superusers in the DB.
+    """
+    # do not allow access if a superuser already exists
+    if User.objects.filter(is_superuser=True).exists():
+        return redirect("index")
+
+    if request.method == "POST":
+        form = AdminSetupForm(request.POST)
+        if form.is_valid():
+            user = form.save()
+            # log in the newly created admin
+            user.backend = "django.contrib.auth.backends.ModelBackend"
+            login(request, user)
+            messages.success(request, "Admin account created and signed in.")
+            return redirect(reverse("admin:index"))
+    else:
+        form = AdminSetupForm()
+
+    return render(request, "setup.html", {"form": form})
+
+
+def signup(request):
+    """
+    User signup page: create new regular user accounts.
+    """
+    if request.method == "POST":
+        form = UserSignupForm(request.POST)
+        if form.is_valid():
+            user = form.save()
+            # log in the newly created user
+            user.backend = "django.contrib.auth.backends.ModelBackend"
+            login(request, user)
+            messages.success(request, "Account created and signed in.")
+            return redirect("index")
+    else:
+        form = UserSignupForm()
+
+    return render(request, "signup.html", {"form": form})

sandwitches-1.0.3/src/sandwitches/forms.py

@@ -1,60 +0,0 @@
-from django import forms
-from django.contrib.auth import get_user_model
-from .models import Recipe
-
-User = get_user_model()
-
-
-class AdminSetupForm(forms.Form):
-    username = forms.CharField(max_length=150, label="Username")
-    email = forms.EmailField(required=False, label="Email (optional)")
-    password1 = forms.CharField(label="Password", widget=forms.PasswordInput)
-    password2 = forms.CharField(label="Confirm password", widget=forms.PasswordInput)
-    first_name = forms.CharField(max_length=30, required=False, label="First name")
-    last_name = forms.CharField(max_length=150, required=False, label="Last name")
-
-    def clean_username(self):
-        username = self.cleaned_data.get("username")
-        if User.objects.filter(username=username).exists():
-            raise forms.ValidationError("A user with that username already exists.")
-        return username
-
-    def clean(self):
-        cleaned = super().clean()
-        p1 = cleaned.get("password1")
-        p2 = cleaned.get("password2")
-        if p1 and p2 and p1 != p2:
-            raise forms.ValidationError("Passwords do not match.")
-        return cleaned
-
-    def save(self):
-        data = self.cleaned_data
-        user = User.objects.create_superuser(
-            username=data["username"],
-            email=data.get("email") or "",
-            password=data["password1"],
-        )
-        # set optional names
-        if data.get("first_name"):
-            user.first_name = data["first_name"]
-        if data.get("last_name"):
-            user.last_name = data["last_name"]
-        user.is_staff = True
-        user.save()
-        return user
-
-
-class RecipeForm(forms.ModelForm):
-    class Meta:
-        model = Recipe
-        fields = [
-            "title",
-            "description",
-            "ingredients",
-            "instructions",
-            "image",
-            "tags",
-        ]
-        widgets = {
-            "tags": forms.TextInput(attrs={"placeholder": "tag1,tag2"}),
-        }

sandwitches-1.0.3/src/sandwitches/templates/detail.html

@@ -1,44 +0,0 @@
-{% extends "base_pico.html" %}
-{% block title %}{{ recipe.title }} — Sandwitch{% endblock %}
-
-{% block content %}
-
-{% load markdown_extras %}
-<nav aria-label="breadcrumb" class="container">
-  <a href="{% url 'index' %}">&larr; Back to all</a>
-</nav>
-
-<div class="grid">
-  <article class="card">
-    <figure>
-      {% if recipe.image %}
-        <img src="{{ recipe.image.url }}" alt="{{ recipe.title }}">
-      {% endif %}
-    </figure>
-    <header>
-      {{ recipe.title }}
-    </header>
-      <h4>Description</h4>
-      {{ recipe.description|convert_markdown|safe|default:"No description yet." }}
-
-      <h4>Ingredients</h4>
-      {{ recipe.ingredients|convert_markdown|safe|default:"No ingredients listed." }}
-
-      <h4>Instructions</h4>
-      {{ recipe.instructions|convert_markdown|safe|default:"No instructions yet." }}
-    
-    <div class="tags-row">
-      <div style="margin-top:12px;">
-        {% for tag in recipe.tags.all %}
-          <span class="tag">{{ tag.name }}</span>
-        {% endfor %}
-      </div>
-    </div>
-      {% if user.is_authenticated and user.is_staff %}
-    <footer>
-        <a href="/admin/sandwitches/recipe/{{ recipe.pk }}/change/">Edit</a>
-    </footer>
-    {% endif %}
-  </article>
-</div>
-{% endblock %}

sandwitches-1.0.3/src/sandwitches/views.py

@@ -1,58 +0,0 @@
-from django.shortcuts import render, get_object_or_404, redirect
-from django.urls import reverse
-from django.contrib import messages
-from django.contrib.auth import login
-from django.contrib.auth import get_user_model
-
-from .models import Recipe
-from .forms import RecipeForm, AdminSetupForm
-
-User = get_user_model()
-
-
-def recipe_edit(request, pk):
-    recipe = get_object_or_404(Recipe, pk=pk)
-    if request.method == "POST":
-        form = RecipeForm(request.POST, request.FILES, instance=recipe)
-        if form.is_valid():
-            form.save()
-            return redirect("recipes:admin_list")
-    else:
-        form = RecipeForm(instance=recipe)
-    return render(request, "recipe_form.html", {"form": form, "recipe": recipe})
-
-
-def recipe_detail(request, slug):
-    recipe = get_object_or_404(Recipe, slug=slug)
-    return render(request, "detail.html", {"recipe": recipe})
-
-
-def index(request):
-    if not User.objects.filter(is_superuser=True).exists():
-        return redirect("setup")
-    recipes = Recipe.objects.order_by("-created_at")
-    return render(request, "index.html", {"recipes": recipes})
-
-
-def setup(request):
-    """
-    First-time setup page: create initial superuser if none exists.
-    Visible only while there are no superusers in the DB.
-    """
-    # do not allow access if a superuser already exists
-    if User.objects.filter(is_superuser=True).exists():
-        return redirect("index")
-
-    if request.method == "POST":
-        form = AdminSetupForm(request.POST)
-        if form.is_valid():
-            user = form.save()
-            # log in the newly created admin
-            user.backend = "django.contrib.auth.backends.ModelBackend"
-            login(request, user)
-            messages.success(request, "Admin account created and signed in.")
-            return redirect(reverse("admin:index"))
-    else:
-        form = AdminSetupForm()
-
-    return render(request, "setup.html", {"form": form})