sandwitches 2.5.2__tar.gz → 2.5.4__tar.gz

{sandwitches-2.5.2 → sandwitches-2.5.4}/PKG-INFO

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

{sandwitches-2.5.2 → sandwitches-2.5.4}/pyproject.toml

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

{sandwitches-2.5.2 → sandwitches-2.5.4}/src/sandwitches/templates/admin/admin_base.html

@@ -26,8 +26,7 @@
     <i>menu</i>
   </button>
   <a href="{% url 'admin_dashboard' %}" class="row align-center">
-    <img src="{% static 'icons/icon.svg' %}" class="circle small">
-    <h6 class="max">{% trans "Sandwitches Admin" %} | {% block admin_title %}{% endblock %}</h6>
+    <img src="{% static 'icons/icon.svg' %}" class="circle">
   </a>
   <div class="max"></div>
 
@@ -45,48 +44,52 @@
             <h5 class="max">{% trans "Admin" %}</h5>
         </header>
         <div class="space"></div>
-        <a href="{% url 'admin_dashboard' %}" class="{% if request.resolver_match.url_name == 'admin_dashboard' %}active{% endif %}">
+        <a href="{% url 'admin_dashboard' %}" class="padding {% if request.resolver_match.url_name == 'admin_dashboard' %}active{% endif %}">
             <i>dashboard</i>
-            <span>{% trans "Dashboard" %}</span>
+            <span class="large-text">{% trans "Dashboard" %}</span>
         </a>
-        <a href="{% url 'admin_recipe_list' %}" class="{% if request.resolver_match.url_name == 'admin_recipe_list' %}active{% endif %}">
+        <a href="{% url 'admin_recipe_list' %}" class="padding {% if request.resolver_match.url_name == 'admin_recipe_list' %}active{% endif %}">
             <i>restaurant</i>
-            <span>{% trans "Recipes" %}</span>
+            <span class="large-text">{% trans "Recipes" %}</span>
         </a>
-        <a href="{% url 'admin_recipe_approval_list' %}" class="{% if request.resolver_match.url_name == 'admin_recipe_approval_list' %}active{% endif %}">
+        <a href="{% url 'admin_recipe_approval_list' %}" class="padding {% if request.resolver_match.url_name == 'admin_recipe_approval_list' %}active{% endif %}">
             <i>how_to_reg</i>
-            <span>{% trans "Approvals" %}</span>
+            <span class="large-text">{% trans "Approvals" %}</span>
         </a>
-        <a href="{% url 'admin_user_list' %}" class="{% if request.resolver_match.url_name == 'admin_user_list' %}active{% endif %}">
+        <a href="{% url 'admin_user_list' %}" class="padding {% if request.resolver_match.url_name == 'admin_user_list' %}active{% endif %}">
             <i>people</i>
-            <span>{% trans "Users" %}</span>
+            <span class="large-text">{% trans "Users" %}</span>
         </a>
-        <a href="{% url 'admin_tag_list' %}" class="{% if request.resolver_match.url_name == 'admin_tag_list' %}active{% endif %}">
+        <a href="{% url 'admin_tag_list' %}" class="padding {% if request.resolver_match.url_name == 'admin_tag_list' %}active{% endif %}">
             <i>label</i>
-            <span>{% trans "Tags" %}</span>
+            <span class="large-text">{% trans "Tags" %}</span>
         </a>
-        <a href="{% url 'admin_rating_list' %}" class="{% if request.resolver_match.url_name == 'admin_rating_list' %}active{% endif %}">
+        <a href="{% url 'admin_rating_list' %}" class="padding {% if request.resolver_match.url_name == 'admin_rating_list' %}active{% endif %}">
             <i>star</i>
-            <span>{% trans "Ratings" %}</span>
+            <span class="large-text">{% trans "Ratings" %}</span>
         </a>
