sandwitches 2.1.1__tar.gz → 2.2.0__tar.gz

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

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

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

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

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

@@ -42,7 +42,8 @@ class CustomUserAdmin(UserAdmin):
 @admin.register(Recipe)
 class RecipeAdmin(ImportExportModelAdmin):
     resource_classes = [RecipeResource]
-    list_display = ("title", "uploaded_by", "created_at", "show_url")
+    list_display = ("title", "uploaded_by", "created_at", "is_highlighted", "show_url")
+    list_editable = ("is_highlighted",)
     readonly_fields = ("created_at", "updated_at")
 
     def save_model(self, request, obj, form, change):

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

@@ -149,8 +149,8 @@ class RecipeForm(forms.ModelForm):
                 # PIL rotates counter-clockwise by default, our 'rotation' is clockwise
                 img = img.rotate(-rotation, expand=True)
                 img.save(recipe.image.path)
-            except Exception:
-                pass
+            except Exception as e:
+                print(f"Error rotating image: {e}")
 
         if commit:
             recipe.set_tags_from_string(self.cleaned_data.get("tags_string", ""))

sandwitches-2.2.0/src/sandwitches/migrations/0006_historicalrecipe_is_highlighted_and_more.py

@@ -0,0 +1,22 @@
+# Generated by Django 6.0.1 on 2026-01-17 16:48
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("sandwitches", "0005_rating_comment"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="historicalrecipe",
+            name="is_highlighted",
+            field=models.BooleanField(default=False),
+        ),
+        migrations.AddField(
+            model_name="recipe",
+            name="is_highlighted",
+            field=models.BooleanField(default=False),
+        ),
+    ]

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

@@ -127,6 +127,7 @@ class Recipe(models.Model):
         options={"quality": 95},
     )
     tags = models.ManyToManyField(Tag, blank=True, related_name="recipes")
+    is_highlighted = models.BooleanField(default=False)
     created_at = models.DateTimeField(auto_now_add=True)
     updated_at = models.DateTimeField(auto_now=True)
     history = HistoricalRecords()

{sandwitches-2.1.1 → sandwitches-2.2.0}/src/sandwitches/settings.py

@@ -130,6 +130,9 @@ LOGGING = {
     },
 }
 
+LOGIN_REDIRECT_URL = "index"
+LOGOUT_REDIRECT_URL = "index"
+
 
 # Password validation
 # https://docs.djangoproject.com/en/5.2/ref/settings/#auth-password-validators

{sandwitches-2.1.1 → sandwitches-2.2.0}/src/sandwitches/templates/admin/recipe_form.html

@@ -81,7 +81,7 @@
 
                 <div class="relative mb-1" style="overflow: hidden; min-height: 200px; display: flex; align-items: center; justify-content: center;">
                     {% if recipe.image %}
-                    <img src="{{ recipe.image_medium.url }}" class="responsive round" id="image-preview" style="max-height: 300px; width: 100%; object-fit: contain; transition: transform 0.3s ease;">
+                    <img src="{{ recipe.image_medium.url }}?v={% now "U" %}" class="responsive round" id="image-preview" style="max-height: 300px; width: 100%; object-fit: contain; transition: transform 0.3s ease;">
                     {% else %}
                     <div class="medium-height middle-align center-align gray1 round" id="image-placeholder" style="width: 100%;">
                         <i class="extra">image</i>

sandwitches-2.2.0/src/sandwitches/templates/components/carousel_scripts.html

@@ -0,0 +1,59 @@
+<script>
+(function() {
+    const carousel = document.getElementById('highlighted-carousel');
+    const scrollAmount = 320; // Approximately card width + margin
+    let autoScrollInterval;
+
+    window.scrollCarousel = function(direction) {
+        if (carousel) {
+            const currentScroll = carousel.scrollLeft;
+            const maxScroll = carousel.scrollWidth - carousel.clientWidth;
+            
+            let newScroll = currentScroll + (direction * scrollAmount);
+            
+            // Loop functionality for manual navigation? 
+            // Maybe just stop at ends or loop? Let's just scroll.
+            carousel.scrollBy({ left: direction * scrollAmount, behavior: 'smooth' });
+        }
+    }
+
+    function autoScroll() {
+        if (!carousel) return;
+
+        const currentScroll = carousel.scrollLeft;
+        const maxScroll = carousel.scrollWidth - carousel.clientWidth;
+        
+        // Tolerance for float calculation
+        if (currentScroll >= maxScroll - 10) {
+            // Loop back to start
+            carousel.scrollTo({ left: 0, behavior: 'smooth' });
+        } else {
+            carousel.scrollBy({ left: scrollAmount, behavior: 'smooth' });
+        }
+    }
+
+    function startAutoScroll() {
+        stopAutoScroll(); // Clear any existing
+        autoScrollInterval = setInterval(autoScroll, 5000); // 5 seconds
+    }
+
+    function stopAutoScroll() {
+        if (autoScrollInterval) {
+            clearInterval(autoScrollInterval);
+        }
+    }
+
+    if (carousel) {
+        // Start auto-scroll
+        startAutoScroll();
+
+        // Pause on interaction
+        carousel.addEventListener('mouseenter', stopAutoScroll);
+        carousel.addEventListener('mouseleave', startAutoScroll);
+        
+        // Touch events for mobile
+        carousel.addEventListener('touchstart', stopAutoScroll);
+        carousel.addEventListener('touchend', startAutoScroll);
+    }
+})();
+</script>

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

