sandwitches 2.3.3__py3-none-any.whl → 2.4.1__py3-none-any.whl

sandwitches/templates/admin/recipe_list.html

@@ -88,7 +88,7 @@
                 </div>
             </td>
             <td class="min center-align">
-                {% if recipe.is_community_made %}
+                {% 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();">

sandwitches/templates/cart.html

@@ -0,0 +1,102 @@
+{% extends "base_beer.html" %}
+{% load i18n static %}
+
+{% block title %}{% trans "Your Cart" %}{% endblock %}
+
+{% block content %}
+<main class="responsive">
+    <div class="large-space"></div>
+    <div class="row align-center">
+        <i class="extra">shopping_cart</i>
+        <h4 class="max">{% trans "Your Shopping Cart" %}</h4>
+    </div>
+    <div class="space"></div>
+
+    {% if cart_items %}
+    <div class="grid">
+        <div class="s12 m8">
+            <div class="padding border round surface">
+                <table class="border striped no-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>
+                        </tr>
+                    </thead>
+                    <tbody>
+                        {% for item in cart_items %}
+                        <tr>
+                            <td class="min">
+                                {% if item.recipe.image %}
+                                <img src="{{ item.recipe.image_thumbnail.url }}" class="circle small">
+                                {% else %}
+                                <i class="circle small gray1">restaurant</i>
+                                {% endif %}
+                            </td>
+                            <td class="max">
+                                <a href="{% url 'recipe_detail' item.recipe.slug %}" class="bold">{{ item.recipe.title }}</a>
+                            </td>
+                            <td class="min">
+                                <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;">
+                                        <input type="number" name="quantity" value="{{ item.quantity }}" min="1" onchange="this.form.submit()">
+                                    </div>
+                                </form>
+                            </td>
+                            <td class="min no-wrap">{{ item.total_price }} €</td>
+                            <td class="min">
+                                <a href="{% url 'remove_from_cart' item.pk %}" class="button circle transparent">
+                                    <i>delete</i>
+                                </a>
+                            </td>
+                        </tr>
+                        {% endfor %}
+                    </tbody>
+                </table>
+            </div>
+        </div>
+        <div class="s12 m4">
+            <article class="round padding border primary-container">
+                <h6 class="bold">{% trans "Summary" %}</h6>
+                <div class="row mt-1">
+                    <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>
+                </div>
+                <div class="space"></div>
+                <form action="{% url 'checkout_cart' %}" method="post">
+                    {% csrf_token %}
+                    <button type="submit" class="button primary round extend">
+                        <i>check</i>
+                        <span>{% trans "Checkout" %}</span>
+                    </button>
+                </form>
+            </article>
+            <div class="space"></div>
+            <a href="{% url 'index' %}" class="button transparent extend">
+                <i>arrow_back</i>
+                <span>{% trans "Continue Shopping" %}</span>
+            </a>
+        </div>
+    </div>
+    {% else %}
+    <div class="center-align padding">
+        <i class="extra gray-text">shopping_cart_off</i>
+        <h5 class="gray-text">{% trans "Your cart is empty." %}</h5>
+        <div class="space"></div>
+        <a href="{% url 'index' %}" class="button primary round">
+            <span>{% trans "Start Shopping" %}</span>
+        </a>
+    </div>
+    {% endif %}
+    <div class="large-space"></div>
+</main>
+{% endblock %}

sandwitches/templates/community.html

@@ -4,6 +4,15 @@
 {% block title %}{% trans "Community" %}{% endblock %}
 
 {% block content %}
+<style>
+    .cropper-container {
+        max-height: 70vh;
+    }
+    #cropper-image {
+        display: block;
+        max-width: 100%;
+    }
+</style>
 <main class="responsive">
 <div class="large-space"></div>
 <article class="round s12 m10 l8 offset-m1 offset-l2 elevate">
@@ -15,6 +24,7 @@
 
         <form method="post" enctype="multipart/form-data">
             {% csrf_token %}
+            {{ form.image_data }}
 
             <div class="grid">
                 <div class="s12">
@@ -53,15 +63,21 @@
 
                 <!-- Image Upload with Preview -->
                 <div class="s12 m6">
-                     <div class="field label border round">
+                     <div class="field file label border round">
+                        <input type="text" readonly>
                         {{ form.image }}
                         <label>{% trans "Image" %}</label>
+                        <i>publish</i>
                     </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 %}">
