sandwitches 2.5.1__tar.gz → 2.5.3__tar.gz

{sandwitches-2.5.1 → sandwitches-2.5.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: sandwitches
-Version: 2.5.1
+Version: 2.5.3
 Summary: Add your description here
 Author: Martyn van Dijke
 Author-email: Martyn van Dijke <martijnvdijke600@gmail.com>
@@ -18,6 +18,7 @@ Requires-Dist: markdown>=3.10
 Requires-Dist: pillow>=12.0.0
 Requires-Dist: uvicorn>=0.40.0
 Requires-Dist: whitenoise[brotli]>=6.11.0
+Requires-Dist: requests>=2.32.5
 Requires-Python: >=3.12
 Description-Content-Type: text/markdown
 

{sandwitches-2.5.1 → sandwitches-2.5.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "sandwitches"
-version = "2.5.1"
+version = "2.5.3"
 description = "Add your description here"
 readme = "README.md"
 authors = [
@@ -24,11 +24,12 @@ dependencies = [
     "pillow>=12.0.0",
     "uvicorn>=0.40.0",
     "whitenoise[brotli]>=6.11.0",
+    "requests>=2.32.5",
 ]
 
 
 [build-system]
-requires = ["uv_build>=0.8.19,<0.9.0"]
+requires = ["uv_build>=0.9.27,<0.10.0"]
 build-backend = "uv_build"
 
 [dependency-groups]

{sandwitches-2.5.1 → sandwitches-2.5.3}/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">{% block admin_title %}{% trans "Sandwitches Admin" %}{% 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 %}
@@ -104,17 +107,7 @@
 {% endblock %}
 
 {% block footer %}
-<footer class="padding">
-    <div class="row align-center">
-        <div class="max">
-            <h6 class="small">Sandwitches Admin</h6>
-            <div class="small-text">© {% now "Y" %} Sandwitches Inc.</div>
-        </div>
-        <nav>
-            version {{ version }}
-        </nav>
-    </div>
-</footer>
+    {% include "components/footer.html" %}
 {% endblock %}
 
 {% block extra_scripts %}

{sandwitches-2.5.1 → sandwitches-2.5.3}/src/sandwitches/templates/admin/dashboard.html

@@ -13,313 +13,123 @@
 {% block content %}
 
 <div class="row align-center mb-2">
-
     <div class="max"></div>
-
     <form method="get" class="row no-space border round padding surface-variant">
-
         <div class="field label small transparent">
-
             <input type="date" name="start_date" value="{{ start_date }}">
-
             <label>{% trans "Start Date" %}</label>
-
         </div>
-
         <div class="divider vertical"></div>
-
         <div class="field label small transparent">
-
             <input type="date" name="end_date" value="{{ end_date }}">
-
             <label>{% trans "End Date" %}</label>
-
         </div>
-
         <button type="submit" class="button primary square"><i>refresh</i></button>
-
     </form>
-
 </div>
 
 
 
 <div class="grid">
-
     <div class="s12 m4">
-
         <article class="round primary-container padding">
-
             <div class="row align-center">
-
                 <i class="extra">restaurant</i>
-
                 <div class="max">
-
                     <h4 class="bold">{{ recipe_count }}</h4>
-
                     <div>{% trans "Recipes" %}</div>
-
                 </div>
-
             </div>
-
             <nav class="right-align">
-
                 <a href="{% url 'admin_recipe_list' %}" class="button transparent">{% trans "View all" %}</a>
-
             </nav>
-
         </article>
-
     </div>
 
     <div class="s12 m4">
-
         <article class="round secondary-container padding">
-
             <div class="row align-center">
-
                 <i class="extra">people</i>
-
                 <div class="max">
-
                     <h4 class="bold">{{ user_count }}</h4>
-
                     <div>{% trans "Users" %}</div>
-
                 </div>
-
             </div>
-
             <nav class="right-align">
-
                 <a href="{% url 'admin_user_list' %}" class="button transparent">{% trans "View all" %}</a>
-
             </nav>
-
         </article>
-
     </div>
 
     <div class="s12 m4">
-
         <article class="round tertiary-container padding">
-
             <div class="row align-center">
-
                 <i class="extra">label</i>
-
                 <div class="max">
-
                     <h4 class="bold">{{ tag_count }}</h4>
-
                     <div>{% trans "Tags" %}</div>
-
                 </div>
-
             </div>
-
             <nav class="right-align">
-
                 <a href="{% url 'admin_tag_list' %}" class="button transparent">{% trans "View all" %}</a>
-
             </nav>
-
         </article>
-
+    </div>
+    <div class="s12">
+        {% include "admin/partials/dashboard_charts.html" %}
     </div>
 
-
-
-        <!-- Charts Section -->
-
-
-
-            <div class="s12">
-
-
-
-                {% include "admin/partials/dashboard_charts.html" %}
-
-
-
-            </div>
-
-
-
-
-
-
-
-            {% if pending_recipes %}
-
-
-
-            <div class="s12">
-
-
-
-                <h5 class="bold error-text">{% trans "Pending Approvals" %}</h5>
-
-
-
-                <table class="border striped no-space">
-
-
-
-                    <thead>
-
-
-
-                        <tr>
-
-
-
-                            <th>{% trans "Title" %}</th>
-
-
-
-                            <th>{% trans "Uploader" %}</th>
-
-
-
-                            <th>{% trans "Created At" %}</th>
-
-
-
-                            <th class="right-align">{% trans "Actions" %}</th>
-
-
-
-                        </tr>
-
-
-
-                    </thead>
-
-
-
-                    <tbody>
-
-
-
-                        {% for recipe in pending_recipes %}
-
-
-
-                        <tr class="pointer" onclick="location.href='{% url 'admin_recipe_edit' recipe.pk %}'">
-
-
-
-                            <td>{{ recipe.title }}</td>
-
-
-
-                            <td>{{ recipe.uploaded_by.username|default:"-" }}</td>
-
-
-
-                            <td>{{ recipe.created_at|date:"SHORT_DATETIME_FORMAT" }}</td>
-
-
-
-                            <td class="right-align">
-
-
-
-                                <a href="{% url 'admin_recipe_approve' recipe.pk %}" class="button circle transparent" onclick="event.stopPropagation();" title="{% trans 'Approve' %}"><i>check</i></a>
-
-
-
-                                <a href="{% url 'admin_recipe_edit' recipe.pk %}" class="button circle transparent" onclick="event.stopPropagation();"><i>edit</i></a>
-
-
-
-                            </td>
-
-
-
-                        </tr>
-
-
-
-                        {% endfor %}
-
-
-
-                    </tbody>
-
-
-
-                </table>
-
-
-
-            </div>
-
-
-
-            {% endif %}
-
-
-
-
-
-
-
-            <div class="s12">
-
-
-
-                <h5 class="bold">{% trans "Recent Recipes" %}</h5>
-
+    <div class="s12">
+        <h5 class="bold error-text">{% trans "Pending Approvals" %}</h5>
         <table class="border striped no-space">
-
             <thead>
-
                 <tr>
-
                     <th>{% trans "Title" %}</th>
-
                     <th>{% trans "Uploader" %}</th>
-
                     <th>{% trans "Created At" %}</th>
-
                     <th class="right-align">{% trans "Actions" %}</th>
-
                 </tr>
-
             </thead>
-
             <tbody>
-
-                {% for recipe in recent_recipes %}
-
+                {% for recipe in pending_recipes %}
                 <tr class="pointer" onclick="location.href='{% url 'admin_recipe_edit' recipe.pk %}'">
-
                     <td>{{ recipe.title }}</td>
-
                     <td>{{ recipe.uploaded_by.username|default:"-" }}</td>
-
                     <td>{{ recipe.created_at|date:"SHORT_DATETIME_FORMAT" }}</td>
-
                     <td class="right-align">
-
+                        <a href="{% url 'admin_recipe_approve' recipe.pk %}" class="button circle transparent" onclick="event.stopPropagation();" title="{% trans 'Approve' %}"><i>check</i></a>
+                        <a href="{% url 'admin_recipe_edit' recipe.pk %}" class="button circle transparent" onclick="event.stopPropagation();"><i>edit</i></a>
+                    </td>
+                </tr>
+                {% endfor %}
+            </tbody>
+        </table>
+    </div>
+    <div class="s12">
+        <h5 class="bold">{% trans "Recent Recipes" %}</h5>
+        <table class="border striped scroll surface">
+            <thead>
+                <tr>
+                    <th>{% trans "Title" %}</th>
+                    <th>{% trans "Uploader" %}</th>
+                    <th>{% trans "Created At" %}</th>
+                    <th >{% trans "Actions" %}</th>
+                </tr>
+            </thead>
+            <tbody>
+                {% for recipe in recent_recipes %}
+                <tr class="pointer" onclick="location.href='{% url 'admin_recipe_edit' recipe.pk %}'">
+                    <td>{{ recipe.title }}</td>
+                    <td>{{ recipe.uploaded_by.username|default:"-" }}</td>
+                    <td>{{ recipe.created_at|date:"SHORT_DATETIME_FORMAT" }}</td>
+                    <td>
                         <a href="{% url 'admin_recipe_edit' recipe.pk %}" class="button circle transparent" onclick="event.stopPropagation();"><i>edit</i></a>
-
                     </td>
-
                 </tr>
-
                 {% endfor %}
-
             </tbody>
-
         </table>
-
     </div>
-
 </div>
 
 {% endblock %}

sandwitches-2.5.3/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.1 → sandwitches-2.5.3}/src/sandwitches/templates/admin/recipe_list.html

@@ -12,32 +12,33 @@
     </a>
 </div>
 
-    <table class="border striped no-space">
+    <table class="border scroll surface large-space">
         <thead>
             <tr>
-                <th class="min">{% trans "ID" %}</th>
-                <th class="min">{% trans "Image" %}</th>
-                <th class="max">
+                <th>{% trans "Image" %}</th>
+                <th>
                     <a href="?sort={% if current_sort == 'title' %}-title{% else %}title{% endif %}" class="row align-center">
                         {% trans "Title" %}
                         {% if current_sort == 'title' %}<i>arrow_upward</i>{% elif current_sort == '-title' %}<i>arrow_downward</i>{% endif %}
                     </a>
                 </th>
-                <th class="min">
+                <th>
                     <a href="?sort={% if current_sort == 'price' %}-price{% else %}price{% endif %}" class="row align-center">
                         {% trans "Price" %}
                         {% if current_sort == 'price' %}<i>arrow_upward</i>{% elif current_sort == '-price' %}<i>arrow_downward</i>{% endif %}
                     </a>
                 </th>
-                <th class="min">
+                <th>
                     <a href="?sort={% if current_sort == 'orders' %}-orders{% else %}orders{% endif %}" class="row align-center">
                         {% trans "Orders" %}
+                        <i class="primary-text">orders</i>
                         {% if current_sort == 'orders' %}<i>arrow_upward</i>{% elif current_sort == '-orders' %}<i>arrow_downward</i>{% endif %}
                     </a>
                 </th>
-                <th class="min">{% trans "Rating" %}</th>
-                <th class="min">{% trans "Approved" %}</th>
-                <th class="m l">{% trans "Tags" %}</th>
+                <th>{% trans "Rating" %}
+                    <i class="primary-text">star</i>
+                </th>
+                <th>{% trans "Tags" %}</th>
                 <th>
                     <a href="?sort={% if current_sort == 'uploader' %}-uploader{% else %}uploader{% endif %}" class="row align-center">
                         {% trans "Uploader" %}
@@ -50,61 +51,51 @@
                         {% if current_sort == 'created_at' %}<i>arrow_upward</i>{% elif current_sort == '-created_at' %}<i>arrow_downward</i>{% endif %}
                     </a>
                 </th>
-                <th class="right-align">{% trans "Actions" %}</th>
+                <th>{% trans "Actions" %}</th>
             </tr>
         </thead>
-        <tbody>        {% for recipe in recipes %}
+        <tbody>
+        {% for recipe in recipes %}
         <tr class="pointer" onclick="location.href='{% url 'admin_recipe_edit' recipe.pk %}'">
-            <td class="min">{{ recipe.id }}</td>
-            <td class="min">
+            <td>
                 {% if recipe.image %}
                 <img src="{{ recipe.image_thumbnail.url }}" class="admin-thumb round">
                 {% else %}
                 <div class="admin-thumb round gray1 middle-align center-align">
-                    <i class="extra">restaurant</i>
+                    <i class="extra">image</i>
                 </div>
                 {% endif %}
             </td>
-            <td class="max">
+            <td>
                 {% if recipe.is_highlighted %}
                 <i class="tiny amber-text">star</i>
                 {% endif %}
                 <b>{{ recipe.title }}</b>
             </td>
-            <td class="min no-wrap">
+            <td>
                 {% if recipe.price %}
-                {{ recipe.price }} €
+                € {{ recipe.price }}
                 {% else %}
                 -
                 {% endif %}
             </td>
-            <td class="min no-wrap">
+            <td>
                 {{ recipe.daily_orders_count }} / {{ recipe.max_daily_orders|default:"∞" }}
             </td>
-            <td class="min center-align">
+            <td class="center-align">
                 <div class="row align-center">
                     <i class="primary-text">star</i>
                     <span>{{ recipe.avg_rating|default:0|floatformat:1 }}</span>
                 </div>
             </td>
-            <td class="min center-align">
-                {% if recipe.is_approved %}
-                <i class="primary-text">check_circle</i>
-                {% else %}
-                <a href="{% url 'admin_recipe_approve' recipe.pk %}" class="button tiny primary round" onclick="event.stopPropagation();">
-                    <i>check</i>
-                    <span>{% trans "Approve" %}</span>
-                </a>
-                {% endif %}
-            </td>
-            <td class="m l">
+            <td>
                 {% for tag in recipe.tags.all %}
                 <span class="chip tiny">{{ tag.name }}</span>
                 {% endfor %}
             </td>
             <td>{{ recipe.uploaded_by.username|default:"-" }}</td>
             <td>{{ recipe.created_at|date:"SHORT_DATE_FORMAT" }}</td>
-            <td class="right-align">
+            <td>
                 <a href="{% url 'admin_recipe_delete' recipe.pk %}" class="button circle transparent" onclick="event.stopPropagation();" title="{% trans 'Delete' %}"><i>delete</i></a>
             </td>
         </tr>