-        <a href="{% url 'admin_order_list' %}" class="{% if request.resolver_match.url_name == 'admin_order_list' %}active{% endif %}">
+        <a href="{% url 'admin_order_list' %}" class="padding {% if request.resolver_match.url_name == 'admin_order_list' %}active{% endif %}">
             <i>shopping_cart</i>
-            <span>{% trans "Orders" %}</span>
+            <span class="large-text">{% trans "Orders" %}</span>
         </a>
-        <a href="{% url 'admin_task_list' %}" class="{% if request.resolver_match.url_name == 'admin_task_list' %}active{% endif %}">
+        <a href="{% url 'admin_settings' %}" class="padding {% if request.resolver_match.url_name == 'admin_settings' %}active{% endif %}">
+            <i>settings</i>
+            <span class="large-text">{% trans "Site Settings" %}</span>
+        </a>
+        <a href="{% url 'admin_task_list' %}" class="padding {% if request.resolver_match.url_name == 'admin_task_list' %}active{% endif %}">
             <i>assignment</i>
-            <span>{% trans "Tasks" %}</span>
+            <span class="large-text">{% trans "Tasks" %}</span>
         </a>
         <div class="divider"></div>
-        <a href="{% url 'index' %}">
+        <a href="{% url 'index' %}" class="padding">
             <i>home</i>
-            <span>{% trans "Public Site" %}</span>
+            <span class="large-text">{% trans "Public Site" %}</span>
         </a>
     </nav>
 </dialog>
 
 {% if user.is_authenticated %}
-<menu id="user-menu" class="no-wrap left">
+<menu id="user-menu" class="left">
   <a href="{% url 'admin:logout' %}" class="row"><i>logout</i>{% trans "Logout" %}</a>
 </menu>
 {% endif %}

sandwitches-2.5.4/src/sandwitches/templates/admin/partials/order_rows.html

@@ -0,0 +1,41 @@
+{% load i18n %}
+{% for order in orders %}
+<tr>
+    <td>{{ order.id }}</td>
+    <td>
+        <div class="row align-center">
+            {% if order.user.avatar %}
+            <img src="{{ order.user.avatar.url }}" class="circle tiny">
+            {% else %}
+            <i class="circle tiny">person</i>
+            {% endif %}
+            <span class="max">{{ order.user.username }}</span>
+        </div>
+    </td>
+    <td>{{ order.recipe.title }}</td>
+    <td>€ {{ order.total_price }} </td>
+    <td>
+        <form method="post" action="{% url 'admin_order_update_status' order.pk %}" class="row align-center no-space">
+            {% csrf_token %}
+            <div class="field border round small no-margin">
+                <select name="status" onchange="this.form.submit()" {% if order.status == 'COMPLETED' or order.status == 'CANCELLED' %}disabled{% endif %}>
+                    {% for val, label in status_choices %}
+                    <option value="{{ val }}" {% if order.status == val %}selected{% endif %}>{{ label }}</option>
+                    {% endfor %}
+                </select>
+                <i>arrow_drop_down</i>
+            </div>
+            {% if order.status == 'COMPLETED' or order.status == 'CANCELLED' %}
+            <span class="chip {% if order.status == 'COMPLETED' %}primary{% else %}error{% endif %} margin">
+                {{ order.get_status_display }}
+            </span>
+            {% endif %}
+        </form>
+    </td>
+    <td>{{ order.created_at|date:"d/m/Y H:i" }}</td>
+</tr>
+{% empty %}
+<tr>
+    <td colspan="6" class="center-align">{% trans "No orders found." %}</td>
+</tr>
+{% endfor %}

{sandwitches-2.5.2 → sandwitches-2.5.4}/src/sandwitches/templates/admin/recipe_list.html

@@ -38,7 +38,6 @@
                 <th>{% trans "Rating" %}
                     <i class="primary-text">star</i>
                 </th>
-                <th>{% trans "Approved" %}</th>
                 <th>{% trans "Tags" %}</th>
                 <th>
                     <a href="?sort={% if current_sort == 'uploader' %}-uploader{% else %}uploader{% endif %}" class="row align-center">
