Erweitere Einkaufssuche um Archiv und Unsortiert

nouri/main.py

@@ -21,7 +21,7 @@ from flask import (
     url_for,
 )
 
-from .auth import admin_required, login_required
+from .auth import admin_required, login_required, url_with_scroll_position, wants_to_stay_on_form
 from .backup import RESTORE_CONFIRMATION_TEXT, export_backup_archive, restore_backup_archive
 from .constants import (
     AVAILABILITY_LABELS,
@@ -71,7 +71,8 @@ main_bp = Blueprint("main", __name__)
 ACTIVE_STATE_OPTIONS = [
     ("", "Alle aktiven"),
     ("home", "Zuhause"),
-    ("idea", "Merkliste"),
+    ("idea", "Gerade nicht da"),
+    ("unsorted", "Unsortiert"),
 ]
 KIND_FILTER_OPTIONS = [
     ("", "Alles"),
@@ -465,6 +466,16 @@ def describe_record(entry: dict) -> dict:
         entry["for_label"] = "Für mich" if entry["is_mine"] else f"Für {owner_name}"
     else:
         entry["for_label"] = "Für alle"
+    entry["is_archived"] = bool(entry.get("is_archived"))
+    entry["is_quick_added"] = bool(entry.get("is_quick_added"))
+    entry["is_home"] = bool(entry.get("availability_state") == "home" and not entry["is_archived"])
+    if entry["is_archived"]:
+        entry["availability_key"] = "archived"
+    elif entry["is_quick_added"]:
+        entry["availability_key"] = "unsorted"
+    else:
+        entry["availability_key"] = "home" if entry["is_home"] else "idea"
+    entry["availability_label"] = AVAILABILITY_LABELS.get(entry["availability_key"], AVAILABILITY_LABELS["idea"])
     entry["can_edit"] = entry["is_shared"] or entry["is_mine"] or g.user["role"] == "admin"
     return entry
 
@@ -798,6 +809,7 @@ def fetch_items(
     kind: str | None = None,
     availability: str | None = None,
     include_archived: bool = False,
+    include_quick_added: bool = False,
     query: str | None = None,
     daypart_id: int | None = None,
     visibility: str | None = None,
@@ -809,10 +821,19 @@ def fetch_items(
         conditions.append("items.kind = ?")
         params.append(kind)
     if availability:
-        conditions.append("items.availability_state = ?")
-        params.append(availability)
+        if availability == "archived":
+            conditions.append("items.is_archived = 1")
+        elif availability == "unsorted":
+            conditions.append("items.is_archived = 0")
+            conditions.append("COALESCE(items.is_quick_added, 0) = 1")
+        else:
+            conditions.append("items.is_archived = 0")
+            conditions.append("items.availability_state = ?")
+            params.append(availability)
     elif not include_archived:
-        conditions.append("items.availability_state != 'archived'")
+        conditions.append("items.is_archived = 0")
+    if not include_quick_added and availability != "unsorted":
+        conditions.append("COALESCE(items.is_quick_added, 0) = 0")
     if query:
         conditions.append("LOWER(items.name) LIKE ?")
         params.append(f"%{query.lower()}%")
@@ -849,7 +870,11 @@ def fetch_items(
         LEFT JOIN users AS target ON target.id = items.target_user_id
         WHERE {' AND '.join(conditions)}
         ORDER BY
-            CASE items.availability_state WHEN 'home' THEN 0 WHEN 'idea' THEN 1 ELSE 2 END,
+            CASE
+                WHEN items.is_archived = 1 THEN 2
+                WHEN items.availability_state = 'home' THEN 0
+                ELSE 1
+            END,
             CASE items.visibility WHEN 'shared' THEN 0 ELSE 1 END,
             LOWER(items.name)
         """,
@@ -859,13 +884,14 @@ def fetch_items(
 
 
 def fetch_food_options(query: str | None = None):
-    return fetch_items(kind="food", include_archived=True, query=query)
+    return fetch_items(kind="food", include_archived=False, query=query)
 
 
 def group_items_by_availability(items: list[dict]) -> list[dict]:
     grouped = defaultdict(list)
     for item in items:
-        grouped[item["availability_state"]].append(item)
+        key = "archived" if item.get("is_archived") else item.get("availability_state", "idea")
+        grouped[key].append(item)
 
     result = []
     for state in ("home", "idea", "archived"):
@@ -1108,6 +1134,7 @@ def fetch_meal_missing_components(meal_id: int) -> list[dict]:
         WHERE meal_components.meal_item_id = ?
           AND items.household_id = ?
           AND (items.visibility = 'shared' OR items.owner_user_id = ?)
+          AND items.is_archived = 0
           AND items.availability_state != 'home'
         ORDER BY LOWER(items.name)
         """,
@@ -1169,16 +1196,6 @@ def ensure_item_or_missing_components_are_shopped(
             "used_components": True,
         }
 
-    if item["availability_state"] == "home":
-        return {
-            "added": False,
-            "count": 0,
-            "names": [],
-            "scheduled_count": 0,
-            "scheduled_names": [],
-            "used_components": False,
-        }
-
     if needed_for_date and not should_activate_shopping_need(parse_plan_date(needed_for_date)):
         schedule_shopping_need(
             item_id=item_id,
@@ -1279,8 +1296,10 @@ def fetch_shopping_entries():
         SELECT shopping_entries.*,
                items.name AS item_name,
                items.kind AS item_kind,
+               items.base_type,
                items.photo_filename,
                items.availability_state,
+               items.is_archived,
                owner.display_name AS owner_display_name,
                owner.username AS owner_username,
                target.display_name AS target_display_name,
@@ -1322,6 +1341,7 @@ def activate_due_shopping_needs(today: date | None = None) -> int:
         WHERE shopping_needs.household_id = ?
           AND shopping_needs.is_activated = 0
           AND shopping_needs.activation_date <= ?
+          AND items.is_archived = 0
         ORDER BY shopping_needs.activation_date, shopping_needs.needed_for_date
         """,
         (current_household_id(), today.isoformat()),
@@ -1353,6 +1373,7 @@ def fetch_upcoming_shopping_needs(limit: int | None = None) -> list[dict]:
                items.kind AS item_kind,
                items.photo_filename,
                items.availability_state,
+               items.is_archived,
                owner.display_name AS owner_display_name,
                owner.username AS owner_username,
                target.display_name AS target_display_name,
@@ -1366,6 +1387,7 @@ def fetch_upcoming_shopping_needs(limit: int | None = None) -> list[dict]:
         WHERE shopping_needs.household_id = ?
           AND shopping_needs.is_activated = 0
           AND (shopping_needs.visibility = 'shared' OR shopping_needs.owner_user_id = ?)
+          AND items.is_archived = 0
           AND items.availability_state != 'home'
         ORDER BY shopping_needs.activation_date, shopping_needs.needed_for_date, LOWER(items.name)
     """
@@ -1393,6 +1415,7 @@ def fetch_plan_entries_for_range(start_date: date, end_date: date):
                items.kind AS item_kind,
                items.photo_filename,
                items.availability_state,
+               items.is_archived,
                dayparts.name AS daypart_name,
                dayparts.slug AS daypart_slug,
                dayparts.sort_order,
@@ -1434,6 +1457,7 @@ def fetch_recent_plan_items(daypart_id: int, limit: int = 6):
                items.note,
                items.photo_filename,
                items.availability_state,
+               items.is_archived,
                owner.display_name AS owner_display_name,
                owner.username AS owner_username,
                target.display_name AS target_display_name,
@@ -1453,7 +1477,7 @@ def fetch_recent_plan_items(daypart_id: int, limit: int = 6):
 
 def fetch_plan_candidates(daypart_id: int, query: str | None = None):
     params = [daypart_id, *visible_params()]
-    conditions = [visible_clause("items"), "items.availability_state != 'archived'"]
+    conditions = [visible_clause("items"), "items.is_archived = 0"]
     if query:
         conditions.append("LOWER(items.name) LIKE ?")
         params.append(f"%{query.lower()}%")
@@ -1495,7 +1519,7 @@ def fetch_home_food_ids() -> set[int]:
         f"""
         SELECT id
         FROM items
-        WHERE kind = 'food' AND availability_state = 'home' AND {visible_clause('items')}
+        WHERE kind = 'food' AND availability_state = 'home' AND is_archived = 0 AND {visible_clause('items')}
         """,
         visible_params(),
     ).fetchall()
@@ -1962,6 +1986,7 @@ def build_dashboard_hints(today: date) -> list[str]:
             JOIN item_dayparts ON item_dayparts.item_id = items.id
             JOIN dayparts ON dayparts.id = item_dayparts.daypart_id
             WHERE items.availability_state = 'home'
+              AND items.is_archived = 0
               AND dayparts.slug = 'dinner'
               AND {visible_clause('items')}
             """,
@@ -2001,13 +2026,13 @@ def build_dashboard_hints(today: date) -> list[str]:
 def build_setup_checklist(today: date) -> list[dict]:
     total_items = int(
         get_db().execute(
-            f"SELECT COUNT(*) AS count FROM items WHERE {visible_clause('items')}",
+            f"SELECT COUNT(*) AS count FROM items WHERE items.is_archived = 0 AND {visible_clause('items')}",
             visible_params(),
         ).fetchone()["count"]
     )
     meal_count = int(
         get_db().execute(
-            f"SELECT COUNT(*) AS count FROM items WHERE kind = 'meal' AND {visible_clause('items')}",
+            f"SELECT COUNT(*) AS count FROM items WHERE kind = 'meal' AND items.is_archived = 0 AND {visible_clause('items')}",
             visible_params(),
         ).fetchone()["count"]
     )
@@ -2095,7 +2120,7 @@ def build_day_hints(selected_date: date) -> list[str]:
             FROM items
             JOIN item_dayparts ON item_dayparts.item_id = items.id
             JOIN dayparts ON dayparts.id = item_dayparts.daypart_id
-            WHERE items.availability_state != 'archived'
+            WHERE items.is_archived = 0
               AND dayparts.slug = 'afternoon-snack'
               AND {visible_clause('items')}
             """,
@@ -2233,12 +2258,12 @@ def build_day_planner_sections(
         candidates = fetch_plan_candidates(daypart["id"])
         entries = day_entries.get((selected_date.isoformat(), daypart["id"]), [])
         meal_candidates = dedupe_items(
-            [item for item in candidates if item["kind"] == "meal" and item["availability_state"] == "home"]
+            [item for item in candidates if item["kind"] == "meal" and item.get("is_home")]
             + [item for item in candidates if item["kind"] == "meal"],
             limit=6,
         )
         food_candidates = dedupe_items(
-            [item for item in candidates if item["kind"] == "food" and item["availability_state"] == "home"]
+            [item for item in candidates if item["kind"] == "food" and item.get("is_home")]
             + fetch_recent_plan_items(daypart["id"])
             + [item for item in candidates if item["kind"] == "food"],
             limit=20,
@@ -2281,7 +2306,7 @@ def build_template_day_sections(selected_map: dict[int, list[int]] | None = None
     for daypart in get_dayparts():
         candidates = fetch_plan_candidates(int(daypart["id"]))
         quick_items = dedupe_items(
-            [item for item in candidates if item["availability_state"] == "home"] + candidates,
+            [item for item in candidates if item.get("is_home")] + candidates,
             limit=10,
         )
         quick_ids = {item["id"] for item in quick_items}
@@ -2305,7 +2330,7 @@ def fetch_week_cards(week_start: date):
     for daypart in get_dayparts():
         candidates = fetch_plan_candidates(int(daypart["id"]))
         meal_candidates = dedupe_items(
-            [item for item in candidates if item["kind"] == "meal" and item["availability_state"] == "home"]
+            [item for item in candidates if item["kind"] == "meal" and item.get("is_home")]
             + [item for item in candidates if item["kind"] == "meal"],
             limit=4,
         )
@@ -2379,6 +2404,7 @@ def fetch_plan_entries_for_range_export(start_date: date, end_date: date, *, mod
                items.kind AS item_kind,
                items.photo_filename,
                items.availability_state,
+               items.is_archived,
                dayparts.name AS daypart_name,
                dayparts.slug AS daypart_slug,
                dayparts.sort_order,
@@ -2523,10 +2549,20 @@ def build_week_plan_pdf(week_start: date, *, mode: str = "mine") -> bytes:
 
 
 def count_visible_items(availability_state: str) -> int:
-    row = get_db().execute(
-        f"SELECT COUNT(*) AS count FROM items WHERE availability_state = ? AND {visible_clause('items')}",
-        [availability_state, *visible_params()],
-    ).fetchone()
+    if availability_state == "archived":
+        row = get_db().execute(
+            f"SELECT COUNT(*) AS count FROM items WHERE is_archived = 1 AND COALESCE(is_quick_added, 0) = 0 AND {visible_clause('items')}",
+            visible_params(),
+        ).fetchone()
+    else:
+        row = get_db().execute(
+            f"""
+            SELECT COUNT(*) AS count
+            FROM items
+            WHERE availability_state = ? AND is_archived = 0 AND COALESCE(is_quick_added, 0) = 0 AND {visible_clause('items')}
+            """,
+            [availability_state, *visible_params()],
+        ).fetchone()
     return int(row["count"])
 
 
@@ -3225,6 +3261,8 @@ def day_template_create():
             sync_day_template_entries(template_id, form_data["selected_map"])
             get_db().commit()
             flash("Die Tagesvorlage wurde gespeichert.", "success")
+            if wants_to_stay_on_form():
+                return redirect(url_with_scroll_position(url_for("main.day_template_edit", template_id=template_id)))
             return redirect(url_for("main.template_library"))
     return render_template(
         "library/day_form.html",
@@ -3270,6 +3308,8 @@ def day_template_edit(template_id: int):
             sync_day_template_entries(template_id, form_data["selected_map"])
             get_db().commit()
             flash("Die Tagesvorlage wurde aktualisiert.", "success")
+            if wants_to_stay_on_form():
+                return redirect(url_with_scroll_position(url_for("main.day_template_edit", template_id=template_id)))
             return redirect(url_for("main.template_library"))
     return render_template(
         "library/day_form.html",
@@ -3337,6 +3377,8 @@ def week_template_create():
             sync_week_template_days(template_id, selected_map)
             get_db().commit()
             flash("Die Wochenvorlage wurde gespeichert.", "success")
+            if wants_to_stay_on_form():
+                return redirect(url_with_scroll_position(url_for("main.week_template_edit", template_id=template_id)))
             return redirect(url_for("main.template_library"))
     return render_template(
         "library/week_form.html",
@@ -3382,6 +3424,8 @@ def week_template_edit(template_id: int):
             sync_week_template_days(template_id, form_data["selected_map"])
             get_db().commit()
             flash("Die Wochenvorlage wurde aktualisiert.", "success")
+            if wants_to_stay_on_form():
+                return redirect(url_with_scroll_position(url_for("main.week_template_edit", template_id=template_id)))
             return redirect(url_for("main.template_library"))
     return render_template(
         "library/week_form.html",
@@ -3436,6 +3480,8 @@ def item_set_create():
             sync_item_set_items(set_id, form_data["item_ids"])
             get_db().commit()
             flash("Das Paket wurde gespeichert.", "success")
+            if wants_to_stay_on_form():
+                return redirect(url_with_scroll_position(url_for("main.item_set_edit", set_id=set_id)))
             return redirect(url_for("main.template_library"))
     items = fetch_items(include_archived=False, query=form_data["item_search"] or None)
     return render_template(
@@ -3487,6 +3533,8 @@ def item_set_edit(set_id: int):
             sync_item_set_items(set_id, form_data["item_ids"])
             get_db().commit()
             flash("Das Paket wurde aktualisiert.", "success")
+            if wants_to_stay_on_form():
+                return redirect(url_with_scroll_position(url_for("main.item_set_edit", set_id=set_id)))
             return redirect(url_for("main.template_library"))
     items = fetch_items(include_archived=False, query=form_data["item_search"] or None)
     return render_template(
@@ -3531,6 +3579,9 @@ def settings_view():
             )
             get_db().commit()
             flash("Die Einkaufsrhythmus-Einstellungen wurden gespeichert.", "success")
+            if wants_to_stay_on_form():
+                return redirect(url_with_scroll_position(url_for("main.settings_view")))
+            return redirect(url_for("auth.profile"))
         elif form_name == "reminders":
             ensure_user_settings_row()
             suggestion_style = normalize_suggestion_style(request.form.get("suggestion_style"), "balanced")
@@ -3591,6 +3642,9 @@ def settings_view():
             )
             get_db().commit()
             flash("Deine Erinnerungen und Hinweise wurden gespeichert.", "success")
+            if wants_to_stay_on_form():
+                return redirect(url_with_scroll_position(url_for("main.settings_view")))
+            return redirect(url_for("auth.profile"))
         elif form_name == "push_test":
             subscription = get_db().execute(
                 """
@@ -3763,6 +3817,7 @@ def item_list(kind: str):
     items = fetch_items(
         kind=kind,
         availability=state or None,
+        include_quick_added=state == "unsorted",
         query=query or None,
         daypart_id=daypart_id,
         visibility=scope or None,
@@ -3783,6 +3838,104 @@ def item_list(kind: str):
     )
 
 
+@main_bp.route("/items/food/quick-add", methods=("GET", "POST"))
+@login_required
+def item_quick_add():
+    form_data = {
+        "names_text": "",
+        "visibility": "shared",
+        "target_user_id": None,
+        "target_user_raw": TARGET_USER_OPTIONS_DEFAULT,
+        "base_type": "neutral",
+        "flavor_profile": "neutral",
+        "suggestion_role": "base",
+        "suggestion_priority": "normal",
+        "can_be_meal_core": False,
+        "energy_density": "neutral",
+        "daypart_ids": [],
+        "note": "",
+    }
+
+    if request.method == "POST":
+        form_data.update(
+            {
+                "names_text": request.form.get("names_text", "").strip(),
+                "visibility": normalize_visibility(request.form.get("visibility"), form_data["visibility"]),
+                "target_user_id": normalize_target_user_id(request.form.get("target_user_id")),
+                "target_user_raw": request.form.get("target_user_id", TARGET_USER_OPTIONS_DEFAULT),
+                "base_type": normalize_base_type(request.form.get("base_type"), form_data["base_type"]),
+                "flavor_profile": normalize_food_flavor(request.form.get("flavor_profile"), form_data["flavor_profile"]),
+                "suggestion_role": normalize_food_role(request.form.get("suggestion_role"), form_data["suggestion_role"]),
+                "suggestion_priority": normalize_suggestion_priority(request.form.get("suggestion_priority"), form_data["suggestion_priority"]),
+                "can_be_meal_core": request.form.get("can_be_meal_core", "0") == "1",
+                "energy_density": normalize_energy_density(request.form.get("energy_density"), form_data["energy_density"]),
+                "daypart_ids": [int(value) for value in request.form.getlist("daypart_ids") if value.isdigit()],
+                "note": request.form.get("note", "").strip(),
+            }
+        )
+
+        names = list(
+            dict.fromkeys(
+                line.strip()
+                for line in form_data["names_text"].splitlines()
+                if line.strip()
+            )
+        )
+
+        if not names:
+            flash("Bitte mindestens ein Lebensmittel eintragen.", "error")
+        else:
+            created_names: list[str] = []
+            for name in names:
+                cursor = get_db().execute(
+                    """
+                    INSERT INTO items (
+                        household_id, owner_user_id, target_user_id, visibility, kind, name, category, base_type, flavor_profile, suggestion_role, suggestion_priority, can_be_meal_core, meal_type, meal_tags, energy_density, note, availability_state, is_archived, is_quick_added, created_by, updated_by
+                    )
+                    VALUES (?, ?, ?, ?, 'food', ?, ?, ?, ?, ?, ?, ?, NULL, '', ?, ?, 'idea', 0, 1, ?, ?)
+                    """,
+                    (
+                        current_household_id(),
+                        g.user["id"],
+                        form_data["target_user_id"],
+                        form_data["visibility"],
+                        name,
+                        "Unsortiert",
+                        form_data["base_type"],
+                        form_data["flavor_profile"],
+                        form_data["suggestion_role"],
+                        form_data["suggestion_priority"],
+                        1 if form_data["can_be_meal_core"] else 0,
+                        form_data["energy_density"],
+                        form_data["note"],
+                        g.user["id"],
+                        g.user["id"],
+                    ),
+                )
+                item_id = int(cursor.lastrowid)
+                sync_item_dayparts(item_id, form_data["daypart_ids"])
+                created_names.append(name)
+
+            get_db().commit()
+            flash(f"{len(created_names)} Lebensmittel wurden in „Unsortiert“ angelegt.", "success")
+            return redirect(url_for("main.item_list", kind="food", state="unsorted"))
+
+    return render_template(
+        "items/quick_add.html",
+        form_data=form_data,
+        builder_options=[(key, label) for key, label in BUILDER_LABELS.items()],
+        food_flavor_options=FOOD_FLAVOR_OPTIONS,
+        food_flavor_descriptions=FOOD_FLAVOR_DESCRIPTIONS,
+        food_role_options=FOOD_ROLE_OPTIONS,
+        food_role_descriptions=FOOD_ROLE_DESCRIPTIONS,
+        suggestion_priority_options=SUGGESTION_PRIORITY_OPTIONS,
+        energy_density_options=ENERGY_DENSITY_OPTIONS,
+        visibility_options=VISIBILITY_FORM_OPTIONS,
+        target_user_options=get_target_user_options(),
+        dayparts=get_dayparts(),
+    )
+
+
 @main_bp.route("/items/<kind>/new", methods=("GET", "POST"))
 @login_required
 def item_create(kind: str):
@@ -3894,6 +4047,8 @@ def item_create(kind: str):
                 sync_meal_components(item_id, form_data["component_ids"])
             get_db().commit()
             flash(f"{ITEM_KIND_SINGULAR_LABELS[kind]} wurde angelegt.", "success")
+            if wants_to_stay_on_form():
+                return redirect(url_with_scroll_position(url_for("main.item_edit", item_id=item_id)))
             return redirect(url_for("main.item_list", kind=kind))
         flash(error, "error")
 
@@ -4025,6 +4180,8 @@ def item_edit(item_id: int):
                 sync_meal_components(item_id, form_data["component_ids"])
             get_db().commit()
             flash("Der Eintrag wurde aktualisiert.", "success")
+            if wants_to_stay_on_form():
+                return redirect(url_with_scroll_position(url_for("main.item_edit", item_id=item_id)))
             return redirect(url_for("main.item_list", kind=item["kind"]))
         flash(error, "error")
 
@@ -4040,6 +4197,13 @@ def item_add_to_shopping(item_id: int):
         flash(str(exc), "error")
         return redirect(request.referrer or url_for("main.shopping_list"))
 
+    if item.get("is_archived"):
+        get_db().execute(
+            "UPDATE items SET is_archived = 0, updated_by = ?, updated_at = CURRENT_TIMESTAMP WHERE id = ?",
+            (g.user["id"], item_id),
+        )
+        get_db().commit()
+
     result = ensure_item_or_missing_components_are_shopped(
         item_id,
         g.user["id"],
@@ -4068,7 +4232,15 @@ def item_set_home(item_id: int):
         return redirect(request.referrer or url_for("main.home_view"))
 
     get_db().execute(
-        "UPDATE items SET availability_state = 'home', updated_by = ?, updated_at = CURRENT_TIMESTAMP WHERE id = ?",
+        """
+        UPDATE items
+        SET availability_state = 'home',
+            is_archived = 0,
+            is_quick_added = 0,
+            updated_by = ?,
+            updated_at = CURRENT_TIMESTAMP
+        WHERE id = ?
+        """,
         (g.user["id"], item_id),
     )
     get_db().commit()
@@ -4076,6 +4248,33 @@ def item_set_home(item_id: int):
     return redirect(request.referrer or url_for("main.home_view"))
 
 
+@main_bp.post("/items/<int:item_id>/set-not-home")
+@login_required
+def item_set_not_home(item_id: int):
+    try:
+        item = get_item(item_id)
+        ensure_can_edit(item)
+    except (ValueError, PermissionError) as exc:
+        flash(str(exc), "error")
+        return redirect(request.referrer or url_for("main.home_view"))
+
+    get_db().execute(
+        """
+        UPDATE items
+        SET availability_state = 'idea',
+            is_archived = 0,
+            is_quick_added = 0,
+            updated_by = ?,
+            updated_at = CURRENT_TIMESTAMP
+        WHERE id = ?
+        """,
+        (g.user["id"], item_id),
+    )
+    get_db().commit()
+    flash(f"{item['name']} ist jetzt als nicht mehr da markiert.", "info")
+    return redirect(request.referrer or url_for("main.home_view"))
+
+
 @main_bp.post("/items/<int:item_id>/archive")
 @login_required
 def item_archive(item_id: int):
@@ -4087,7 +4286,15 @@ def item_archive(item_id: int):
         return redirect(request.referrer or url_for("main.archive_view"))
 
     get_db().execute(
-        "UPDATE items SET availability_state = 'archived', updated_by = ?, updated_at = CURRENT_TIMESTAMP WHERE id = ?",
+        """
+        UPDATE items
+        SET availability_state = 'idea',
+            is_archived = 1,
+            is_quick_added = 0,
+            updated_by = ?,
+            updated_at = CURRENT_TIMESTAMP
+        WHERE id = ?
+        """,
         (g.user["id"], item_id),
     )
     get_db().commit()
@@ -4106,7 +4313,15 @@ def item_restore(item_id: int):
         return redirect(request.referrer or url_for("main.archive_view"))
 
     get_db().execute(
-        "UPDATE items SET availability_state = 'idea', updated_by = ?, updated_at = CURRENT_TIMESTAMP WHERE id = ?",
+        """
+        UPDATE items
+        SET is_archived = 0,
+            is_quick_added = 0,
+            availability_state = CASE WHEN availability_state = 'home' THEN 'home' ELSE 'idea' END,
+            updated_by = ?,
+            updated_at = CURRENT_TIMESTAMP
+        WHERE id = ?
+        """,
         (g.user["id"], item_id),
     )
     get_db().commit()
@@ -4114,6 +4329,110 @@ def item_restore(item_id: int):
     return redirect(request.referrer or url_for("main.archive_view"))
 
 
+def mark_shopping_entry_checked(entry_id: int) -> dict:
+    entry = get_db().execute(
+        f"""
+        SELECT shopping_entries.*,
+               owner.display_name AS owner_display_name,
+               owner.username AS owner_username
+        FROM shopping_entries
+        LEFT JOIN users AS owner ON owner.id = shopping_entries.owner_user_id
+        WHERE shopping_entries.id = ? AND {visible_clause('shopping_entries')}
+        """,
+        [entry_id, *visible_params()],
+    ).fetchone()
+    if entry is None:
+        raise ValueError("Der Einkaufseintrag wurde nicht gefunden.")
+
+    ensure_can_edit(describe_record(dict(entry)), "Diesen Einkaufseintrag kannst du gerade nicht ändern.")
+    item = get_item(entry["item_id"])
+
+    get_db().execute(
+        "UPDATE shopping_entries SET is_checked = 1, checked_at = CURRENT_TIMESTAMP, checked_by = ? WHERE id = ?",
+        (g.user["id"], entry_id),
+    )
+    get_db().execute(
+        """
+        UPDATE items
+        SET availability_state = 'home',
+            is_archived = 0,
+            is_quick_added = 0,
+            updated_by = ?,
+            updated_at = CURRENT_TIMESTAMP
+        WHERE id = ?
+        """,
+        (g.user["id"], item["id"]),
+    )
+    get_db().commit()
+    return item
+
+
+def remove_shopping_entry(entry_id: int) -> None:
+    entry = get_db().execute(
+        f"""
+        SELECT shopping_entries.*,
+               owner.display_name AS owner_display_name,
+               owner.username AS owner_username
+        FROM shopping_entries
+        LEFT JOIN users AS owner ON owner.id = shopping_entries.owner_user_id
+        WHERE shopping_entries.id = ? AND {visible_clause('shopping_entries')}
+        """,
+        [entry_id, *visible_params()],
+    ).fetchone()
+    if entry is None:
+        raise ValueError("Der Eintrag wurde nicht gefunden.")
+
+    ensure_can_edit(describe_record(dict(entry)), "Diesen Einkaufseintrag kannst du gerade nicht entfernen.")
+    get_db().execute("DELETE FROM shopping_entries WHERE id = ?", (entry_id,))
+    get_db().commit()
+
+
+@main_bp.post("/items/<int:item_id>/shopping/bought")
+@login_required
+def item_mark_bought(item_id: int):
+    entry = get_db().execute(
+        """
+        SELECT id FROM shopping_entries
+        WHERE item_id = ? AND is_checked = 0
+        ORDER BY added_at DESC
+        LIMIT 1
+        """,
+        (item_id,),
+    ).fetchone()
+    if entry is None:
+        return redirect(request.referrer or url_for("main.shopping_list"))
+    try:
+        item = mark_shopping_entry_checked(int(entry["id"]))
+    except (ValueError, PermissionError) as exc:
+        flash(str(exc), "error")
+        return redirect(request.referrer or url_for("main.shopping_list"))
+    flash(f"{item['name']} ist jetzt als Zuhause vorhanden markiert.", "success")
+    return redirect(request.referrer or url_for("main.shopping_list"))
+
+
+@main_bp.post("/items/<int:item_id>/shopping/remove")
+@login_required
+def item_remove_from_shopping(item_id: int):
+    entry = get_db().execute(
+        """
+        SELECT id FROM shopping_entries
+        WHERE item_id = ? AND is_checked = 0
+        ORDER BY added_at DESC
+        LIMIT 1
+        """,
+        (item_id,),
+    ).fetchone()
+    if entry is None:
+        return redirect(request.referrer or url_for("main.shopping_list"))
+    try:
+        remove_shopping_entry(int(entry["id"]))
+    except (ValueError, PermissionError) as exc:
+        flash(str(exc), "error")
+        return redirect(request.referrer or url_for("main.shopping_list"))
+    flash("Der Eintrag wurde von der Einkaufsliste entfernt.", "info")
+    return redirect(request.referrer or url_for("main.shopping_list"))
+
+
 @main_bp.route("/shopping", methods=("GET", "POST"))
 @login_required
 def shopping_list():
@@ -4137,12 +4456,12 @@ def shopping_list():
                     flash("Dafür ist gerade nichts zusätzlich nötig.", "info")
             except ValueError as exc:
                 flash(str(exc), "error")
-        return redirect(url_for("main.shopping_list"))
+        return redirect(url_with_scroll_position(url_for("main.shopping_list")))
 
     entries = fetch_shopping_entries()
     upcoming_entries = fetch_upcoming_shopping_needs()
-    addable_items = fetch_items(include_archived=False)
-    addable_items = [item for item in addable_items if not item["is_on_shopping_list"]]
+    addable_items = fetch_items(include_archived=True, include_quick_added=True)
+    addable_items = [item for item in addable_items if item["kind"] == "food" and not item["is_on_shopping_list"]]
     household_settings = get_household_settings()
     shopping_weekday_label = dict(WEEKDAY_OPTIONS).get(household_settings["shopping_weekday"], "gesetzt")
     return render_template(
@@ -4158,68 +4477,25 @@ def shopping_list():
 @main_bp.post("/shopping/<int:entry_id>/check")
 @login_required
 def shopping_check(entry_id: int):
-    entry = get_db().execute(
-        f"""
-        SELECT shopping_entries.*,
-               owner.display_name AS owner_display_name,
-               owner.username AS owner_username
-        FROM shopping_entries
-        LEFT JOIN users AS owner ON owner.id = shopping_entries.owner_user_id
-        WHERE shopping_entries.id = ? AND {visible_clause('shopping_entries')}
-        """,
-        [entry_id, *visible_params()],
-    ).fetchone()
-    if entry is None:
-        flash("Der Einkaufseintrag wurde nicht gefunden.", "error")
-        return redirect(url_for("main.shopping_list"))
-
-    entry_dict = describe_record(dict(entry))
     try:
-        ensure_can_edit(entry_dict, "Diesen Einkaufseintrag kannst du gerade nicht ändern.")
-        item = get_item(entry["item_id"])
+        item = mark_shopping_entry_checked(entry_id)
     except (ValueError, PermissionError) as exc:
         flash(str(exc), "error")
-        return redirect(url_for("main.shopping_list"))
-
-    get_db().execute(
-        "UPDATE shopping_entries SET is_checked = 1, checked_at = CURRENT_TIMESTAMP, checked_by = ? WHERE id = ?",
-        (g.user["id"], entry_id),
-    )
-    get_db().execute(
-        "UPDATE items SET availability_state = 'home', updated_by = ?, updated_at = CURRENT_TIMESTAMP WHERE id = ?",
-        (g.user["id"], item["id"]),
-    )
-    get_db().commit()
+        return redirect(url_with_scroll_position(url_for("main.shopping_list")))
     flash(f"{item['name']} ist jetzt als Zuhause vorhanden markiert.", "success")
-    return redirect(url_for("main.shopping_list"))
+    return redirect(url_with_scroll_position(url_for("main.shopping_list")))
 
 
 @main_bp.post("/shopping/<int:entry_id>/remove")
 @login_required
 def shopping_remove(entry_id: int):
-    entry = get_db().execute(
-        f"""
-        SELECT shopping_entries.*,
-               owner.display_name AS owner_display_name,
-               owner.username AS owner_username
-        FROM shopping_entries
-        LEFT JOIN users AS owner ON owner.id = shopping_entries.owner_user_id
-        WHERE shopping_entries.id = ? AND {visible_clause('shopping_entries')}
-        """,
-        [entry_id, *visible_params()],
-    ).fetchone()
-    if entry is None:
-        flash("Der Eintrag wurde nicht gefunden.", "error")
-        return redirect(url_for("main.shopping_list"))
     try:
-        ensure_can_edit(describe_record(dict(entry)), "Diesen Einkaufseintrag kannst du gerade nicht entfernen.")
-    except PermissionError as exc:
+        remove_shopping_entry(entry_id)
+    except (ValueError, PermissionError) as exc:
         flash(str(exc), "error")
-        return redirect(url_for("main.shopping_list"))
-    get_db().execute("DELETE FROM shopping_entries WHERE id = ?", (entry_id,))
-    get_db().commit()
+        return redirect(url_with_scroll_position(url_for("main.shopping_list")))
     flash("Der Eintrag wurde von der Einkaufsliste entfernt.", "info")
-    return redirect(url_for("main.shopping_list"))
+    return redirect(url_with_scroll_position(url_for("main.shopping_list")))
 
 
 @main_bp.get("/home")

nouri/static/css/styles.css

@@ -941,11 +941,21 @@ h3 {
     color: #ece8e4;
 }
 
+.status-unsorted {
+    background: rgba(184, 161, 108, 0.18);
+}
+
+[data-theme="dark"] .status-unsorted {
+    background: rgba(177, 148, 97, 0.2);
+    color: #f1e7d8;
+}
+
 .status-soft {
     background: var(--lilac-soft);
 }
 
 .item-card {
+    position: relative;
     display: grid;
     grid-template-columns: 112px 1fr;
     gap: 1rem;
@@ -979,6 +989,20 @@ h3 {
     color: var(--accent-strong);
 }
 
+.placeholder-icon-tile {
+    width: 100%;
+    height: 100%;
+    display: grid;
+    place-items: center;
+    background: color-mix(in srgb, var(--surface-soft) 84%, transparent 16%);
+}
+
+.placeholder-icon-tile .ui-icon {
+    width: 2.1rem;
+    height: 2.1rem;
+    opacity: 0.9;
+}
+
 .item-body {
     min-width: 0;
     display: grid;
@@ -1057,13 +1081,382 @@ h3 {
     border-color: color-mix(in srgb, var(--line) 58%, rgba(243, 177, 125, 0.16) 42%);
 }
 
+.item-card-food {
+    grid-template-columns: 1fr;
+    gap: 0.9rem;
+    align-content: start;
+    min-height: 260px;
+    padding: 1.15rem 1.15rem 1.2rem;
+}
+
+.item-card-food-muted {
+    opacity: 0.72;
+}
+
+.item-card-food .item-media-food {
+    width: min(100%, 170px);
+    justify-self: center;
+    aspect-ratio: 1;
+    border-radius: 24px;
+}
+
+.item-card-food .item-body-food {
+    justify-items: center;
+    text-align: center;
+    gap: 0.25rem;
+}
+
+.item-card-food .item-body-food h2 {
+    margin: 0;
+    font-size: 1.9rem;
+    line-height: 1.08;
+}
+
+.item-card-cover-link {
+    position: absolute;
+    inset: 0;
+    z-index: 1;
+    border-radius: inherit;
+}
+
+.item-card-archive-form {
+    position: absolute;
+    top: 0.85rem;
+    right: 0.85rem;
+    z-index: 3;
+}
+
+.item-card-archive-button {
+    width: 2.2rem;
+    height: 2.2rem;
+    padding: 0;
+    border-radius: 999px;
+    border: 1px solid color-mix(in srgb, var(--line) 82%, transparent 18%);
+    background: color-mix(in srgb, var(--surface-soft) 88%, transparent 12%);
+    color: var(--muted);
+    font-size: 1.35rem;
+    line-height: 1;
+    display: grid;
+    place-items: center;
+    transition: background 0.18s ease, border-color 0.18s ease, color 0.18s ease, transform 0.18s ease;
+}
+
+.item-card-archive-button:hover {
+    background: color-mix(in srgb, var(--accent-soft) 26%, var(--surface-soft) 74%);
+    border-color: color-mix(in srgb, var(--accent) 34%, var(--line) 66%);
+    color: var(--text);
+    transform: translateY(-1px);
+}
+
+.item-card-hover-meta {
+    position: absolute;
+    inset: 0;
+    z-index: 2;
+    display: grid;
+    align-content: end;
+    gap: 0.75rem;
+    padding: 1rem;
+    border-radius: inherit;
+    background: color-mix(in srgb, var(--surface) 68%, rgba(48, 39, 35, 0.86) 32%);
+    opacity: 0;
+    visibility: hidden;
+    transform: translateY(8px);
+    pointer-events: none;
+    transition: opacity 0.18s ease, transform 0.18s ease, visibility 0.18s ease;
+}
+
+.item-card-hover-meta p {
+    margin: 0;
+    font-size: 0.95rem;
+    line-height: 1.45;
+    color: var(--text);
+}
+
+.item-card-food:hover .item-card-hover-meta,
+.item-card-food:focus-within .item-card-hover-meta {
+    opacity: 1;
+    visibility: visible;
+    transform: translateY(0);
+}
+
+[data-theme="dark"] .item-card-archive-button {
+    background: color-mix(in srgb, var(--surface-soft) 62%, rgba(26, 22, 21, 0.84) 38%);
+    border-color: color-mix(in srgb, var(--line) 58%, rgba(243, 177, 125, 0.16) 42%);
+}
+
+[data-theme="dark"] .item-card-hover-meta {
+    background: linear-gradient(
+        180deg,
+        rgba(36, 29, 27, 0.16),
+        rgba(31, 25, 23, 0.92)
+    );
+}
+
 .item-actions {
     grid-column: 1 / -1;
-    display: flex;
-    flex-wrap: wrap;
+    display: grid;
+    grid-template-columns: repeat(2, minmax(0, 1fr));
     gap: 0.65rem;
 }
 
+.item-actions > * {
+    min-width: 0;
+}
+
+.item-actions form,
+.item-actions a {
+    width: 100%;
+}
+
+.item-actions form button,
+.item-actions a.ghost-button,
+.item-actions a.button {
+    width: 100%;
+    justify-content: center;
+}
+
+.item-actions > .primary-action {
+    grid-column: 1 / -1;
+}
+
+.shopping-add-grid {
+    display: grid;
+    grid-template-columns: repeat(auto-fit, minmax(190px, 1fr));
+    gap: 0.8rem;
+}
+
+.shopping-add-grid > form {
+    min-width: 0;
+}
+
+.shopping-add-empty {
+    margin: 0;
+    padding: 0.35rem 0.1rem;
+}
+
+.shopping-add-card {
+    width: 100%;
+    min-height: 88px;
+    display: grid;
+    grid-template-columns: 58px minmax(0, 1fr);
+    gap: 0.9rem;
+    align-items: center;
+    padding: 0.85rem 0.95rem;
+    border-radius: 22px;
+    text-align: left;
+}
+
+.shopping-add-card-visual,
+.shopping-add-card-fallback,
+.shopping-entry-visual,
+.shopping-entry-fallback {
+    width: 58px;
+    height: 58px;
+    border-radius: 18px;
+    overflow: hidden;
+    display: grid;
+    place-items: center;
+    background: color-mix(in srgb, var(--surface-soft) 84%, transparent 16%);
+    border: 1px solid color-mix(in srgb, var(--line) 80%, transparent 20%);
+}
+
+.shopping-add-card-visual img,
+.shopping-entry-visual img {
+    width: 100%;
+    height: 100%;
+    object-fit: cover;
+}
+
+.shopping-add-card-fallback .ui-icon,
+.shopping-entry-fallback .ui-icon {
+    font-size: 1.2rem;
+}
+
+.shopping-add-card-copy,
+.shopping-entry-copy {
+    min-width: 0;
+    display: grid;
+    gap: 0.28rem;
+}
+
+.shopping-add-card-copy strong,
+.shopping-entry-copy strong {
+    display: block;
+    font-size: 1.1rem;
+    line-height: 1.2;
+}
+
+.shopping-add-card-copy small {
+    color: var(--muted);
+    font-size: 0.92rem;
+}
+
+.shopping-entry-card {
+    position: relative;
+    display: grid;
+    gap: 1rem;
+    padding: 1rem;
+    border-radius: 24px;
+    border: 1px solid var(--line);
+    background: linear-gradient(
+        180deg,
+        color-mix(in srgb, var(--surface-strong) 90%, transparent 10%),
+        color-mix(in srgb, var(--surface) 94%, transparent 6%)
+    );
+}
+
+.shopping-entry-row {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    gap: 0.9rem;
+}
+
+.shopping-entry-open {
+    flex: 1 1 auto;
+    min-width: 0;
+    padding: 0;
+    border-radius: 18px;
+    background: transparent;
+    color: inherit;
+    text-align: left;
+    cursor: pointer;
+}
+
+.shopping-entry-open:hover .shopping-entry-main,
+.shopping-entry-open:focus-visible .shopping-entry-main {
+    transform: translateY(-1px);
+}
+
+.shopping-entry-main {
+    display: grid;
+    grid-template-columns: 58px minmax(0, 1fr);
+    gap: 0.95rem;
+    align-items: center;
+    min-width: 0;
+    flex: 1 1 auto;
+    transition: transform 140ms ease;
+}
+
+.shopping-entry-copy .muted {
+    margin: 0;
+}
+
+.shopping-entry-actions {
+    display: flex;
+    align-items: center;
+    flex: 0 0 auto;
+}
+
+.shopping-entry-actions form {
+    width: auto;
+}
+
+.shopping-entry-actions button {
+    white-space: nowrap;
+}
+
+.shopping-entry-close-form {
+    flex: 0 0 auto;
+    margin: 0;
+}
+
+.shopping-entry-close {
+    width: 2.1rem;
+    height: 2.1rem;
+    min-width: 2.1rem;
+    padding: 0;
+    border-radius: 999px;
+    display: grid;
+    place-items: center;
+    background: color-mix(in srgb, var(--surface-soft) 34%, transparent 66%);
+}
+
+.shopping-entry-close span[aria-hidden="true"] {
+    font-size: 1.4rem;
+    line-height: 1;
+    transform: translateY(-1px);
+}
+
+.shopping-entry-dialog {
+    padding: 0;
+    border: 0;
+    background: transparent;
+    max-width: min(30rem, calc(100vw - 2rem));
+    width: min(30rem, calc(100vw - 2rem));
+}
+
+.shopping-entry-dialog::backdrop {
+    background: rgba(29, 22, 19, 0.54);
+    backdrop-filter: blur(6px);
+}
+
+.shopping-entry-dialog-card {
+    gap: 1rem;
+}
+
+.shopping-entry-dialog-actions {
+    display: grid;
+    gap: 0.7rem;
+}
+
+.shopping-entry-dialog-actions form,
+.shopping-entry-dialog-actions a {
+    width: 100%;
+}
+
+.shopping-entry-dialog-actions a {
+    text-align: center;
+}
+
+[data-theme="dark"] .shopping-entry-close {
+    background: color-mix(in srgb, var(--surface-soft) 46%, rgba(34, 29, 27, 0.54) 54%);
+}
+
+@media (max-width: 680px) {
+    .shopping-entry-row {
+        align-items: stretch;
+        flex-direction: column;
+    }
+
+    .shopping-entry-open {
+        width: 100%;
+    }
+
+    .shopping-entry-actions,
+    .shopping-entry-actions form,
+    .shopping-entry-actions button,
+    .shopping-entry-close-form {
+        width: 100%;
+    }
+
+    .shopping-entry-close {
+        width: 100%;
+        border-radius: 18px;
+    }
+}
+
+[data-theme="dark"] .shopping-add-card-fallback,
+[data-theme="dark"] .shopping-entry-fallback,
+[data-theme="dark"] .shopping-add-card-visual,
+[data-theme="dark"] .shopping-entry-visual {
+    background: linear-gradient(
+        180deg,
+        color-mix(in srgb, var(--surface-soft) 60%, #453a37 40%),
+        color-mix(in srgb, var(--surface) 90%, #2b2523 10%)
+    );
+    border-color: color-mix(in srgb, var(--line) 58%, rgba(243, 177, 125, 0.18) 42%);
+}
+
+[data-theme="dark"] .shopping-entry-card {
+    background: linear-gradient(
+        180deg,
+        color-mix(in srgb, var(--surface-soft) 56%, #433834 44%),
+        color-mix(in srgb, var(--surface) 94%, #26201e 6%)
+    );
+    border-color: color-mix(in srgb, var(--line) 58%, rgba(243, 177, 125, 0.14) 42%);
+}
+
 .auth-shell {
     min-height: calc(100vh - 10rem);
     display: grid;
@@ -2755,12 +3148,23 @@ legend {
         grid-template-columns: 1fr;
     }
 
+    .item-card-food {
+        min-height: 0;
+    }
+
+    .item-card-food .item-media-food {
+        width: min(100%, 156px);
+    }
+
+    .item-card-hover-meta {
+        display: none;
+    }
+
     .simple-list li,
     .list-row,
     .planner-entry-top,
     .week-nav,
     .row-actions,
-    .item-actions,
     .hero-actions,
     .more-actions,
     .filter-actions {
@@ -2770,12 +3174,19 @@ legend {
     }
 
     .row-actions > *,
-    .item-actions > *,
     .hero-actions > *,
     .more-actions > * {
         flex: 1 1 auto;
     }
 
+    .item-actions {
+        grid-template-columns: 1fr;
+    }
+
+    .item-actions > .primary-action {
+        grid-column: auto;
+    }
+
     .quick-add-row {
         display: grid;
         gap: 0.75rem;

nouri/templates/items/list.html

@@ -5,9 +5,18 @@
     <div>
         <p class="eyebrow">{{ item_kind_labels[kind] }}</p>
         <h1>{{ item_kind_labels[kind] }}</h1>
-        <p class="lead">Gemeinsame und persönliche Ideen bleiben hier ruhig sortiert, mit einem klaren Blick darauf, für wen etwas gedacht ist.</p>
+        {% if kind == 'food' %}
+            <p class="lead">Hier stehen alle aktiven Lebensmittel, egal ob sie gerade zuhause sind oder im Moment fehlen. Archiviertes bleibt bewusst außen vor.</p>
+        {% else %}
+            <p class="lead">Gemeinsame und persönliche Ideen bleiben hier ruhig sortiert, mit einem klaren Blick darauf, für wen etwas gedacht ist.</p>
+        {% endif %}
+    </div>
+    <div class="hero-actions">
+        {% if kind == 'food' %}
+            <a class="ghost-button" href="{{ url_for('main.item_quick_add') }}">Schnell anlegen</a>
+        {% endif %}
+        <a class="button" href="{{ url_for('main.item_create', kind=kind) }}">Neu anlegen</a>
     </div>
-    <a class="button" href="{{ url_for('main.item_create', kind=kind) }}">Neu anlegen</a>
 </section>
 
 <section class="panel compact-form-panel">
@@ -51,58 +60,92 @@
 {% if items %}
     <section class="card-grid">
         {% for item in items %}
-            <article class="item-card">
-                <div class="item-media">
-                    {% if item.photo_filename %}
-                        <img
-                            src="{{ image_url(item.photo_filename, 'md') }}"
-                            srcset="{{ image_srcset(item.photo_filename) }}"
-                            sizes="{{ image_sizes('grid') }}"
-                            alt="{{ item.name }}"
-                            loading="lazy">
-                    {% else %}
-                        <div class="placeholder-tile">{{ item.name[:1] }}</div>
+            {% if item.kind == 'food' %}
+                {% set item_icon_class = {
+                    'protein': 'icon-component-protein',
+                    'carb': 'icon-component-carb',
+                    'veg': 'icon-component-veg',
+                    'fruit': 'icon-component-fruit',
+                    'dairy': 'icon-component-dairy',
+                    'nuts': 'icon-component-nuts',
+                    'seeds': 'icon-component-seeds',
+                    'neutral': 'icon-component-neutral',
+                }.get(item.primary_builder_key or item.base_type, 'icon-component-neutral') %}
+                <article class="item-card item-card-food{% if not item.is_home %} item-card-food-muted{% endif %}">
+                    {% if item.can_edit %}
+                        <a class="item-card-cover-link" href="{{ url_for('main.item_edit', item_id=item.id) }}">
+                            <span class="sr-only">{{ item.name }} bearbeiten</span>
+                        </a>
+                        <form
+                            class="item-card-archive-form"
+                            method="post"
+                            action="{{ url_for('main.item_archive', item_id=item.id) }}"
+                            onsubmit="return confirm('Willst du dieses Lebensmittel wirklich archivieren?');"
+                        >
+                            {{ csrf_input() }}
+                            <button class="item-card-archive-button" type="submit" aria-label="{{ item.name }} archivieren">×</button>
+                        </form>
                     {% endif %}
-                </div>
-                <div class="item-body">
-                    <div class="item-topline">
-                        <h2>{{ item.name }}</h2>
-                        <span class="status-pill status-{{ item.availability_state }}">{{ availability_labels[item.availability_state] }}</span>
+
+                    <div class="item-media item-media-food">
+                        {% if item.photo_filename %}
+                            <img
+                                src="{{ image_url(item.photo_filename, 'md') }}"
+                                srcset="{{ image_srcset(item.photo_filename) }}"
+                                sizes="{{ image_sizes('grid') }}"
+                                alt="{{ item.name }}"
+                                loading="lazy">
+                        {% else %}
+                            <div class="placeholder-icon-tile">
+                                <span class="ui-icon {{ item_icon_class }}"></span>
+                            </div>
+                        {% endif %}
                     </div>
-                    {% if item.kind == 'food' %}
+
+                    <div class="item-body item-body-food">
+                        <h2>{{ item.name }}</h2>
+                    </div>
+
+                    <div class="item-card-hover-meta" aria-hidden="true">
                         <div class="chip-row">
                             <span class="chip">{{ item.for_label }}</span>
+                            <span class="chip">{{ item.visibility_label }}</span>
+                            <span class="chip status-soft">{{ item.owner_label }}</span>
+                            <span class="chip">{{ item.base_type_label }}</span>
+                            <span class="chip">{{ item.suggestion_role_label }}</span>
+                            <span class="chip">{{ item.suggestion_priority_label }}</span>
+                            {% if item.can_be_meal_core %}
+                                <span class="chip status-okay">Trägt gut eine Mahlzeit</span>
+                            {% endif %}
                             {% if item.is_on_shopping_list %}
                                 <span class="chip status-idea">Auf Einkaufsliste</span>
                             {% endif %}
+                            {% if item.dayparts %}
+                                {% for daypart in item.dayparts %}
+                                    <span class="chip">{{ daypart }}</span>
+                                {% endfor %}
+                            {% endif %}
                         </div>
-                        <details class="item-meta-disclosure">
-                            <summary>Mehr zeigen</summary>
-                            <div class="item-meta-panel">
-                                <div class="chip-row">
-                                    <span class="chip">{{ item.visibility_label }}</span>
-                                    <span class="chip status-soft">{{ item.owner_label }}</span>
-                                    <span class="chip">{{ item.base_type_label }}</span>
-                                    <span class="chip">{{ item.suggestion_role_label }}</span>
-                                    <span class="chip">{{ item.suggestion_priority_label }}</span>
-                                    {% if item.can_be_meal_core %}
-                                        <span class="chip status-okay">Trägt gut eine Mahlzeit</span>
-                                    {% endif %}
-                                    <span class="chip">{{ item_kind_labels[item.kind] }}</span>
-                                </div>
-                                {% if item.dayparts %}
-                                    <div class="chip-row">
-                                        {% for daypart in item.dayparts %}
-                                            <span class="chip">{{ daypart }}</span>
-                                        {% endfor %}
-                                    </div>
-                                {% endif %}
-                                {% if item.note %}
-                                    <p>{{ item.note }}</p>
-                                {% endif %}
-                            </div>
-                        </details>
-                    {% else %}
+                        {% if item.note %}
+                            <p>{{ item.note }}</p>
+                        {% endif %}
+                    </div>
+                </article>
+            {% else %}
+                <article class="item-card">
+                    <div class="item-media">
+                        {% if item.photo_filename %}
+                            <img
+                                src="{{ image_url(item.photo_filename, 'md') }}"
+                                srcset="{{ image_srcset(item.photo_filename) }}"
+                                sizes="{{ image_sizes('grid') }}"
+                                alt="{{ item.name }}"
+                                loading="lazy">
+                        {% else %}
+                            <div class="placeholder-tile">{{ item.name[:1] }}</div>
+                        {% endif %}
+                    </div>
+                    <div class="item-body">
                         <div class="chip-row">
                             <span class="chip">{{ item.visibility_label }}</span>
                             <span class="chip status-soft">{{ item.owner_label }}</span>
@@ -115,7 +158,6 @@
                                 <span class="chip">{{ tag }}</span>
                             {% endfor %}
                         </div>
-                    {% endif %}
                     {% if item.kind != 'food' and item.dayparts %}
                         <div class="chip-row">
                             {% for daypart in item.dayparts %}
@@ -129,30 +171,25 @@
                     {% if item.kind != 'food' and item.note %}
                         <p>{{ item.note }}</p>
                     {% endif %}
-                </div>
-                <div class="item-actions">
-                    {% if item.can_edit %}
-                        <a class="ghost-button" href="{{ url_for('main.item_edit', item_id=item.id) }}">Bearbeiten</a>
-                    {% endif %}
-                    <a class="ghost-button" href="{{ url_for('main.planner_day', date=today.isoformat(), item_id=item.id, daypart_id=item.primary_daypart_id) }}">Im Tagesplan öffnen</a>
-                    <form method="post" action="{{ url_for('main.item_add_to_shopping', item_id=item.id) }}">
-                        {{ csrf_input() }}
-                        <button type="submit">Auf Einkaufsliste</button>
-                    </form>
-                    {% if item.availability_state != 'home' and item.can_edit %}
-                        <form method="post" action="{{ url_for('main.item_set_home', item_id=item.id) }}">
+                    </div>
+                    <div class="item-actions">
+                        {% if item.can_edit %}
+                            <a class="ghost-button" href="{{ url_for('main.item_edit', item_id=item.id) }}">Bearbeiten</a>
+                        {% endif %}
+                        <a class="ghost-button" href="{{ url_for('main.planner_day', date=today.isoformat(), item_id=item.id, daypart_id=item.primary_daypart_id) }}">Im Tagesplan öffnen</a>
+                        <form class="primary-action" method="post" action="{{ url_for('main.item_add_to_shopping', item_id=item.id) }}">
                             {{ csrf_input() }}
-                            <button class="secondary" type="submit">Als Zuhause markieren</button>
+                            <button type="submit">Auf Einkaufsliste</button>
                         </form>
-                    {% endif %}
-                    {% if item.availability_state != 'archived' and item.can_edit %}
-                        <form method="post" action="{{ url_for('main.item_archive', item_id=item.id) }}">
-                            {{ csrf_input() }}
-                            <button class="ghost-button" type="submit">Ins Archiv</button>
-                        </form>
-                    {% endif %}
-                </div>
-            </article>
+                        {% if item.can_edit %}
+                            <form method="post" action="{{ url_for('main.item_archive', item_id=item.id) }}">
+                                {{ csrf_input() }}
+                                <button class="ghost-button" type="submit">Archivieren</button>
+                            </form>
+                        {% endif %}
+                    </div>
+                </article>
+            {% endif %}
         {% endfor %}
     </section>
 {% else %}

nouri/templates/shopping/list.html

@@ -10,19 +10,68 @@
 </section>
 
 <section class="panel compact-form-panel">
-    <form method="post" class="inline-form">
-        {{ csrf_input() }}
-        <select name="item_id">
-            <option value="">Bestehenden Eintrag hinzufügen</option>
+    <div class="stack-sections">
+        <label>
+            Lebensmittel suchen
+            <input
+                type="text"
+                placeholder="Nach Lebensmitteln suchen"
+                data-filter-input
+                data-filter-target="#shopping-add-list"
+                data-filter-limit="8"
+            >
+        </label>
+        <div class="shopping-add-grid" id="shopping-add-list">
             {% for item in addable_items %}
-                <option value="{{ item.id }}">
-                    {{ item.name }} · {{ item_kind_labels[item.kind] }} · {{ item.visibility_label }}
-                    {% if item.availability_state == 'home' %} · zuhause{% endif %}
-                </option>
+                {% set item_icon_class = {
+                    'protein': 'icon-component-protein',
+                    'carb': 'icon-component-carb',
+                    'veg': 'icon-component-veg',
+                    'fruit': 'icon-component-fruit',
+                    'dairy': 'icon-component-dairy',
+                    'nuts': 'icon-component-nuts',
+                    'seeds': 'icon-component-seeds',
+                    'neutral': 'icon-component-neutral',
+                }.get(item.primary_builder_key or item.base_type, 'icon-component-neutral') %}
+                <form method="post" data-filter-label="{{ item.name|lower }} {{ item.base_type_label|lower }} {{ item.for_label|lower }}">
+                    {{ csrf_input() }}
+                    <input type="hidden" name="item_id" value="{{ item.id }}">
+                    <button class="shopping-add-card" type="submit">
+                        <span class="shopping-add-card-visual">
+                            {% if item.photo_filename %}
+                                <img
+                                    src="{{ image_url(item.photo_filename, 'md') }}"
+                                    srcset="{{ image_srcset(item.photo_filename) }}"
+                                    sizes="{{ image_sizes('grid') }}"
+                                    alt=""
+                                    loading="lazy">
+                            {% else %}
+                                <span class="shopping-add-card-fallback">
+                                    <span class="ui-icon {{ item_icon_class }}"></span>
+                                </span>
+                            {% endif %}
+                        </span>
+                        <span class="shopping-add-card-copy">
+                            <strong>{{ item.name }}</strong>
+                            <small>
+                                {% if item.is_archived %}
+                                    Archiviert
+                                {% elif item.is_quick_added %}
+                                    Unsortiert
+                                {% elif item.is_home %}
+                                    Zuhause · trotzdem ergänzen
+                                {% else %}
+                                    Gerade nicht da
+                                {% endif %}
+                            </small>
+                        </span>
+                    </button>
+                </form>
+            {% else %}
+                <p class="shopping-add-empty muted">Gerade ist nichts zusätzlich offen.</p>
             {% endfor %}
-        </select>
-        <button type="submit">Auf Liste setzen</button>
-    </form>
+        </div>
+    </div>
 </section>
 
 {% if entries %}
@@ -34,35 +83,117 @@
     </section>
     <section class="stack-list">
         {% for entry in entries %}
-            <article class="list-row stacked-mobile roomy-row">
-                <div>
-                    <strong>{{ entry.item_name }}</strong>
-                    <p class="muted">{{ item_kind_labels[entry.item_kind] }}</p>
-                    <div class="chip-row">
-                        <span class="chip">{{ entry.visibility_label }}</span>
-                        <span class="chip status-soft">{{ entry.owner_label }}</span>
-                        <span class="chip">{{ entry.for_label }}</span>
-                        {% if entry.needed_for_label %}
-                            <span class="chip status-home">
-                                Für {{ entry.needed_for_label }}
-                                {% if entry.needed_daypart_name %} · {{ entry.needed_daypart_name }}{% endif %}
-                            </span>
-                        {% endif %}
+            {% set entry_icon_class = {
+                'protein': 'icon-component-protein',
+                'carb': 'icon-component-carb',
+                'veg': 'icon-component-veg',
+                'fruit': 'icon-component-fruit',
+                'dairy': 'icon-component-dairy',
+                'nuts': 'icon-component-nuts',
+                'seeds': 'icon-component-seeds',
+                'neutral': 'icon-component-neutral',
+            }.get(entry.primary_builder_key or entry.base_type, 'icon-component-neutral') %}
+            <article class="shopping-entry-card">
+                <div class="shopping-entry-row">
+                    <div
+                    class="shopping-entry-open"
+                    data-dialog-open="shopping-entry-dialog-{{ entry.id }}"
+                    tabindex="0"
+                    role="button"
+                    aria-label="{{ entry.item_name }} öffnen"
+                    >
+                        <div class="shopping-entry-main">
+                            <div class="shopping-entry-visual">
+                                {% if entry.photo_filename %}
+                                    <img
+                                        src="{{ image_url(entry.photo_filename, 'md') }}"
+                                        srcset="{{ image_srcset(entry.photo_filename) }}"
+                                        sizes="{{ image_sizes('grid') }}"
+                                        alt=""
+                                        loading="lazy">
+                                {% else %}
+                                    <span class="shopping-entry-fallback">
+                                        <span class="ui-icon {{ entry_icon_class }}"></span>
+                                    </span>
+                                {% endif %}
+                            </div>
+                            <div class="shopping-entry-copy">
+                                <strong>{{ entry.item_name }}</strong>
+                                {% if entry.needed_for_label %}
+                                    <p class="muted">
+                                        Für {{ entry.needed_for_label }}
+                                        {% if entry.needed_daypart_name %} · {{ entry.needed_daypart_name }}{% endif %}
+                                    </p>
+                                {% endif %}
+                            </div>
+                        </div>
                     </div>
-                </div>
-                <div class="row-actions">
-                    <form method="post" action="{{ url_for('main.shopping_check', entry_id=entry.id) }}">
-                        {{ csrf_input() }}
-                        <button type="submit">Eingekauft</button>
-                    </form>
-                    {% if entry.can_edit %}
-                        <form method="post" action="{{ url_for('main.shopping_remove', entry_id=entry.id) }}">
+                    <div class="shopping-entry-actions">
+                        <form method="post" action="{{ url_for('main.shopping_check', entry_id=entry.id) }}">
                             {{ csrf_input() }}
-                            <button class="ghost-button" type="submit">Entfernen</button>
+                            <button type="submit">Eingekauft</button>
+                        </form>
+                    </div>
+                    {% if entry.can_edit %}
+                        <form method="post" action="{{ url_for('main.shopping_remove', entry_id=entry.id) }}" class="shopping-entry-close-form">
+                            {{ csrf_input() }}
+                            <button class="shopping-entry-close" type="submit" aria-label="{{ entry.item_name }} entfernen">
+                                <span aria-hidden="true">×</span>
+                            </button>
                         </form>
                     {% endif %}
                 </div>
             </article>
+            <dialog class="shopping-entry-dialog week-entry-dialog" id="shopping-entry-dialog-{{ entry.id }}">
+                <div class="shopping-entry-dialog-card week-entry-dialog-card">
+                    <div class="week-entry-dialog-head">
+                        <div>
+                            <h3>{{ entry.item_name }}</h3>
+                            <p>
+                                {% if entry.needed_for_label %}
+                                    Für {{ entry.needed_for_label }}
+                                    {% if entry.needed_daypart_name %} · {{ entry.needed_daypart_name }}{% endif %}
+                                {% elif entry.is_home %}
+                                    Zuhause vorhanden
+                                {% else %}
+                                    Gerade nicht da
+                                {% endif %}
+                            </p>
+                        </div>
+                        <button class="ghost-button" type="button" data-dialog-close>Schließen</button>
+                    </div>
+                    <div class="shopping-entry-dialog-actions">
+                        {% if entry.can_edit %}
+                            <a class="ghost-button" href="{{ url_for('main.item_edit', item_id=entry.item_id) }}">Bearbeiten</a>
+                        {% endif %}
+                        <form method="post" action="{{ url_for('main.shopping_check', entry_id=entry.id) }}">
+                            {{ csrf_input() }}
+                            <button type="submit">Eingekauft</button>
+                        </form>
+                        {% if entry.can_edit %}
+                            <form method="post" action="{{ url_for('main.shopping_remove', entry_id=entry.id) }}">
+                                {{ csrf_input() }}
+                                <button class="ghost-button" type="submit">Von Einkaufsliste nehmen</button>
+                            </form>
+                            {% if entry.is_home %}
+                                <form method="post" action="{{ url_for('main.item_set_not_home', item_id=entry.item_id) }}">
+                                    {{ csrf_input() }}
+                                    <button class="ghost-button" type="submit">Nicht mehr da</button>
+                                </form>
+                            {% else %}
+                                <form method="post" action="{{ url_for('main.item_set_home', item_id=entry.item_id) }}">
+                                    {{ csrf_input() }}
+                                    <button class="ghost-button" type="submit">Als zuhause markieren</button>
+                                </form>
+                            {% endif %}
+                            <form method="post" action="{{ url_for('main.item_archive', item_id=entry.item_id) }}">
+                                {{ csrf_input() }}
+                                <button class="ghost-button" type="submit">Archivieren</button>
+                            </form>
+                        {% endif %}
+                    </div>
+                </div>
+            </dialog>
         {% endfor %}
     </section>
 {% else %}