sandwitches 2.1.1__py3-none-any.whl → 2.1.2__py3-none-any.whl

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/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/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/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/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/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/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]

{sandwitches-2.1.1.dist-info → sandwitches-2.1.2.dist-info}/METADATA

@@ -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.dist-info → sandwitches-2.1.2.dist-info}/RECORD

@@ -3,7 +3,7 @@ sandwitches/admin.py,sha256=3n73AD-j7vyajgoFdhPe3IXH6SFGIAq378gKDRr6ims,1852
 sandwitches/api.py,sha256=4Upjd78dHVZDOIFkZjPst0mLfVdiToB3RVVrBpttTYg,5714
 sandwitches/asgi.py,sha256=cygnXdXSSVspM7ZXuj47Ef6oz7HSTw4D7BPzgE2PU5w,399
 sandwitches/feeds.py,sha256=iz1d11dV0utA0ZNsB7VIAp0h8Zr5mFNSKJWHbw_j6YM,683
-sandwitches/forms.py,sha256=ODrwV52TSBxIatmVp_5A_l7WcDh9m1D3vLgL22HwLHo,5880
+sandwitches/forms.py,sha256=QMSCpiy42AjretzEkj8FghfmBj-gkalSOXZVwiTtkOQ,5916
 sandwitches/locale/nl/LC_MESSAGES/django.mo,sha256=EzQWzIhz_Na3w9AS7F-YjB-Xv63t4sMRSAkEQ1-g32M,5965
 sandwitches/locale/nl/LC_MESSAGES/django.po,sha256=znxspEoMwkmktusZtbVrt1KG1LDUwIEi4ZEIE3XGeoI,25904
 sandwitches/migrations/0001_initial.py,sha256=hXnCAhoA91C6YCinXyUdIfQ7QL29NPBHFfTqLgulMsY,12507
@@ -20,7 +20,7 @@ sandwitches/templates/admin/admin_base.html,sha256=yPFo1K1LrRuPKfOuOGLEgQm29vWqz
 sandwitches/templates/admin/confirm_delete.html,sha256=HfsZI_gV8JQTKz215TYgPWBrgrFhGv1UB3N-0Hln-14,804
 sandwitches/templates/admin/dashboard.html,sha256=uHisWI3x-KehPDlwBFF5bIT5-tPsCVU5duA_ZPF-GHc,6168
 sandwitches/templates/admin/rating_list.html,sha256=ZTxu4emeYInlYyw7b19c8cYlj90fo1wtA-1BEJKZGt0,1256
-sandwitches/templates/admin/recipe_form.html,sha256=FeQgxDyj8z9vBltoneXNEcxa4YkbeatCkHB_GeHL8MU,7544
+sandwitches/templates/admin/recipe_form.html,sha256=ssLnS63UobRFwPbDHMrnwniJEta3QHkWOJb8IPzYd_k,7560
 sandwitches/templates/admin/recipe_list.html,sha256=HDOmhK-XEPwTv1CCBqTXK79pLoH5y2xKPFjjue0HFeQ,2454
 sandwitches/templates/admin/tag_form.html,sha256=JRWgAl4fz_Oy-Kuo1K6Mex_CXdsHMABzzyPazthr1Kg,989
 sandwitches/templates/admin/tag_list.html,sha256=ttxwXgfdxkEs4Cmrz5RHaGmaqLd7JDmWhjv80XIQqyw,1246
@@ -36,8 +36,8 @@ sandwitches/templates/components/ingredients_scripts.html,sha256=2zKTC65GYF589uW
 sandwitches/templates/components/ingredients_section.html,sha256=XsaVXTs9MIwjfJeLjlzah3GWWj8oFU-_HJd9i9l1HAo,665
 sandwitches/templates/components/instructions_section.html,sha256=RFlA4uPiI6vf1e2QgiD5KzGoy7Vg7y7nFY7TFabCYLA,277
 sandwitches/templates/components/language_dialog.html,sha256=iz-6QhFe4f_dsVhGDhVx6KKKLgQz4grX8tbIqSQjDsg,1184