@@ -75,7 +74,7 @@
             </td>
             <td>
                 {% if recipe.price %}
-                {{ recipe.price }} €
+                € {{ recipe.price }}
                 {% else %}
                 -
                 {% endif %}
@@ -89,13 +88,6 @@
                     <span>{{ recipe.avg_rating|default:0|floatformat:1 }}</span>
                 </div>
             </td>
-            <td class="center-align">
-                {% if recipe.is_approved %}
-                <i class="primary-text">check_circle</i>
-                {% else %}
-                <i class="primary-text">close</i>
-                {% endif %}
-            </td>
             <td>
                 {% for tag in recipe.tags.all %}
                 <span class="chip tiny">{{ tag.name }}</span>

sandwitches-2.5.4/src/sandwitches/templates/admin/settings.html

@@ -0,0 +1,41 @@
+{% extends "admin/admin_base.html" %}
+{% load i18n %}
+
+{% block admin_title %}{{ title }}{% endblock %}
+
+{% block content %}
+<main class="container">
+    <article class="round padding">
+        <header>
+            <h5 class="max">{% trans "Site Settings" %}</h5>
+        </header>
+        <div class="space"></div>
+        <form method="post">
+            {% csrf_token %}
+            <div class="grid">
+                {% for field in form %}
+                <div class="s12 m6">
+                    <div class="field label border round">
+                        {{ field }}
+                        <label>{{ field.label }}</label>
+                        {% if field.help_text %}
+                        <div class="helper">{{ field.help_text }}</div>
+                        {% endif %}
+                        {% if field.errors %}
+                        <span class="error">{{ field.errors|striptags }}</span>
+                        {% endif %}
+                    </div>
+                </div>
+                {% endfor %}
+            </div>
+            <div class="space"></div>
+            <nav class="right-align">
+                <button type="submit" class="button primary round">
+                    <i>save</i>
+                    <span>{% trans "Save Settings" %}</span>
+                </button>
+            </nav>
+        </form>
+    </article>
+</main>
+{% endblock %}

{sandwitches-2.5.2 → sandwitches-2.5.4}/src/sandwitches/templates/cart.html

@@ -15,31 +15,31 @@
     {% if cart_items %}
     <div class="grid">
         <div class="s12 m8">
-            <div class="padding border round surface">
-                <table class="border striped no-space">
+            <div class="padding border round secondary-container">
+                <table class="border striped large-space">
                     <thead>
                         <tr>
-                            <th class="min">{% trans "Item" %}</th>
-                            <th class="max">{% trans "Description" %}</th>
-                            <th class="min">{% trans "Quantity" %}</th>
-                            <th class="min">{% trans "Price" %}</th>
-                            <th class="min"></th>
+                            <th>{% trans "Item" %}</th>
+                            <th>{% trans "Description" %}</th>
+                            <th>{% trans "Quantity" %}</th>
+                            <th>{% trans "Price" %}</th>
+                            <th></th>
                         </tr>
                     </thead>
                     <tbody>
                         {% for item in cart_items %}
                         <tr>
-                            <td class="min">
+                            <td>
                                 {% if item.recipe.image %}
-                                <img src="{{ item.recipe.image_thumbnail.url }}" class="circle small">
+                                <img src="{{ item.recipe.image_thumbnail.url }}" class="large circle" alt="{{ item.recipe.title }}">
                                 {% else %}
                                 <i class="circle small gray1">restaurant</i>
                                 {% endif %}
                             </td>
-                            <td class="max">
+                            <td>
                                 <a href="{% url 'recipe_detail' item.recipe.slug %}" class="bold">{{ item.recipe.title }}</a>
                             </td>
-                            <td class="min">
+                            <td>
                                 <form action="{% url 'update_cart_quantity' item.pk %}" method="post" class="row no-space align-center">
                                     {% csrf_token %}
                                     <div class="field border round small no-margin" style="width: 80px;">
@@ -47,8 +47,8 @@
                                     </div>
                                 </form>
                             </td>
