sandwitches 2.2.0__py3-none-any.whl → 2.3.1__py3-none-any.whl

sandwitches/templates/admin/dashboard.html

@@ -127,37 +127,147 @@
 
 
 
-    <!-- Charts Section -->
+        <!-- Charts Section -->
 
-    <div class="s12 m6">
 
-        <article class="round border padding">
 
-            <h6 class="bold mb-1">{% trans "Recipes Over Time (Last 30 Days)" %}</h6>
+            <div class="s12">
 
-            <canvas id="recipeChart" style="width:100%; max-height:300px;"></canvas>
 
-        </article>
 
-    </div>
+                {% 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 m6">
 
-        <article class="round border padding">
 
-            <h6 class="bold mb-1">{% trans "Average Rating Over Time (Last 30 Days)" %}</h6>
 
-            <canvas id="ratingChart" style="width:100%; max-height:300px;"></canvas>
 
-        </article>
 
-    </div>
 
+            <div class="s12">
 
 
-    <div class="s12">
 
-        <h5 class="bold">{% trans "Recent Recipes" %}</h5>
+                <h5 class="bold">{% trans "Recent Recipes" %}</h5>
 
         <table class="border striped no-space">
 
@@ -213,50 +323,4 @@
 
 {% block admin_scripts %}
 <script src="https://cdn.jsdelivr.net/npm/chart.js"></script>
-<script>
-    document.addEventListener('DOMContentLoaded', function() {
-        const primaryColor = getComputedStyle(document.documentElement).getPropertyValue('--primary').trim() || '#5d4037';
-        const secondaryColor = getComputedStyle(document.documentElement).getPropertyValue('--secondary').trim() || '#ff7a18';
-
-        // Recipe Chart
-        new Chart(document.getElementById('recipeChart'), {
-            type: 'line',
-            data: {
-                labels: {{ recipe_labels|safe }},
-                datasets: [{
-                    label: '{% trans "Recipes Created" %}',
-                    data: {{ recipe_counts|safe }},
-                    borderColor: primaryColor,
-                    backgroundColor: primaryColor + '33',
-                    fill: true,
-                    tension: 0.4
-                }]
-            },
-            options: {
-                responsive: true,
-                plugins: { legend: { display: false } },
-                scales: { y: { beginAtZero: true, ticks: { stepSize: 1 } } }
-            }
-        });
-
-        // Rating Chart
-        new Chart(document.getElementById('ratingChart'), {
-            type: 'bar',
-            data: {
-                labels: {{ rating_labels|safe }},
-                datasets: [{
-                    label: '{% trans "Avg Rating" %}',
-                    data: {{ rating_avgs|safe }},
-                    backgroundColor: secondaryColor,
-                    borderRadius: 4
-                }]
-            },
-            options: {
-                responsive: true,
-                plugins: { legend: { display: false } },
-                scales: { y: { min: 0, max: 10 } }
-            }
-        });
-    });
-</script>
 {% endblock %}

sandwitches/templates/admin/order_list.html

@@ -0,0 +1,30 @@
+{% extends "admin/admin_base.html" %}
+{% load i18n %}
+
+{% block admin_title %}{% trans "Orders" %}{% endblock %}
+
+{% block content %}
+<div class="padding">
+    <div class="row align-center">
+        <h5 class="max">{% trans "Orders" %}</h5>
+    </div>
+
+    <div class="space"></div>
+
+    <table class="border">
+        <thead>
+            <tr>
+                <th>ID</th>
+                <th>{% trans "User" %}</th>
+                <th>{% trans "Recipe" %}</th>
+                <th>{% trans "Price" %}</th>
+                <th>{% trans "Status" %}</th>
+                <th>{% trans "Date" %}</th>
+            </tr>
+        </thead>
+        <tbody hx-get="{% url 'admin_order_list' %}" hx-trigger="every 5s">
+            {% include "admin/partials/order_rows.html" %}
+        </tbody>
+    </table>
+</div>
+{% endblock %}

sandwitches/templates/admin/partials/dashboard_charts.html

@@ -0,0 +1,90 @@
+{% load i18n %}
+<div class="grid" hx-get="." hx-trigger="every 30s" hx-swap="outerHTML">
+    <div class="s12 m4">
+        <article class="round border padding">
+            <h6 class="bold mb-1">{% trans "Recipes Over Time" %}</h6>
+            <canvas id="recipeChart" style="width:100%; max-height:300px;"></canvas>
+        </article>
+    </div>
+    <div class="s12 m4">
+        <article class="round border padding">
+            <h6 class="bold mb-1">{% trans "Orders Over Time" %}</h6>
+            <canvas id="orderChart" style="width:100%; max-height:300px;"></canvas>
+        </article>
+    </div>
+    <div class="s12 m4">
+        <article class="round border padding">
+            <h6 class="bold mb-1">{% trans "Avg Rating" %}</h6>
+            <canvas id="ratingChart" style="width:100%; max-height:300px;"></canvas>
+        </article>
+    </div>
+
+    <script>
+        (function() {
+            const primaryColor = getComputedStyle(document.documentElement).getPropertyValue('--primary').trim() || '#5d4037';
+            const secondaryColor = getComputedStyle(document.documentElement).getPropertyValue('--secondary').trim() || '#ff7a18';
+            const tertiaryColor = getComputedStyle(document.documentElement).getPropertyValue('--tertiary').trim() || '#4caf50';
+
+            // Recipe Chart
+            new Chart(document.getElementById('recipeChart'), {
+                type: 'line',
+                data: {
+                    labels: {{ recipe_labels|safe }},
+                    datasets: [{
+                        label: '{% trans "Recipes" %}',
+                        data: {{ recipe_counts|safe }},
+                        borderColor: primaryColor,
+                        backgroundColor: primaryColor + '33',
+                        fill: true,
+                        tension: 0.4
+                    }]
+                },
+                options: {
+                    responsive: true,
+                    plugins: { legend: { display: false } },
+                    scales: { y: { beginAtZero: true, ticks: { stepSize: 1 } } }
+                }
+            });
+
+            // Order Chart
+            new Chart(document.getElementById('orderChart'), {
+                type: 'line',
+                data: {
+                    labels: {{ order_labels|safe }},
+                    datasets: [{
+                        label: '{% trans "Orders" %}',
+                        data: {{ order_counts|safe }},
+                        borderColor: tertiaryColor,
+                        backgroundColor: tertiaryColor + '33',
+                        fill: true,
+                        tension: 0.4
+                    }]
+                },
+                options: {
+                    responsive: true,
+                    plugins: { legend: { display: false } },
+                    scales: { y: { beginAtZero: true, ticks: { stepSize: 1 } } }
+                }
+            });
+
+            // Rating Chart
+            new Chart(document.getElementById('ratingChart'), {
+                type: 'bar',
+                data: {
+                    labels: {{ rating_labels|safe }},
+                    datasets: [{
+                        label: '{% trans "Avg Rating" %}',
+                        data: {{ rating_avgs|safe }},
+                        backgroundColor: secondaryColor,
+                        borderRadius: 4
+                    }]
+                },
+                options: {
+                    responsive: true,
+                    plugins: { legend: { display: false } },
+                    scales: { y: { min: 0, max: 10 } }
+                }
+            });
+        })();
+    </script>
+</div>

sandwitches/templates/admin/partials/order_rows.html

@@ -0,0 +1,28 @@
+{% 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{% else %}error{% 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 %}

sandwitches/templates/admin/rating_list.html

@@ -12,6 +12,7 @@
             <th>{% trans "Recipe" %}</th>
             <th>{% trans "User" %}</th>
             <th class="min center-align">{% trans "Score" %}</th>
+            <th>{% trans "Comment" %}</th>
             <th>{% trans "Updated" %}</th>
             <th class="right-align">{% trans "Actions" %}</th>
         </tr>
@@ -27,6 +28,7 @@
                     <span>{{ r.score }}</span>
                 </div>
             </td>
+            <td>{{ r.comment|default:"-"|truncatechars:50 }}</td>
             <td>{{ r.updated_at|date:"SHORT_DATETIME_FORMAT" }}</td>
             <td class="right-align">
                 <a href="{% url 'admin_rating_delete' r.pk %}" class="button circle transparent" title="{% trans 'Delete' %}"><i>delete</i></a>

sandwitches/templates/admin/recipe_form.html

@@ -60,6 +60,32 @@
                     <label>{{ form.uploaded_by.label }}</label>
                     {% if form.uploaded_by.errors %}<span class="error">{{ form.uploaded_by.errors|striptags }}</span>{% endif %}
                 </div>
+
+                <div class="field label border round mt-1">
+                    {{ form.price }}
+                    <label>{{ form.price.label }}</label>
+                    {% if form.price.errors %}<span class="error">{{ form.price.errors|striptags }}</span>{% endif %}
+                </div>
+
+                <div class="field label border round mt-1">
+                    {{ form.max_daily_orders }}
+                    <label>{{ form.max_daily_orders.label }}</label>
+                    {% if form.max_daily_orders.errors %}<span class="error">{{ form.max_daily_orders.errors|striptags }}</span>{% endif %}
+                </div>
+
+                <div class="field middle-align mt-1">
+                    <label class="checkbox">
+                        {{ form.is_highlighted }}
+                        <span>{{ form.is_highlighted.label }}</span>
+                    </label>
+                </div>
+
+                <div class="field middle-align mt-1">
+                    <label class="checkbox">
+                        {{ form.is_approved }}
+                        <span>{{ form.is_approved.label }}</span>
+                    </label>
+                </div>
             </article>
 
             <!-- Description -->

sandwitches/templates/admin/recipe_list.html

@@ -12,21 +12,48 @@
     </a>
 </div>
 
-<table class="border striped no-space">
-    <thead>
-        <tr>
-            <th class="min">{% trans "ID" %}</th>
-            <th class="min">{% trans "Image" %}</th>
-            <th class="max">{% trans "Title" %}</th>
-            <th class="min">{% trans "Rating" %}</th>
-            <th class="m l">{% trans "Tags" %}</th>
-            <th>{% trans "Uploader" %}</th>
-            <th>{% trans "Created" %}</th>
-            <th class="right-align">{% trans "Actions" %}</th>
-        </tr>
-    </thead>
-    <tbody>
-        {% for recipe in recipes %}
+    <table class="border striped no-space">
+        <thead>
+            <tr>
+                <th class="min">{% trans "ID" %}</th>
+                <th class="min">{% trans "Image" %}</th>
+                <th class="max">
+                    <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">
+                    <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">
+                    <a href="?sort={% if current_sort == 'orders' %}-orders{% else %}orders{% endif %}" class="row align-center">
+                        {% trans "Orders" %}
+                        {% 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>
+                    <a href="?sort={% if current_sort == 'uploader' %}-uploader{% else %}uploader{% endif %}" class="row align-center">
+                        {% trans "Uploader" %}
+                        {% if current_sort == 'uploader' %}<i>arrow_upward</i>{% elif current_sort == '-uploader' %}<i>arrow_downward</i>{% endif %}
+                    </a>
+                </th>
+                <th>
+                    <a href="?sort={% if current_sort == 'created_at' %}-created_at{% else %}created_at{% endif %}" class="row align-center">
+                        {% trans "Created" %}
+                        {% 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>
+            </tr>
+        </thead>
+        <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">
@@ -39,14 +66,37 @@
                 {% endif %}
             </td>
             <td class="max">
+                {% if recipe.is_highlighted %}
+                <i class="tiny amber-text">star</i>
+                {% endif %}
                 <b>{{ recipe.title }}</b>
             </td>
+            <td class="min no-wrap">
+                {% if recipe.price %}
+                {{ recipe.price }} €
+                {% else %}
+                -
+                {% endif %}
+            </td>
+            <td class="min no-wrap">
+                {{ recipe.daily_orders_count }} / {{ recipe.max_daily_orders|default:"∞" }}
+            </td>
             <td class="min 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">
                 {% for tag in recipe.tags.all %}
                 <span class="chip tiny">{{ tag.name }}</span>

sandwitches/templates/base.html

@@ -56,6 +56,18 @@
         </svg>
     </div>
     {% block navbar %}{% endblock %}
+
+    {% if messages %}
+    <div class="padding no-margin">
+        {% for message in messages %}
+        <div class="snackbar active {% if message.tags == 'error' %}error{% else %}primary{% endif %}">
+            <i>{% if message.tags == 'error' %}error{% else %}info{% endif %}</i>
+            <span>{{ message }}</span>
+        </div>
+        {% endfor %}
+    </div>
+    {% endif %}
+
     <main class="container" role="main">{% block content %}{% endblock %}</main>
     {% block footer %}{% endblock %}
     {% block extra_scripts %}{% endblock %}

sandwitches/templates/components/navbar.html

@@ -15,11 +15,16 @@
   </button>
 
   {% if user.is_authenticated %}
-    {% if user.avatar %}
-    <img src="{{ user.avatar.url }}" class="circle" data-ui="#user-menu">
-    {% else %}
-    <img src="https://www.w3schools.com/howto/img_avatar.png" class="circle" data-ui="#user-menu">
-    {% endif %}
+    <a href="{% url 'user_profile' %}">
+      {% if user.avatar %}
+      <img src="{{ user.avatar.url }}" class="circle">
+      {% else %}
+      <img src="https://www.w3schools.com/howto/img_avatar.png" class="circle">
+      {% endif %}
+    </a>
+    <button class="circle transparent" data-ui="#user-menu">
+      <i>more_vert</i>
+    </button>
   {% 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/templates/components/recipe_header.html

@@ -30,3 +30,20 @@
         </div>
     {% endif %}
 </div>
+
+<div class="space"></div>
+{% if recipe.price %}
+<div class="row align-center">
+    <i class="primary-text">euro_symbol</i>
+    <h5 class="bold ml-1">{{ recipe.price }}</h5>
+    {% if user.is_authenticated %}
+    <form action="{% url 'order_recipe' recipe.pk %}" method="post" class="ml-2">
+        {% csrf_token %}
+        <button type="submit" class="button primary round">
+            <i>shopping_cart</i>
+            <span>{% trans "Order Now" %}</span>
+        </button>
+    </form>
+    {% endif %}
+</div>
+{% endif %}

sandwitches/templates/components/side_menu.html

@@ -15,6 +15,10 @@
             <i class="extra padding">favorite</i>
             <span class="large-text">{% trans "Favorites" %}</span>
         </a>
+        <a href="{% url 'submit_recipe' %}" class="padding {% if request.resolver_match.url_name == 'submit_recipe' %}active{% endif %}">
+            <i class="extra padding">add_circle</i>
+            <span class="large-text">{% trans "Submit Recipe" %}</span>
+        </a>
         {% endif %}
         <a href="/api/docs" class="padding">
             <i class="extra padding">api</i>

sandwitches/templates/partials/recipe_list.html

@@ -26,6 +26,13 @@
        <div class="padding">
          <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>
+            <span class="bold">{{ recipe.price }}</span>
+         </div>
+         {% endif %}
+
          <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;">