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

sandwitches/api.py

@@ -37,6 +37,16 @@ class Error(Schema):
     message: str
 
 
+class RatingResponseSchema(Schema):
+    average: float
+    count: int
+
+
+@api.get("ping")
+def ping(request):
+    return {"status": "ok", "message": "pong"}
+
+
 @api.get("v1/me", response={200: UserSchema, 403: Error})
 def me(request):
     if not request.user.is_authenticated:
@@ -71,6 +81,15 @@ def get_recipe_of_the_day(request):
     return recipe
 
 
+@api.get("v1/recipes/{recipe_id}/rating", response=RatingResponseSchema)
+def get_recipe_rating(request, recipe_id: int):
+    recipe = get_object_or_404(Recipe, id=recipe_id)
+    return {
+        "average": recipe.average_rating(),
+        "count": recipe.rating_count(),
+    }
+
+
 @api.get("v1/tags", response=list[TagSchema])
 def get_tags(request):
     return Tag.objects.all()  # ty:ignore[unresolved-attribute]

sandwitches/forms.py

@@ -80,10 +80,13 @@ class RecipeForm(forms.ModelForm):
 
 
 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,
+    """Form for rating recipes (0-10)."""
+
+    score = forms.FloatField(
+        min_value=0.0,
+        max_value=10.0,
+        widget=forms.NumberInput(
+            attrs={"step": "0.1", "min": "0", "max": "10", "class": "slider"}
+        ),
         label="Your rating",
     )

sandwitches/migrations/0007_alter_rating_score.py

@@ -0,0 +1,23 @@
+# Generated by Django 6.0 on 2025-12-29 17:58
+
+import django.core.validators
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("sandwitches", "0006_profile"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="rating",
+            name="score",
+            field=models.FloatField(
+                validators=[
+                    django.core.validators.MinValueValidator(0.0),
+                    django.core.validators.MaxValueValidator(10.0),
+                ]
+            ),
+        ),
+    ]

sandwitches/models.py

@@ -6,6 +6,7 @@ from django.contrib.auth import get_user_model
 from django.db.models import Avg
 from .tasks import email_users
 from django.conf import settings
+from django.core.validators import MinValueValidator, MaxValueValidator
 import logging
 from django.urls import reverse
 
@@ -179,7 +180,9 @@ class Recipe(models.Model):
 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)])
+    score = models.FloatField(
+        validators=[MinValueValidator(0.0), MaxValueValidator(10.0)]
+    )
     created_at = models.DateTimeField(auto_now_add=True)
     updated_at = models.DateTimeField(auto_now=True)
 

sandwitches/settings.py

@@ -149,7 +149,7 @@ AUTH_PASSWORD_VALIDATORS = [
 
 # Media files (for uploaded images)
 MEDIA_URL = "/media/"
-MEDIA_ROOT = Path("/config/media")
+MEDIA_ROOT = Path(os.environ.get("MEDIA_ROOT", default=BASE_DIR / "media"))  # ty:ignore[no-matching-overload]
 
 # Static (for CSS etc)
 STATIC_URL = "/static/"

sandwitches/templates/detail.html

@@ -83,24 +83,22 @@
                         {% 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 class="col-sm-12">
+                            <label for="{{ rating_form.score.id_for_label }}">
+                                Score (0-10): <span id="score-output">{{ rating_form.score.value|default:"5.0" }}</span>
+                            </label>
+                            <input 
+                                type="range" 
+                                name="{{ rating_form.score.name }}" 
+                                id="{{ rating_form.score.id_for_label }}" 
+                                min="0" 
+                                max="10" 
+                                step="0.1" 
+                                value="{{ rating_form.score.value|default:'5.0' }}"
+                                oninput="document.getElementById('score-output').innerText = parseFloat(this.value).toFixed(1)"
+                                style="width: 100%;"
+                            >
+                          </div>
                         </div>
                       </fieldset>
                       <p style="margin-top:0.5rem;">

sandwitches/views.py

@@ -66,7 +66,7 @@ def recipe_rate(request, pk):
 
     form = RatingForm(request.POST)
     if form.is_valid():
-        score = int(form.cleaned_data["score"])
+        score = float(form.cleaned_data["score"])
         Rating.objects.update_or_create(  # ty:ignore[unresolved-attribute]
             recipe=recipe, user=request.user, defaults={"score": score}
         )

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

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

{sandwitches-1.2.0.dist-info → sandwitches-1.3.0.dist-info}/RECORD

@@ -1,8 +1,8 @@
 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/api.py,sha256=YDadi-3f2Oz4ia5gXo_rgXVZkZ6LAOiOWraz9bpZzho,2404
 sandwitches/asgi.py,sha256=cygnXdXSSVspM7ZXuj47Ef6oz7HSTw4D7BPzgE2PU5w,399
-sandwitches/forms.py,sha256=NeGUi3xPzQpgw2cVWpo2ZKpYUXsCuJ3SzgGUkvxdV2A,2610
+sandwitches/forms.py,sha256=RFOF9WFXB2kgZp-dXFJjmja_N9VFrBJaB1SB5Rr7zOo,2682
 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
@@ -11,14 +11,15 @@ sandwitches/migrations/0003_rating.py,sha256=iKk9M9lcBS5LwsJkMYsmYfHKqKs2QRTILgI
 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/0007_alter_rating_score.py,sha256=hHdJqjTwq2afcBi7TRSBofAjedDxu5YybbXLhUoMGUg,588
 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/models.py,sha256=CxTwpzIej9hCnBb7kEF5bQAbw-lOvN_8w4SGplCDbFI,6484
+sandwitches/settings.py,sha256=vkIxkZpbaobuLeqYydckYSBJBrCAs-4royx7vym2bQA,5680
 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/detail.html,sha256=6-JL7btpgVuoVhezjPlunw_ysZXbfIxy0GIVBiqZ5wE,4625
 sandwitches/templates/form.html,sha256=S4yUq9p2v7vWifhA5xj_Z4ObpMoaqUq2w08TDw3vk0o,449
 sandwitches/templates/index.html,sha256=tgZFplcedG1r4s8pBc_qvJDXECPqrESPOSw56FnnCkw,2606
 sandwitches/templates/setup.html,sha256=btid1XtR0MO_qSWriWX7LeWUtNFA7rDB4zt5Md9UNhU,1787
@@ -26,8 +27,8 @@ sandwitches/templates/signup.html,sha256=3qOdDMUHMshe2FoaQzR07lIm3Wbrzorb_h9Fp8O
 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/views.py,sha256=7ukWJHBflhAM02j_ZGuoqlBEgN2QnIIq4VhtnvRU1rM,5194
 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.3.0.dist-info/WHEEL,sha256=eh7sammvW2TypMMMGKgsM83HyA_3qQ5Lgg3ynoecH3M,79
+sandwitches-1.3.0.dist-info/METADATA,sha256=d8rJUM76Ts32l7skMKmNezjt7gdH56TzrZGDPfgygEM,731
+sandwitches-1.3.0.dist-info/RECORD,,