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

sandwitches/templates/signup.html

@@ -1,50 +1,133 @@
-{% extends "base_pico.html" %}
+{% extends "base_beer.html" %}
 {% load static i18n %}
 {% block title %}{% trans "Sign Up" %}{% endblock %}
 
 {% block content %}
-<div class="container" style="max-width:720px; margin:2rem auto;">
-  <article class="card">
-    <div class="card-body">
-      <h2>{% trans "Sign up" %}</h2> 
+<div class="large-space"></div>
 
-      <form method="post" novalidate>
+<div class="grid">
+  <div class="s12 m10 l8 xl6 middle-align center-align" style="margin: 0 auto;">
+    <article class="round elevate">
+      <div class="padding">
+          <h4 class="center-align primary-text">{% trans "Create your account" %}</h4>
+          <p class="center-align">{% trans "Join the Sandwitches community today!" %}</p>
+      </div>
+      
+      <form method="post" enctype="multipart/form-data" novalidate>
         {% csrf_token %}
+        
         {% if form.non_field_errors %}
-          <div class="card-panel" role="alert">
-            <ul>
-              {% for err in form.non_field_errors %}
-                <li>{{ err }}</li>
-              {% endfor %}
-            </ul>
+          <div class="padding error surface round mb">
+             {% for err in form.non_field_errors %}
+                <div class="row align-center">
+                    <i class="error-text">warning</i>
+                    <span class="error-text">{{ err }}</span>
+                </div>
+             {% endfor %}
           </div>
         {% endif %}
 
-        <label for="{{ form.username.id_for_label }}">{% trans "Username" %}</label>
-        {{ form.username }}
+        <div class="grid">
+            <div class="s12 m6">
+                <div class="field label border round {% if form.first_name.errors %}error{% endif %}">
+                    <input type="text" name="{{ form.first_name.name }}" id="{{ form.first_name.id_for_label }}" value="{{ form.first_name.value|default:'' }}">
+                    <label>{% trans "First name" %}</label>
+                    {% if form.first_name.errors %}
+                        <span class="helper error-text">{{ form.first_name.errors.0 }}</span>
+                    {% endif %}
+                </div>
+            </div>
+             <div class="s12 m6">
+                <div class="field label border round {% if form.last_name.errors %}error{% endif %}">
+                    <input type="text" name="{{ form.last_name.name }}" id="{{ form.last_name.id_for_label }}" value="{{ form.last_name.value|default:'' }}">
+                    <label>{% trans "Last name" %}</label>
+                     {% if form.last_name.errors %}
+                        <span class="helper error-text">{{ form.last_name.errors.0 }}</span>
+                    {% endif %}
+                </div>
+            </div>
+        </div>
 
-        <label for="{{ form.email.id_for_label }}">{% trans "Email (optional)" %}</label>
-        {{ form.email }}
+        <div class="field label border round {% if form.username.errors %}error{% endif %}">
+            <input type="text" name="{{ form.username.name }}" id="{{ form.username.id_for_label }}" value="{{ form.username.value|default:'' }}">
+            <label>{% trans "Username" %}</label>
+            {% if form.username.errors %}
+                <span class="helper error-text">{{ form.username.errors.0 }}</span>
+            {% endif %}
+        </div>
 
-        <label for="{{ form.first_name.id_for_label }}">{% trans "First name" %}</label>
-        {{ form.first_name }}
+        <div class="field label border round {% if form.email.errors %}error{% endif %}">
+            <input type="email" name="{{ form.email.name }}" id="{{ form.email.id_for_label }}" value="{{ form.email.value|default:'' }}">
+            <label>{% trans "Email (optional)" %}</label>
+            {% if form.email.errors %}
+                <span class="helper error-text">{{ form.email.errors.0 }}</span>
+            {% endif %}
+        </div>
+        
+        <div class="field label border round {% if form.language.errors %}error{% endif %}">
+            <select name="{{ form.language.name }}" id="{{ form.language.id_for_label }}">
+                {% for value, label in form.language.field.choices %}
+                    <option value="{{ value }}" {% if form.language.value == value %}selected{% endif %}>{{ label }}</option>
+                {% endfor %}
+            </select>
+            <label>{% trans "Preferred Language" %}</label>
+            {% if form.language.errors %}
+                 <span class="helper error-text">{{ form.language.errors.0 }}</span>
+            {% endif %}
+        </div>
 