-sandwitches/templates/components/navbar.html,sha256=qGr2m-1vTeCdMsc16anYrCpREvYHv0oJh6lpvtWL3jY,1055
-sandwitches/templates/components/rating_section.html,sha256=Hq1t51ETQckUzNeZyvEnGKGIHfUiu6XJF8T4TzCZ3NU,2723
+sandwitches/templates/components/navbar.html,sha256=CtWqAmPke7nm-UqSvGGl6TPaNwT2Zqkw9UySOCA8hfo,1049
+sandwitches/templates/components/rating_section.html,sha256=8O5IsFfQwnElMQZLnDpJiuCvvQMLa3jCS67u_RhMi7o,2717
 sandwitches/templates/components/recipe_header.html,sha256=-LCp6KqkQO7a7yqR0jKUQ95-RczYU-_MFO058lE04_w,1473
 sandwitches/templates/components/search_form.html,sha256=B8579Jo44gLrlmvkkc2-Vuv_QD93Ljt6F2J1WgTDV60,6617
 sandwitches/templates/components/search_scripts.html,sha256=HvsO5e50DoTZeoFiYeNP5S8S5h7Zfr9VULOWKKR1i_M,3423
@@ -46,6 +46,7 @@ sandwitches/templates/components/user_menu.html,sha256=c20cBpyLheGvHdQ5nn-c4fjNl
 sandwitches/templates/detail.html,sha256=g-O_RsW9Ix9ivWC0nZ4FwHY2NhgYZ3bEGLpqGY0JSxg,5642
 sandwitches/templates/favorites.html,sha256=0cPpW07N6Isrb8XpvA5Eh97L2-12QFZ43EzeJvbOlXo,917
 sandwitches/templates/index.html,sha256=JqIeAY2Yz5yZ9MWSMjWXOQIohykcPlJHBRUrspahGCU,899
+sandwitches/templates/login.html,sha256=LiQskhkOkfx0EE4ssA1ToqQ3oEll08OPYLDIkLjHfU8,2177
 sandwitches/templates/partials/recipe_list.html,sha256=AVzz_fIE4cBVU-E2E0VpE1tFmUV8jy7QpOninZEUMi8,3952
 sandwitches/templates/recipe_form.html,sha256=TzdlzeSqUoJTDTuCdFbeF5jCBZUTZEtlTIC_IQM3WL8,4754
 sandwitches/templates/setup.html,sha256=iNveFgePATsCSO4XMbGPa8TnWHyvj8S_5WwcW6i7pbo,4661
@@ -53,10 +54,10 @@ sandwitches/templates/signup.html,sha256=pNBSlRGZI_B5ccF3dWpUgWBcjODkdLlq7HhyJLY
 sandwitches/templatetags/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 sandwitches/templatetags/custom_filters.py,sha256=0KDFlFz4b5LwlcURBAmzyYWKKea-LwydZytJGVkkuKA,243
 sandwitches/templatetags/markdown_extras.py,sha256=0ibmRzxE3r85x4k7kK71R-9UT0CgeegYF7MHzj3juTI,344
-sandwitches/urls.py,sha256=uhzsVpKC8Vo6ReDZk3BMg9Pxg4uSrFO8rUdNm18h-xI,3710
+sandwitches/urls.py,sha256=fT4JYLMrTS1IDgb3Ruivj69lXcW86Th44Lt4Kr6Tchs,3922
 sandwitches/utils.py,sha256=SJP-TkeRZ0OIfaMigYrOSbxRqYXswoqoWhwll3nFuAM,7245
-sandwitches/views.py,sha256=BpJkrBVXYoDMFborpH0FEaYT5xk0Dg4adCurXbFl4-o,20215
+sandwitches/views.py,sha256=DA2q1ZrzdimTyVGt9Sbnvvex20gzMuu3N4SGoLQFNtU,20372
 sandwitches/wsgi.py,sha256=Eyncpnahq_4s3Lr9ruB-R3Lu9j9zBXqgPbUj7qhIbwU,399
-sandwitches-2.1.1.dist-info/WHEEL,sha256=eh7sammvW2TypMMMGKgsM83HyA_3qQ5Lgg3ynoecH3M,79
-sandwitches-2.1.1.dist-info/METADATA,sha256=uf0NdPqZ5ObdsQpR1J_6yxKbNjluClyqe-NYQjklh3c,3111
-sandwitches-2.1.1.dist-info/RECORD,,
+sandwitches-2.1.2.dist-info/WHEEL,sha256=eh7sammvW2TypMMMGKgsM83HyA_3qQ5Lgg3ynoecH3M,79
+sandwitches-2.1.2.dist-info/METADATA,sha256=TH8TEmijKUIiOWXUBs-WBv8hZestoOqw0NldlLLJ6kM,3111
+sandwitches-2.1.2.dist-info/RECORD,,