-                            <td class="min no-wrap">{{ item.total_price }} €</td>
-                            <td class="min">
+                            <td>{{ item.total_price }} €</td>
+                            <td>
                                 <a href="{% url 'remove_from_cart' item.pk %}" class="button circle transparent">
                                     <i>delete</i>
                                 </a>
@@ -66,7 +66,6 @@
                     <div class="max">{% trans "Subtotal" %}</div>
                     <div class="bold">{{ total }} €</div>
                 </div>
-                <div class="divider mt-1 mb-1"></div>
                 <div class="row">
                     <div class="max bold">{% trans "Total" %}</div>
                     <div class="bold large-text">{{ total }} €</div>
@@ -74,14 +73,14 @@
                 <div class="space"></div>
                 <form action="{% url 'checkout_cart' %}" method="post">
                     {% csrf_token %}
-                    <button type="submit" class="button primary round extend">
+                    <button type="submit" class="button primary round">
                         <i>check</i>
                         <span>{% trans "Checkout" %}</span>
                     </button>
                 </form>
             </article>
             <div class="space"></div>
-            <a href="{% url 'index' %}" class="button transparent extend">
+            <a href="{% url 'index' %}" class="button secondary round">
                 <i>arrow_back</i>
                 <span>{% trans "Continue Shopping" %}</span>
             </a>

{sandwitches-2.5.2 → sandwitches-2.5.4}/src/sandwitches/templates/components/ingredients_section.html

@@ -6,6 +6,6 @@
     <input type="number" id="portions" value="{{ recipe.servings }}" min="1" onchange="scaleIngredients()">
     <button class="button circle transparent" onclick="adjustPortions(1)">+</button>
 </div>
- <div id="ingredients-display" class="card padding flat gray1">
+ <div id="ingredients-display" class="card padding">
   <p class="text-center">{% trans "Loading ingredients..." %}</p>
  </div>

{sandwitches-2.5.2 → sandwitches-2.5.4}/src/sandwitches/templates/components/navbar.html

@@ -12,7 +12,7 @@
     <a href="{% url 'view_cart' %}" class="button circle transparent">
         <i>shopping_cart</i>
         {% if user.cart_items.exists %}
-        <badge class="red">{{ user.cart_items.count }}</badge>
+        <badge class="tertiary round small-padding">{{ user.cart_items.count }}</badge>
         {% endif %}
     </a>
     <a href="{% url 'user_profile' %}">
@@ -22,9 +22,9 @@
       <img src="https://www.w3schools.com/howto/img_avatar.png" class="circle">
       {% endif %}
     </a>
-    <button class="circle transparent" data-ui="#user-menu">
+    <a href="{% url 'user_settings' %}" class="{% if request.resolver_match.url_name == 'user_settings' %}active{% endif %}">
       <i>more_vert</i>
-    </button>
+    </a>
   {% else %}
     <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>

{sandwitches-2.5.2 → sandwitches-2.5.4}/src/sandwitches/templates/components/rating_section.html

@@ -40,6 +40,7 @@
               <textarea name="{{ rating_form.comment.name }}" placeholder="{% trans "Add a comment (optional)" %}">{{ user_rating.comment|default:"" }}</textarea>
               <label>{% trans "Comment" %}</label>
           </div>
+          <div class="space"></div>
           <button type="submit" class="button primary round mt-2">{% trans "Submit Rating" %}</button>
       </form>
   </article>

{sandwitches-2.5.2 → sandwitches-2.5.4}/src/sandwitches/templates/components/recipe_header.html

@@ -3,7 +3,7 @@
     <h4 class="bold max">{{ recipe.title }}</h4>
     {% if user.is_authenticated %}
     <a href="{% url 'toggle_favorite' recipe.pk %}" id="favorite-toggle-button" class="button circle transparent" title="{% trans 'Toggle Favorite' %}">