@@ -21,7 +21,7 @@
     <img src="https://www.w3schools.com/howto/img_avatar.png" class="circle" data-ui="#user-menu">
     {% endif %}
   {% else %}
-    <a href="{% url 'admin:login' %}"><button class="chip transparent border white-text">{% trans "Login" %}</button></a>
+    <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>
   {% endif %}
 </nav>

{sandwitches-2.1.1 → sandwitches-2.2.0}/src/sandwitches/templates/components/rating_section.html

@@ -44,7 +44,7 @@
       </form>
   </article>
 {% else %}
-   <p><a href="{% url 'admin:login' %}" class="link">{% trans "Log in" %}</a> {% trans "to rate this recipe." %}</p>
+   <p><a href="{% url 'login' %}" class="link">{% trans "Log in" %}</a> {% trans "to rate this recipe." %}</p>
 {% endif %}
 
 {% if all_ratings %}

sandwitches-2.2.0/src/sandwitches/templates/index.html

@@ -0,0 +1,76 @@
+{% extends "base_beer.html" %}
+{% load i18n static %}
+
+{% block title %}Sandwitches{% endblock %}
+
+{% block extra_head %}
+{{ block.super }}
+<style>
+    @media only screen and (min-width: 992px) {
+        main.container {
+            padding-left: 10%;
+            padding-right: 10%;
+        }
+    }
+</style>
+{% endblock %}
+
+{% block content %}
+<div class="large-space"></div>
+
+<article class="round secondary s12 m12 l12">
+  <div class="row align-center">
+    <div class="max">
+      <h4 class="upper">{% trans 'Sandwitches' %}</h4>
+      <p class="large-text">{% trans 'Sandwiches so good, they haunt you!' %}</p>
+    </div>
+  </div>
+</article>
+
+<div class="space"></div>
+
+{% include "components/search_form.html" %}
+
+{% if highlighted_recipes %}
+<div class="large-space"></div>
+<h4 class="upper center-align">{% trans 'Highlights' %}</h4>
+<div class="small-space"></div>
+<div class="relative">
+    <div class="row scroll snap no-scrollbar" id="highlighted-carousel" style="gap: 20px; flex-wrap: nowrap;">
+        {% for recipe in highlighted_recipes %}
+        <a href="{{ recipe.get_absolute_url }}">
+        <article class="round no-padding elevate" style="min-width: 300px; width: 300px; flex-shrink: 0; scroll-snap-align: start;">
+                {% if recipe.image %}
+                <img src="{{ recipe.image_medium.url }}" class="responsive top-round" alt="{{ recipe.title }}" style="height: 200px; object-fit: cover;">
+                {% else %}
+                <div class="primary medium-height top-round middle-align center-align" style="height:200px;">
+                    <i class="extra">lunch_dining</i>
+                </div>
+                {% endif %}
+            <div class="padding">
+                <h5>{{ recipe.title }}</h5>
+            </div>
+        </article>
+        </a>
+        {% endfor %}
+    </div>
+    
+    <button class="circle surface absolute left middle-align elevate" onclick="scrollCarousel(-1)" style="top: 50%; transform: translateY(-50%); left: -20px; z-index: 10;">
+        <i>chevron_left</i>
+    </button>
+    <button class="circle surface absolute right middle-align elevate" onclick="scrollCarousel(1)" style="top: 50%; transform: translateY(-50%); right: -20px; z-index: 10;">
+        <i>chevron_right</i>
+    </button>
+</div>
+{% endif %}
+
+<div class="large-space"></div>
+
+{% include "partials/recipe_list.html" %}
+
+{% endblock %}
+
+{% block page_scripts %}
+{% include "components/search_scripts.html" %}
+{% include "components/carousel_scripts.html" %}
+{% endblock %}

