sandwitches 1.1.0__py3-none-any.whl → 1.2.0__py3-none-any.whl

sandwitches/templates/signup.html

@@ -1,12 +1,12 @@
 {% extends "base_pico.html" %}
-{% load static %}
-{% block title %}Sign Up{% endblock %}
+{% load static i18n %}
+{% block title %}{% trans "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>
+      <h2>{% trans "Sign up" %}</h2> 
 
       <form method="post" novalidate>
         {% csrf_token %}
@@ -20,27 +20,27 @@
           </div>
         {% endif %}
 
-        <label for="{{ form.username.id_for_label }}">Username</label>
+        <label for="{{ form.username.id_for_label }}">{% trans "Username" %}</label>
         {{ form.username }}
 
-        <label for="{{ form.email.id_for_label }}">Email (optional)</label>
+        <label for="{{ form.email.id_for_label }}">{% trans "Email (optional)" %}</label>
         {{ form.email }}
 
-        <label for="{{ form.first_name.id_for_label }}">First name</label>
+        <label for="{{ form.first_name.id_for_label }}">{% trans "First name" %}</label>
         {{ form.first_name }}
 
-        <label for="{{ form.last_name.id_for_label }}">Last name</label>
+        <label for="{{ form.last_name.id_for_label }}">{% trans "Last name" %}</label>
         {{ form.last_name }}
 
-        <label for="{{ form.password1.id_for_label }}">Password</label>
+        <label for="{{ form.password1.id_for_label }}">{% trans "Password" %}</label>
         {{ form.password1 }}
 
-        <label for="{{ form.password2.id_for_label }}">Confirm password</label>
+        <label for="{{ form.password2.id_for_label }}">{% trans "Confirm password" %}</label>
         {{ form.password2 }}
 
         <p style="margin-top:1rem;">
-          <button type="submit">Sign Up</button>
-          <a class="contrast" href="{% url 'index' %}">Cancel</a>
+          <button type="submit">{% trans "Sign Up" %}</button>
+          <a class="contrast" href="{% url 'index' %}">{% trans "Cancel" %}</a>
         </p>
       </form>
     </div>

sandwitches/urls.py

@@ -16,27 +16,31 @@ Including another URLconf
 """
 
 from django.contrib import admin
-from django.urls import path
+from django.urls import path, include
 from . import views
 from .api import api
+from django.conf.urls.i18n import i18n_patterns
 
 
-from django.conf import settings
-from django.conf.urls.static import static
-from debug_toolbar.toolbar import debug_toolbar_urls
 import os
 import sys
 
 
 urlpatterns = [
-    path("", views.index, name="index"),
+    path("i18n/", include("django.conf.urls.i18n")),
+    path("signup/", views.signup, name="signup"),
     path("admin/", admin.site.urls),
+    path("api/", api.urls),
+    path("media/<path:file_path>", views.media, name="media"),
+    path("", views.index, name="index"),
+]
+
+urlpatterns += i18n_patterns(
     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"),
-]
+    prefix_default_language=True,
+)
 
 if "test" not in sys.argv or "PYTEST_VERSION" in os.environ:
     from debug_toolbar.toolbar import debug_toolbar_urls
@@ -44,7 +48,3 @@ if "test" not in sys.argv or "PYTEST_VERSION" in os.environ:
     urlpatterns = [
         *urlpatterns,
     ] + debug_toolbar_urls()
-
-
-if settings.DEBUG:
-    urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)

sandwitches/views.py

@@ -4,9 +4,14 @@ 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 django.utils.translation import gettext as _
 from .models import Recipe, Rating
 from .forms import RecipeForm, AdminSetupForm, UserSignupForm, RatingForm
+from django.http import HttpResponseBadRequest
+from django.conf import settings
+from django.http import FileResponse, Http404
+from pathlib import Path
+import mimetypes
 
 User = get_user_model()
 
@@ -31,8 +36,8 @@ def recipe_detail(request, slug):
     rating_form = None
     if request.user.is_authenticated:
         try:
-            user_rating = Rating.objects.get(recipe=recipe, user=request.user)
-        except Rating.DoesNotExist:
+            user_rating = Rating.objects.get(recipe=recipe, user=request.user)  # ty:ignore[unresolved-attribute]
+        except Rating.DoesNotExist:  # ty:ignore[unresolved-attribute]
             user_rating = None
         # show form prefilled when possible
         initial = {"score": str(user_rating.score)} if user_rating else None
@@ -62,19 +67,19 @@ def recipe_rate(request, pk):
     form = RatingForm(request.POST)
     if form.is_valid():
         score = int(form.cleaned_data["score"])
-        Rating.objects.update_or_create(
+        Rating.objects.update_or_create(  # ty:ignore[unresolved-attribute]
             recipe=recipe, user=request.user, defaults={"score": score}
         )
-        messages.success(request, "Your rating has been saved.")
+        messages.success(request, _("Your rating has been saved."))
     else:
-        messages.error(request, "Could not save rating.")
+        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")
+    recipes = Recipe.objects.order_by("-created_at")  # ty:ignore[unresolved-attribute]
     return render(request, "index.html", {"recipes": recipes})
 
 
@@ -91,10 +96,9 @@ def setup(request):
         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.")
+            messages.success(request, _("Admin account created and signed in."))
             return redirect(reverse("admin:index"))
     else:
         form = AdminSetupForm()
@@ -113,9 +117,32 @@ def signup(request):
             # log in the newly created user
             user.backend = "django.contrib.auth.backends.ModelBackend"
             login(request, user)
-            messages.success(request, "Account created and signed in.")
+            messages.success(request, _("Account created and signed in."))
             return redirect("index")
     else:
         form = UserSignupForm()
 
     return render(request, "signup.html", {"form": form})
+
+
+def media(request, file_path=None):
+    media_root = getattr(settings, "MEDIA_ROOT", None)
+    if not media_root:
+        return HttpResponseBadRequest("Invalid Media Root Configuration")
+    if not file_path:
+        return HttpResponseBadRequest("Invalid File Path")
+
+    base_path = Path(media_root).resolve()
+    full_path = base_path.joinpath(file_path).resolve()
+    if base_path not in full_path.parents:
+        return HttpResponseBadRequest("Access Denied")
+
+    if not full_path.exists() or not full_path.is_file():
+        raise Http404("File not found")
+
+    content_type, _ = mimetypes.guess_type(full_path)
+    if not content_type or not content_type.startswith("image/"):
+        return HttpResponseBadRequest("Access Denied: Only image files are allowed.")
+
+    response = FileResponse(open(full_path, "rb"), as_attachment=True)
+    return response

{sandwitches-1.1.0.dist-info → sandwitches-1.2.0.dist-info}/METADATA

@@ -1,18 +1,21 @@
 Metadata-Version: 2.3
 Name: sandwitches
-Version: 1.1.0
+Version: 1.2.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-imagekit>=6.0.0
 Requires-Dist: django-ninja>=1.5.1
 Requires-Dist: django-simple-history>=3.10.1
+Requires-Dist: django-tasks>=0.10.0
 Requires-Dist: django>=6.0.0
 Requires-Dist: gunicorn>=23.0.0
 Requires-Dist: markdown>=3.10
 Requires-Dist: pillow>=12.0.0
-Requires-Dist: uwsgi>=2.0.31
+Requires-Dist: uvicorn>=0.40.0
+Requires-Dist: whitenoise[brotli]>=6.11.0
 Requires-Python: >=3.12
 Description-Content-Type: text/markdown
 

sandwitches-1.2.0.dist-info/RECORD

@@ -0,0 +1,33 @@
+sandwitches/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+sandwitches/admin.py,sha256=IIVQOr_CIXsdFXDPQoZ_c83DuqbHVnw4Ht9tAtmvLM0,870
+sandwitches/api.py,sha256=r4HrlEv9IQMuvlr-WravamzTbUWcn85zS1e-iReHEuU,1968
+sandwitches/asgi.py,sha256=cygnXdXSSVspM7ZXuj47Ef6oz7HSTw4D7BPzgE2PU5w,399
+sandwitches/forms.py,sha256=NeGUi3xPzQpgw2cVWpo2ZKpYUXsCuJ3SzgGUkvxdV2A,2610
+sandwitches/locale/nl/LC_MESSAGES/django.mo,sha256=GgZ4aNmU-v0FStt7mafi_UCR4hC0PC06W0mIUPPWtUE,2906
+sandwitches/locale/nl/LC_MESSAGES/django.po,sha256=uk2W5ai6tyhKlA-rcucv5NpZfBrHNBev6Rp5wKWirqc,2843
+sandwitches/migrations/0001_initial.py,sha256=01IfkFbUyYMpTHV5GaBxJEKjzRIdUdPR5sY3AUTODww,2546
+sandwitches/migrations/0002_historicalrecipe.py,sha256=yU2KYssfjYhPXRYN6C8IMRFr-4QUGJozz-O167XuabM,2499
+sandwitches/migrations/0003_rating.py,sha256=iKk9M9lcBS5LwsJkMYsmYfHKqKs2QRTILgINbnilASM,1857
+sandwitches/migrations/0004_add_uploaded_by.py,sha256=gZawakGU-H0Abnn2Bw_Mswy9ngipzUC-BHRXRByKVZo,720
+sandwitches/migrations/0005_historicalrecipe_uploaded_by.py,sha256=xmYDXgBxjrQkbEtorQlDzW0K1Z70UNxRrUk75WjYdEI,766
+sandwitches/migrations/0006_profile.py,sha256=gzmxZWXmjldimYRdovuNouc2Y2idihg8UvEaU0ad_Ds,1558
+sandwitches/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+sandwitches/models.py,sha256=7Upm6abkEZjmk5rIzViW7M_4a3ai03-9tLWLkCty2hs,6390
+sandwitches/settings.py,sha256=5Qg0Wd-X1Kj1Fm7Teh0SRO8jOmVSUkpnUXfZRe1TjwI,5604
+sandwitches/storage.py,sha256=HIiOEDa_LhpsbhCUBNO-SlCZDUJOoANUbyDIbspEcoE,2325
+sandwitches/tasks.py,sha256=aGLpTE42mCZbh2Pyt7fXIjbELm9lD727ir_2bto-wWw,3241
+sandwitches/templates/base.html,sha256=C9tUPfMKRvvdMqdDpE8ww21DH25bNktcVIwdrDEhajw,570
+sandwitches/templates/base_pico.html,sha256=yeWlWlrCfI9yVLStSyODvcNtSmxXvWm4SZORZN-31R4,8273
+sandwitches/templates/detail.html,sha256=p7FikXyse1bYxRCFCYH3GSwgNXHS7D9O6j4fUmmDkWQ,4592
+sandwitches/templates/form.html,sha256=S4yUq9p2v7vWifhA5xj_Z4ObpMoaqUq2w08TDw3vk0o,449
+sandwitches/templates/index.html,sha256=tgZFplcedG1r4s8pBc_qvJDXECPqrESPOSw56FnnCkw,2606
+sandwitches/templates/setup.html,sha256=btid1XtR0MO_qSWriWX7LeWUtNFA7rDB4zt5Md9UNhU,1787
+sandwitches/templates/signup.html,sha256=3qOdDMUHMshe2FoaQzR07lIm3Wbrzorb_h9Fp8Og-Eg,1585
+sandwitches/templatetags/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+sandwitches/templatetags/markdown_extras.py,sha256=0ibmRzxE3r85x4k7kK71R-9UT0CgeegYF7MHzj3juTI,344
+sandwitches/urls.py,sha256=maKaIDfb_kNmMwrpS495TymuFnJJ6fbLoi5QRLjrFds,1582
+sandwitches/views.py,sha256=Av9dfTAygGkFkHO47NK6RDjprMTVRpDa4c63X_h9ur8,5192
+sandwitches/wsgi.py,sha256=Eyncpnahq_4s3Lr9ruB-R3Lu9j9zBXqgPbUj7qhIbwU,399
+sandwitches-1.2.0.dist-info/WHEEL,sha256=eh7sammvW2TypMMMGKgsM83HyA_3qQ5Lgg3ynoecH3M,79
+sandwitches-1.2.0.dist-info/METADATA,sha256=psetHwoaKHYa-_anYOLXOaBdi1UumZwg5lR8uStEg_I,731
+sandwitches-1.2.0.dist-info/RECORD,,

sandwitches-1.1.0.dist-info/RECORD

@@ -1,28 +0,0 @@
-sandwitches/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-sandwitches/admin.py,sha256=8QyK9xOUvGGPz30-7p2phyc-Ks9VKD_K1kCAagisPwA,120
-sandwitches/api.py,sha256=HaTOgqGZK4sPUoGx1IFJoUQntcB1EX91pnyM7-TREjg,1565
-sandwitches/asgi.py,sha256=cygnXdXSSVspM7ZXuj47Ef6oz7HSTw4D7BPzgE2PU5w,399
-sandwitches/forms.py,sha256=NeGUi3xPzQpgw2cVWpo2ZKpYUXsCuJ3SzgGUkvxdV2A,2610
-sandwitches/migrations/0001_initial.py,sha256=01IfkFbUyYMpTHV5GaBxJEKjzRIdUdPR5sY3AUTODww,2546
-sandwitches/migrations/0002_historicalrecipe.py,sha256=yU2KYssfjYhPXRYN6C8IMRFr-4QUGJozz-O167XuabM,2499
-sandwitches/migrations/0003_rating.py,sha256=iKk9M9lcBS5LwsJkMYsmYfHKqKs2QRTILgINbnilASM,1857
-sandwitches/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-sandwitches/models.py,sha256=7dJ5vHZ1bQWG2ebAJKEwaPHMukgdPth7i6quswRldmw,3974
-sandwitches/settings.py,sha256=ApYwzWeJGX5Af4zJ6wWKq0-u8Lro8RVfO7xS7PRbpmw,3829
-sandwitches/storage.py,sha256=XrzMw8mcUowEoV5hYjP-ZI27C3vfk010UkukA5SrGDk,917
-sandwitches/tasks.py,sha256=rsCpfCwcIoSthpN0IZ_dt2jPsMSUe8otBmE2UbFeKg0,468
-sandwitches/templates/base.html,sha256=gUOxxwD7G8VeBranSYp40PCWsJ-ywf8e7Qyv8VoqRP4,494
-sandwitches/templates/base_pico.html,sha256=ntvh9wrfVqkqI58LregrPuVr9czsYB75n7HazbbkFhM,7477
-sandwitches/templates/detail.html,sha256=1GuCwmIV-k9ROhR9bddv19rjqgC5CbLs3AzounmnAEE,3723
-sandwitches/templates/form.html,sha256=XgrQfb_ZEJfnAou7z3gxcj7wqZ4fwFANplvYdzXg80A,373
-sandwitches/templates/index.html,sha256=fnsU5N5dPaa3BXOoIUvgD-9a3EPz0Fs25M0p_eQnf5w,2307
-sandwitches/templates/setup.html,sha256=Y45l96Tl6ln9Mb5gCC4JnT1bf-zuQOpYYL1JL3k-1T0,1677
-sandwitches/templates/signup.html,sha256=UR5Doueq58hSUQgqDrhH5y5Ivdxp_8cfZ0TPaTW_IrI,1439
-sandwitches/templatetags/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-sandwitches/templatetags/markdown_extras.py,sha256=0ibmRzxE3r85x4k7kK71R-9UT0CgeegYF7MHzj3juTI,344
-sandwitches/urls.py,sha256=dBZ4o5lQqAapIVEIZ1OkNTWmU16tUoG3LygusDREaHY,1573
-sandwitches/views.py,sha256=W8HvLFkdmS-nDj3sDY8IZWXv4V7CU5riQy75HSkbEqM,4001
-sandwitches/wsgi.py,sha256=Eyncpnahq_4s3Lr9ruB-R3Lu9j9zBXqgPbUj7qhIbwU,399
-sandwitches-1.1.0.dist-info/WHEEL,sha256=eh7sammvW2TypMMMGKgsM83HyA_3qQ5Lgg3ynoecH3M,79
-sandwitches-1.1.0.dist-info/METADATA,sha256=f4X5Ovu99_ADGnBoWqgWGP5xZKmU6Y5WWFzWQqtrRvA,613
-sandwitches-1.1.0.dist-info/RECORD,,