sandwitches 1.4.2__py3-none-any.whl → 2.0.0__py3-none-any.whl

sandwitches/templates/detail.html

@@ -1,121 +1,178 @@
-{% extends "base_pico.html" %}
+{% extends "base_beer.html" %}
 {% block title %}{{ recipe.title }} — Sandwitch{% endblock %}
+
+{% block extra_head %}
+{{ block.super }}
+<style>
+    @media only screen and (min-width: 992px) {
+        main.container {
+            padding-left: 10%;
+            padding-right: 10%;
+        }
+    }
+    .portion-selector {
+        display: flex;
+        align-items: center;
+        gap: 10px;
+        margin-bottom: 20px;
+    }
+    .portion-selector input[type="number"] {
+        width: 60px;
+        text-align: center;
+    }
+</style>
+{% load custom_filters %} {# Load your custom filters #} 
+<script type="application/ld+json">
+{
+  "@context": "https://schema.org",
+  "@type": "Recipe",
+  "name": "{{ recipe.title }}",
+  {% if recipe.image %}
+  "image": "{{ request.scheme }}://{{ request.get_host }}{{ recipe.image_medium.url }}",
+  {% endif %}
+  "author": {
+    "@type": "Person",
+    "name": "{% if recipe.uploaded_by %}{{ recipe.uploaded_by.get_full_name|default:recipe.uploaded_by.username }}{% else %}Anonymous{% endif %}"
+  },
+  "datePublished": "{{ recipe.created_at|date:"Y-m-d" }}",
+  "description": "{{ recipe.description|striptags|truncatechars:200 }}",
+  {% if recipe.tags.all %}
+  "recipeCategory": [{% for tag in recipe.tags.all %}"{{ tag.name }}"{% if not forloop.last %},{% endif %}{% endfor %}],
+  {% endif %}
+  "recipeIngredient": [
+    {% for ingredient in recipe.ingredients|linebreaksbr|striptags|split:"\n" %}
+    "{{ ingredient|escapejs }}"{% if not forloop.last %},{% endif %}
+    {% endfor %}
+  ],
+  "recipeInstructions": {
+    "@type": "ItemList",
+    "itemListElement": [
+      {% for instruction in recipe.instructions|linebreaksbr|striptags|split:"\n" %}
+      {
+        "@type": "HowToStep",
+        "text": "{{ instruction|escapejs }}"
+      }{% if not forloop.last %},{% endif %}
+      {% endfor %}
+    ]
+  },
+  {% if avg_rating > 0 %}
+  "aggregateRating": {
+    "@type": "AggregateRating",
+    "ratingValue": "{{ avg_rating|floatformat:1 }}",
+    "reviewCount": "{{ rating_count }}"
+  }
+  {% endif %}
+}
+</script>
+{% endblock %}
+
 {% block content %}
 
-{% load i18n markdown_extras %}
-<nav aria-label="breadcrumb" class="container">
-  <a href="{% url 'index' %}">&larr; {% trans "Back to all" %}</a>
+{% load i18n markdown_extras %} {# Keep existing load tags #} 
+
+<div class="space"></div>
+
+<nav>
+  <a href="{% url 'index' %}" class="button transparent circle">
+      <i>arrow_back</i>
+  </a>
+  <h5 class="max ml-2">{% trans "Back to all" %}</h5>
 </nav>
 
+<div class="large-space"></div>
+
 <div class="grid">
-  <article class="card">
-    <figure>
-      {% if recipe.image %}
+  <!-- Left Column: Image and Main Info -->
+  <div class="s12 m12 l5">
+     <article class="round no-padding elevate">
+        {% if recipe.image %}
         <img src="{{ recipe.image_large.url }}" 
              srcset="{{ recipe.image_medium.url }} 700w, {{ recipe.image_large.url }} 1200w" 
-             sizes="(max-width: 768px) 95vw, 900px"
+             sizes="(max-width: 768px) 95vw, 600px"
              alt="{{ recipe.title }}" 
-             loading="lazy">
-      {% endif %}
-    </figure>
-{% trans "Description" %}
-    <header>
-      {{ recipe.title }}
-      {% if recipe.uploaded_by %}
-        <small>{% trans "Uploaded by" %}: {{ recipe.uploaded_by.get_full_name|default:recipe.uploaded_by.username }}</small>
-      {% endif %}
-    </header>
-      <h4>{% trans "Description" %}</h4>
-      {% if recipe.description %}
-        {{ recipe.description|convert_markdown|safe }}
-      {% else %}
-        <p>{% trans "No description yet." %}</p>
-      {% endif %}
-
-      <h4>{% trans "Ingredients" %}</h4>
-      {% if recipe.ingredients %}
-        {{ recipe.ingredients|convert_markdown|safe }}
-      {% else %}
-        <p>{% trans "No ingredients listed." %}</p>
-      {% endif %}
-
-      <h4>{% trans "Instructions" %}</h4>
-      {% if recipe.instructions %}
-        {{ recipe.instructions|convert_markdown|safe }}
-      {% else %}
-        <p>{% trans "No instructions yet." %}</p>
-      {% endif %}
-    
-    <div class="tags-row">
-      <div style="margin-top:12px;">
-        {% for tag in recipe.tags.all %}
-          <span class="tag">{{ tag.name }}</span>
-        {% endfor %}
+             loading="lazy"
+             class="responsive top-round">
+        {% else %}
+        <div class="primary medium-height top-round middle-align center-align" style="height:300px;">
+           <i class="extra">lunch_dining</i>
+        </div>
+        {% endif %}        
+        <div class="padding">
+            {% include "components/recipe_header.html" %}
+            
+            <div class="space"></div>
+            <div class="divider"></div>
+            <div class="space"></div>
+
+            <h6 class="bold">{% trans "Tags" %}</h6>
+            <div class="row wrap">
+              {% for tag in recipe.tags.all %}
+                <a href="{% url 'index' %}?tag={{ tag.name|urlencode }}" class="chip round surface">{{ tag.name }}</a>
+              {% endfor %}
+            </div>
+
+            <div class="space"></div>
+            <div class="divider"></div>
+            <div class="space"></div>
+
+            <div class="row wrap">
+                {% if recipe.favorited_by.all %}
+                   <span class="tiny-text">
+                       {% if recipe.favorited_by.count == 1 %}
+                           {% trans "Liked by" %} {{ recipe.favorited_by.first.username }}
+                       {% else %}
+                           {% trans "Liked by" %} {{ recipe.favorited_by.first.username }} {% trans "and" %} {{ recipe.favorited_by.count|add:"-1" }} {% trans "others" %}
+                       {% endif %}
+                   </span>
+                {% endif %}
+            </div>
+
+            <div class="space"></div>
+            <div class="divider"></div>
+            <div class="space"></div>
+            
+            {% include "components/rating_section.html" %}
+
+            {% if user.is_authenticated and user.is_staff %}
+            <div class="space"></div>
+            <a href="/admin/sandwitches/recipe/{{ recipe.pk }}/change/" class="button transparent border round width-100 center-align">
+                <i>edit</i>
+                <span>{% trans "Edit Recipe" %}</span>
+            </a>
+            {% endif %}
+        </div>
+     </article>
+  </div>
+
+  <!-- Right Column: Details -->
+  <div class="s12 m12 l7">
+      <div class="padding">
+          
+          <h5 class="primary-text">{% trans "Description" %}</h5>
+          <div class="large-text">
+            {% if recipe.description %}
+                {{ recipe.description|convert_markdown|safe }}
+            {% else %}
+                <p class="italic">{% trans "No description yet." %}</p>
+            {% endif %}
+          </div>
+          
+          <div class="large-space"></div>
+          
+          {% include "components/ingredients_section.html" %}
+
+          <div class="large-space"></div>
+
+          {% include "components/instructions_section.html" %}
       </div>
-    </div>
-
-    <div style="margin-top:1rem;">
-      <h4>{% trans "Rating" %}</h4>
-      {% if rating_count %}
-        <p>{% trans "Average:" %} {{ avg_rating|floatformat:1 }} ({{ rating_count }} {% trans "vote" %}{% if rating_count %}s{% endif %})</p>
-      {% else %}
-        <p>{% trans "No ratings yet." %}</p>
-      {% endif %}
-
-      {% if user.is_authenticated %}
-          {% if user_rating %}
-            <p>{% trans "Your rating:" %} {{ user_rating.score }}</p>
-          {% else %}
-            <form method="post" action="{% url 'recipe_rate' pk=recipe.pk %}">
-                      {% csrf_token %}
-
-                      <fieldset>
-                        <legend>{% trans "What would you rate this sandwich?" %}</legend>
-
-                        {% if rating_form.score.errors %}
-                          <div class="card-panel" role="alert">
-                            <ul>
-                              {% for err in rating_form.score.errors %}
-                                <li>{{ err }}</li>
-                              {% endfor %}
-                            </ul>
-                          </div>
-                        {% endif %}
-
-                        <div class="row">
-                          <div class="col-sm-12">
-                            <label for="{{ rating_form.score.id_for_label }}">
-                                {% trans "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;">
-                        <button type="submit">{% if user_rating %}{% trans "Update" %}{% else %}{% trans "Rate" %}{% endif %}</button>
-                      </p>
-                    </form>
-          {% endif %}        
-      {% else %}
-        <p><a href="{% url 'admin:login' %}">{% trans "Log in" %}</a> {% trans "to rate this recipe." %}</p>
-      {% endif %}
-    </div>
-
-      {% if user.is_authenticated and user.is_staff %}
-    <footer>
-        <a href="/admin/sandwitches/recipe/{{ recipe.pk }}/change/">{% trans "Edit" %}</a>
-    </footer>
-    {% endif %}
-  </article>
+  </div>
 </div>
-{% endblock %}
+{% endblock %}
+
+{% block extra_scripts %}
+
+{{ block.super }}
+
+{% include "components/ingredients_scripts.html" %}
+
+{% endblock %}

sandwitches/templates/favorites.html

@@ -0,0 +1,42 @@
+{% extends "base_beer.html" %}
+{% load i18n static %}
+
+{% block title %}{% trans 'Favorites' %}{% 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 primary s12 m12 l12">
+  <div class="row align-center">
+    <div class="max">
+      <h4 class="upper">{% trans 'Your Favorites' %}</h4>
+      <p class="large-text">{% trans 'The recipes you love the most.' %}</p>
+    </div>
+  </div>
+</article>
+
+<div class="space"></div>
+
+{% include "components/favorites_search_form.html" %}
+
+<div class="large-space"></div>
+
+{% include "partials/recipe_list.html" %}
+
+{% endblock %}
+
+{% block page_scripts %}
+{% include "components/search_scripts.html" %}
+{% endblock %}

sandwitches/templates/index.html

@@ -1,75 +1,42 @@
-{% extends "base_pico.html" %} {% load i18n static %}
+{% 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="grid search-row">
-  <div>
-    <h4>{% trans 'Sandwitches: sandwiches so good, they haunt you!' %}</h4>
+<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>
-  <div>
-    <form role="search" onsubmit="return false;">
-      <input id="search" type="search" placeholder="{% trans "Search by title or tag" %}" aria-label="{% trans "Search" %}">
-    </form>
-  </div>
-</div>
-
-<section class="grid">
-  {% for recipe in recipes %}
-    <article class="card" onclick="location.href='{% url 'recipe_detail' recipe.slug %}';" style="cursor:pointer;">
-      {% if recipe.image %}
-      <figure class="recipe-figure">
-          <img src="{{ recipe.image_medium.url }}" 
-               srcset="{{ recipe.image_thumbnail.url }} 150w, {{ recipe.image_medium.url }} 700w" 
-               sizes="(max-width: 640px) 90vw, 45vw"
-               alt="{{ recipe.title }}" 
-               loading="lazy">
-      </figure>
-      {% endif %}
+</article>
 
-      <div class="card-body">
-        <header class="card-title">{{ recipe.title }}</header>
+<div class="space"></div>
 
-        <div class="tags-row" aria-hidden="false">
-          {% for tag in recipe.tags.all %}
-            <span class="chip{% if tag|length < 8 %} chip--accent{% endif %}">{{ tag.name }}</span>
-          {% endfor %}
-        </div>
-      </div>
+{% include "components/search_form.html" %}
 
-      {% if user.is_authenticated and user.is_staff %}
-      <footer>            
-          <a href="/admin/sandwitches/recipe/{{ recipe.pk }}/change/" rel="noopener">{% trans "Edit" %}</a>
-      </footer>
-      {% endif %}
-    </article>
+<div class="large-space"></div>
 
-  {% empty %}
-    <article class="card">
-      <div class="card-body">
-        <p>{% trans "No sandwitches yet, please stay tuned." %}</p>
-      </div>
-    </article>
-  {% endfor %}
-</section>
+{% include "partials/recipe_list.html" %}
 
 {% endblock %}
 
 {% block page_scripts %}
-<script>
-document.addEventListener('DOMContentLoaded', function() {
-  const search = document.getElementById('search');
-  if (!search) return;
-  search.addEventListener('input', function() {
-    const q = this.value.toLowerCase().trim();
-    document.querySelectorAll('section.grid article.card').forEach(card => {
-      const title = (card.querySelector('.card-title')?.textContent || '').toLowerCase();
-      const tags = Array.from(card.querySelectorAll('.tag, .chip')).map(t => t.textContent.toLowerCase());
-      const descr = (card.querySelector('.card-body p')?.textContent || '').toLowerCase();
-      const match = !q || title.includes(q) || descr.includes(q) || tags.some(t => t.includes(q));
-      card.style.display = match ? '' : 'none';
-    });
-  });
-});
-</script>
+{% include "components/search_scripts.html" %}
 {% endblock %}

sandwitches/templates/partials/recipe_list.html

@@ -0,0 +1,87 @@
+{% load i18n %}
+<div class="grid justify-center" id="recipe-grid">
+  {% for recipe in recipes %}
+  <div class="s12 m6 l4 xl3 recipe-card">
+    <article class="round no-padding elevate">
+       <div style="position: relative;">
+         {% if recipe.image %}
+         <img src="{{ recipe.image_medium.url }}" class="responsive top-round" style="height:220px; width:100%; object-fit:cover; cursor:pointer;" loading="lazy" alt="{{ recipe.title }}" onclick="location.href='{% url 'recipe_detail' recipe.slug %}';">
+         {% else %}
+         <div class="primary medium-height top-round middle-align center-align" style="height:220px; cursor:pointer;" onclick="location.href='{% url 'recipe_detail' recipe.slug %}';">
+           <i class="extra">lunch_dining</i>
+         </div>
+         {% endif %}
+         
+         {% if user.is_authenticated %}
+         <div class="absolute top left padding">
+             <a href="{% url 'toggle_favorite' recipe.pk %}" class="button circle surface white-text">
+                <i class="{% if recipe in user.favorites.all %}primary-text{% else %}black-text{% endif %}">
+                    {% if recipe in user.favorites.all %}favorite{% else %}favorite_border{% endif %}
+                </i>
+             </a>
+         </div>
+         {% endif %}
+       </div>
+       
+       <div class="padding">
+         <h5 class="truncate pointer" onclick="location.href='{% url 'recipe_detail' recipe.slug %}';">{{ recipe.title }}</h5>
+         
+         <div class="row align-center">
+            {% if recipe.uploaded_by %}
+                <a href="{% url 'index' %}?uploader={{ recipe.uploaded_by.username|urlencode }}" class="row align-center" style="color: inherit; text-decoration: none;">
+                    {% if recipe.uploaded_by.avatar %}
+                    <img src="{{ recipe.uploaded_by.avatar.url }}" class="circle tiny" alt="{{ recipe.uploaded_by.username }}">
+                    {% else %}
+                    <i class="tiny circle surface">person</i>
+                    {% endif %}
+                    <span class="tiny-text left-margin">{{ recipe.uploaded_by.username }}</span>
+                </a>
+            {% else %}
+                <i class="tiny circle surface">person_off</i>
+                <span class="tiny-text left-margin">{% trans "Unknown" %}</span>
+            {% endif %}
+         </div>
+         
+         <div class="space"></div>
+
+         <div class="row wrap">
+             {% if recipe.favorited_by.all %}
+                <span class="tiny-text">
+                    {% if recipe.favorited_by.count == 1 %}
+                        {% trans "Liked by" %} {{ recipe.favorited_by.first.username }}
+                    {% else %}
+                        {% trans "Liked by" %} {{ recipe.favorited_by.first.username }} {% trans "and" %} {{ recipe.favorited_by.count|add:"-1" }} {% trans "others" %}
+                    {% endif %}
+                </span>
+             {% endif %}
+         </div>
+
+         <div class="space"></div>
+         
+         <div class="row wrap">
+           {% for tag in recipe.tags.all %}
+           <a href="{% url 'index' %}?tag={{ tag.name|urlencode }}" class="chip small round surface margin-bottom">{{ tag.name }}</a>
+           {% endfor %}
+         </div>
+       </div>
+       
+       <div class="padding pt-0">
+         <a href="{% url 'recipe_detail' recipe.slug %}" class="button fill round responsive">
+           <span>{% trans 'View Recipe' %}</span>
+           <i class="suffix">arrow_forward</i>
+         </a>
+       </div>
+    </article>
+  </div>
+  {% empty %}
+  <div class="s12 center-align">
+    <div class="large-space"></div>
+    <i class="extra gray-text">no_food</i>
+    <h5 class="gray-text">{% trans "No sandwitches found." %}</h5>
+    <p>{% trans "Be the first to create one!" %}</p>
+    {% if user.is_authenticated %}
+    <a href="{% url 'admin:sandwitches_recipe_add' %}" class="button primary round">{% trans "Add Recipe" %}</a>
+    {% endif %}
+  </div>
+  {% endfor %}
+</div>

sandwitches/templates/recipe_form.html

@@ -0,0 +1,119 @@
+{% extends "base_beer.html" %}
+{% load i18n %}
+
+{% block title %}{% trans "Edit Recipe" %}{% endblock %}
+
+{% block content %}
+<div class="large-space"></div>
+<article class="round s12 m10 l8 offset-m1 offset-l2 elevate">
+    <div class="padding">
+        <h4 class="center-align">
+            {% if recipe.pk %}
+                {% trans "Edit Recipe:" %} {{ recipe.title }}
+            {% else %}
+                {% trans "New Recipe" %}
+            {% endif %}
+        </h4>
+        <div class="space"></div>
+        
+        <form method="post" enctype="multipart/form-data">
+            {% csrf_token %}
+            
+            <div class="grid">
+                <div class="s12">
+                    <div class="field label border round">
+                        {{ form.title }}
+                        <label>{% trans "Title" %}</label> 
+                    </div>
+                    {% if form.title.errors %}
+                    <p class="error-text tiny-text no-margin">{{ form.title.errors.0 }}</p>
+                    {% endif %}
+                </div>
+
+                <div class="s12">
+                    <div class="field textarea label border round" style="height: auto;">
+                        {{ form.description }}
+                        <label>{% trans "Description" %}</label>
+                    </div>
+                     {% if form.description.errors %}
+                    <p class="error-text tiny-text no-margin">{{ form.description.errors.0 }}</p>
+                    {% endif %}
+                </div>
+
+                <div class="s12 m6">
+                    <div class="field textarea label border round">
+                        {{ form.ingredients }}
+                        <label>{% trans "Ingredients" %}</label>
+                    </div>
+                </div>
+
+                <div class="s12 m6">
+                    <div class="field textarea label border round">
+                        {{ form.instructions }}
+                        <label>{% trans "Instructions" %}</label>
+                    </div>
+                </div>
+
+                <!-- Image Upload with Preview -->
+                <div class="s12 m6">
+                     <div class="field label border round">
+                        {{ form.image }}
+                        <label>{% trans "Image" %}</label>
+                    </div>
+                </div>
+                <div class="s12 m6 center-align relative">
+                    <div class="padding border round dashed surface-variant" style="min-height: 150px; display: flex; align-items: center; justify-content: center;">
+                         <img id="image-preview" src="{% if recipe.image %}{{ recipe.image.url }}{% endif %}" class="responsive round" style="max-height: 200px; {% if not recipe.image %}display:none;{% endif %}">
+                         <span id="image-placeholder" class="gray-text" {% if recipe.image %}style="display:none;"{% endif %}>{% trans "Image Preview" %}</span>
+                    </div>
+                </div>
+
+                <div class="s12">
+                    <div class="field label border round">
+                        {{ form.tags }}
+                        <label>{% trans "Tags (comma separated)" %}</label>
+                    </div>
+                </div>
+            </div>
+
+            <div class="large-space"></div>
+            
+            <div class="row right-align">
+                <!-- Fallback to index if referer is missing, or history.back -->
+                <a href="javascript:history.back()" class="button transparent border round">{% trans "Cancel" %}</a>
+                <button type="submit" class="button primary round">
+                    <i class="front">save</i>
+                    <span>{% trans "Save Recipe" %}</span>
+                </button>
+            </div>
+        </form>
+    </div>
+</article>
+<div class="large-space"></div>
+
+{% endblock %}
+
+{% block page_scripts %}
+<script>
+    // Image Preview Logic
+    var imageInput = document.querySelector('input[type="file"]');
+    if (imageInput) {
+        imageInput.onchange = function (evt) {
+            var tgt = evt.target || window.event.srcElement,
+                files = tgt.files;
+
+            if (FileReader && files && files.length) {
+                var fr = new FileReader();
+                fr.onload = function () {
+                    var preview = document.getElementById('image-preview');
+                    var placeholder = document.getElementById('image-placeholder');
+                    preview.src = fr.result;
+                    preview.style.display = 'block';
+                    if(placeholder) placeholder.style.display = 'none';
+                }
+                fr.readAsDataURL(files[0]);
+            }
+        }
+    }
+</script>
+{% endblock %}

sandwitches/templates/setup.html

@@ -1,4 +1,4 @@
-{% extends "base_pico.html" %}
+{% extends "base_beer.html" %}
 {% load static i18n %}
 {% block title %}{% trans "Initial setup — Create admin" %}{% endblock %}