-        <label for="{{ form.last_name.id_for_label }}">{% trans "Last name" %}</label>
-        {{ form.last_name }}
+        <div class="field label border round textarea {% if form.bio.errors %}error{% endif %}">
+            <textarea name="{{ form.bio.name }}" id="{{ form.bio.id_for_label }}" rows="3">{{ form.bio.value|default:'' }}</textarea>
+            <label>{% trans "Bio" %}</label>
+            {% if form.bio.errors %}
+                 <span class="helper error-text">{{ form.bio.errors.0 }}</span>
+            {% endif %}
+        </div>
+        
+        <div class="field middle-align {% if form.avatar.errors %}error{% endif %}">
+             <nav>
+                <div class="max">
+                    <label class="button border transparent round">
+                        <input type="file" name="{{ form.avatar.name }}" id="{{ form.avatar.id_for_label }}" accept="image/*">
+                        <i>upload</i>
+                        <span>{% trans "Upload Profile Picture" %}</span>
+                    </label>
+                </div>
+            </nav>
+            {% if form.avatar.errors %}
+                 <span class="helper error-text">{{ form.avatar.errors.0 }}</span>
+            {% endif %}
+        </div>
 
-        <label for="{{ form.password1.id_for_label }}">{% trans "Password" %}</label>
-        {{ form.password1 }}
+        <div class="space"></div>
+        <div class="divider"></div>
+        <div class="space"></div>
 
-        <label for="{{ form.password2.id_for_label }}">{% trans "Confirm password" %}</label>
-        {{ form.password2 }}
+        <div class="field label border round {% if form.password1.errors %}error{% endif %}">
+            <input type="password" name="{{ form.password1.name }}" id="{{ form.password1.id_for_label }}">
+            <label>{% trans "Password" %}</label>
+            {% if form.password1.errors %}
+                <span class="helper error-text">{{ form.password1.errors.0 }}</span>
+            {% endif %}
+        </div>
+
+        <div class="field label border round {% if form.password2.errors %}error{% endif %}">
+             <input type="password" name="{{ form.password2.name }}" id="{{ form.password2.id_for_label }}">
+            <label>{% trans "Confirm password" %}</label>
+             {% if form.password2.errors %}
+                <span class="helper error-text">{{ form.password2.errors.0 }}</span>
+            {% endif %}
+        </div>
+
+        <div class="large-space"></div>
+        
+        <nav class="right-align">
+            <a class="button transparent border round" href="{% url 'index' %}">{% trans "Cancel" %}</a>
+            <button type="submit" class="button primary round">{% trans "Sign Up" %}</button>
+        </nav>
 
-        <p style="margin-top:1rem;">
-          <button type="submit">{% trans "Sign Up" %}</button>
-          <a class="contrast" href="{% url 'index' %}">{% trans "Cancel" %}</a>
-        </p>
       </form>
-    </div>
-  </article>
+    </article>
+  </div>
 </div>
-
 {% endblock %}

sandwitches/templatetags/custom_filters.py

@@ -0,0 +1,15 @@
+from django import template
+
+register = template.Library()
+
+
+@register.filter
+def split(value, arg):
+    return value.split(arg)
+
+
+@register.filter
+def strip(value):
+    if isinstance(value, str):
+        return value.strip()
+    return value

sandwitches/urls.py

@@ -20,6 +20,7 @@ from django.urls import path, include
 from . import views
 from .api import api
 from django.conf.urls.i18n import i18n_patterns
+from .feeds import LatestRecipesFeed  # Import the feed class
 
 
 import os