+                    <div class="padding border round dashed surface-variant" style="min-height: 150px; display: flex; align-items: center; justify-content: center; flex-direction: column;">
+                         <img id="image-preview" src="{% if recipe.image %}{{ recipe.image.url }}{% endif %}" class="responsive round mb-1" 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>
+                         <button type="button" id="edit-image-btn" class="button transparent border round" style="display: none;" onclick="openCropper()">
+                            <i>crop_rotate</i>
+                            <span>{% trans "Edit Image" %}</span>
+                         </button>
                     </div>
                 </div>
 
@@ -101,6 +117,41 @@
     </div>
 </article>
 
+<dialog id="cropper-dialog" class="large">
+    <div class="padding">
+        <h5 class="bold mb-1">{% trans "Edit Image" %}</h5>
+        <div class="cropper-container mb-1">
+            <img id="cropper-image" src="">
+        </div>
+        <div class="row scroll no-space border round mb-1">
+            <button type="button" class="button transparent max" onclick="cropper.rotate(-90)" title="{% trans 'Rotate Left' %}">
+                <i>rotate_left</i>
+            </button>
+            <button type="button" class="button transparent max" onclick="cropper.rotate(90)" title="{% trans 'Rotate Right' %}">
+                <i>rotate_right</i>
+            </button>
+            <div class="divider vertical"></div>
+            <button type="button" class="button transparent max" onclick="cropper.scaleX(-cropper.getData().scaleX || -1)" title="{% trans 'Flip Horizontal' %}">
+                <i>flip</i>
+            </button>
+            <button type="button" class="button transparent max" onclick="cropper.scaleY(-cropper.getData().scaleY || -1)" title="{% trans 'Flip Vertical' %}">
+                <i>flip</i>
+            </button>
+            <div class="divider vertical"></div>
+            <button type="button" class="button transparent max" onclick="cropper.setAspectRatio(1)" title="{% trans '1:1' %}">1:1</button>
+            <button type="button" class="button transparent max" onclick="cropper.setAspectRatio(4/3)" title="{% trans '4:3' %}">4:3</button>
+            <button type="button" class="button transparent max" onclick="cropper.setAspectRatio(16/9)" title="{% trans '16:9' %}">16:9</button>
+            <button type="button" class="button transparent max" onclick="cropper.setAspectRatio(NaN)" title="{% trans 'Free' %}">
+                <i>crop_free</i>
+            </button>
+        </div>
+        <nav class="right-align">
+            <button type="button" class="button transparent" onclick="ui('#cropper-dialog')">{% trans "Cancel" %}</button>
+            <button type="button" class="button primary" onclick="applyCrop()">{% trans "Apply" %}</button>
+        </nav>
+    </div>
+</dialog>
+
 
 <div class="large-space"></div>
 
@@ -117,21 +168,67 @@
 
 {% block page_scripts %}
 <script>