-        <i class="{% if recipe in user.favorites.all %}primary-text{% else %}black-text{% endif %}">
+        <i class="{% if recipe in user.favorites.all %}red-text{% else %}primary-text{% endif %}">
             {% if recipe in user.favorites.all %}favorite{% else %}favorite_border{% endif %}
         </i>
     </a>

{sandwitches-2.5.2 → sandwitches-2.5.4}/src/sandwitches/templates/components/side_menu.html

@@ -19,10 +19,6 @@
             <i class="extra padding">group</i>
             <span class="large-text">{% trans "Community" %}</span>
         </a>
-        <a href="{% url 'user_settings' %}" class="padding {% if request.resolver_match.url_name == 'user_settings' %}active{% endif %}">
-            <i class="extra padding">settings</i>
-            <span class="large-text">{% trans "Settings" %}</span>
-        </a>
         {% endif %}
         <a href="/api/docs" class="padding">
             <i class="extra padding">api</i>

{sandwitches-2.5.2 → sandwitches-2.5.4}/src/sandwitches/templates/detail.html

@@ -81,10 +81,9 @@
 
 <div class="large-space"></div>
 
-<div class="grid">
-  <!-- Left Column: Image and Main Info -->
-  <div class="s12 m12 l5">
-     <article class="round no-padding elevate">
+<div>
+  <aside class="left rounded padding">
+    <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"
@@ -127,8 +126,6 @@
                 {% endif %}
             </div>
 
-            <div class="space"></div>
-            <div class="divider"></div>
             <div class="space"></div>
 
             {% include "components/rating_section.html" %}
@@ -142,31 +139,26 @@
             {% 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>
+  </aside>
+  <h5>{{ recipe.title }}</h5>
+    <div class="large-padding">
+      <div class="page active">
+        <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="small-space"></div>
+        {% include "components/ingredients_section.html" %}
+        <div class="small-space"></div>
+        {% include "components/instructions_section.html" %}
+        </div>
+    </div>
 </div>
+
 {% endblock %}
 
 {% block extra_scripts %}

{sandwitches-2.5.2 → sandwitches-2.5.4}/src/sandwitches/templates/index.html

@@ -36,10 +36,10 @@
 <h4 class="upper center-align">{% trans 'Highlights' %}</h4>
 <div class="small-space"></div>
 <div class="relative">
-    <div class="row scroll snap no-scrollbar" id="highlighted-carousel" style="gap: 20px; flex-wrap: nowrap;">
+    <div class="row scroll snap no-scrollbar large-padding" id="highlighted-carousel" style="gap: 20px; flex-wrap: nowrap;">
         {% for recipe in highlighted_recipes %}
         <a href="{{ recipe.get_absolute_url }}">
-        <article class="round no-padding elevate" style="min-width: 300px; width: 300px; flex-shrink: 0; scroll-snap-align: start;">
+        <article class="round no-padding elevate tertiary-container" style="min-width: 300px; width: 300px; flex-shrink: 0; scroll-snap-align: start;">
                 {% if recipe.image %}
                 <img src="{{ recipe.image_medium.url }}" class="responsive top-round" alt="{{ recipe.title }}" style="height: 200px; object-fit: cover;">
                 {% else %}
@@ -54,7 +54,6 @@
         </a>
         {% endfor %}
     </div>
-    
     <button class="circle surface absolute left middle-align elevate" onclick="scrollCarousel(-1)" style="top: 50%; transform: translateY(-50%); left: -20px; z-index: 10;">
         <i>chevron_left</i>
     </button>

{sandwitches-2.5.2 → sandwitches-2.5.4}/src/sandwitches/templates/partials/recipe_list.html

@@ -2,7 +2,7 @@
 <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">
+    <article class="round no-padding elevate secondary-container">
        <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 %}';">
@@ -14,18 +14,27 @@
 
          {% 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 %}">
+             <a href="{% url 'toggle_favorite' recipe.pk %}" class="button circle transparent">
+                <i class="{% if recipe in user.favorites.all %}red-text{% else %}black-text{% endif %}">
                     {% if recipe in user.favorites.all %}favorite{% else %}favorite_border{% endif %}
                 </i>
              </a>
          </div>
          {% endif %}