@@ -32,13 +33,68 @@ urlpatterns = [
     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("", views.index, name="index"),
+    path("feeds/latest/", LatestRecipesFeed(), name="latest_recipes_feed"),
+    path(
+        "feeds/latest/", LatestRecipesFeed(), name="latest_recipes_feed"
+    ),  # Add this line
 ]
 
 urlpatterns += i18n_patterns(
     path("recipes/<slug:slug>/", views.recipe_detail, name="recipe_detail"),
     path("setup/", views.setup, name="setup"),
     path("recipes/<int:pk>/rate/", views.recipe_rate, name="recipe_rate"),
+    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/recipes/add/", views.admin_recipe_add, name="admin_recipe_add"),
+    path(
+        "dashboard/recipes/<int:pk>/edit/",
+        views.admin_recipe_edit,
+        name="admin_recipe_edit",
+    ),
+    path(
+        "dashboard/recipes/<int:pk>/delete/",
+        views.admin_recipe_delete,
+        name="admin_recipe_delete",
+    ),
+    path(
+        "dashboard/recipes/<int:pk>/rotate/",
+        views.admin_recipe_rotate,
+        name="admin_recipe_rotate",
+    ),
+    path("dashboard/users/", views.admin_user_list, name="admin_user_list"),
+    path(
+        "dashboard/users/<int:pk>/edit/", views.admin_user_edit, name="admin_user_edit"
+    ),
+    path(
+        "dashboard/users/<int:pk>/delete/",
+        views.admin_user_delete,
+        name="admin_user_delete",
+    ),
+    path("dashboard/tags/", views.admin_tag_list, name="admin_tag_list"),
+    path("dashboard/tags/add/", views.admin_tag_add, name="admin_tag_add"),
+    path(
+        "dashboard/tags/<int:pk>/edit/",
+        views.admin_tag_edit,
+        name="admin_tag_edit",
+    ),
+    path(
+        "dashboard/tags/<int:pk>/delete/",
+        views.admin_tag_delete,
+        name="admin_tag_delete",
+    ),
+    path("dashboard/tasks/", views.admin_task_list, name="admin_task_list"),
+    path(
+        "dashboard/tasks/<str:pk>/", views.admin_task_detail, name="admin_task_detail"
+    ),
+    path("dashboard/ratings/", views.admin_rating_list, name="admin_rating_list"),
+    path(
+        "dashboard/ratings/<int:pk>/delete/",
+        views.admin_rating_delete,
+        name="admin_rating_delete",
+    ),
     prefix_default_language=True,
 )
 

sandwitches/utils.py