-    // Image Preview Logic
-    var imageInput = document.querySelector('input[type="file"]');
+    let cropper;
+    const imageInput = document.querySelector('input[type="file"]');
+    const imagePreview = document.getElementById('image-preview');
+    const imagePlaceholder = document.getElementById('image-placeholder');
+    const editImageBtn = document.getElementById('edit-image-btn');
+    const imageDataInput = document.getElementsByName('image_data')[0];
+    const cropperImage = document.getElementById('cropper-image');
+
+    function openCropper() {
+        if (!imagePreview.src || imagePreview.src === window.location.href) return;
+        cropperImage.src = imagePreview.src;
+        ui('#cropper-dialog');
+
+        if (cropper) {
+            cropper.destroy();
+        }
+
+        setTimeout(() => {
+            cropper = new Cropper(cropperImage, {
+                viewMode: 1,
+                autoCropArea: 1,
+                responsive: true,
+                restore: false,
+                checkCrossOrigin: true,
+                guides: true,
+                center: true,
+                highlight: false,
+                cropBoxMovable: true,
+                cropBoxResizable: true,
+                toggleDragModeOnDblclick: false,
+            });
+        }, 100);
+    }
+
+    function applyCrop() {
+        const canvas = cropper.getCroppedCanvas({
+            maxWidth: 2000,
+            maxHeight: 2000,
+        });
+
+        const croppedData = canvas.toDataURL('image/jpeg', 0.9);
+        imagePreview.src = croppedData;
+        imagePreview.style.display = 'block';
+        if (imagePlaceholder) imagePlaceholder.style.display = 'none';
+        if (editImageBtn) editImageBtn.style.display = 'inline-flex';
+        imageDataInput.value = croppedData;
+
+        ui('#cropper-dialog');
+    }
+
     if (imageInput) {
         imageInput.onchange = function (evt) {
-            var tgt = evt.target || window.event.srcElement,
-                files = tgt.files;
-
+            const files = evt.target.files;
             if (FileReader && files && files.length) {
-                var fr = new FileReader();
+                const 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';
+                    imagePreview.src = fr.result;
+                    imagePreview.style.display = 'block';
+                    if (imagePlaceholder) imagePlaceholder.style.display = 'none';
+                    if (editImageBtn) editImageBtn.style.display = 'inline-flex';
+                    openCropper();
                 }
                 fr.readAsDataURL(files[0]);
             }

sandwitches/templates/components/navbar.html

@@ -15,6 +15,12 @@
   </button>
 
   {% if user.is_authenticated %}
+    <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>
+        {% endif %}
+    </a>
     <a href="{% url 'user_profile' %}">
       {% if user.avatar %}
       <img src="{{ user.avatar.url }}" class="circle">

sandwitches/templates/components/recipe_header.html

@@ -37,11 +37,11 @@
     <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">
+    <form action="{% url 'add_to_cart' 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>
+            <i>add_shopping_cart</i>
+            <span>{% trans "Add to Cart" %}</span>
         </button>
     </form>
     {% endif %}

sandwitches/templates/order_detail.html

@@ -0,0 +1,68 @@
+{% extends "base_beer.html" %}
+{% load static i18n %}
+
+{% block title %}{% trans "Order Details" %} #{{ order.id }}{% endblock %}
+
+{% block content %}
+<div class="large-space"></div>
+
+<div class="grid">
+  <div class="s12 m10 l8 xl6 middle-align center-align" style="margin: 0 auto;">
+    <article class="round elevate left-align">
+      <div class="padding">
+          <nav>
+              <a href="{% url 'user_profile' %}" class="button transparent circle">
+                  <i>arrow_back</i>
+              </a>
+              <h5 class="max">{% trans "Order" %} #{{ order.id }}</h5>
+              <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>
+          </nav>
+          <div class="divider"></div>
+
+          <div class="grid">
+              <div class="s12 m6">
+                  <p class="small-text">{% trans "Date Ordered" %}</p>
+                  <p>{{ order.created_at|date:"d F Y, H:i" }}</p>
+              </div>
+              <div class="s12 m6">
+                   <p class="small-text">{% trans "Last Update" %}</p>
+                   <p>{{ order.updated_at|date:"d F Y, H:i" }}</p>
+              </div>
+          </div>
+
+          <div class="divider"></div>
+
+          <h6>{% trans "Item Details" %}</h6>
+          <div class="row">
+              <div class="max">
+                  <a href="{% url 'recipe_detail' order.recipe.slug %}" class="bold primary-text">{{ order.recipe.title }}</a>
+                  <p class="small-text">{{ order.recipe.description|truncatewords:20 }}</p>
+              </div>
+              <div class="min">
+                  <span class="bold">{{ order.total_price }} €</span>
+              </div>
+          </div>
+
+          {% if order.recipe.image %}
+          <div class="space"></div>
+          <img src="{{ order.recipe.image.url }}" class="responsive round border" alt="{{ order.recipe.title }}">
+          {% endif %}
+
+          <div class="divider"></div>
+
+          <div class="row">
+              <div class="max text-right">
+                  <span class="bold">{% trans "Total" %}</span>
+              </div>
+               <div class="min">
+                  <span class="bold text-primary">{{ order.total_price }} €</span>
+              </div>
+          </div>
+
+      </div>
+    </article>
+  </div>
+</div>
+{% endblock %}

sandwitches/templates/partials/recipe_list.html

@@ -72,11 +72,19 @@
          </div>
        </div>
 
-       <div class="padding pt-0">
-         <a href="{% url 'recipe_detail' recipe.slug %}" class="button fill round responsive">
-           <span>{% trans 'View Recipe' %}</span>
+       <div class="padding pt-0 row no-space">
+         <a href="{% url 'recipe_detail' recipe.slug %}" class="button fill round max">
+           <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/templates/profile.html

@@ -90,6 +90,96 @@
 
       </form>
     </article>
+
+    <div class="large-space"></div>
+
+    <h4 class="center-align primary-text">{% trans "Order History" %}</h4>
+
+    <form method="get" class="row no-wrap middle-align">
+        <div class="field label border round small">
+            <select name="status" onchange="this.form.submit()">
+                <option value="">{% trans "All Statuses" %}</option>
+                {% for code, label in status_choices %}
+                <option value="{{ code }}" {% if current_status == code %}selected{% endif %}>{{ label }}</option>
+                {% endfor %}
+            </select>
+            <label>{% trans "Filter by Status" %}</label>
+        </div>
+        <div class="space"></div>
+        <div class="field label border round small">
+             <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>
+                <option value="price_desc" {% if current_sort == 'price_desc' %}selected{% endif %}>{% trans "Price: High to Low" %}</option>
+                <option value="price_asc" {% if current_sort == 'price_asc' %}selected{% endif %}>{% trans "Price: Low to High" %}</option>
+            </select>
+            <label>{% trans "Sort by" %}</label>
+        </div>
+    </form>
+
+    {% if orders %}
+    <div class="padding border round surface left-align">
+        <table class="border striped">
+            <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>
+                </tr>
+            </thead>
+            <tbody>
+                {% for order in orders %}
+                <tr>
+                    <td>{{ order.id }}</td>
+                    <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>
+                        <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>
+                        <a href="{% url 'user_order_detail' order.id %}" class="button circle transparent small">
+                            <i>visibility</i>
+                        </a>
+                    </td>
+                </tr>
+                {% endfor %}
+            </tbody>
+        </table>
+    </div>
+
+    {% if orders.paginator.num_pages > 1 %}
+    <div class="center-align padding">
+        <nav class="row">
+            {% if orders.has_previous %}
+                <a href="?page={{ orders.previous_page_number }}{% if current_status %}&status={{ current_status }}{% endif %}{% if current_sort %}&sort={{ current_sort }}{% endif %}" class="button transparent circle"><i>chevron_left</i></a>
+            {% else %}
+                <button class="button transparent circle" disabled><i>chevron_left</i></button>
+            {% endif %}
+
+            <span class="padding">{{ orders.number }} / {{ orders.paginator.num_pages }}</span>
+
+            {% if orders.has_next %}
+                 <a href="?page={{ orders.next_page_number }}{% if current_status %}&status={{ current_status }}{% endif %}{% if current_sort %}&sort={{ current_sort }}{% endif %}" class="button transparent circle"><i>chevron_right</i></a>
+            {% else %}
+                <button class="button transparent circle" disabled><i>chevron_right</i></button>
+            {% endif %}
+        </nav>
+    </div>
+    {% endif %}
+
+    {% else %}
+    <div class="padding border round surface">
+        <p class="center-align">{% trans "No previous orders found." %}</p>
+    </div>
+    {% endif %}
   </div>
 </div>
 {% endblock %}

sandwitches/urls.py

@@ -34,11 +34,19 @@ urlpatterns = [
     path("login/", views.CustomLoginView.as_view(), name="login"),
     path("logout/", LogoutView.as_view(next_page="index"), name="logout"),
     path("profile/", views.user_profile, name="user_profile"),
+    path("orders/<int:pk>/", views.user_order_detail, name="user_order_detail"),
     path("community/", views.community, name="community"),
     path("admin/", admin.site.urls),
     path("api/", api.urls),
     path("media/<path:file_path>", views.media, name="media"),
     path("favorites/", views.favorites, name="favorites"),
+    path("cart/", views.view_cart, name="view_cart"),
+    path("cart/add/<int:pk>/", views.add_to_cart, name="add_to_cart"),
+    path("cart/remove/<int:pk>/", views.remove_from_cart, name="remove_from_cart"),
+    path(
+        "cart/update/<int:pk>/", views.update_cart_quantity, name="update_cart_quantity"
+    ),
+    path("cart/checkout/", views.checkout_cart, name="checkout_cart"),
     path("", views.index, name="index"),
     path("feeds/latest/", LatestRecipesFeed(), name="latest_recipes_feed"),
     path(
@@ -54,6 +62,11 @@ urlpatterns += i18n_patterns(
     path("recipes/<int:pk>/favorite/", views.toggle_favorite, name="toggle_favorite"),
     path("dashboard/", views.admin_dashboard, name="admin_dashboard"),
     path("dashboard/recipes/", views.admin_recipe_list, name="admin_recipe_list"),
+    path(
+        "dashboard/approvals/",
+        views.admin_recipe_approval_list,
+        name="admin_recipe_approval_list",
+    ),
     path("dashboard/recipes/add/", views.admin_recipe_add, name="admin_recipe_add"),
     path(
         "dashboard/recipes/<int:pk>/edit/",