+        {% if user.is_authenticated and recipe.price %}
+         <div class="absolute top right padding">
+          <form action="{% url 'add_to_cart' recipe.pk %}" method="post" class="ml-1">
+              {% csrf_token %}
+              <button type="submit" class="button circle primary" title="{% trans 'Add to Cart' %}">
+                <i>add_shopping_cart</i>
+              </button>
+          </form>
+         </div>
+         {% endif %}
        </div>
 
-       <div class="padding">
+       <div class="padding grow">
          <h5 class="truncate pointer" onclick="location.href='{% url 'recipe_detail' recipe.slug %}';">{{ recipe.title }}</h5>
-
          {% if recipe.price %}
          <div class="row align-center mb-1">
             <i class="small-text primary-text">euro_symbol</i>
@@ -48,23 +57,27 @@
                 <span class="tiny-text left-margin">{% trans "Unknown" %}</span>
             {% endif %}
          </div>
-
          <div class="space"></div>
-
          <div class="row wrap">
-             {% if recipe.favorited_by.all %}
+             {% with favoriters=recipe.favorited_by.all %}
+             {% with count=favoriters.count %}
+             {% if count > 0 %}
                 <span class="tiny-text">
-                    {% if recipe.favorited_by.count == 1 %}
-                        {% trans "Liked by" %} {{ recipe.favorited_by.first.username }}
+                    {% trans "Liked by" %}
+                    {% if count == 1 %}
+                        {{ favoriters.0.username }}
+                    {% elif count == 2 %}
+                        {{ favoriters.0.username }} {% trans "and" %} {{ favoriters.1.username }}
                     {% else %}
-                        {% trans "Liked by" %} {{ recipe.favorited_by.first.username }} {% trans "and" %} {{ recipe.favorited_by.count|add:"-1" }} {% trans "others" %}
+                        {{ favoriters.0.username }}, {{ favoriters.1.username }} {% trans "and" %} {{ count|add:"-2" }} {% trans "others" %}
                     {% endif %}
                 </span>
              {% endif %}
+             {% endwith %}
+             {% endwith %}
          </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>
@@ -77,14 +90,6 @@
            <span>{% trans 'View' %}</span>
            <i class="suffix">arrow_forward</i>
          </a>
-         {% if user.is_authenticated and recipe.price %}
-         <form action="{% url 'add_to_cart' recipe.pk %}" method="post" class="ml-1">
-            {% csrf_token %}
-            <button type="submit" class="button circle primary" title="{% trans 'Add to Cart' %}">
-              <i>add_shopping_cart</i>
-            </button>
-         </form>
-         {% endif %}
        </div>
     </article>
   </div>

{sandwitches-2.5.2 → sandwitches-2.5.4}/src/sandwitches/templates/profile.html

@@ -5,8 +5,7 @@
 {% block content %}
 <div class="large-space"></div>
 
-<div class="grid">
-  <div class="s12 m10 l8 xl6 middle-align center-align" style="margin: 0 auto;">
+  <div class="s12 m10 l8 xl6 middle-align center-align" >
     <article class="round elevate">
       <div class="padding">
           <h4 class="center-align primary-text">{% trans "Edit your profile" %}</h4>
@@ -73,7 +72,7 @@
                     </label>
                 </div>
                  {% if user.avatar %}
-                    <img src="{{ user.avatar.url }}" class="circle small">
+                    <img src="{{ user.avatar.url }}" class="circle">
                  {% endif %}
             </nav>
             {% if form.avatar.errors %}
@@ -91,13 +90,13 @@
 
       </form>
     </article>
+    </div>
 
     <div class="large-space"></div>
-
-    <h4 class="center-align primary-text">{% trans "Order History" %}</h4>
-
+    <div class="middle-align center-align ">
+    <h4 class="center-align padding">{% trans "Order History" %}</h4>
     <form method="get" class="row no-wrap middle-align">
