sandwitches 2.1.1__tar.gz → 2.1.2__tar.gz

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

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

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

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

{sandwitches-2.1.1 → sandwitches-2.1.2}/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.1.1 → sandwitches-2.1.2}/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.1.1 → sandwitches-2.1.2}/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.1.2}/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.1.2/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.1.2}/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.1.2}/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]