release nouri 0.3 household sharing and mobile polish

.dockerignore

@@ -0,0 +1,14 @@
+.git
+.venv
+venv
+__pycache__
+*.pyc
+*.pyo
+*.pyd
+.pytest_cache
+.mypy_cache
+node_modules
+dist
+build
+data
+instance

CloudronManifest.json

@@ -0,0 +1,21 @@
+{
+  "id": "io.hnz.nouri",
+  "title": "Nouri",
+  "author": "Florian Heinz",
+  "description": "Private Flask app for meals, shopping and gentle food planning",
+  "tagline": "einfach essen planen",
+  "version": "0.3.0",
+  "upstreamVersion": "0.3.0",
+  "healthCheckPath": "/",
+  "httpPort": 8000,
+  "manifestVersion": 2,
+  "addons": {
+    "localstorage": {
+      "sqlite": {
+        "paths": [
+          "/app/data/nouri.sqlite3"
+        ]
+      }
+    }
+  }
+}

Dockerfile.cloudron

@@ -0,0 +1,21 @@
+FROM python:3.13-slim
+
+WORKDIR /app/code
+
+ENV PYTHONDONTWRITEBYTECODE=1 \
+    PYTHONUNBUFFERED=1 \
+    PIP_NO_CACHE_DIR=1
+
+RUN apt-get update && apt-get install -y --no-install-recommends sqlite3 \
+    && rm -rf /var/lib/apt/lists/*
+
+COPY requirements.txt /app/code/
+RUN pip install --no-cache-dir -r requirements.txt
+
+COPY . /app/code
+
+RUN chmod +x /app/code/start.sh
+
+EXPOSE 8000
+
+CMD ["/app/code/start.sh"]

README.md

@@ -1,16 +1,22 @@
 # Nouri
 
-Nouri ist eine kleine private Flask-App fuer einen Haushalt, um Essensideen, Einkaeufe, vorhandene Lebensmittel und einfache Tages- oder Wochenplanung ruhig und alltagsnah festzuhalten.
+Nouri ist eine kleine private Flask-App für einen Haushalt, um Essensideen, Einkäufe, vorhandene Lebensmittel und eine einfache Tages- oder Wochenplanung ruhig und alltagsnah festzuhalten.
 
-## Merkmale in Version 0.1
+## Merkmale in Version 0.3
 
 - Lebensmittel und Mahlzeitenideen anlegen
 - Fotos lokal hochladen
 - Einkaufsliste mit Abhaken
-- "Zuhause" als sichtbarer Vorrat
+- „Zuhause“ als sichtbarer Vorrat mit Tageszeit-Filtern
-- Archiv zum spaeteren Wiederverwenden
+- Archiv mit Suche und schneller Wiederaufnahme
-- Tages- und Wochenplanung nach Tageszeiten
+- Tagesplan mit schnellen Vorschlägen je Tageszeit
-- einfache Benutzeranmeldung fuer einen Haushalt
+- Wochenansicht für die nächsten 7 Tage
+- einfache Suche und Filter für Lebensmittel und Mahlzeitenideen
+- mehrere Haushaltsnutzer mit Rollen
+- gemeinsame und persönliche Inhalte
+- Profilseite und Passwortänderung
+- kleine Admin-Verwaltung für Nutzer
+- kompaktere mobile Navigation mit Bottom-Bar
 
 ## Lokal starten
 
@@ -21,18 +27,31 @@ pip install -r requirements.txt
 flask --app wsgi run --debug
 ```
 
-Dann `http://127.0.0.1:5000` oeffnen und beim ersten Start einen ersten Haushalt-Benutzer unter `/setup` anlegen.
+Dann `http://127.0.0.1:5000` öffnen und beim ersten Start einen ersten Haushalt-Benutzer unter `/auth/setup` anlegen.
 
 ## Konfiguration
 
-Die App legt Daten standardmaessig unter `./data` ab.
+Die App legt Daten standardmäßig unter `./data` ab.
 
 Wichtige Umgebungsvariablen:
 
-- `NOURI_SECRET_KEY`: Session-Secret fuer Produktion
+- `NOURI_SECRET_KEY`: Session-Secret für Produktion
-- `NOURI_DATA_DIR`: Pfad fuer Datenbank und Uploads, z. B. `/app/data` auf Cloudron
+- `NOURI_DATA_DIR`: Pfad für Datenbank und Uploads, z. B. `/app/data` auf Cloudron
 - `NOURI_MAX_UPLOAD_MB`: maximales Upload-Limit in MB, Standard `5`
 
+## Migration von 0.2 auf 0.3
+
+Beim Start erweitert Nouri das Schema pragmatisch direkt in SQLite: Haushalt, Rollen, Aktiv-Status und Sichtbarkeit (`persönlich` oder `Für alle`) werden ergänzt. Vorhandene 0.2-Daten bleiben erhalten und werden automatisch einem gemeinsamen Haushaltskontext zugeordnet.
+
 ## Cloudron-Hinweis
 
-Fuer Cloudron spaeter `NOURI_DATA_DIR=/app/data` setzen, damit Datenbank und Uploads persistent liegen.
+Für Cloudron ist die App jetzt so vorbereitet, dass Datenbank und Uploads unter `/app/data` liegen. Das Startskript setzt `NOURI_DATA_DIR=/app/data`, legt die SQLite-Datei dort an und startet die App per `gunicorn`.
+
+Lokale Testdaten und produktive Cloudron-Daten bleiben bewusst getrennt:
+
+- lokal nutzt Nouri ohne gesetzte Variable standardmäßig `./data`
+- auf Cloudron nutzt Nouri `/app/data`
+- `data/` ist in `.gitignore` und `.dockerignore` ausgeschlossen und wird weder eingecheckt noch ins Image kopiert
+- `/app/data` ist auf Cloudron persistent und bleibt bei App-Updates erhalten
+
+Wenn die App auf Cloudron bereits installiert ist, bitte **kein neues `cloudron install`** ausführen. Stattdessen die bestehende App aktualisieren, also ein neues Image bzw. Paket bauen und dann die vorhandene Installation updaten.

nouri/__init__.py

@@ -2,16 +2,48 @@ from __future__ import annotations
 
 import os
 import secrets
+from datetime import date, timedelta
 from pathlib import Path
 
-from flask import Flask, send_from_directory
+from flask import Flask, g, send_from_directory
 
 from . import db
+from .admin import admin_bp
 from .auth import auth_bp
-from .constants import CATEGORIES, DAYPARTS, ITEM_KIND_LABELS, ITEM_KIND_SINGULAR_LABELS
+from .constants import (
+    CATEGORIES,
+    DAYPARTS,
+    ITEM_KIND_LABELS,
+    ITEM_KIND_SINGULAR_LABELS,
+    ROLE_LABELS,
+    VISIBILITY_DESCRIPTIONS,
+    VISIBILITY_LABELS,
+)
 from .main import main_bp
 
 
+WEEKDAY_NAMES = ["Montag", "Dienstag", "Mittwoch", "Donnerstag", "Freitag", "Samstag", "Sonntag"]
+WEEKDAY_SHORT_NAMES = ["Mo", "Di", "Mi", "Do", "Fr", "Sa", "So"]
+
+
+def load_secret_key(data_dir: Path) -> str:
+    env_secret = os.environ.get("NOURI_SECRET_KEY")
+    if env_secret:
+        return env_secret
+
+    secret_path = data_dir / ".secret_key"
+    if secret_path.exists():
+        return secret_path.read_text(encoding="utf-8").strip()
+
+    secret_value = secrets.token_hex(24)
+    try:
+        with secret_path.open("x", encoding="utf-8") as handle:
+            handle.write(secret_value)
+    except FileExistsError:
+        return secret_path.read_text(encoding="utf-8").strip()
+    return secret_value
+
+
 def create_app() -> Flask:
     root_dir = Path(__file__).resolve().parent.parent
     data_dir = Path(os.environ.get("NOURI_DATA_DIR", root_dir / "data")).resolve()
@@ -23,17 +55,21 @@ def create_app() -> Flask:
 
     app = Flask(__name__, instance_relative_config=False)
     app.config.update(
-        SECRET_KEY=os.environ.get("NOURI_SECRET_KEY", secrets.token_hex(24)),
+        SECRET_KEY=load_secret_key(data_dir),
         DATABASE_PATH=str(db_path),
         DATA_DIR=str(data_dir),
         UPLOAD_FOLDER=str(upload_dir),
         MAX_CONTENT_LENGTH=int(os.environ.get("NOURI_MAX_UPLOAD_MB", "5")) * 1024 * 1024,
+        PERMANENT_SESSION_LIFETIME=timedelta(days=30),
+        SESSION_COOKIE_HTTPONLY=True,
+        SESSION_COOKIE_SAMESITE="Lax",
     )
 
     db.init_app(app)
     db.init_db_if_needed(app)
 
     app.register_blueprint(auth_bp)
+    app.register_blueprint(admin_bp)
     app.register_blueprint(main_bp)
 
     @app.context_processor
@@ -43,6 +79,13 @@ def create_app() -> Flask:
             "item_kind_singular_labels": ITEM_KIND_SINGULAR_LABELS,
             "category_suggestions": CATEGORIES,
             "daypart_suggestions": DAYPARTS,
+            "visibility_labels": VISIBILITY_LABELS,
+            "visibility_descriptions": VISIBILITY_DESCRIPTIONS,
+            "role_labels": ROLE_LABELS,
+            "today": date.today(),
+            "weekday_name": lambda value: WEEKDAY_NAMES[value.weekday()],
+            "weekday_short_name": lambda value: WEEKDAY_SHORT_NAMES[value.weekday()],
+            "is_admin": lambda: bool(getattr(g, "user", None)) and g.user["role"] == "admin",
         }
 
     @app.get("/uploads/<path:filename>")

nouri/admin.py

@@ -0,0 +1,180 @@
+from __future__ import annotations
+
+from flask import Blueprint, flash, g, redirect, render_template, request, url_for
+from werkzeug.security import generate_password_hash
+
+from .auth import admin_required, can_remove_last_admin, validate_admin_user_form
+from .constants import ROLE_LABELS
+from .db import get_db
+
+
+admin_bp = Blueprint("admin", __name__, url_prefix="/admin")
+
+
+def get_household_user(user_id: int):
+    user = get_db().execute(
+        """
+        SELECT users.*, households.name AS household_name
+        FROM users
+        LEFT JOIN households ON households.id = users.household_id
+        WHERE users.id = ? AND users.household_id = ?
+        """,
+        (user_id, g.user["household_id"]),
+    ).fetchone()
+    if user is None:
+        raise ValueError("Der Nutzer wurde nicht gefunden.")
+    return user
+
+
+@admin_bp.get("/users")
+@admin_required
+def user_list():
+    users = get_db().execute(
+        """
+        SELECT *
+        FROM users
+        WHERE household_id = ?
+        ORDER BY is_active DESC, LOWER(COALESCE(display_name, username))
+        """,
+        (g.user["household_id"],),
+    ).fetchall()
+    return render_template("admin/users_list.html", users=users, role_labels=ROLE_LABELS)
+
+
+@admin_bp.route("/users/new", methods=("GET", "POST"))
+@admin_required
+def user_create():
+    form_data = {
+        "display_name": "",
+        "username": "",
+        "email": "",
+        "role": "member",
+        "is_active": True,
+    }
+
+    if request.method == "POST":
+        database = get_db()
+        form_data = {
+            "display_name": request.form.get("display_name", "").strip(),
+            "username": request.form.get("username", "").strip().lower(),
+            "email": request.form.get("email", "").strip().lower(),
+            "role": request.form.get("role", "member").strip(),
+            "is_active": request.form.get("is_active", "1") == "1",
+        }
+        password = request.form.get("password", "")
+        password_repeat = request.form.get("password_repeat", "")
+
+        error = validate_admin_user_form(
+            database,
+            username=form_data["username"],
+            email=form_data["email"] or None,
+            role=form_data["role"],
+            is_active=form_data["is_active"],
+            password=password,
+            password_repeat=password_repeat,
+        )
+
+        if error is None:
+            database.execute(
+                """
+                INSERT INTO users (household_id, username, email, display_name, role, is_active, password_hash)
+                VALUES (?, ?, ?, ?, ?, ?, ?)
+                """,
+                (
+                    g.user["household_id"],
+                    form_data["username"],
+                    form_data["email"] or None,
+                    form_data["display_name"],
+                    form_data["role"],
+                    1 if form_data["is_active"] else 0,
+                    generate_password_hash(password),
+                ),
+            )
+            database.commit()
+            flash("Der Nutzer wurde angelegt.", "success")
+            return redirect(url_for("admin.user_list"))
+
+        flash(error, "error")
+
+    return render_template("admin/user_form.html", user=None, form_data=form_data, role_labels=ROLE_LABELS)
+
+
+@admin_bp.route("/users/<int:user_id>/edit", methods=("GET", "POST"))
+@admin_required
+def user_edit(user_id: int):
+    try:
+        user = get_household_user(user_id)
+    except ValueError as exc:
+        flash(str(exc), "error")
+        return redirect(url_for("admin.user_list"))
+
+    form_data = {
+        "display_name": user["display_name"] or "",
+        "username": user["username"],
+        "email": user["email"] or "",
+        "role": user["role"],
+        "is_active": bool(user["is_active"]),
+    }
+
+    if request.method == "POST":
+        database = get_db()
+        form_data = {
+            "display_name": request.form.get("display_name", "").strip(),
+            "username": request.form.get("username", "").strip().lower(),
+            "email": request.form.get("email", "").strip().lower(),
+            "role": request.form.get("role", "member").strip(),
+            "is_active": request.form.get("is_active", "0") == "1",
+        }
+        password = request.form.get("password", "")
+        password_repeat = request.form.get("password_repeat", "")
+
+        error = validate_admin_user_form(
+            database,
+            username=form_data["username"],
+            email=form_data["email"] or None,
+            role=form_data["role"],
+            is_active=form_data["is_active"],
+            password=password,
+            password_repeat=password_repeat,
+            current_user_id=user_id,
+        )
+        if error is None and can_remove_last_admin(user_id, form_data["role"], form_data["is_active"]):
+            error = "Mindestens ein aktiver Admin sollte im Haushalt bleiben."
+
+        if error is None:
+            database.execute(
+                """
+                UPDATE users
+                SET username = ?,
+                    email = ?,
+                    display_name = ?,
+                    role = ?,
+                    is_active = ?,
+                    updated_at = CURRENT_TIMESTAMP
+                WHERE id = ?
+                """,
+                (
+                    form_data["username"],
+                    form_data["email"] or None,
+                    form_data["display_name"],
+                    form_data["role"],
+                    1 if form_data["is_active"] else 0,
+                    user_id,
+                ),
+            )
+            if password:
+                database.execute(
+                    """
+                    UPDATE users
+                    SET password_hash = ?, updated_at = CURRENT_TIMESTAMP
+                    WHERE id = ?
+                    """,
+                    (generate_password_hash(password), user_id),
+                )
+            database.commit()
+            flash("Der Nutzer wurde aktualisiert.", "success")
+            return redirect(url_for("admin.user_list"))
+
+        flash(error, "error")
+
+    return render_template("admin/user_form.html", user=user, form_data=form_data, role_labels=ROLE_LABELS)

nouri/auth.py

@@ -1,6 +1,7 @@
 from __future__ import annotations
 
 import functools
+import secrets
 
 from flask import (
     Blueprint,
@@ -15,7 +16,8 @@ from flask import (
 from markupsafe import Markup
 from werkzeug.security import check_password_hash, generate_password_hash
 
-from .db import get_db, user_count
+from .constants import ROLE_LABELS
+from .db import active_admin_count, ensure_default_household, get_db, user_count
 
 
 auth_bp = Blueprint("auth", __name__, url_prefix="/auth")
@@ -31,19 +33,59 @@ def login_required(view):
     return wrapped_view
 
 
+def admin_required(view):
+    @functools.wraps(view)
+    def wrapped_view(**kwargs):
+        if g.user is None:
+            return redirect(url_for("auth.login"))
+        if g.user["role"] != "admin":
+            flash("Dieser Bereich ist für Admins gedacht.", "error")
+            return redirect(url_for("main.dashboard"))
+        return view(**kwargs)
+
+    return wrapped_view
+
+
 def ensure_csrf_token() -> str:
     token = session.get("_csrf_token")
     if not token:
-        token = session["_csrf_token"] = __import__("secrets").token_hex(24)
+        token = session["_csrf_token"] = secrets.token_hex(24)
     return token
 
 
+def normalize_login_value(raw: str) -> str:
+    return raw.strip().lower()
+
+
+def validate_identity_fields(database, username: str, email: str | None, current_user_id: int | None = None) -> str | None:
+    if not username:
+        return "Bitte einen Benutzernamen eintragen."
+
+    existing_user = database.execute(
+        "SELECT id FROM users WHERE LOWER(username) = LOWER(?)",
+        (username,),
+    ).fetchone()
+    if existing_user and int(existing_user["id"]) != current_user_id:
+        return "Dieser Benutzername ist bereits vergeben."
+
+    if email:
+        existing_email = database.execute(
+            "SELECT id FROM users WHERE LOWER(email) = LOWER(?)",
+            (email,),
+        ).fetchone()
+        if existing_email and int(existing_email["id"]) != current_user_id:
+            return "Diese E-Mail-Adresse wird bereits verwendet."
+
+    return None
+
+
 @auth_bp.app_context_processor
 def inject_csrf_input():
     return {
         "csrf_input": lambda: Markup(
             f'<input type="hidden" name="csrf_token" value="{ensure_csrf_token()}">'
-        )
+        ),
+        "csrf_token_value": ensure_csrf_token(),
     }
 
 
@@ -54,9 +96,18 @@ def load_logged_in_user():
         g.user = None
     else:
         g.user = get_db().execute(
-            "SELECT * FROM users WHERE id = ?",
+            """
+            SELECT users.*,
+                   households.name AS household_name
+            FROM users
+            LEFT JOIN households ON households.id = users.household_id
+            WHERE users.id = ?
+            """,
             (user_id,),
         ).fetchone()
+        if g.user is not None and not g.user["is_active"]:
+            session.clear()
+            g.user = None
 
     endpoint = request.endpoint or ""
     if user_count() == 0 and endpoint not in {"auth.setup", "static", "uploaded_file"}:
@@ -76,27 +127,32 @@ def setup():
         return redirect(url_for("auth.login"))
 
     if request.method == "POST":
-        username = request.form.get("username", "").strip().lower()
+        household_name = request.form.get("household_name", "").strip() or "Unser Haushalt"
+        username = normalize_login_value(request.form.get("username", ""))
+        email = normalize_login_value(request.form.get("email", "")) or None
         display_name = request.form.get("display_name", "").strip()
         password = request.form.get("password", "")
         password_repeat = request.form.get("password_repeat", "")
+        database = get_db()
 
-        error = None
+        error = validate_identity_fields(database, username, email)
-        if not username:
+        if error is None and not password:
-            error = "Bitte einen Benutzernamen eintragen."
-        elif not password:
             error = "Bitte ein Passwort vergeben."
-        elif password != password_repeat:
+        elif error is None and password != password_repeat:
-            error = "Die Passwoerter stimmen nicht ueberein."
+            error = "Die Passwörter stimmen nicht überein."
 
         if error is None:
-            database = get_db()
+            database.execute(
+                "INSERT INTO households (name) VALUES (?)",
+                (household_name,),
+            )
+            household_id = ensure_default_household(database)
             database.execute(
                 """
-                INSERT INTO users (username, display_name, password_hash)
+                INSERT INTO users (household_id, username, email, display_name, role, password_hash)
-                VALUES (?, ?, ?)
+                VALUES (?, ?, ?, ?, 'admin', ?)
                 """,
-                (username, display_name, generate_password_hash(password)),
+                (household_id, username, email, display_name, generate_password_hash(password)),
             )
             database.commit()
             flash("Der erste Haushalt-Zugang ist angelegt. Du kannst dich jetzt anmelden.", "success")
@@ -113,20 +169,29 @@ def login():
         return redirect(url_for("auth.setup"))
 
     if request.method == "POST":
-        username = request.form.get("username", "").strip().lower()
+        identity = normalize_login_value(request.form.get("username", ""))
         password = request.form.get("password", "")
+        remember_me = request.form.get("remember_me") == "1"
         database = get_db()
         user = database.execute(
-            "SELECT * FROM users WHERE username = ?",
+            """
-            (username,),
+            SELECT users.*, households.name AS household_name
+            FROM users
+            LEFT JOIN households ON households.id = users.household_id
+            WHERE LOWER(users.username) = LOWER(?) OR LOWER(COALESCE(users.email, '')) = LOWER(?)
+            """,
+            (identity, identity),
         ).fetchone()
 
         error = None
         if user is None or not check_password_hash(user["password_hash"], password):
-            error = "Benutzername oder Passwort passen nicht zusammen."
+            error = "Login oder Passwort passen nicht zusammen."
+        elif not user["is_active"]:
+            error = "Dieser Zugang ist derzeit nicht aktiv."
 
         if error is None:
             session.clear()
+            session.permanent = remember_me
             session["user_id"] = user["id"]
             ensure_csrf_token()
             return redirect(url_for("main.dashboard"))
@@ -136,8 +201,109 @@ def login():
     return render_template("auth/login.html")
 
 
+@auth_bp.route("/profile", methods=("GET", "POST"))
+@login_required
+def profile():
+    database = get_db()
+
+    if request.method == "POST":
+        username = normalize_login_value(request.form.get("username", ""))
+        email = normalize_login_value(request.form.get("email", "")) or None
+        display_name = request.form.get("display_name", "").strip()
+
+        error = validate_identity_fields(database, username, email, current_user_id=g.user["id"])
+        if error is None:
+            database.execute(
+                """
+                UPDATE users
+                SET username = ?, email = ?, display_name = ?, updated_at = CURRENT_TIMESTAMP
+                WHERE id = ?
+                """,
+                (username, email, display_name, g.user["id"]),
+            )
+            database.commit()
+            flash("Dein Profil wurde aktualisiert.", "success")
+            return redirect(url_for("auth.profile"))
+
+        flash(error, "error")
+
+    return render_template("auth/profile.html", role_labels=ROLE_LABELS)
+
+
+@auth_bp.post("/password")
+@login_required
+def change_password():
+    current_password = request.form.get("current_password", "")
+    new_password = request.form.get("new_password", "")
+    new_password_repeat = request.form.get("new_password_repeat", "")
+
+    error = None
+    if not check_password_hash(g.user["password_hash"], current_password):
+        error = "Das aktuelle Passwort stimmt nicht."
+    elif not new_password:
+        error = "Bitte ein neues Passwort eintragen."
+    elif new_password != new_password_repeat:
+        error = "Die neuen Passwörter stimmen nicht überein."
+
+    if error is None:
+        get_db().execute(
+            """
+            UPDATE users
+            SET password_hash = ?, updated_at = CURRENT_TIMESTAMP
+            WHERE id = ?
+            """,
+            (generate_password_hash(new_password), g.user["id"]),
+        )
+        get_db().commit()
+        flash("Dein Passwort wurde geändert.", "success")
+    else:
+        flash(error, "error")
+
+    return redirect(url_for("auth.profile"))
+
+
 @auth_bp.post("/logout")
 def logout():
     session.clear()
     flash("Du bist abgemeldet.", "info")
     return redirect(url_for("auth.login"))
+
+
+def validate_admin_user_form(
+    database,
+    *,
+    username: str,
+    email: str | None,
+    role: str,
+    is_active: bool,
+    password: str,
+    password_repeat: str,
+    current_user_id: int | None = None,
+) -> str | None:
+    error = validate_identity_fields(database, username, email, current_user_id=current_user_id)
+    if error:
+        return error
+    if role not in ROLE_LABELS:
+        return "Bitte eine gültige Rolle auswählen."
+    if current_user_id is None and not password:
+        return "Bitte ein Passwort vergeben."
+    if password and password != password_repeat:
+        return "Die Passwörter stimmen nicht überein."
+    if current_user_id == g.user["id"] and not is_active:
+        return "Du kannst deinen eigenen Zugang hier nicht deaktivieren."
+    return None
+
+
+def can_remove_last_admin(target_user_id: int, new_role: str, is_active: bool) -> bool:
+    if g.user is None:
+        return False
+    if target_user_id != g.user["id"] and g.user["role"] == "admin":
+        target = get_db().execute("SELECT * FROM users WHERE id = ?", (target_user_id,)).fetchone()
+        if target is None:
+            return False
+        if target["role"] != "admin" or not target["is_active"]:
+            return False
+        if new_role == "admin" and is_active:
+            return False
+        return active_admin_count(g.user["household_id"]) <= 1
+    return False

nouri/constants.py

@@ -1,20 +1,20 @@
 DAYPARTS = [
-    {"slug": "breakfast", "name": "Fruehstueck", "sort_order": 10},
+    {"slug": "breakfast", "name": "Frühstück", "sort_order": 10},
     {"slug": "morning-snack", "name": "Vormittagssnack", "sort_order": 20},
     {"slug": "lunch", "name": "Mittagessen", "sort_order": 30},
     {"slug": "afternoon-snack", "name": "Nachmittagssnack", "sort_order": 40},
     {"slug": "dinner", "name": "Abendessen", "sort_order": 50},
-    {"slug": "late-snack", "name": "Spaeter Snack", "sort_order": 60},
+    {"slug": "late-snack", "name": "Später Snack", "sort_order": 60},
 ]
 
 CATEGORIES = [
     "Brot & Getreide",
     "Milchprodukt",
     "Obst",
-    "Gemuese",
+    "Gemüse",
-    "Eiweissquelle",
+    "Eiweißquelle",
     "Snack",
-    "Getraenk",
+    "Getränk",
     "Vorrat & Basics",
     "Warmes",
     "Kleines Essen",
@@ -35,3 +35,18 @@ AVAILABILITY_LABELS = {
     "home": "Zuhause",
     "archived": "Archiv",
 }
+
+ROLE_LABELS = {
+    "admin": "Admin",
+    "member": "Mitglied",
+}
+
+VISIBILITY_LABELS = {
+    "shared": "Für alle",
+    "personal": "Persönlich",
+}
+
+VISIBILITY_DESCRIPTIONS = {
+    "shared": "Gemeinsam im Haushalt sichtbar und nutzbar.",
+    "personal": "Nur für dich sichtbar und planbar.",
+}

nouri/db.py

@@ -23,20 +23,210 @@ def get_db() -> sqlite3.Connection:
 
 
 def close_db(_error=None) -> None:
-    db = g.pop("db", None)
+    database = g.pop("db", None)
-    if db is not None:
+    if database is not None:
-        db.close()
+        database.close()
+
+
+def table_columns(database: sqlite3.Connection, table_name: str) -> set[str]:
+    rows = database.execute(f"PRAGMA table_info({table_name})").fetchall()
+    return {row["name"] for row in rows}
+
+
+def add_column_if_missing(database: sqlite3.Connection, table_name: str, definition: str) -> None:
+    column_name = definition.split()[0]
+    if column_name not in table_columns(database, table_name):
+        database.execute(f"ALTER TABLE {table_name} ADD COLUMN {definition}")
+
+
+def bootstrap_legacy_schema(database: sqlite3.Connection) -> None:
+    database.execute(
+        """
+        CREATE TABLE IF NOT EXISTS households (
+            id INTEGER PRIMARY KEY AUTOINCREMENT,
+            name TEXT NOT NULL,
+            created_at TEXT NOT NULL DEFAULT CURRENT_TIMESTAMP
+        )
+        """
+    )
+
+    existing_tables = {
+        row["name"]
+        for row in database.execute(
+            "SELECT name FROM sqlite_master WHERE type = 'table'"
+        ).fetchall()
+    }
+
+    if "users" in existing_tables:
+        add_column_if_missing(database, "users", "household_id INTEGER")
+        add_column_if_missing(database, "users", "email TEXT")
+        add_column_if_missing(database, "users", "role TEXT NOT NULL DEFAULT 'member'")
+        add_column_if_missing(database, "users", "is_active INTEGER NOT NULL DEFAULT 1")
+        add_column_if_missing(database, "users", "updated_at TEXT")
+
+    if "items" in existing_tables:
+        add_column_if_missing(database, "items", "household_id INTEGER")
+        add_column_if_missing(database, "items", "owner_user_id INTEGER")
+        add_column_if_missing(database, "items", "visibility TEXT NOT NULL DEFAULT 'shared'")
+
+    if "shopping_entries" in existing_tables:
+        add_column_if_missing(database, "shopping_entries", "household_id INTEGER")
+        add_column_if_missing(database, "shopping_entries", "owner_user_id INTEGER")
+        add_column_if_missing(database, "shopping_entries", "visibility TEXT NOT NULL DEFAULT 'shared'")
+
+    if "plan_entries" in existing_tables:
+        add_column_if_missing(database, "plan_entries", "household_id INTEGER")
+        add_column_if_missing(database, "plan_entries", "owner_user_id INTEGER")
+        add_column_if_missing(database, "plan_entries", "visibility TEXT NOT NULL DEFAULT 'shared'")
+
+
+def ensure_default_household(database: sqlite3.Connection) -> int:
+    household = database.execute(
+        "SELECT id FROM households ORDER BY id LIMIT 1"
+    ).fetchone()
+    if household:
+        return int(household["id"])
+
+    database.execute(
+        "INSERT INTO households (name) VALUES (?)",
+        ("Unser Haushalt",),
+    )
+    return int(
+        database.execute("SELECT id FROM households ORDER BY id LIMIT 1").fetchone()["id"]
+    )
+
+
+def first_user_id(database: sqlite3.Connection) -> int | None:
+    row = database.execute("SELECT id FROM users ORDER BY id LIMIT 1").fetchone()
+    return int(row["id"]) if row else None
+
+
+def ensure_schema_upgrades(database: sqlite3.Connection) -> None:
+    add_column_if_missing(database, "users", "household_id INTEGER")
+    add_column_if_missing(database, "users", "email TEXT")
+    add_column_if_missing(database, "users", "role TEXT NOT NULL DEFAULT 'member'")
+    add_column_if_missing(database, "users", "is_active INTEGER NOT NULL DEFAULT 1")
+    add_column_if_missing(database, "users", "updated_at TEXT")
+
+    default_household_id = ensure_default_household(database)
+    database.execute(
+        "UPDATE users SET household_id = ? WHERE household_id IS NULL",
+        (default_household_id,),
+    )
+    database.execute(
+        "UPDATE users SET role = 'member' WHERE role IS NULL OR role = ''",
+    )
+    database.execute(
+        "UPDATE users SET is_active = 1 WHERE is_active IS NULL",
+    )
+    database.execute(
+        "UPDATE users SET email = NULL WHERE TRIM(COALESCE(email, '')) = ''",
+    )
+    database.execute(
+        "UPDATE users SET updated_at = COALESCE(updated_at, created_at, CURRENT_TIMESTAMP)"
+    )
+
+    admin_row = database.execute(
+        "SELECT id FROM users WHERE role = 'admin' AND is_active = 1 ORDER BY id LIMIT 1"
+    ).fetchone()
+    if admin_row is None:
+        first_id = first_user_id(database)
+        if first_id is not None:
+            database.execute(
+                "UPDATE users SET role = 'admin' WHERE id = ?",
+                (first_id,),
+            )
+
+    default_owner_id = first_user_id(database)
+    for table_name in ("items", "shopping_entries", "plan_entries"):
+        add_column_if_missing(database, table_name, "household_id INTEGER")
+        add_column_if_missing(database, table_name, "owner_user_id INTEGER")
+        add_column_if_missing(database, table_name, "visibility TEXT NOT NULL DEFAULT 'shared'")
+
+    if default_owner_id is not None:
+        database.execute(
+            """
+            UPDATE items
+            SET household_id = COALESCE(household_id, ?),
+                owner_user_id = COALESCE(owner_user_id, created_by, ?),
+                visibility = CASE WHEN visibility IS NULL OR visibility = '' THEN 'shared' ELSE visibility END
+            WHERE household_id IS NULL OR owner_user_id IS NULL OR visibility IS NULL OR visibility = ''
+            """,
+            (default_household_id, default_owner_id),
+        )
+        database.execute(
+            """
+            UPDATE shopping_entries
+            SET household_id = COALESCE(household_id, ?),
+                owner_user_id = COALESCE(owner_user_id, added_by, ?),
+                visibility = CASE WHEN visibility IS NULL OR visibility = '' THEN 'shared' ELSE visibility END
+            WHERE household_id IS NULL OR owner_user_id IS NULL OR visibility IS NULL OR visibility = ''
+            """,
+            (default_household_id, default_owner_id),
+        )
+        database.execute(
+            """
+            UPDATE plan_entries
+            SET household_id = COALESCE(household_id, ?),
+                owner_user_id = COALESCE(owner_user_id, created_by, ?),
+                visibility = CASE WHEN visibility IS NULL OR visibility = '' THEN 'shared' ELSE visibility END
+            WHERE household_id IS NULL OR owner_user_id IS NULL OR visibility IS NULL OR visibility = ''
+            """,
+            (default_household_id, default_owner_id),
+        )
+    else:
+        database.execute(
+            "UPDATE items SET visibility = 'shared' WHERE visibility IS NULL OR visibility = ''"
+        )
+        database.execute(
+            "UPDATE shopping_entries SET visibility = 'shared' WHERE visibility IS NULL OR visibility = ''"
+        )
+        database.execute(
+            "UPDATE plan_entries SET visibility = 'shared' WHERE visibility IS NULL OR visibility = ''"
+        )
+
+    database.execute(
+        """
+        CREATE UNIQUE INDEX IF NOT EXISTS idx_users_email_unique
+        ON users (email)
+        WHERE email IS NOT NULL AND email != ''
+        """
+    )
+    database.execute(
+        """
+        CREATE INDEX IF NOT EXISTS idx_items_household_visibility
+        ON items (household_id, visibility, availability_state)
+        """
+    )
+    database.execute(
+        """
+        CREATE INDEX IF NOT EXISTS idx_plan_entries_household_visibility
+        ON plan_entries (household_id, visibility, plan_date)
+        """
+    )
+    database.execute(
+        """
+        CREATE INDEX IF NOT EXISTS idx_shopping_entries_household_visibility
+        ON shopping_entries (household_id, visibility, is_checked)
+        """
+    )
+
+
+def apply_schema(database: sqlite3.Connection) -> None:
+    bootstrap_legacy_schema(database)
+    schema_path = Path(__file__).with_name("schema.sql")
+    database.executescript(schema_path.read_text(encoding="utf-8"))
+    ensure_schema_upgrades(database)
+    sync_dayparts(database)
 
 
 def init_db() -> None:
     database = get_db()
-    schema_path = Path(__file__).with_name("schema.sql")
+    apply_schema(database)
-    database.executescript(schema_path.read_text(encoding="utf-8"))
-    seed_dayparts(database)
     database.commit()
 
 
-def seed_dayparts(database: sqlite3.Connection) -> None:
+def sync_dayparts(database: sqlite3.Connection) -> None:
     for entry in DAYPARTS:
         database.execute(
             """
@@ -45,21 +235,18 @@ def seed_dayparts(database: sqlite3.Connection) -> None:
             """,
             (entry["slug"], entry["name"], entry["sort_order"]),
         )
+        database.execute(
+            """
+            UPDATE dayparts
+            SET name = ?, sort_order = ?
+            WHERE slug = ?
+            """,
+            (entry["name"], entry["sort_order"], entry["slug"]),
+        )
 
 
 def init_db_if_needed(app: Flask) -> None:
-    db_path = Path(app.config["DATABASE_PATH"])
-    needs_init = not db_path.exists()
     with app.app_context():
-        if needs_init:
-            init_db()
-            return
-
-        database = get_db()
-        table = database.execute(
-            "SELECT name FROM sqlite_master WHERE type = 'table' AND name = 'users'"
-        ).fetchone()
-        if table is None:
         init_db()
 
 
@@ -68,6 +255,18 @@ def user_count() -> int:
     return int(row["count"])
 
 
+def active_admin_count(household_id: int) -> int:
+    row = get_db().execute(
+        """
+        SELECT COUNT(*) AS count
+        FROM users
+        WHERE household_id = ? AND role = 'admin' AND is_active = 1
+        """,
+        (household_id,),
+    ).fetchone()
+    return int(row["count"])
+
+
 @click.command("init-db")
 @with_appcontext
 def init_db_command() -> None:
@@ -79,15 +278,25 @@ def init_db_command() -> None:
 @click.argument("username")
 @click.argument("password")
 @click.option("--display-name", default="", help="Friendly display name.")
+@click.option("--email", default="", help="Optional email address.")
+@click.option("--role", default="member", type=click.Choice(["admin", "member"]))
 @with_appcontext
-def create_user_command(username: str, password: str, display_name: str) -> None:
+def create_user_command(username: str, password: str, display_name: str, email: str, role: str) -> None:
     database = get_db()
+    household_id = ensure_default_household(database)
     database.execute(
         """
-        INSERT INTO users (username, display_name, password_hash)
+        INSERT INTO users (household_id, username, email, display_name, role, password_hash)
-        VALUES (?, ?, ?)
+        VALUES (?, ?, ?, ?, ?, ?)
         """,
-        (username.strip().lower(), display_name.strip(), generate_password_hash(password)),
+        (
+            household_id,
+            username.strip().lower(),
+            email.strip().lower() or None,
+            display_name.strip(),
+            role,
+            generate_password_hash(password),
+        ),
     )
     database.commit()
     click.echo(f"User '{username}' created.")

nouri/schema.sql

@@ -1,13 +1,29 @@
 PRAGMA foreign_keys = ON;
 
+CREATE TABLE IF NOT EXISTS households (
+    id INTEGER PRIMARY KEY AUTOINCREMENT,
+    name TEXT NOT NULL,
+    created_at TEXT NOT NULL DEFAULT CURRENT_TIMESTAMP
+);
+
 CREATE TABLE IF NOT EXISTS users (
     id INTEGER PRIMARY KEY AUTOINCREMENT,
+    household_id INTEGER,
     username TEXT NOT NULL UNIQUE,
+    email TEXT,
     display_name TEXT,
+    role TEXT NOT NULL DEFAULT 'member',
+    is_active INTEGER NOT NULL DEFAULT 1,
     password_hash TEXT NOT NULL,
-    created_at TEXT NOT NULL DEFAULT CURRENT_TIMESTAMP
+    created_at TEXT NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    updated_at TEXT NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    FOREIGN KEY (household_id) REFERENCES households(id) ON DELETE RESTRICT
 );
 
+CREATE UNIQUE INDEX IF NOT EXISTS idx_users_email_unique
+ON users (email)
+WHERE email IS NOT NULL AND email != '';
+
 CREATE TABLE IF NOT EXISTS dayparts (
     id INTEGER PRIMARY KEY AUTOINCREMENT,
     slug TEXT NOT NULL UNIQUE,
@@ -17,6 +33,9 @@ CREATE TABLE IF NOT EXISTS dayparts (
 
 CREATE TABLE IF NOT EXISTS items (
     id INTEGER PRIMARY KEY AUTOINCREMENT,
+    household_id INTEGER,
+    owner_user_id INTEGER,
+    visibility TEXT NOT NULL DEFAULT 'shared',
     kind TEXT NOT NULL CHECK (kind IN ('food', 'meal')),
     name TEXT NOT NULL,
     category TEXT,
@@ -27,6 +46,8 @@ CREATE TABLE IF NOT EXISTS items (
     updated_by INTEGER,
     created_at TEXT NOT NULL DEFAULT CURRENT_TIMESTAMP,
     updated_at TEXT NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    FOREIGN KEY (household_id) REFERENCES households(id) ON DELETE CASCADE,
+    FOREIGN KEY (owner_user_id) REFERENCES users(id) ON DELETE SET NULL,
     FOREIGN KEY (created_by) REFERENCES users(id) ON DELETE SET NULL,
     FOREIGN KEY (updated_by) REFERENCES users(id) ON DELETE SET NULL
 );
@@ -49,12 +70,17 @@ CREATE TABLE IF NOT EXISTS meal_components (
 
 CREATE TABLE IF NOT EXISTS shopping_entries (
     id INTEGER PRIMARY KEY AUTOINCREMENT,
+    household_id INTEGER,
+    owner_user_id INTEGER,
+    visibility TEXT NOT NULL DEFAULT 'shared',
     item_id INTEGER NOT NULL,
     added_by INTEGER,
     checked_by INTEGER,
     is_checked INTEGER NOT NULL DEFAULT 0,
     added_at TEXT NOT NULL DEFAULT CURRENT_TIMESTAMP,
     checked_at TEXT,
+    FOREIGN KEY (household_id) REFERENCES households(id) ON DELETE CASCADE,
+    FOREIGN KEY (owner_user_id) REFERENCES users(id) ON DELETE SET NULL,
     FOREIGN KEY (item_id) REFERENCES items(id) ON DELETE CASCADE,
     FOREIGN KEY (added_by) REFERENCES users(id) ON DELETE SET NULL,
     FOREIGN KEY (checked_by) REFERENCES users(id) ON DELETE SET NULL
@@ -66,13 +92,36 @@ WHERE is_checked = 0;
 
 CREATE TABLE IF NOT EXISTS plan_entries (
     id INTEGER PRIMARY KEY AUTOINCREMENT,
+    household_id INTEGER,
+    owner_user_id INTEGER,
+    visibility TEXT NOT NULL DEFAULT 'shared',
     plan_date TEXT NOT NULL,
     daypart_id INTEGER NOT NULL,
     item_id INTEGER NOT NULL,
     note TEXT,
     created_by INTEGER,
     created_at TEXT NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    FOREIGN KEY (household_id) REFERENCES households(id) ON DELETE CASCADE,
+    FOREIGN KEY (owner_user_id) REFERENCES users(id) ON DELETE SET NULL,
     FOREIGN KEY (daypart_id) REFERENCES dayparts(id) ON DELETE CASCADE,
     FOREIGN KEY (item_id) REFERENCES items(id) ON DELETE CASCADE,
     FOREIGN KEY (created_by) REFERENCES users(id) ON DELETE SET NULL
 );
+
+CREATE INDEX IF NOT EXISTS idx_items_kind_name
+ON items (kind, name);
+
+CREATE INDEX IF NOT EXISTS idx_items_household_visibility
+ON items (household_id, visibility, availability_state);
+
+CREATE INDEX IF NOT EXISTS idx_item_dayparts_daypart_item
+ON item_dayparts (daypart_id, item_id);
+
+CREATE INDEX IF NOT EXISTS idx_plan_entries_plan_date_daypart
+ON plan_entries (plan_date, daypart_id);
+
+CREATE INDEX IF NOT EXISTS idx_plan_entries_household_visibility
+ON plan_entries (household_id, visibility, plan_date);
+
+CREATE INDEX IF NOT EXISTS idx_shopping_entries_household_visibility
+ON shopping_entries (household_id, visibility, is_checked);

nouri/static/brand/favicon.svg

@@ -0,0 +1,16 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64">
+  <defs>
+    <linearGradient id="bg" x1="0%" y1="0%" x2="100%" y2="100%">
+      <stop offset="0%" stop-color="#ffd7be"/>
+      <stop offset="100%" stop-color="#e39a63"/>
+    </linearGradient>
+    <linearGradient id="leaf" x1="0%" y1="0%" x2="100%" y2="100%">
+      <stop offset="0%" stop-color="#b5dfc8"/>
+      <stop offset="100%" stop-color="#72a98b"/>
+    </linearGradient>
+  </defs>
+  <rect width="64" height="64" rx="18" fill="url(#bg)"/>
+  <path d="M16 34c0-3 2.4-5.4 5.4-5.4h21.2c3 0 5.4 2.4 5.4 5.4 0 9.2-7.4 16.6-16.6 16.6h-.8C23.4 50.6 16 43.2 16 34z" fill="#fff9f4"/>
+  <path d="M21 25c2.4-6.7 7.2-10.6 11-10.6S40.6 18.3 43 25" fill="none" stroke="#fff9f4" stroke-linecap="round" stroke-width="4"/>
+  <path d="M40 12c5 .4 9 5 9 10.1 0 .5 0 1-.1 1.5-.8-.7-1.8-1.2-2.9-1.5-2.7-.8-4.3-3.3-4.2-6.1 0-1.3-.6-2.6-1.8-4z" fill="url(#leaf)"/>
+</svg>

nouri/static/brand/nouri-icon.svg

@@ -0,0 +1,21 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 256 256" role="img" aria-labelledby="title">
+  <title>Nouri</title>
+  <defs>
+    <linearGradient id="bg" x1="0%" y1="0%" x2="100%" y2="100%">
+      <stop offset="0%" stop-color="#ffd7be"/>
+      <stop offset="55%" stop-color="#f5b17a"/>
+      <stop offset="100%" stop-color="#d58c57"/>
+    </linearGradient>
+    <linearGradient id="leaf" x1="0%" y1="0%" x2="100%" y2="100%">
+      <stop offset="0%" stop-color="#b5dfc8"/>
+      <stop offset="100%" stop-color="#70aa87"/>
+    </linearGradient>
+  </defs>
+  <rect width="256" height="256" rx="64" fill="url(#bg)"/>
+  <circle cx="128" cy="128" r="96" fill="rgba(255,255,255,0.16)"/>
+  <path d="M68 132c0-9.9 8.1-18 18-18h84c9.9 0 18 8.1 18 18 0 31.8-25.8 57.6-57.6 57.6h-4.8C93.8 189.6 68 163.8 68 132z" fill="#fff9f4"/>
+  <path d="M84 105c7-21.3 24-34 44-34s37 12.7 44 34" fill="none" stroke="#fff9f4" stroke-linecap="round" stroke-width="14"/>
+  <path d="M156 55c15 1 27 14.7 27 30.6 0 1.6-.1 3.1-.3 4.6-1.9-2.4-4.5-4.2-7.5-5.1-8-2.5-13.1-10.2-12.7-18.5.1-4.1-1.8-8-5.2-11.6z" fill="url(#leaf)"/>
+  <path d="M129 143h41" stroke="#f0a46c" stroke-linecap="round" stroke-width="10"/>
+  <path d="M92 96l-10 62" stroke="#fff9f4" stroke-linecap="round" stroke-width="10"/>
+</svg>

nouri/static/icons/fa/archive.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 672 672"><!--! Font Awesome Pro 7.0.0 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license (Commercial License) Copyright 2025 Fonticons, Inc. --><path opacity=".4" fill="currentColor" d="M112.2 272.6C120.4 277.3 129.9 280 140 280L532 280C542.1 280 551.6 277.3 559.8 272.6C560 275 560 277.5 560 280L560 476C560 537.9 509.9 588 448 588L224 588C162.1 588 112 537.9 112 476L112 280C112 277.5 112.1 275.1 112.2 272.6zM118.6 242C134.1 198.8 175.5 168 224 168L448 168C496.5 168 537.9 198.9 553.4 242C548.3 248.1 540.6 252 532 252L140 252C131.4 252 123.7 248.1 118.6 242zM196 350C196 357.7 202.3 364 210 364L462 364C469.7 364 476 357.7 476 350C476 342.3 469.7 336 462 336L210 336C202.3 336 196 342.3 196 350z"/><path fill="currentColor" d="M140 112C124.5 112 112 124.5 112 140L112 224C112 239.5 124.5 252 140 252L532 252C547.5 252 560 239.5 560 224L560 140C560 124.5 547.5 112 532 112L140 112zM84 140C84 109.1 109.1 84 140 84L532 84C562.9 84 588 109.1 588 140L588 224C588 254.9 562.9 280 532 280L140 280C109.1 280 84 254.9 84 224L84 140zM210 336L462 336C469.7 336 476 342.3 476 350C476 357.7 469.7 364 462 364L210 364C202.3 364 196 357.7 196 350C196 342.3 202.3 336 210 336z"/></svg>

nouri/static/icons/fa/bowl-food.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 640 640"><!--! Font Awesome Pro 7.0.0 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license (Commercial License) Copyright 2025 Fonticons, Inc. --><path opacity=".4" fill="currentColor" d="M96.1 352L305.7 352L189.9 481.4C186.5 475.9 181.5 471.6 175.5 468.9C130 449 97.9 404.3 96.1 352z"/><path fill="currentColor" d="M267.8 146.2C277.9 125.5 297.8 112 320 112C342.2 112 362.2 125.5 372.2 146.2C374.2 150.3 377.8 153.4 382.2 154.6C386.6 155.8 391.3 155.2 395.1 152.7C403.9 147.1 414 144 424.9 144C452.7 144 477 165.2 482.7 195C484.2 202.7 491 208.2 498.8 208C499.2 208 499.5 208 499.9 208C523.2 208 543.9 228.5 543.9 256C543.9 264.8 551.1 272 559.9 272C568.7 272 575.9 264.8 575.9 256C575.9 216.6 548.4 182.5 511 176.8C498.9 139.6 465.4 112 424.9 112C413.5 112 402.6 114.2 392.6 118.2C376.2 95.2 349.9 80 319.9 80C289.9 80 263.7 95.2 247.2 118.2C237.2 114.2 226.3 112 214.9 112C174.4 112 140.9 139.6 128.8 176.8C91.4 182.5 63.9 216.6 63.9 256C63.9 264.8 71.1 272 79.9 272C88.7 272 95.9 264.8 95.9 256C95.9 228.5 116.6 208 139.9 208C140.3 208 140.6 208 141 208C148.8 208.2 155.7 202.7 157.1 195C162.8 165.2 187.1 144 214.9 144C225.7 144 235.9 147.2 244.7 152.7C248.5 155.1 253.3 155.8 257.6 154.6C261.9 153.4 265.6 150.3 267.6 146.2zM193.3 489.1C190.6 480.1 184.1 472.7 175.5 468.9C130 449 97.9 404.3 96.1 352L543.9 352C542.1 404.3 510 449 464.5 468.9C455.9 472.7 449.3 480.1 446.7 489.1C442.8 502.3 430.5 512 416 512L224 512C209.5 512 197.3 502.4 193.3 489.1zM91.4 320C76.3 320 64 332.3 64 347.4C64 414.9 104.6 472.8 162.6 498.3C170.5 524.7 195 544 224 544L416 544C445 544 469.5 524.7 477.4 498.3C535.5 472.9 576 414.9 576 347.5C576 332.4 563.7 320.1 548.6 320.1L91.4 320z"/></svg>

nouri/static/icons/fa/calendar-days.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 640 640"><!--! Font Awesome Pro 7.0.0 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license (Commercial License) Copyright 2025 Fonticons, Inc. --><path opacity=".4" fill="currentColor" d="M128 256L128 320L224 320L224 256L128 256zM128 352L128 416L224 416L224 352L128 352zM128 448L128 480C128 497.7 142.3 512 160 512L224 512L224 448L128 448zM256 256L256 320L384 320L384 256L256 256zM256 352L256 416L384 416L384 352L256 352zM256 448L256 512L384 512L384 448L256 448zM416 256L416 320L512 320L512 256L416 256zM416 352L416 416L512 416L512 352L416 352zM416 448L416 512L480 512C497.7 512 512 497.7 512 480L512 448L416 448z"/><path fill="currentColor" d="M208 64C216.8 64 224 71.2 224 80L224 128L416 128L416 80C416 71.2 423.2 64 432 64C440.8 64 448 71.2 448 80L448 128L480 128C515.3 128 544 156.7 544 192L544 480C544 515.3 515.3 544 480 544L160 544C124.7 544 96 515.3 96 480L96 192C96 156.7 124.7 128 160 128L192 128L192 80C192 71.2 199.2 64 208 64zM480 160L160 160C142.3 160 128 174.3 128 192L128 224L512 224L512 192C512 174.3 497.7 160 480 160zM512 256L416 256L416 320L512 320L512 256zM512 352L416 352L416 416L512 416L512 352zM512 448L416 448L416 512L480 512C497.7 512 512 497.7 512 480L512 448zM384 416L384 352L256 352L256 416L384 416zM256 448L256 512L384 512L384 448L256 448zM224 416L224 352L128 352L128 416L224 416zM128 448L128 480C128 497.7 142.3 512 160 512L224 512L224 448L128 448zM128 320L224 320L224 256L128 256L128 320zM256 320L384 320L384 256L256 256L256 320z"/></svg>

nouri/static/icons/fa/calendar.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 672 672"><!--! Font Awesome Pro 7.0.0 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license (Commercial License) Copyright 2025 Fonticons, Inc. --><path opacity=".4" fill="currentColor" d="M84 224L84 252L588 252L588 224C588 162.1 537.9 112 476 112L469 112L469 140C469 147.7 462.7 154 455 154C447.3 154 441 147.7 441 140L441 112L224 112L224 140C224 147.7 217.7 154 210 154C202.3 154 196 147.7 196 140L196 112C134.1 112 84 162.1 84 224zM84 280L84 476C84 537.9 134.1 588 196 588L476 588C537.9 588 588 537.9 588 476L588 280L84 280z"/><path fill="currentColor" d="M210 56C202.3 56 196 62.3 196 70L196 140C196 147.7 202.3 154 210 154C217.7 154 224 147.7 224 140L224 70C224 62.3 217.7 56 210 56zM455 56C447.3 56 441 62.3 441 70L441 140C441 147.7 447.3 154 455 154C462.7 154 469 147.7 469 140L469 70C469 62.3 462.7 56 455 56zM84 252C76.3 252 70 258.3 70 266C70 273.7 76.3 280 84 280L588 280C595.7 280 602 273.7 602 266C602 258.3 595.7 252 588 252L84 252z"/></svg>

nouri/static/icons/fa/cart-shopping.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 672 672"><!--! Font Awesome Pro 7.0.0 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license (Commercial License) Copyright 2025 Fonticons, Inc. --><path opacity=".4" fill="currentColor" d="M160.7 140.2L202.6 412.4C203 415 203.6 417.6 204.5 420L499.9 420C535.2 420 566 396 574.6 361.7L614.5 202C615.5 198 616 194 616 189.9C616 162.4 593.7 140 566.1 140L162.1 140C161.6 140 161.1 140.1 160.6 140.2z"/><path fill="currentColor" d="M56 98C56 90.3 62.3 84 70 84L110 84C134.2 84 154.8 101.6 158.4 125.5L202.5 412.3C205.7 432.8 223.3 447.9 244 447.9L546 447.9C553.7 447.9 560 454.2 560 461.9C560 469.6 553.7 475.9 546 475.9L244 475.9C209.4 475.9 180.1 450.7 174.8 416.5L130.7 129.8C129.2 119.6 120.3 112 110 112L70 112C62.3 112 56 105.7 56 98zM252 588C267.5 588 280 575.5 280 560C280 544.5 267.5 532 252 532C236.5 532 224 544.5 224 560C224 575.5 236.5 588 252 588zM252 504C282.9 504 308 529.1 308 560C308 590.9 282.9 616 252 616C221.1 616 196 590.9 196 560C196 529.1 221.1 504 252 504zM532 560C532 544.5 519.5 532 504 532C488.5 532 476 544.5 476 560C476 575.5 488.5 588 504 588C519.5 588 532 575.5 532 560zM448 560C448 529.1 473.1 504 504 504C534.9 504 560 529.1 560 560C560 590.9 534.9 616 504 616C473.1 616 448 590.9 448 560z"/></svg>

nouri/static/icons/fa/house.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 672 672"><!--! Font Awesome Pro 7.0.0 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license (Commercial License) Copyright 2025 Fonticons, Inc. --><path opacity=".4" fill="currentColor" d="M84 303.5L336 101.9L588 303.5L588 476C588 537.9 537.9 588 476 588L448 588L448 434C448 395.3 416.7 364 378 364L294 364C255.3 364 224 395.3 224 434L224 588L196 588C134.1 588 84 537.9 84 476L84 303.5zM252 434C252 410.8 270.8 392 294 392L378 392C401.2 392 420 410.8 420 434L420 588L252 588L252 434z"/><path fill="currentColor" d="M344.7 73.1C339.6 69 332.3 69 327.2 73.1L47.2 297.1C41.2 301.9 40.2 310.7 45 316.8C49.8 322.9 58.6 323.8 64.7 319L336 102L607.3 319C613.3 323.8 622.1 322.9 627 316.8C631.9 310.7 630.9 302 624.8 297.1L344.8 73.1zM252 434C252 410.8 270.8 392 294 392L378 392C401.2 392 420 410.8 420 434L420 588C420 595.7 426.3 602 434 602C441.7 602 448 595.7 448 588L448 434C448 395.3 416.7 364 378 364L294 364C255.3 364 224 395.3 224 434L224 588C224 595.7 230.3 602 238 602C245.7 602 252 595.7 252 588L252 434z"/></svg>

nouri/static/icons/fa/sparkles.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 640 640"><!--! Font Awesome Pro 7.0.0 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license (Commercial License) Copyright 2025 Fonticons, Inc. --><path opacity=".4" fill="currentColor" d="M86.2 320L175.1 361.1C178.6 362.7 181.3 365.5 182.9 368.9L224 457.8L265.1 368.9C266.7 365.5 269.5 362.7 272.9 361.1L361.8 320L272.9 278.9C269.4 277.3 266.7 274.5 265.1 271.1L224 182.2L182.9 271.1C181.3 274.6 178.5 277.3 175.1 278.9L86.2 320z"/><path fill="currentColor" d="M512 48C520.8 48 528 55.2 528 64L528 112L576 112C584.8 112 592 119.2 592 128C592 136.8 584.8 144 576 144L528 144L528 192C528 200.8 520.8 208 512 208C503.2 208 496 200.8 496 192L496 144L448 144C439.2 144 432 136.8 432 128C432 119.2 439.2 112 448 112L496 112L496 64C496 55.2 503.2 48 512 48zM224 128C230.2 128 235.9 131.6 238.5 137.3L291.6 252.3L406.6 305.4C412.3 308 415.9 313.7 415.9 319.9C415.9 326.1 412.3 331.8 406.6 334.4L291.6 387.5L238.5 502.5C235.9 508.2 230.2 511.8 224 511.8C217.8 511.8 212.1 508.2 209.5 502.5L156.4 387.5L41.4 334.4C35.6 331.9 32 326.2 32 320C32 313.8 35.6 308.1 41.3 305.5L156.3 252.4L209.4 137.4C212 131.7 217.7 128.1 223.9 128.1zM224 182.2L182.9 271.1C181.3 274.6 178.5 277.3 175.1 278.9L86.2 320L175.1 361.1C178.6 362.7 181.3 365.5 182.9 368.9L224 457.8L265.1 368.9C266.7 365.5 269.5 362.7 272.9 361.1L361.8 320L272.9 278.9C269.4 277.3 266.7 274.5 265.1 271.1L224 182.2zM496 448L496 496L544 496C552.8 496 560 503.2 560 512C560 520.8 552.8 528 544 528L496 528L496 576C496 584.8 488.8 592 480 592C471.2 592 464 584.8 464 576L464 528L416 528C407.2 528 400 520.8 400 512C400 503.2 407.2 496 416 496L464 496L464 448C464 439.2 471.2 432 480 432C488.8 432 496 439.2 496 448z"/></svg>

nouri/static/icons/fa/utensils.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 672 672"><!--! Font Awesome Pro 7.0.0 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license (Commercial License) Copyright 2025 Fonticons, Inc. --><path opacity=".4" fill="currentColor" d="M112 112L112 252C112 313.9 162.1 364 224 364L224 350C224 342.3 230.3 336 238 336C245.7 336 252 342.3 252 350L252 364C313.9 364 364 313.9 364 252L364 112C364 81.1 338.9 56 308 56L294 56L294 238C294 245.7 287.7 252 280 252C272.3 252 266 245.7 266 238L266 56L210 56L210 238C210 245.7 203.7 252 196 252C188.3 252 182 245.7 182 238L182 56L168 56C137.1 56 112 81.1 112 112zM420 182L420 392C420 422.9 445.1 448 476 448L532 448L532 70C532 62.4 538.1 56.2 545.7 56C476.3 56.2 420 112.5 420 182z"/><path fill="currentColor" d="M210 56C210 48.3 203.7 42 196 42C188.3 42 182 48.3 182 56L182 238C182 245.7 188.3 252 196 252C203.7 252 210 245.7 210 238L210 56zM294 56C294 48.3 287.7 42 280 42C272.3 42 266 48.3 266 56L266 238C266 245.7 272.3 252 280 252C287.7 252 294 245.7 294 238L294 56zM560 70C560 62.3 553.7 56 546 56C538.3 56 532 62.3 532 70L532 602C532 609.7 538.3 616 546 616C553.7 616 560 609.7 560 602L560 70zM238 336C230.3 336 224 342.3 224 350L224 602C224 609.7 230.3 616 238 616C245.7 616 252 609.7 252 602L252 350C252 342.3 245.7 336 238 336z"/></svg>

nouri/static/js/planner.js

@@ -0,0 +1,81 @@
+(() => {
+    const getCsrfToken = () => {
+        const meta = document.querySelector('meta[name="csrf-token"]');
+        return meta ? meta.getAttribute("content") : "";
+    };
+
+    const initWeekDragAndDrop = () => {
+        const board = document.querySelector(".week-board");
+        if (!board) return;
+
+        let draggedEntry = null;
+
+        board.querySelectorAll(".draggable-plan-entry").forEach((entry) => {
+            if (entry.getAttribute("draggable") !== "true") return;
+            entry.addEventListener("dragstart", () => {
+                draggedEntry = entry;
+                entry.classList.add("is-dragging");
+            });
+
+            entry.addEventListener("dragend", () => {
+                entry.classList.remove("is-dragging");
+                draggedEntry = null;
+                board.querySelectorAll(".drop-slot").forEach((slot) => slot.classList.remove("is-drag-over"));
+            });
+        });
+
+        board.querySelectorAll(".drop-slot").forEach((slot) => {
+            slot.addEventListener("dragover", (event) => {
+                event.preventDefault();
+                if (!draggedEntry) return;
+                slot.classList.add("is-drag-over");
+            });
+
+            slot.addEventListener("dragleave", () => {
+                slot.classList.remove("is-drag-over");
+            });
+
+            slot.addEventListener("drop", async (event) => {
+                event.preventDefault();
+                slot.classList.remove("is-drag-over");
+                if (!draggedEntry) return;
+
+                // Keep DnD lightweight: move on the server, then refresh into the canonical rendered state.
+                const moveUrl = draggedEntry.dataset.moveUrl;
+                const payload = new URLSearchParams({
+                    csrf_token: getCsrfToken(),
+                    target_date: slot.dataset.targetDate,
+                    target_daypart_id: slot.dataset.targetDaypartId,
+                });
+
+                try {
+                    const response = await fetch(moveUrl, {
+                        method: "POST",
+                        headers: {
+                            "Content-Type": "application/x-www-form-urlencoded;charset=UTF-8",
+                            "X-Requested-With": "XMLHttpRequest",
+                        },
+                        body: payload.toString(),
+                    });
+
+                    if (!response.ok) {
+                        throw new Error("move failed");
+                    }
+
+                    const result = await response.json();
+                    if (result.redirect_url) {
+                        window.location.href = result.redirect_url;
+                    } else {
+                        window.location.reload();
+                    }
+                } catch (_error) {
+                    window.location.reload();
+                }
+            });
+        });
+    };
+
+    document.addEventListener("DOMContentLoaded", () => {
+        initWeekDragAndDrop();
+    });
+})();

nouri/static/js/theme.js

@@ -1,7 +1,7 @@
 (() => {
     const root = document.documentElement;
     const storageKey = "nouri-theme";
-    const toggle = () => document.querySelector("[data-theme-toggle]");
+    const toggles = () => Array.from(document.querySelectorAll("[data-theme-toggle]"));
 
     const applyTheme = (theme) => {
         const resolved = theme || localStorage.getItem(storageKey) || "auto";
@@ -11,17 +11,14 @@
                 : resolved;
         root.dataset.theme = finalTheme;
 
-        const button = toggle();
+        toggles().forEach((button) => {
-        if (button) {
             button.textContent = finalTheme === "dark" ? "Hell" : "Dunkel";
-        }
+        });
     };
 
     document.addEventListener("DOMContentLoaded", () => {
         applyTheme();
-        const button = toggle();
+        toggles().forEach((button) => {
-        if (!button) return;
-
             button.addEventListener("click", () => {
                 const current = root.dataset.theme === "dark" ? "dark" : "light";
                 const next = current === "dark" ? "light" : "dark";
@@ -29,4 +26,5 @@
                 applyTheme(next);
             });
         });
+    });
 })();

nouri/templates/admin/user_form.html

@@ -0,0 +1,53 @@
+{% extends "base.html" %}
+{% block title %}{% if user %}Nutzer bearbeiten{% else %}Nutzer anlegen{% endif %} | Nouri{% endblock %}
+{% block content %}
+<section class="page-intro">
+    <div>
+        <p class="eyebrow">Nutzer verwalten</p>
+        <h1>{% if user %}{{ user.display_name or user.username }} bearbeiten{% else %}Neuen Nutzer anlegen{% endif %}</h1>
+        <p class="lead">Wenig Felder, klare Rollen und ein ruhiger Zugang für den gemeinsamen Haushalt.</p>
+    </div>
+</section>
+
+<section class="panel form-panel">
+    <form method="post" class="stack-form">
+        {{ csrf_input() }}
+        <label>
+            Anzeigename
+            <input type="text" name="display_name" value="{{ form_data.display_name }}" autocomplete="name">
+        </label>
+        <label>
+            Benutzername
+            <input type="text" name="username" value="{{ form_data.username }}" autocomplete="username" required>
+        </label>
+        <label>
+            E-Mail
+            <input type="email" name="email" value="{{ form_data.email }}" autocomplete="email">
+        </label>
+        <label>
+            Rolle
+            <select name="role">
+                {% for value, label in role_labels.items() %}
+                    <option value="{{ value }}" {% if form_data.role == value %}selected{% endif %}>{{ label }}</option>
+                {% endfor %}
+            </select>
+        </label>
+        <label class="inline-check">
+            <input type="checkbox" name="is_active" value="1" {% if form_data.is_active %}checked{% endif %}>
+            <span>Zugang aktiv</span>
+        </label>
+        <label>
+            {% if user %}Neues Passwort{% else %}Passwort{% endif %}
+            <input type="password" name="password" autocomplete="new-password" {% if not user %}required{% endif %}>
+        </label>
+        <label>
+            Passwort wiederholen
+            <input type="password" name="password_repeat" autocomplete="new-password" {% if not user %}required{% endif %}>
+        </label>
+        <div class="form-actions">
+            <button type="submit">Speichern</button>
+            <a class="ghost-button" href="{{ url_for('admin.user_list') }}">Zurück</a>
+        </div>
+    </form>
+</section>
+{% endblock %}

nouri/templates/admin/users_list.html

@@ -0,0 +1,40 @@
+{% extends "base.html" %}
+{% block title %}Nutzer verwalten | Nouri{% endblock %}
+{% block content %}
+<section class="page-intro">
+    <div>
+        <p class="eyebrow">Nutzer verwalten</p>
+        <h1>Haushaltszugänge ruhig pflegen</h1>
+        <p class="lead">Admins können hier weitere Mitglieder anlegen, Rollen anpassen und Zugänge bei Bedarf pausieren.</p>
+    </div>
+    <a class="button" href="{{ url_for('admin.user_create') }}">Neuen Nutzer anlegen</a>
+</section>
+
+<section class="stack-list">
+    {% for user in users %}
+        <article class="list-row stacked-mobile">
+            <div>
+                <strong>{{ user.display_name or user.username }}</strong>
+                <p class="muted">
+                    {{ user.username }}
+                    {% if user.email %} · {{ user.email }}{% endif %}
+                </p>
+                <div class="chip-row">
+                    <span class="chip">{{ role_labels[user.role] }}</span>
+                    {% if user.is_active %}
+                        <span class="chip status-home">Aktiv</span>
+                    {% else %}
+                        <span class="chip status-archived">Pausiert</span>
+                    {% endif %}
+                    {% if user.id == g.user.id %}
+                        <span class="chip status-soft">Du</span>
+                    {% endif %}
+                </div>
+            </div>
+            <div class="row-actions">
+                <a class="ghost-button" href="{{ url_for('admin.user_edit', user_id=user.id) }}">Bearbeiten</a>
+            </div>
+        </article>
+    {% endfor %}
+</section>
+{% endblock %}

nouri/templates/archive/list.html

@@ -4,11 +4,40 @@
 <section class="page-intro">
     <div>
         <p class="eyebrow">Archiv</p>
-        <h1>Fruehere Ideen bleiben greifbar</h1>
+        <h1>Frühere Ideen bleiben greifbar</h1>
-        <p class="lead">Das Archiv ist ein Erinnerungsspeicher. Von hier aus lassen sich vertraute Dinge leicht wieder auf die Einkaufsliste setzen.</p>
+        <p class="lead">Das Archiv ist ein Erinnerungsspeicher. Von hier aus lassen sich vertraute Dinge leicht wieder einplanen oder einkaufen.</p>
     </div>
 </section>
 
+<section class="panel compact-form-panel">
+    <form method="get" class="filter-form">
+        <label class="wide">
+            Suche
+            <input type="text" name="q" value="{{ query }}" placeholder="Nach Namen suchen">
+        </label>
+        <label>
+            Bereich
+            <select name="kind">
+                {% for value, label in kind_options %}
+                    <option value="{{ value }}" {% if selected_kind == value %}selected{% endif %}>{{ label }}</option>
+                {% endfor %}
+            </select>
+        </label>
+        <label>
+            Sichtbarkeit
+            <select name="visibility">
+                {% for value, label in visibility_options %}
+                    <option value="{{ value }}" {% if selected_visibility == value %}selected{% endif %}>{{ label }}</option>
+                {% endfor %}
+            </select>
+        </label>
+        <div class="filter-actions">
+            <button type="submit">Filtern</button>
+            <a class="ghost-button" href="{{ url_for('main.archive_view') }}">Zurücksetzen</a>
+        </div>
+    </form>
+</section>
+
 {% if items %}
     <section class="card-grid">
         {% for item in items %}
@@ -22,6 +51,10 @@
                 </div>
                 <div class="item-body">
                     <h2>{{ item.name }}</h2>
+                    <div class="chip-row">
+                        <span class="chip">{{ item.visibility_label }}</span>
+                        <span class="chip status-soft">{{ item.owner_label }}</span>
+                    </div>
                     <p class="muted">{{ item_kind_labels[item.kind] }}{% if item.category %} · {{ item.category }}{% endif %}</p>
                     {% if item.dayparts %}
                         <div class="chip-row">
@@ -42,18 +75,21 @@
                         {{ csrf_input() }}
                         <button type="submit">Wieder einkaufen</button>
                     </form>
+                    <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>
+                    {% if item.can_edit %}
                         <form method="post" action="{{ url_for('main.item_restore', item_id=item.id) }}">
                             {{ csrf_input() }}
                             <button class="ghost-button" type="submit">Zur aktiven Liste</button>
                         </form>
+                    {% endif %}
                 </div>
             </article>
         {% endfor %}
     </section>
 {% else %}
     <section class="panel empty-panel">
-        <h2>Das Archiv ist noch leer</h2>
+        <h2>Keine passenden Archiv-Einträge</h2>
-        <p>Sobald etwas als verbraucht markiert wird, bleibt es hier als spaetere Erinnerung erhalten.</p>
+        <p>Mit einer kurzen Suche findest du vertraute Dinge meist schnell wieder.</p>
     </section>
 {% endif %}
 {% endblock %}

nouri/templates/auth/login.html

@@ -3,20 +3,24 @@
 {% block content %}
 <section class="auth-shell">
     <div class="auth-card">
-        <p class="eyebrow">Willkommen zurueck</p>
+        <p class="eyebrow">Willkommen zurück</p>
         <h1>Ruhig wieder einsteigen</h1>
-        <p class="lead">Nouri hilft beim Erinnern, Sichtbar-Machen und Planen. Ohne Zahlen, ohne Druck.</p>
+        <p class="lead">Nouri bleibt ein kleiner, freundlicher Ort für euren Alltag rund um Essen, Einkauf und Planung.</p>
 
         <form method="post" class="stack-form">
             {{ csrf_input() }}
             <label>
-                Benutzername
+                Benutzername oder E-Mail
                 <input type="text" name="username" autocomplete="username" required>
             </label>
             <label>
                 Passwort
                 <input type="password" name="password" autocomplete="current-password" required>
             </label>
+            <label class="inline-check">
+                <input type="checkbox" name="remember_me" value="1">
+                <span>Angemeldet bleiben</span>
+            </label>
             <button type="submit">Anmelden</button>
         </form>
     </div>

nouri/templates/auth/profile.html

@@ -0,0 +1,63 @@
+{% extends "base.html" %}
+{% block title %}Mein Profil | Nouri{% endblock %}
+{% block content %}
+<section class="page-intro">
+    <div>
+        <p class="eyebrow">Mein Profil</p>
+        <h1>{{ g.user.display_name or g.user.username }}</h1>
+        <p class="lead">Dein Zugang bleibt bewusst schlicht. Hier kannst du Namen, Login-Daten und Passwort pflegen.</p>
+    </div>
+    <div class="intro-pills">
+        <span class="status-pill">{{ role_labels[g.user.role] }}</span>
+        {% if g.user.household_name %}
+            <span class="status-pill status-soft">{{ g.user.household_name }}</span>
+        {% endif %}
+    </div>
+</section>
+
+<section class="two-column">
+    <article class="panel">
+        <div class="panel-head">
+            <h2>Basisdaten</h2>
+        </div>
+        <form method="post" class="stack-form">
+            {{ csrf_input() }}
+            <label>
+                Anzeigename
+                <input type="text" name="display_name" value="{{ g.user.display_name or '' }}" autocomplete="name">
+            </label>
+            <label>
+                Benutzername
+                <input type="text" name="username" value="{{ g.user.username }}" autocomplete="username" required>
+            </label>
+            <label>
+                E-Mail
+                <input type="email" name="email" value="{{ g.user.email or '' }}" autocomplete="email">
+            </label>
+            <button type="submit">Speichern</button>
+        </form>
+    </article>
+
+    <article class="panel">
+        <div class="panel-head">
+            <h2>Passwort ändern</h2>
+        </div>
+        <form method="post" action="{{ url_for('auth.change_password') }}" class="stack-form">
+            {{ csrf_input() }}
+            <label>
+                Aktuelles Passwort
+                <input type="password" name="current_password" autocomplete="current-password" required>
+            </label>
+            <label>
+                Neues Passwort
+                <input type="password" name="new_password" autocomplete="new-password" required>
+            </label>
+            <label>
+                Neues Passwort wiederholen
+                <input type="password" name="new_password_repeat" autocomplete="new-password" required>
+            </label>
+            <button type="submit">Passwort ändern</button>
+        </form>
+    </article>
+</section>
+{% endblock %}

nouri/templates/auth/setup.html

@@ -5,14 +5,22 @@
     <div class="auth-card">
         <p class="eyebrow">Erster Start</p>
         <h1>Den ersten Haushalt-Zugang anlegen</h1>
-        <p class="lead">Danach koennt ihr die App gemeinsam nutzen. Die Daten bleiben lokal in dieser Installation.</p>
+        <p class="lead">Danach könnt ihr Nouri gemeinsam nutzen. Persönliche und gemeinsame Einträge lassen sich später ruhig auseinanderhalten.</p>
 
         <form method="post" class="stack-form">
             {{ csrf_input() }}
+            <label>
+                Haushaltsname
+                <input type="text" name="household_name" autocomplete="organization" placeholder="z. B. Zuhause">
+            </label>
             <label>
                 Benutzername
                 <input type="text" name="username" autocomplete="username" required>
             </label>
+            <label>
+                E-Mail
+                <input type="email" name="email" autocomplete="email" placeholder="Optional">
+            </label>
             <label>
                 Anzeigename
                 <input type="text" name="display_name" autocomplete="name" placeholder="z. B. Heinz">

nouri/templates/base.html

@@ -4,36 +4,55 @@
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <title>{% block title %}Nouri{% endblock %}</title>
+    <meta name="csrf-token" content="{{ csrf_token_value }}">
+    <link rel="icon" type="image/svg+xml" href="{{ url_for('static', filename='brand/favicon.svg') }}">
     <link rel="stylesheet" href="{{ url_for('static', filename='css/styles.css') }}">
     <script defer src="{{ url_for('static', filename='js/theme.js') }}"></script>
+    <script defer src="{{ url_for('static', filename='js/planner.js') }}"></script>
 </head>
-<body>
+<body class="{% if g.user %}has-mobile-nav{% endif %}">
     <div class="page-shell">
         <header class="site-header">
             <a class="brand" href="{{ url_for('main.dashboard') }}">
-                <span class="brand-mark">N</span>
+                <span class="brand-mark">
-                <span>
+                    <img src="{{ url_for('static', filename='brand/nouri-icon.svg') }}" alt="">
+                </span>
+                <span class="brand-copy">
                     <strong>Nouri</strong>
-                    <small>freundliches Essensgedaechtnis</small>
+                    <small>einfach essen planen</small>
                 </span>
             </a>
+
             {% if g.user %}
-                <nav class="site-nav">
+                <nav class="site-nav desktop-nav">
-                    <a href="{{ url_for('main.dashboard') }}" class="{{ 'active' if request.endpoint == 'main.dashboard' else '' }}">Heute</a>
+                    <a href="{{ url_for('main.dashboard') }}" class="{{ 'active' if request.endpoint == 'main.dashboard' else '' }}"><span class="nav-link-inner"><span class="ui-icon icon-sparkles"></span><span>Heute</span></span></a>
-                    <a href="{{ url_for('main.item_list', kind='food') }}" class="{{ 'active' if request.endpoint == 'main.item_list' and request.view_args and request.view_args.get('kind') == 'food' else '' }}">Lebensmittel</a>
+                    <a href="{{ url_for('main.shopping_list') }}" class="{{ 'active' if request.endpoint == 'main.shopping_list' else '' }}"><span class="nav-link-inner"><span class="ui-icon icon-cart-shopping"></span><span>Einkauf</span></span></a>
-                    <a href="{{ url_for('main.item_list', kind='meal') }}" class="{{ 'active' if request.endpoint == 'main.item_list' and request.view_args and request.view_args.get('kind') == 'meal' else '' }}">Mahlzeiten</a>
+                    <a href="{{ url_for('main.home_view') }}" class="{{ 'active' if request.endpoint == 'main.home_view' else '' }}"><span class="nav-link-inner"><span class="ui-icon icon-house"></span><span>Zuhause</span></span></a>
-                    <a href="{{ url_for('main.shopping_list') }}" class="{{ 'active' if request.endpoint == 'main.shopping_list' else '' }}">Einkaufsliste</a>
+                    <a href="{{ url_for('main.planner_day', date=today.isoformat()) }}" class="{{ 'active' if request.endpoint == 'main.planner_day' else '' }}"><span class="nav-link-inner"><span class="ui-icon icon-calendar"></span><span>Plan</span></span></a>
-                    <a href="{{ url_for('main.home_view') }}" class="{{ 'active' if request.endpoint == 'main.home_view' else '' }}">Zuhause</a>
+                    <a href="{{ url_for('main.item_list', kind='food') }}" class="{{ 'active' if request.endpoint == 'main.item_list' and request.view_args and request.view_args.get('kind') == 'food' else '' }}"><span class="nav-link-inner"><span class="ui-icon icon-utensils"></span><span>Lebensmittel</span></span></a>
-                    <a href="{{ url_for('main.planner') }}" class="{{ 'active' if request.endpoint == 'main.planner' else '' }}">Wochenplan</a>
+                    <a href="{{ url_for('main.item_list', kind='meal') }}" class="{{ 'active' if request.endpoint == 'main.item_list' and request.view_args and request.view_args.get('kind') == 'meal' else '' }}"><span class="nav-link-inner"><span class="ui-icon icon-bowl-food"></span><span>Mahlzeiten</span></span></a>
-                    <a href="{{ url_for('main.archive_view') }}" class="{{ 'active' if request.endpoint == 'main.archive_view' else '' }}">Archiv</a>
+                    <a href="{{ url_for('main.planner') }}" class="{{ 'active' if request.endpoint == 'main.planner' else '' }}"><span class="nav-link-inner"><span class="ui-icon icon-calendar-days"></span><span>Woche</span></span></a>
+                    <a href="{{ url_for('main.archive_view') }}" class="{{ 'active' if request.endpoint == 'main.archive_view' else '' }}"><span class="nav-link-inner"><span class="ui-icon icon-archive"></span><span>Archiv</span></span></a>
                 </nav>
-                <div class="header-actions">
+
-                    <button class="theme-toggle" type="button" data-theme-toggle>Modus</button>
+                <div class="header-actions desktop-actions">
+                    <button class="theme-toggle ghost-button" type="button" data-theme-toggle>Modus</button>
+                    <a class="user-chip" href="{{ url_for('auth.profile') }}">
+                        <span class="user-chip-title">{{ g.user.display_name or g.user.username }}</span>
+                        <small>{{ role_labels[g.user.role] }}</small>
+                    </a>
+                    {% if g.user.role == 'admin' %}
+                        <a class="ghost-button" href="{{ url_for('admin.user_list') }}">Nutzer verwalten</a>
+                    {% endif %}
                     <form method="post" action="{{ url_for('auth.logout') }}">
                         {{ csrf_input() }}
                         <button class="ghost-button" type="submit">Abmelden</button>
                     </form>
                 </div>
+
+                <a class="mobile-profile-link" href="{{ url_for('main.more_view') }}" aria-label="Mehr">
+                    <span class="mobile-profile-avatar">{{ (g.user.display_name or g.user.username)[0]|upper }}</span>
+                </a>
             {% endif %}
         </header>
 
@@ -51,5 +70,30 @@
             {% block content %}{% endblock %}
         </main>
     </div>
+
+    {% if g.user %}
+        <nav class="mobile-bottom-nav" aria-label="Mobile Navigation">
+            <a href="{{ url_for('main.dashboard') }}" class="{{ 'active' if request.endpoint == 'main.dashboard' else '' }}">
+                <span class="ui-icon icon-sparkles"></span>
+                <span>Heute</span>
+            </a>
+            <a href="{{ url_for('main.shopping_list') }}" class="{{ 'active' if request.endpoint == 'main.shopping_list' else '' }}">
+                <span class="ui-icon icon-cart-shopping"></span>
+                <span>Einkauf</span>
+            </a>
+            <a href="{{ url_for('main.planner_day', date=today.isoformat()) }}" class="{{ 'active' if request.endpoint == 'main.planner_day' else '' }}">
+                <span class="ui-icon icon-calendar"></span>
+                <span>Plan</span>
+            </a>
+            <a href="{{ url_for('main.home_view') }}" class="{{ 'active' if request.endpoint == 'main.home_view' else '' }}">
+                <span class="ui-icon icon-house"></span>
+                <span>Zuhause</span>
+            </a>
+            <a href="{{ url_for('main.more_view') }}" class="{{ 'active' if request.endpoint == 'main.more_view' or request.endpoint == 'auth.profile' or (request.endpoint or '').startswith('admin.') else '' }}">
+                <span class="ui-icon icon-archive"></span>
+                <span>Mehr</span>
+            </a>
+        </nav>
+    {% endif %}
 </body>
 </html>

nouri/templates/dashboard.html

@@ -4,11 +4,11 @@
 <section class="hero">
     <div>
         <p class="eyebrow">Heute</p>
-        <h1>Ein ruhiger Blick auf das, was gerade hilft</h1>
+        <h1>Ein ruhiger Blick auf euren Alltag</h1>
-        <p class="lead">Du siehst auf einen Blick, was zuhause da ist, was noch eingekauft werden soll und was heute schon eingeplant ist.</p>
+        <p class="lead">Du siehst schnell, was zuhause da ist, was schon geplant wurde und was gemeinsam oder persönlich vorbereitet ist.</p>
     </div>
     <div class="hero-actions">
-        <a class="button secondary" href="{{ url_for('main.item_create', kind='food') }}">Lebensmittel anlegen</a>
+        <a class="button" href="{{ url_for('main.planner_day', date=today.isoformat()) }}">Heutigen Tagesplan öffnen</a>
         <a class="button secondary" href="{{ url_for('main.item_create', kind='meal') }}">Mahlzeitenidee anlegen</a>
     </div>
 </section>
@@ -17,7 +17,7 @@
     <article class="stat-card">
         <span>Zuhause</span>
         <strong>{{ home_count }}</strong>
-        <small>sichtbare Eintraege</small>
+        <small>sichtbare Einträge</small>
     </article>
     <article class="stat-card">
         <span>Einkaufsliste</span>
@@ -35,19 +35,28 @@
     <article class="panel">
         <div class="panel-head">
             <h2>Heute im Plan</h2>
-            <a href="{{ url_for('main.planner') }}">Wochenplan oeffnen</a>
+            <a href="{{ url_for('main.planner_day', date=today.isoformat()) }}">Zum Tagesplan</a>
         </div>
         {% if today_entries %}
             <ul class="simple-list">
                 {% for entry in today_entries %}
-                    <li>
+                    <li class="stacked-mobile">
+                        <div>
                             <strong>{{ entry.daypart_name }}</strong>
                             <span>{{ entry.item_name }}</span>
+                            <div class="chip-row">
+                                <span class="chip">{{ entry.visibility_label }}</span>
+                                <span class="chip status-soft">{{ entry.owner_label }}</span>
+                            </div>
+                        </div>
+                        {% if entry.availability_state == 'home' %}
+                            <span class="status-pill status-home">zuhause</span>
+                        {% endif %}
                     </li>
                 {% endfor %}
             </ul>
         {% else %}
-            <p class="empty-state">Fuer heute ist noch nichts fest eingeplant. Das ist vollkommen okay.</p>
+            <p class="empty-state">Für heute ist noch nichts fest eingeplant. Ein kleiner Anfang reicht völlig.</p>
         {% endif %}
     </article>
 
@@ -62,7 +71,8 @@
                     <article class="mini-card">
                         <div class="mini-card-body">
                             <strong>{{ item.name }}</strong>
-                            <small>{{ item_kind_labels[item.kind] }}</small>
+                            <small>{{ item_kind_labels[item.kind] }} · {{ item.visibility_label }}</small>
+                            <small>{{ item.owner_label }}</small>
                             {% if item.dayparts %}
                                 <div class="chip-row">
                                     {% for daypart in item.dayparts %}
@@ -79,4 +89,25 @@
         {% endif %}
     </article>
 </section>
+
+<section class="panel">
+    <div class="panel-head">
+        <h2>Nächste Tage</h2>
+        <a href="{{ url_for('main.planner') }}">Wochenansicht öffnen</a>
+    </div>
+    <div class="week-mini-grid">
+        {% for card in week_cards %}
+            <a class="week-mini-card" href="{{ url_for('main.planner_day', date=card.date.isoformat()) }}">
+                <strong>{{ weekday_short_name(card.date) }} {{ card.date.strftime('%d.%m.') }}</strong>
+                {% if card.filled_dayparts %}
+                    <span>{{ card.planned_count }} Einträge</span>
+                    <small>{{ card.filled_dayparts | map(attribute='name') | join(', ') }}</small>
+                {% else %}
+                    <span>Noch frei</span>
+                    <small>sanfter Einstieg für den Tag</small>
+                {% endif %}
+            </a>
+        {% endfor %}
+    </div>
+</section>
 {% endblock %}

nouri/templates/home/list.html

@@ -5,20 +5,50 @@
     <div>
         <p class="eyebrow">Zuhause</p>
         <h1>Was aktuell da ist</h1>
-        <p class="lead">Sichtbar, ruhig und nach Tageszeiten sortiert. Wenn etwas aufgebraucht ist, wandert es nicht weg, sondern ins Archiv.</p>
+        <p class="lead">Sichtbar, ruhig und nach Tageszeiten sortiert. Wenn etwas aufgebraucht ist, bleibt es später im Archiv greifbar.</p>
     </div>
 </section>
 
-{% if grouped %}
+<section class="panel compact-form-panel">
+    <form method="get" class="filter-form">
+        <label class="wide">
+            Suche
+            <input type="text" name="q" value="{{ query }}" placeholder="Nach Namen suchen">
+        </label>
+        <label>
+            Sichtbarkeit
+            <select name="visibility">
+                {% for value, label in visibility_options %}
+                    <option value="{{ value }}" {% if selected_visibility == value %}selected{% endif %}>{{ label }}</option>
+                {% endfor %}
+            </select>
+        </label>
+        <label>
+            Tageszeit
+            <select name="daypart_id">
+                <option value="">Alle Tageszeiten</option>
+                {% for daypart in dayparts %}
+                    <option value="{{ daypart.id }}" {% if selected_daypart_id == daypart.id %}selected{% endif %}>{{ daypart.name }}</option>
+                {% endfor %}
+            </select>
+        </label>
+        <div class="filter-actions">
+            <button type="submit">Filtern</button>
+            <a class="ghost-button" href="{{ url_for('main.home_view') }}">Zurücksetzen</a>
+        </div>
+    </form>
+</section>
+
+{% if sections %}
     <section class="stack-sections">
-        {% for title, items in grouped.items() %}
+        {% for section in sections if section["items"] %}
             <article class="panel">
                 <div class="panel-head">
-                    <h2>{{ title }}</h2>
+                    <h2>{{ section["title"] }}</h2>
-                    <span>{{ items|length }} Eintraege</span>
+                    <span>{{ section["items"]|length }} Einträge</span>
                 </div>
                 <div class="card-grid">
-                    {% for item in items %}
+                    {% for item in section["items"] %}
                         <article class="item-card compact">
                             <div class="item-media">
                                 {% if item.photo_filename %}
@@ -29,16 +59,23 @@
                             </div>
                             <div class="item-body">
                                 <h3>{{ item.name }}</h3>
+                                <div class="chip-row">
+                                    <span class="chip">{{ item.visibility_label }}</span>
+                                    <span class="chip status-soft">{{ item.owner_label }}</span>
+                                </div>
                                 <p class="muted">{{ item_kind_labels[item.kind] }}{% if item.category %} · {{ item.category }}{% endif %}</p>
                                 {% if item.components %}
                                     <p class="muted">Mit: {{ item.components|join(', ') }}</p>
                                 {% endif %}
                             </div>
                             <div class="item-actions">
+                                <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>
+                                {% 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">Verbraucht / nicht mehr da</button>
                                     </form>
+                                {% endif %}
                                 <form method="post" action="{{ url_for('main.item_add_to_shopping', item_id=item.id) }}">
                                     {{ csrf_input() }}
                                     <button type="submit">Erneut einkaufen</button>

nouri/templates/items/form.html

@@ -5,8 +5,14 @@
     <div>
         <p class="eyebrow">{{ item_kind_labels[kind] }}</p>
         <h1>{% if item %}{{ item.name }} bearbeiten{% else %}Neue{% endif %} {{ item_kind_singular_labels[kind] }}</h1>
-        <p class="lead">Nur das Nötigste: Name, Bild, Tageszeiten und eine kleine Notiz, wenn sie hilft.</p>
+        <p class="lead">Nur das Nötigste: Name, Sichtbarkeit, Bild, Tageszeiten und eine kleine Notiz, wenn sie hilft.</p>
     </div>
+    {% if item %}
+        <div class="intro-pills">
+            <span class="status-pill">{{ item.visibility_label }}</span>
+            <span class="status-pill status-soft">{{ item.owner_label }}</span>
+        </div>
+    {% endif %}
 </section>
 
 <section class="panel form-panel">
@@ -18,13 +24,26 @@
         </label>
 
         <label>
-            Kategorie
+            Sichtbarkeit
-            <input type="text" name="category" list="category-list" value="{{ form_data.category }}" placeholder="z. B. Obst, Warmes, Snack">
+            <select name="visibility">
-            <datalist id="category-list">
+                {% for value, label in visibility_options %}
-                {% for category in categories %}
+                    <option value="{{ value }}" {% if form_data.visibility == value %}selected{% endif %}>{{ label }}</option>
-                    <option value="{{ category }}"></option>
                 {% endfor %}
-            </datalist>
+            </select>
+            <small class="helper-text">{{ visibility_descriptions[form_data.visibility] }}</small>
+        </label>
+
+        <label>
+            Kategorie
+            <select name="category">
+                <option value="">Ohne Kategorie</option>
+                {% for category in categories %}
+                    <option value="{{ category }}" {% if form_data.category == category %}selected{% endif %}>{{ category }}</option>
+                {% endfor %}
+                {% if form_data.category and form_data.category not in categories %}
+                    <option value="{{ form_data.category }}" selected>{{ form_data.category }}</option>
+                {% endif %}
+            </select>
         </label>
 
         <label>
@@ -58,20 +77,64 @@
         {% if kind == 'meal' %}
             <fieldset>
                 <legend>Bestandteile der Mahlzeitenidee</legend>
+                <p class="muted">Optional: Du kannst eine Mahlzeit frei als Idee anlegen oder sie aus sichtbaren Lebensmitteln zusammenklicken.</p>
+                {% if food_groups %}
+                    <div class="stack-sections">
+                        {% for group in food_groups %}
+                            <div class="component-group">
+                                <div class="panel-head">
+                                    <h3>{{ group["title"] }}</h3>
+                                    <span>{{ group["items"]|length }} Einträge</span>
+                                </div>
                                 <div class="checkbox-grid">
-                    {% for food in foods %}
+                                    {% for food in group["items"] %}
                                         <label class="check-option">
                                             <input type="checkbox" name="component_ids" value="{{ food.id }}" {% if food.id in form_data.component_ids %}checked{% endif %}>
-                            <span>{{ food.name }}</span>
+                                            <span>{{ food.name }} · {{ food.visibility_label }}</span>
                                         </label>
                                     {% endfor %}
                                 </div>
+                            </div>
+                        {% endfor %}
+                    </div>
+                {% else %}
+                    <p class="empty-state">Lege zuerst ein paar Lebensmittel an, damit du daraus Mahlzeitenideen bauen kannst.</p>
+                {% endif %}
+                <div class="quick-food-panel">
+                    <div class="panel-head">
+                        <h3>Neues Lebensmittel direkt anlegen</h3>
+                        <span>ohne die Seite zu verlassen</span>
+                    </div>
+                    <div class="quick-food-grid">
+                        <label>
+                            Name
+                            <input type="text" name="quick_food_name" value="{{ form_data.quick_food_name }}" placeholder="z. B. Hüttenkäse">
+                        </label>
+                        <label>
+                            Kategorie
+                            <select name="quick_food_category">
+                                <option value="">Ohne Kategorie</option>
+                                {% for category in categories %}
+                                    <option value="{{ category }}" {% if form_data.quick_food_category == category %}selected{% endif %}>{{ category }}</option>
+                                {% endfor %}
+                                {% if form_data.quick_food_category and form_data.quick_food_category not in categories %}
+                                    <option value="{{ form_data.quick_food_category }}" selected>{{ form_data.quick_food_category }}</option>
+                                {% endif %}
+                            </select>
+                        </label>
+                        <label class="wide">
+                            Notiz
+                            <input type="text" name="quick_food_note" value="{{ form_data.quick_food_note }}" placeholder="Optional">
+                        </label>
+                        <button type="submit" name="form_action" value="quick_add_food" class="secondary">Lebensmittel anlegen und übernehmen</button>
+                    </div>
+                </div>
             </fieldset>
         {% endif %}
 
         <div class="form-actions">
-            <button type="submit">Speichern</button>
+            <button type="submit" name="form_action" value="save_item">Speichern</button>
-            <a class="ghost-button" href="{{ url_for('main.item_list', kind=kind) }}">Zurueck</a>
+            <a class="ghost-button" href="{{ url_for('main.item_list', kind=kind) }}">Zurück</a>
         </div>
     </form>
 </section>

nouri/templates/items/list.html

@@ -5,11 +5,49 @@
     <div>
         <p class="eyebrow">{{ item_kind_labels[kind] }}</p>
         <h1>{{ item_kind_labels[kind] }}</h1>
-        <p class="lead">Schnell gepflegte Eintraege mit Foto, Tageszeiten und einem ruhigen Status zwischen Idee, Zuhause und Archiv.</p>
+        <p class="lead">Gemeinsame und persönliche Ideen bleiben hier ruhig sortiert und schnell wiederverwendbar.</p>
     </div>
     <a class="button" href="{{ url_for('main.item_create', kind=kind) }}">Neu anlegen</a>
 </section>
 
+<section class="panel compact-form-panel">
+    <form method="get" class="filter-form">
+        <label class="wide">
+            Suche
+            <input type="text" name="q" value="{{ query }}" placeholder="Nach Namen suchen">
+        </label>
+        <label>
+            Status
+            <select name="state">
+                {% for value, label in state_options %}
+                    <option value="{{ value }}" {% if selected_state == value %}selected{% endif %}>{{ label }}</option>
+                {% endfor %}
+            </select>
+        </label>
+        <label>
+            Sichtbarkeit
+            <select name="visibility">
+                {% for value, label in visibility_options %}
+                    <option value="{{ value }}" {% if selected_visibility == value %}selected{% endif %}>{{ label }}</option>
+                {% endfor %}
+            </select>
+        </label>
+        <label>
+            Tageszeit
+            <select name="daypart_id">
+                <option value="">Alle Tageszeiten</option>
+                {% for daypart in dayparts %}
+                    <option value="{{ daypart.id }}" {% if selected_daypart_id == daypart.id %}selected{% endif %}>{{ daypart.name }}</option>
+                {% endfor %}
+            </select>
+        </label>
+        <div class="filter-actions">
+            <button type="submit">Filtern</button>
+            <a class="ghost-button" href="{{ url_for('main.item_list', kind=kind) }}">Zurücksetzen</a>
+        </div>
+    </form>
+</section>
+
 {% if items %}
     <section class="card-grid">
         {% for item in items %}
@@ -26,10 +64,13 @@
                         <h2>{{ item.name }}</h2>
                         <span class="status-pill status-{{ item.availability_state }}">{{ availability_labels[item.availability_state] }}</span>
                     </div>
+                    <div class="chip-row">
+                        <span class="chip">{{ item.visibility_label }}</span>
+                        <span class="chip status-soft">{{ item.owner_label }}</span>
+                    </div>
                     <p class="muted">
                         {% if item.category %}{{ item.category }}{% else %}ohne Kategorie{% endif %}
-                        ·
+                        · {{ item_kind_labels[item.kind] }}
-                        {{ item_kind_labels[item.kind] }}
                     </p>
                     {% if item.dayparts %}
                         <div class="chip-row">
@@ -46,18 +87,21 @@
                     {% 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' %}
+                    {% if item.availability_state != 'home' and item.can_edit %}
                         <form method="post" action="{{ url_for('main.item_set_home', item_id=item.id) }}">
                             {{ csrf_input() }}
                             <button class="secondary" type="submit">Als Zuhause markieren</button>
                         </form>
                     {% endif %}
-                    {% if item.availability_state != 'archived' %}
+                    {% 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>
@@ -69,9 +113,9 @@
     </section>
 {% else %}
     <section class="panel empty-panel">
-        <h2>Noch keine Eintraege</h2>
+        <h2>Keine passenden Einträge</h2>
-        <p>Der schnellste Start ist ein erstes vertrautes Lebensmittel oder eine einfache Mahlzeitenidee.</p>
+        <p>Mit einer kleinen Suche oder einem anderen Filter findest du meist schnell wieder das Richtige.</p>
-        <a class="button" href="{{ url_for('main.item_create', kind=kind) }}">Ersten Eintrag anlegen</a>
+        <a class="button" href="{{ url_for('main.item_create', kind=kind) }}">Neuen Eintrag anlegen</a>
     </section>
 {% endif %}
 {% endblock %}

nouri/templates/more.html

@@ -0,0 +1,56 @@
+{% extends "base.html" %}
+{% block title %}Mehr | Nouri{% endblock %}
+{% block content %}
+<section class="page-intro">
+    <div>
+        <p class="eyebrow">Mehr</p>
+        <h1>Alles Weitere auf einen Blick</h1>
+        <p class="lead">Hier liegen die ruhigeren Nebenwege: Lebensmittel, Mahlzeiten, Woche, Profil und die kleinen Einstellungen.</p>
+    </div>
+    <div class="intro-pills">
+        <span class="status-pill">{{ g.user.display_name or g.user.username }}</span>
+        <span class="status-pill status-soft">{{ role_labels[g.user.role] }}</span>
+    </div>
+</section>
+
+<section class="panel">
+    <div class="more-link-grid">
+        <a class="more-link-card" href="{{ url_for('main.item_list', kind='food') }}">
+            <strong>Lebensmittel</strong>
+            <small>Persönliche und gemeinsame Einträge ansehen</small>
+        </a>
+        <a class="more-link-card" href="{{ url_for('main.item_list', kind='meal') }}">
+            <strong>Mahlzeiten</strong>
+            <small>Mahlzeitenideen sammeln und wiederverwenden</small>
+        </a>
+        <a class="more-link-card" href="{{ url_for('main.planner') }}">
+            <strong>Woche</strong>
+            <small>Die nächsten sieben Tage im Blick behalten</small>
+        </a>
+        <a class="more-link-card" href="{{ url_for('main.archive_view') }}">
+            <strong>Archiv</strong>
+            <small>Vertraute Dinge leicht wiederfinden</small>
+        </a>
+        <a class="more-link-card" href="{{ url_for('auth.profile') }}">
+            <strong>Mein Profil</strong>
+            <small>Zugang, Name und Passwort pflegen</small>
+        </a>
+        {% if g.user.role == 'admin' %}
+            <a class="more-link-card" href="{{ url_for('admin.user_list') }}">
+                <strong>Nutzer verwalten</strong>
+                <small>Weitere Haushaltsmitglieder verwalten</small>
+            </a>
+        {% endif %}
+    </div>
+</section>
+
+<section class="panel">
+    <div class="more-actions">
+        <button class="ghost-button" type="button" data-theme-toggle>Modus wechseln</button>
+        <form method="post" action="{{ url_for('auth.logout') }}">
+            {{ csrf_input() }}
+            <button class="ghost-button" type="submit">Abmelden</button>
+        </form>
+    </div>
+</section>
+{% endblock %}

nouri/templates/planner/day.html

@@ -0,0 +1,119 @@
+{% extends "base.html" %}
+{% block title %}Tagesplan | Nouri{% endblock %}
+{% block content %}
+<section class="page-intro">
+    <div>
+        <p class="eyebrow">Tagesplan</p>
+        <h1>{{ weekday_name(selected_date) }}, {{ selected_date.strftime('%d.%m.%Y') }}</h1>
+        <p class="lead">Der Tagesplan bleibt bewusst ruhig. Jede Tageszeit ist eine eigene Kachel und öffnet sich erst, wenn du sie brauchst.</p>
+    </div>
+    <div class="week-nav">
+        <a class="ghost-button" href="{{ url_for('main.planner_day', date=previous_day.isoformat()) }}">Vorheriger Tag</a>
+        <a class="ghost-button" href="{{ url_for('main.planner') }}">Zur Woche</a>
+        <a class="ghost-button" href="{{ url_for('main.planner_day', date=next_day.isoformat()) }}">Nächster Tag</a>
+    </div>
+</section>
+
+<section class="planner-day-stack">
+    {% for section in sections %}
+        <details class="day-tile" id="daypart-{{ section.daypart.id }}" {% if section.is_open %}open{% endif %}>
+            <summary class="day-tile-summary">
+                <div class="day-tile-summary-main">
+                    <div class="day-tile-icon"><span class="ui-icon icon-calendar"></span></div>
+                    <div>
+                        <h2>{{ section.daypart.name }}</h2>
+                        {% if section.summary_items %}
+                            <p class="muted">{{ section.summary_items|join(', ') }}</p>
+                        {% else %}
+                            <p class="muted">Noch frei. Öffnen, wenn du etwas ergänzen möchtest.</p>
+                        {% endif %}
+                    </div>
+                </div>
+                <span class="status-pill">{{ section.entries|length }} geplant</span>
+            </summary>
+
+            <div class="day-tile-body">
+                {% if section.quick_items %}
+                    <div class="quick-add-row">
+                        {% for item in section.quick_items %}
+                            <form method="post" action="{{ url_for('main.planner_day', date=selected_date.isoformat()) }}">
+                                {{ csrf_input() }}
+                                <input type="hidden" name="plan_date" value="{{ selected_date.isoformat() }}">
+                                <input type="hidden" name="daypart_id" value="{{ section.daypart.id }}">
+                                <input type="hidden" name="item_id" value="{{ item.id }}">
+                                <input type="hidden" name="visibility" value="{{ item.visibility }}">
+                                <button class="quick-add-button" type="submit">
+                                    <span>{{ item.name }}</span>
+                                    <small>{{ item_kind_labels[item.kind] }} · {{ item.visibility_label }}{% if item.availability_state == 'home' %} · zuhause{% endif %}</small>
+                                </button>
+                            </form>
+                        {% endfor %}
+                    </div>
+                {% endif %}
+
+                <form method="post" class="planner-entry-form planner-entry-form-wide">
+                    {{ csrf_input() }}
+                    <input type="hidden" name="plan_date" value="{{ selected_date.isoformat() }}">
+                    <input type="hidden" name="daypart_id" value="{{ section.daypart.id }}">
+                    <label class="wide">
+                        Eintrag hinzufügen
+                        <select name="item_id">
+                            <option value="">Etwas für {{ section.daypart.name }} wählen</option>
+                            {% for item in section.candidates %}
+                                <option value="{{ item.id }}" {% if section.selected_item_id == item.id %}selected{% endif %}>
+                                    {{ item.name }} · {{ item_kind_labels[item.kind] }} · {{ item.visibility_label }}{% if item.availability_state == 'home' %} · zuhause{% endif %}{% if item.dayparts and section.daypart.name not in item.dayparts %} · auch flexibel{% endif %}
+                                </option>
+                            {% endfor %}
+                        </select>
+                    </label>
+                    <label>
+                        Sichtbarkeit
+                        <select name="visibility">
+                            {% for value, label in visibility_options %}
+                                <option value="{{ value }}" {% if section.default_visibility == value %}selected{% endif %}>{{ label }}</option>
+                            {% endfor %}
+                        </select>
+                    </label>
+                    <label class="wide">
+                        Notiz
+                        <input type="text" name="note" placeholder="Optional, wenn eine kleine Erinnerung hilft">
+                    </label>
+                    <button type="submit">Eintragen</button>
+                </form>
+
+                {% if section.entries %}
+                    <div class="planner-entry-list">
+                        {% for entry in section.entries %}
+                            <article class="planner-entry">
+                                <div class="planner-entry-top">
+                                    <div>
+                                        <strong>{{ entry.item_name }}</strong>
+                                        <small>{{ item_kind_labels[entry.item_kind] }}{% if entry.availability_state == 'home' %} · zuhause{% else %} · bei Bedarf auf Einkaufsliste{% endif %}</small>
+                                        <div class="chip-row">
+                                            <span class="chip">{{ entry.visibility_label }}</span>
+                                            <span class="chip status-soft">{{ entry.owner_label }}</span>
+                                        </div>
+                                    </div>
+                                    {% if entry.can_edit %}
+                                        <div class="row-actions">
+                                            <form method="post" action="{{ url_for('main.planner_remove', entry_id=entry.id, date=selected_date.isoformat()) }}">
+                                                {{ csrf_input() }}
+                                                <button class="ghost-button" type="submit">Entfernen</button>
+                                            </form>
+                                        </div>
+                                    {% endif %}
+                                </div>
+                                {% if entry.note %}
+                                    <p>{{ entry.note }}</p>
+                                {% endif %}
+                            </article>
+                        {% endfor %}
+                    </div>
+                {% else %}
+                    <p class="empty-state">Hier ist noch nichts eingetragen. Ein kleiner Anfang reicht völlig.</p>
+                {% endif %}
+            </div>
+        </details>
+    {% endfor %}
+</section>
+{% endblock %}

nouri/templates/planner/week.html

@@ -1,81 +1,71 @@
 {% extends "base.html" %}
-{% block title %}Wochenplan | Nouri{% endblock %}
+{% block title %}Wochenansicht | Nouri{% endblock %}
 {% block content %}
 <section class="page-intro">
     <div>
-        <p class="eyebrow">Wochenplan</p>
+        <p class="eyebrow">Wochenansicht</p>
-        <h1>Struktur fuer die naechsten Tage</h1>
+        <h1>Ein sanfter Blick auf die nächsten sieben Tage</h1>
-        <p class="lead">Der Plan bleibt bewusst leichtgewichtig. Vorhandene Dinge tauchen in der Auswahl zuerst auf.</p>
+        <p class="lead">Du kannst bestehende Einträge zwischen Tagen und Tageszeiten verschieben. Wenn etwas noch nicht zuhause ist, landet es dabei automatisch auf der Einkaufsliste.</p>
     </div>
     <div class="week-nav">
         <a class="ghost-button" href="{{ url_for('main.planner', week=prev_week.isoformat()) }}">Vorige Woche</a>
-        <span>{{ days[0].strftime('%d.%m.') }} bis {{ days[-1].strftime('%d.%m.%Y') }}</span>
+        <span>{{ week_start.strftime('%d.%m.%Y') }} bis {{ week_end.strftime('%d.%m.%Y') }}</span>
-        <a class="ghost-button" href="{{ url_for('main.planner', week=next_week.isoformat()) }}">Naechste Woche</a>
+        <a class="ghost-button" href="{{ url_for('main.planner', week=next_week.isoformat()) }}">Nächste Woche</a>
     </div>
 </section>
 
-<section class="panel compact-form-panel">
+<section class="week-overview-grid week-board" data-csrf-token="{{ csrf_token_value }}">
-    <form method="post" class="planner-form">
+    {% for card in week_cards %}
-        {{ csrf_input() }}
+        <article class="week-card">
-        <label>
+            <div class="week-card-head">
-            Tag
+                <div>
-            <input type="date" name="plan_date" value="{{ days[0].isoformat() }}">
+                    <p class="eyebrow">{{ weekday_name(card.date) }}</p>
-        </label>
+                    <h2>{{ card.date.strftime('%d.%m.%Y') }}</h2>
-        <label>
+                </div>
-            Tageszeit
+                {% if card.date == today %}
-            <select name="daypart_id">
+                    <span class="status-pill status-home">heute</span>
-                {% for daypart in dayparts %}
-                    <option value="{{ daypart.id }}">{{ daypart.name }}</option>
-                {% endfor %}
-            </select>
-        </label>
-        <label class="wide">
-            Eintrag
-            <select name="item_id">
-                <option value="">Etwas fuer den Plan waehlen</option>
-                {% for item in selectable_items %}
-                    <option value="{{ item.id }}">{{ item.name }} · {{ item_kind_labels[item.kind] }}{% if item.availability_state == 'home' %} · zuhause{% endif %}</option>
-                {% endfor %}
-            </select>
-        </label>
-        <label class="wide">
-            Notiz
-            <input type="text" name="note" placeholder="Optional, z. B. zuerst einkaufen">
-        </label>
-        <button type="submit">In den Plan legen</button>
-    </form>
-</section>
-
-<section class="planner-grid">
-    {% for daypart in dayparts %}
-        <div class="planner-row">
-            <div class="planner-label">{{ daypart.name }}</div>
-            {% for day in days %}
-                <div class="planner-cell">
-                    <div class="planner-date">{{ day.strftime('%a %d.%m.') }}</div>
-                    {% set slot_entries = entries.get((day.isoformat(), daypart.id), []) %}
-                    {% if slot_entries %}
-                        <div class="planner-entry-stack">
-                            {% for entry in slot_entries %}
-                                <article class="planner-entry">
-                                    <strong>{{ entry.item_name }}</strong>
-                                    <small>{{ item_kind_labels[entry.item_kind] }}</small>
-                                    {% if entry.note %}
-                                        <p>{{ entry.note }}</p>
                 {% endif %}
-                                    <form method="post" action="{{ url_for('main.planner_remove', entry_id=entry.id, week=week_start.isoformat()) }}">
+            </div>
-                                        {{ csrf_input() }}
+
-                                        <button class="ghost-button" type="submit">Entfernen</button>
+            {% if card.filled_dayparts %}
-                                    </form>
+                <p class="week-card-count">{{ card.planned_count }} Einträge</p>
+                <div class="chip-row">
+                    {% for slot in card.filled_dayparts %}
+                        <span class="chip">{{ slot.name }} · {{ slot.count }}</span>
+                    {% endfor %}
+                </div>
+                <p class="muted">{{ card.preview_items | join(', ') }}</p>
+            {% else %}
+                <p class="empty-state">Noch offen. Du kannst den Tag ganz leicht nach und nach füllen.</p>
+            {% endif %}
+
+            <div class="week-slot-stack">
+                {% for slot in card.slots %}
+                    <div class="week-slot drop-slot" data-target-date="{{ card.date.isoformat() }}" data-target-daypart-id="{{ slot.daypart.id }}">
+                        <div class="week-slot-head">
+                            <strong>{{ slot.daypart.name }}</strong>
+                            <span>{{ slot.entries|length }}</span>
+                        </div>
+                        {% if slot.entries %}
+                            <div class="week-entry-stack">
+                                {% for entry in slot.entries %}
+                                    <article class="plan-chip draggable-plan-entry" draggable="{{ 'true' if entry.can_edit else 'false' }}" data-entry-id="{{ entry.id }}" data-move-url="{{ url_for('main.planner_move', entry_id=entry.id) }}">
+                                        <strong>{{ entry.item_name }}</strong>
+                                        <small>{{ entry.visibility_label }} · {{ entry.owner_label }}</small>
                                     </article>
                                 {% endfor %}
                             </div>
                         {% else %}
-                        <p class="empty-slot">frei</p>
+                            <p class="week-slot-empty">Hierher ziehen</p>
                         {% endif %}
                     </div>
                 {% endfor %}
             </div>
+
+            <div class="week-card-actions">
+                <a class="button" href="{{ url_for('main.planner_day', date=card.date.isoformat()) }}">Tagesplan öffnen</a>
+            </div>
+        </article>
     {% endfor %}
 </section>
 {% endblock %}

nouri/templates/shopping/list.html

@@ -5,7 +5,7 @@
     <div>
         <p class="eyebrow">Einkaufsliste</p>
         <h1>Was noch mitkommen soll</h1>
-        <p class="lead">Abhaken legt Dinge automatisch unter Zuhause ab. So wird aus der Liste direkt sichtbarer Vorrat.</p>
+        <p class="lead">Abhaken legt Dinge automatisch unter Zuhause ab. Gemeinsame und persönliche Einträge bleiben dabei klar erkennbar.</p>
     </div>
 </section>
 
@@ -13,9 +13,12 @@
     <form method="post" class="inline-form">
         {{ csrf_input() }}
         <select name="item_id">
-            <option value="">Bestehenden Eintrag hinzufuegen</option>
+            <option value="">Bestehenden Eintrag hinzufügen</option>
             {% for item in addable_items %}
-                <option value="{{ item.id }}">{{ item.name }} · {{ item_kind_labels[item.kind] }}{% if item.availability_state == 'home' %} · zuhause{% endif %}</option>
+                <option value="{{ item.id }}">
+                    {{ item.name }} · {{ item_kind_labels[item.kind] }} · {{ item.visibility_label }}
+                    {% if item.availability_state == 'home' %} · zuhause{% endif %}
+                </option>
             {% endfor %}
         </select>
         <button type="submit">Auf Liste setzen</button>
@@ -25,20 +28,26 @@
 {% if entries %}
     <section class="stack-list">
         {% for entry in entries %}
-            <article class="list-row">
+            <article class="list-row stacked-mobile">
                 <div>
                     <strong>{{ entry.item_name }}</strong>
-                    <p class="muted">{{ item_kind_labels[entry.item_kind] }}{% if entry.display_name or entry.username %} · hinzugefuegt von {{ entry.display_name or entry.username }}{% endif %}</p>
+                    <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>
+                    </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) }}">
                             {{ csrf_input() }}
                             <button class="ghost-button" type="submit">Entfernen</button>
                         </form>
+                    {% endif %}
                 </div>
             </article>
         {% endfor %}
@@ -46,7 +55,7 @@
 {% else %}
     <section class="panel empty-panel">
         <h2>Die Liste ist gerade frei</h2>
-        <p>Eintraege aus Lebensmitteln, Mahlzeitenideen oder dem Archiv lassen sich jederzeit wieder hinzufuegen.</p>
+        <p>Einträge aus Lebensmitteln, Mahlzeitenideen oder dem Archiv lassen sich jederzeit wieder hinzufügen.</p>
     </section>
 {% endif %}
 {% endblock %}

requirements.txt

@@ -1 +1,2 @@
 Flask==3.1.1
+gunicorn==23.0.0

start.sh

@@ -0,0 +1,14 @@
+#!/bin/sh
+set -eu
+
+export NOURI_DATA_DIR="${NOURI_DATA_DIR:-/app/data}"
+mkdir -p "${NOURI_DATA_DIR}"
+touch "${NOURI_DATA_DIR}/nouri.sqlite3"
+mkdir -p "${NOURI_DATA_DIR}/uploads"
+
+exec gunicorn \
+  --bind 0.0.0.0:8000 \
+  --workers 2 \
+  --threads 4 \
+  --timeout 60 \
+  wsgi:app