-        <div class="field label border round small">
+        <div class="field label border round">
             <select name="status" onchange="this.form.submit()">
                 <option value="">{% trans "All Statuses" %}</option>
                 {% for code, label in status_choices %}
@@ -107,7 +106,7 @@
             <label>{% trans "Filter by Status" %}</label>
         </div>
         <div class="space"></div>
-        <div class="field label border round small">
+        <div class="field label border round">
              <select name="sort" onchange="this.form.submit()">
                 <option value="date_desc" {% if current_sort == 'date_desc' %}selected{% endif %}>{% trans "Newest First" %}</option>
                 <option value="date_asc" {% if current_sort == 'date_asc' %}selected{% endif %}>{% trans "Oldest First" %}</option>
@@ -117,18 +116,19 @@
             <label>{% trans "Sort by" %}</label>
         </div>
     </form>
+    </div>
 
     {% if orders %}
     <div class="padding border round surface left-align">
-        <table class="border striped">
+        <table class="border striped large-space">
             <thead>
                 <tr>
-                    <th class="min">#</th>
-                    <th class="max">{% trans "Recipe" %}</th>
-                    <th class="min">{% trans "Date" %}</th>
-                    <th class="min">{% trans "Status" %}</th>
-                    <th class="min">{% trans "Price" %}</th>
-                    <th class="min"></th>
+                    <th>{% trans "Order Id" %}</th>
+                    <th>{% trans "Recipe" %}</th>
+                    <th>{% trans "Date" %}</th>
+                    <th>{% trans "Status" %}</th>
+                    <th>{% trans "Price" %}</th>
+                    <th>{% trans "View Order" %}</th>
                 </tr>
             </thead>
             <tbody>
@@ -138,13 +138,13 @@
                     <td>
                         <a href="{% url 'recipe_detail' order.recipe.slug %}">{{ order.recipe.title }}</a>
                     </td>
-                    <td class="no-wrap">{{ order.created_at|date:"d/m/Y" }}</td>
+                    <td>{{ order.created_at|date:"d/m/Y" }}</td>
                     <td>
                         <span class="chip tiny {% if order.status == 'PENDING' %}surface-variant{% elif order.status == 'COMPLETED' %}primary{% elif order.status == 'CANCELLED' %}error{% else %}secondary{% endif %}">
                             {{ order.get_status_display }}
                         </span>
                     </td>
-                    <td class="no-wrap">{{ order.total_price }} €</td>
+                    <td>{{ order.total_price }} €</td>
                     <td>
                         <a href="{% url 'user_order_detail' order.id %}" class="button circle transparent small">
                             <i>visibility</i>
@@ -182,5 +182,5 @@
     </div>
     {% endif %}
   </div>
-</div>
+
 {% endblock %}

{sandwitches-2.5.2 → sandwitches-2.5.4}/src/sandwitches/urls.py

@@ -120,7 +120,13 @@ urlpatterns += i18n_patterns(
         views.admin_rating_delete,
         name="admin_rating_delete",
     ),
+    path("dashboard/settings/", views.admin_settings, name="admin_settings"),
     path("dashboard/orders/", views.admin_order_list, name="admin_order_list"),
+    path(
+        "dashboard/orders/<int:pk>/status/",
+        views.admin_order_update_status,
+        name="admin_order_update_status",
+    ),
     prefix_default_language=True,
 )
 

{sandwitches-2.5.2 → sandwitches-2.5.4}/src/sandwitches/utils.py

@@ -51,6 +51,9 @@ COMMON_UNITS = {
     "to taste",
 }
 