@@ -0,0 +1,222 @@
+import re
+
+# Define a set of common units for better parsing
+COMMON_UNITS = {
+    "cup",
+    "cups",
+    "oz",
+    "ounce",
+    "ounces",
+    "g",
+    "gram",
+    "grams",
+    "kg",
+    "kilogram",
+    "kilograms",
+    "lb",
+    "lbs",
+    "pound",
+    "pounds",
+    "ml",
+    "milliliter",
+    "milliliters",
+    "l",
+    "liter",
+    "liters",
+    "tsp",
+    "teaspoon",
+    "teaspoons",
+    "tbsp",
+    "tablespoon",
+    "tablespoons",
+    "pinch",
+    "pinches",
+    "slice",
+    "slices",
+    "clove",
+    "cloves",
+    "large",
+    "medium",
+    "small",
+    "can",
+    "cans",
+    "package",
+    "packages",
+    "piece",
+    "pieces",
+    "dash",
+    "dashes",
+    "sprig",
+    "sprigs",
+    "to taste",
+}
+
+
+def parse_ingredient_line(line):
+    """
+    Parses a single ingredient line to extract quantity, unit, and ingredient name.
+    This is a heuristic approach and may not cover all possible formats.
+    Returns a dictionary with 'quantity', 'unit', 'name', and 'original_line'.
+    Quantity will be a float, unit and name strings.
+    If parsing fails, returns None for quantity/unit but includes original_line.
+    """
+    original_line = line.strip()
+
+    quantity = None
+    unit = None
+    name = original_line
+
+    # Regex to capture quantity at the beginning:
+    # 1. Whole number with fraction (e.g., "1 1/2", "2 3/4")
+    # 2. Simple fraction (e.g., "1/2", "3/4")
+    # 3. Decimal number (e.g., "0.5", "2.0", ".75")
+    # 4. Whole number (e.g., "1", "100")
+    # The quantity is optional to handle lines like "Salt to taste".
+    #
+    # This pattern specifically tries to get the quantity part.
+    # It covers:
+    # - `1 1/2` (whole number followed by space and fraction)
+    # - `1/2` (fraction)
+    # - `1.5` (decimal)
+    # - `1` (integer)
+    quantity_match = re.match(
+        r"^\s*(\d+\s+\d/\d|\d/\d|\d+\.?\d*|\.\d+)\s*(.*)", original_line
+    )
+
+    remaining_line = original_line
+
+    if quantity_match:
+        quantity_str = quantity_match.group(1)
+        remaining_line = quantity_match.group(2).strip()
+
+        try:
+            # Handle fractions like "1 1/2" or "1/2"
+            if " " in quantity_str and "/" in quantity_str:
+                parts = quantity_str.split(" ", 1)
+                whole = float(parts[0])
+                fraction_parts = parts[1].split("/")
+                numerator = float(fraction_parts[0])
+                denominator = float(fraction_parts[1])
+                quantity = whole + (numerator / denominator)
+            elif "/" in quantity_str:
+                parts = quantity_str.split("/")
+                numerator = float(parts[0])
+                denominator = float(parts[1])
+                quantity = numerator / denominator
+            else:
+                quantity = float(quantity_str)
+        except ValueError:
+            quantity = None  # Parsing quantity failed
+
+    # Now, try to find a unit in the remaining_line
+    # We iterate through common units to find the longest match first
+    found_unit = None
+    for common_unit in sorted(list(COMMON_UNITS), key=len, reverse=True):
+        # Check if the unit is at the beginning of the remaining_line, followed by a space or end of string
+        # using word boundary to avoid partial matches (e.g., "cup" in "cupholder")
+        unit_regex = r"^\s*" + re.escape(common_unit) + r"(\b|\s|$)"  # ty:ignore[invalid-argument-type]
+        unit_match = re.match(unit_regex, remaining_line, re.IGNORECASE)
+        if unit_match:
+            found_unit = remaining_line[: unit_match.end(1)].strip()
+            remaining_line = remaining_line[unit_match.end(1) :].strip()
+            break  # Found the unit, stop searching
+
+    if found_unit:
+        unit = found_unit
+
+    # The rest of the line is the name
+    name = (
+        remaining_line
+        if remaining_line
+        else original_line
+        if quantity is None and unit is None
+        else ""
+    )
+
+    # If quantity was not parsed, and no unit was found, then the whole line is the name
+    if quantity is None and unit is None:
+        name = original_line
+    elif name == "" and (quantity is not None or unit is not None):
+        # If we parsed a quantity or unit but no name, it means the name was part of the unit search
+        # or it was implicitly part of the quantity_match that took everything.
+        # This is a fallback to ensure something is in name if it's not a unit.
+        if unit and original_line.lower().startswith(
+            f"{quantity_str.lower() if quantity_str else ''} {unit.lower()}".strip()
+        ):
+            name_start_index = original_line.lower().find(unit.lower()) + len(unit)
+            potential_name = original_line[name_start_index:].strip()
+            if potential_name:
+                name = potential_name
+        elif quantity_match:
+            # Fallback if name is empty and quantity was matched, it means quantity was everything
+            # or the unit was consumed.
+            if not unit:  # If no unit, the remaining_line should be the name
+                name = remaining_line
+
+    return {
+        "quantity": quantity,
+        "unit": unit,
+        "name": name.strip(),
+        "original_line": original_line,
+    }
+
+
+def scale_ingredient(parsed_ingredient, current_servings, target_servings):
+    """
+    Scales a parsed ingredient based on current and target servings.
+    """
+    if parsed_ingredient["quantity"] is None or current_servings == 0:
+        # Cannot scale if quantity is unknown or current servings is zero
+        return parsed_ingredient
+
+    scale_factor = target_servings / current_servings
+    scaled_quantity = parsed_ingredient["quantity"] * scale_factor
+
+    return {
+        "quantity": scaled_quantity,
+        "unit": parsed_ingredient["unit"],
+        "name": parsed_ingredient["name"],
+        "original_line": parsed_ingredient[
+            "original_line"
+        ],  # Keep original line reference
+    }
+
+
+def format_scaled_ingredient(scaled_ingredient):
+    """
+    Formats a scaled ingredient back into a human-readable string.
+    This will try to reconstruct the string based on the parsed components.
+    """
+    quantity = scaled_ingredient["quantity"]
+    unit = scaled_ingredient["unit"]
+    name = scaled_ingredient["name"]
+
+    if quantity is None:
+        return scaled_ingredient[
+            "original_line"
+        ]  # Fallback to original if quantity was not parsed
+
+    # Simple formatting for now. Could add fraction handling later.
+    if quantity == int(quantity):
+        quantity_str = str(int(quantity))
+    else:
+        # Format to 2 decimal places, remove trailing zeros, and remove trailing dot if integer
+        quantity_str = f"{quantity:.2f}".rstrip("0").rstrip(".")
+        if not quantity_str:  # Handle cases like 0.0 -> ""
+            quantity_str = "0"
+
+    parts = []
+    if quantity_str:
+        parts.append(quantity_str)
+
+    # Check for units that usually don't have a space before them
+    if unit:
+        if unit.lower() in ["g", "mg"]:  # Only g and mg are typically appended directly
+            parts[-1] += unit  # Append unit directly to the last part (quantity)
+        else:
+            parts.append(unit)
+
+    if name:
+        parts.append(name)
+
+    return " ".join(parts).strip()