sandwitches-2.2.0/src/sandwitches/templates/login.html

@@ -0,0 +1,57 @@
+{% extends "base_beer.html" %}
+{% load static i18n %}
+{% block title %}{% trans "Login" %}{% 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 "Login to your account" %}</h4>
+          <p class="center-align">{% trans "Welcome back!" %}</p>
+      </div>
+
+      <form method="post" novalidate>
+        {% csrf_token %}
+
+        {% if form.non_field_errors %}
+          <div class="padding error surface round mb">
+             {% for error in form.non_field_errors %}
+                <div class="row align-center">
+                    <i class="error-text">warning</i>
+                    <span class="error-text">{{ error }}</span>
+                </div>
+             {% endfor %}
+          </div>
+        {% endif %}
+
+        <div class="field label border round {% if form.username.errors %}error{% endif %}">
+            <input type="text" name="{{ form.username.name }}" id="{{ form.username.id_for_label }}" value="{{ form.username.value|default:'' }}">
+            <label>{% trans "Username" %}</label>
+            {% if form.username.errors %}
+                <span class="helper error-text">{{ form.username.errors.0 }}</span>
+            {% endif %}
+        </div>
+
+        <div class="field label border round {% if form.password.errors %}error{% endif %}">
+             <input type="password" name="{{ form.password.name }}" id="{{ form.password.id_for_label }}">
+            <label>{% trans "Password" %}</label>
+             {% if form.password.errors %}
+                <span class="helper error-text">{{ form.password.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 "Login" %}</button>
+        </nav>
+
+      </form>
+    </article>
+  </div>
+</div>
+{% endblock %}

{sandwitches-2.1.1 → sandwitches-2.2.0}/src/sandwitches/urls.py

@@ -21,6 +21,7 @@ from . import views
 from .api import api
 from django.conf.urls.i18n import i18n_patterns
 from .feeds import LatestRecipesFeed  # Import the feed class
+from django.contrib.auth.views import LogoutView  # Import LogoutView
 
 
 import os
@@ -30,6 +31,8 @@ import sys
 urlpatterns = [
     path("i18n/", include("django.conf.urls.i18n")),
     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("admin/", admin.site.urls),
     path("api/", api.urls),
     path("media/<path:file_path>", views.media, name="media"),

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

@@ -23,12 +23,19 @@ import mimetypes
 from PIL import Image
 from django.db.models import Q, Avg
 from django_tasks.backends.database.models import DBTaskResult
+from django.contrib.auth.views import LoginView
+
 
 from sandwitches import __version__ as sandwitches_version
 
 User = get_user_model()
 
 
+class CustomLoginView(LoginView):
+    template_name = "login.html"
+    redirect_authenticated_user = True
+
+
 @staff_member_required
 def admin_dashboard(request):
     recipe_count = Recipe.objects.count()  # ty:ignore[unresolved-attribute]
@@ -556,6 +563,8 @@ def index(request):
     uploaders = User.objects.filter(recipes__isnull=False).distinct()
     tags = Tag.objects.all()  # ty:ignore[unresolved-attribute]
 
+    highlighted_recipes = Recipe.objects.filter(is_highlighted=True)  # ty:ignore[unresolved-attribute]
+
     return render(
         request,
         "index.html",
@@ -566,6 +575,7 @@ def index(request):
             "tags": tags,
             "selected_tags": request.GET.getlist("tag"),
             "user": request.user,  # Pass user to template
+            "highlighted_recipes": highlighted_recipes,
         },
     )
 

sandwitches-2.1.1/src/sandwitches/templates/index.html

@@ -1,42 +0,0 @@
-{% extends "base_beer.html" %}
-{% load i18n static %}
-
-{% block title %}Sandwitches{% endblock %}
-
-{% block extra_head %}
-{{ block.super }}
-<style>
-    @media only screen and (min-width: 992px) {
-        main.container {
-            padding-left: 10%;
-            padding-right: 10%;
-        }
-    }
-</style>
-{% endblock %}
-
-{% block content %}
-<div class="large-space"></div>
-
-<article class="round secondary s12 m12 l12">
-  <div class="row align-center">
-    <div class="max">
-      <h4 class="upper">{% trans 'Sandwitches' %}</h4>
-      <p class="large-text">{% trans 'Sandwiches so good, they haunt you!' %}</p>
-    </div>
-  </div>
-</article>
-
-<div class="space"></div>
-
-{% include "components/search_form.html" %}
-
-<div class="large-space"></div>
-
-{% include "partials/recipe_list.html" %}
-
-{% endblock %}
-
-{% block page_scripts %}
-{% include "components/search_scripts.html" %}
-{% endblock %}