+# Simple in-memory DB for order status tracking
+ORDER_DB = {}
+
 
 def parse_ingredient_line(line):
     """

{sandwitches-2.5.2 → sandwitches-2.5.4}/src/sandwitches/views.py

@@ -9,7 +9,8 @@ from django.contrib.auth.decorators import login_required
 from django.contrib.admin.views.decorators import staff_member_required
 from django.utils.translation import gettext as _
 from django.utils import translation
-from .models import Recipe, Rating, Tag, Order, CartItem
+from .models import Recipe, Rating, Tag, Order, CartItem, Setting
+from .utils import ORDER_DB
 from .forms import (
     RecipeForm,
     AdminSetupForm,
@@ -20,6 +21,7 @@ from .forms import (
     UserProfileForm,
     UserRecipeSubmissionForm,
     UserSettingsForm,
+    SettingForm,
 )
 from django.http import HttpResponseBadRequest, Http404
 from django.conf import settings
@@ -491,6 +493,52 @@ def admin_rating_delete(request, pk):
     )
 
 
+@staff_member_required
+def admin_settings(request):
+    instance = Setting.get_solo()
+    if request.method == "POST":
+        form = SettingForm(request.POST, request.FILES, instance=instance)
+        if form.is_valid():
+            form.save()
+            messages.success(request, _("Site settings updated successfully."))
+            return redirect("admin_settings")
+    else:
+        form = SettingForm(instance=instance)
+    return render(
+        request,
+        "admin/settings.html",
+        {"form": form, "title": _("Site Settings"), "version": sandwitches_version},
+    )
+
+
+@staff_member_required
+def admin_order_update_status(request, pk):
+    order = get_object_or_404(Order, pk=pk)
+    if request.method == "POST":
+        new_status = request.POST.get("status")
+        if new_status in dict(Order.STATUS_CHOICES):
+            # Immutability check: if status is CANCELLED or COMPLETED, it shouldn't be changed
+            if order.status in ["COMPLETED", "CANCELLED"]:
+                messages.error(
+                    request,
+                    _("Cannot change status of a completed or cancelled order."),
+                )
+            else:
+                order.status = new_status
+                if new_status == "COMPLETED":
+                    order.completed = True
+                order.save()
+
+                # Update ORDER_DB
+                ORDER_DB[order.pk] = new_status
+
+                messages.success(request, _("Order status updated."))
+        else:
+            messages.error(request, _("Invalid status."))
+
+    return redirect("admin_order_list")
+
+
 @staff_member_required
 def admin_order_list(request):
     orders = (
@@ -503,13 +551,21 @@ def admin_order_list(request):
         return render(
             request,
             "admin/partials/order_rows.html",
-            {"orders": orders, "version": sandwitches_version},
+            {
+                "orders": orders,
+                "version": sandwitches_version,
+                "status_choices": Order.STATUS_CHOICES,
+            },
         )
 
     return render(
         request,
         "admin/order_list.html",
-        {"orders": orders, "version": sandwitches_version},
+        {
+            "orders": orders,
+            "version": sandwitches_version,
+            "status_choices": Order.STATUS_CHOICES,
+        },
     )
 
 

sandwitches-2.5.2/src/sandwitches/templates/admin/partials/order_rows.html

@@ -1,28 +0,0 @@
-{% load i18n %}
-{% for order in orders %}
-<tr>
-    <td>{{ order.id }}</td>
-    <td>
-        <div class="row align-center">
-            {% if order.user.avatar %}
-            <img src="{{ order.user.avatar.url }}" class="circle tiny">
-            {% else %}
-            <i class="circle tiny">person</i>
-            {% endif %}
-            <span class="max">{{ order.user.username }}</span>
-        </div>
-    </td>
-    <td>{{ order.recipe.title }}</td>
-    <td>{{ order.total_price }} €</td>
-    <td>
-        <span class="chip {% if order.status == 'PENDING' %}surface-variant{% elif order.status == 'COMPLETED' %}primary{% elif order.status == 'CANCELLED' %}error{% else %}secondary{% endif %}">
-            {{ order.get_status_display }}
-        </span>
-    </td>
-    <td>{{ order.created_at|date:"d/m/Y H:i" }}</td>
-</tr>
-{% empty %}
-<tr>
-    <td colspan="6" class="center-align">{% trans "No orders found." %}</td>
-</tr>
-{% endfor %}