Release 1.2.1 with mobile theme and icon polish

CloudronManifest.json

@@ -4,8 +4,8 @@
   "author": "Florian Heinz",
   "description": "Private Flask app for meals, shopping and gentle food planning",
   "tagline": "einfach essen planen",
-  "version": "0.5.1",
+  "version": "1.2.1",
-  "upstreamVersion": "0.5.1",
+  "upstreamVersion": "1.2.1",
   "healthCheckPath": "/",
   "httpPort": 8000,
   "manifestVersion": 2,

README.md

@@ -2,7 +2,7 @@
 
 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.5
+## Merkmale in Version 1.0.0
 
 - Lebensmittel und Mahlzeitenideen anlegen
 - Fotos lokal hochladen
@@ -22,12 +22,8 @@ Nouri ist eine kleine private Flask-App für einen Haushalt, um Essensideen, Ein
 - ruhige Hinweise und Vorschläge aus Zuhause, Archiv und bisherigen Planungen
 - globale Kategorien pro Haushalt
 - „Für wen?“ direkt an Lebensmitteln und Mahlzeiten
-- Mobile-Mehr-Menü als Sheet statt eigener Seite
 - Einkaufsrhythmus mit geplantem Einkaufstag und später aktivierten Bedarfen
-- ausgewogene Ergänzungsvorschläge auf Basis ruhiger Bausteine
+- PWA-Grundlage mit Web App Manifest, Service Worker und optionalem Web Push
-- einfache Kombinations- und Rezeptideen aus zuhause vorhandenen Lebensmitteln
-- Optionen für Erinnerungen, Hinweise und kleine Routinen
-- PWA-Vorbereitung mit Web App Manifest, Service Worker und optionalem Web Push
 
 ## Lokal starten
 
@@ -47,28 +43,104 @@ Die App legt Daten standardmäßig unter `./data` ab.
 Wichtige Umgebungsvariablen:
 
 - `NOURI_SECRET_KEY`: Session-Secret für Produktion
-- `NOURI_DATA_DIR`: Pfad für Datenbank und Uploads, z. B. `/app/data` auf Cloudron
+- `NOURI_DATA_DIR`: Pfad für Datenbank und Uploads, lokal standardmäßig `./data`, auf Cloudron `/app/data`
 - `NOURI_MAX_UPLOAD_MB`: maximales Upload-Limit in MB, Standard `5`
+- `NOURI_SECURE_COOKIES`: bei HTTPS in Produktion auf `1` setzen
+- `NOURI_TIMEZONE`: lokale Zeitzone, z. B. `Europe/Berlin`
 - `NOURI_VAPID_PUBLIC_KEY`: öffentlicher VAPID-Schlüssel für Web Push
 - `NOURI_VAPID_PRIVATE_KEY`: privater VAPID-Schlüssel für Web Push
 - `NOURI_VAPID_SUBJECT`: Kontaktangabe für Web Push, z. B. `mailto:mail@hnz.io`
 
-## Migration von 0.4 auf 0.5
+## Migration und Datenhaltung
 
-Beim Start erweitert Nouri das Schema pragmatisch direkt in SQLite weiter: Einkaufsrhythmus, vorgemerkte Bedarfe, Nutzer-Einstellungen, Push-Registrierungen und Baustein-Zuordnungen für Kategorien werden ergänzt. Vorhandene 0.4-Daten bleiben erhalten und werden weiterverwendet.
+Beim Start erweitert Nouri das SQLite-Schema pragmatisch direkt weiter. Vorhandene Daten bleiben dabei erhalten und werden weiterverwendet.
 
-## Cloudron-Hinweis
+Wichtig für die Trennung zwischen lokal und Produktion:
-
-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
+- `data/` ist nicht für Git oder das Paket gedacht
-- `/app/data` ist auf Cloudron persistent und bleibt bei App-Updates erhalten
+- produktive Daten unter `/app/data` bleiben bei 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.
+## Cloudron
+
+Nouri ist so vorbereitet, dass Code und persistente Daten sauber getrennt bleiben:
+
+- Code liegt im Container unter `/app/code`
+- persistente Daten liegen unter `/app/data`
+- Datenbank und Uploads werden nicht aus dem lokalen `./data` nach Produktion übernommen
+- Updates ersetzen den Code, aber nicht die produktiven Inhalte in `/app/data`
+
+### Neu installieren
+
+1. Paket oder Image bauen und nach Cloudron hochladen.
+2. Die App einmal per Cloudron installieren.
+3. Nach dem ersten Start Nouri öffnen.
+4. Den ersten Haushalt-Zugang unter `/auth/setup` anlegen.
+5. Danach Push, Erinnerungen und Einkaufstag in den Optionen einrichten.
+
+### Bestehende Installation aktualisieren
+
+Wenn Nouri bereits installiert ist, bitte **kein neues `cloudron install`** ausführen.
+Stattdessen die bestehende App aktualisieren, zum Beispiel mit:
+
+```bash
+cloudron update --no-backup --app <deine-app> --server <dein-server> --token <dein-token>
+```
+
+Dabei gilt:
+
+- produktive Daten unter `/app/data` bleiben erhalten
+- lokale Testdaten aus `./data` werden nicht mit hochgeladen
+- die bestehende Installation läuft mit demselben persistenten Datenordner weiter
+
+### Wichtige Cloudron-Variablen
+
+Für eine saubere produktive Installation sind diese Werte sinnvoll:
+
+- `NOURI_DATA_DIR=/app/data`
+- `NOURI_SECURE_COOKIES=1`
+- `NOURI_TIMEZONE=Europe/Berlin`
+- `NOURI_SECRET_KEY=<eigenes-secret>`
+- `NOURI_VAPID_PUBLIC_KEY=<public-key>`
+- `NOURI_VAPID_PRIVATE_KEY=<private-key>`
+- `NOURI_VAPID_SUBJECT=mailto:mail@hnz.io`
+
+## Push einrichten
+
+### 1. VAPID-Schlüssel erzeugen
+
+Die Schritte dafür stehen kompakt in [PUSH_SETUP.md](PUSH_SETUP.md).
+
+### 2. VAPID-Werte in Cloudron setzen
+
+Zum Beispiel so:
+
+```bash
+cloudron env set --app <deine-app> \
+  NOURI_VAPID_PUBLIC_KEY='...' \
+  NOURI_VAPID_PRIVATE_KEY='...' \
+  NOURI_VAPID_SUBJECT='mailto:mail@hnz.io'
+```
+
+Danach die App neu starten:
+
+```bash
+cloudron restart --app <deine-app>
+```
+
+### 3. Push auf dem Gerät aktivieren
+
+1. Nouri im Browser oder auf dem iPhone öffnen.
+2. In `Optionen` auf **Push erlauben** tippen.
+3. Optional eine Test-Mitteilung senden.
+4. Auf dem iPhone Nouri am besten zusätzlich zum Home-Bildschirm hinzufügen.
+
+Wichtig:
+
+- Push funktioniert nur auf Geräten, die sich einmal aktiv registriert haben.
+- Ohne VAPID-Werte bleibt Push bewusst deaktiviert.
+- Die Browser- oder iPhone-Freigabe allein reicht nicht: Hinweise müssen zusätzlich in Nouri eingeschaltet sein.
 
 ## Lizenz
 

RELEASE_NOTES_0.6.0.md

@@ -0,0 +1,57 @@
+# Nouri 0.6.0
+
+Nouri 0.6.0 bringt die App näher an einen stabilen 1.0-Stand. Der Schwerpunkt liegt auf Reife, Alltagstauglichkeit und einem ruhigeren, verlässlicheren Gesamteindruck statt auf großen neuen Kernfunktionen.
+
+## Highlights
+
+### Design und Brand
+
+- Neues Nouri-App-Icon für Header, Favicon und PWA
+- Überarbeitete PWA-Icons inklusive zusätzlicher Größen und maskierbarer Variante
+- Ruhigeres visuelles Finish bei Karten, Fokuszuständen, Setup und leeren Bereichen
+- Mobile Header-Logik bereinigt, damit der obere Bereich auf Smartphones nicht fest mitscrollt
+- Desktop-Navigation wieder klarer als durchlaufende Leiste direkt neben dem Logo
+
+### Bilder und Performance
+
+- Bild-Uploads werden jetzt in mehrere sinnvolle Größen abgeleitet
+- Listen und Formulare nutzen responsive Bildauslieferung statt immer die volle Originalgröße
+- Statische Assets bekommen sauberes Cache-Busting über Versions-URLs
+- Uploads und statische Marken-Assets werden vorsichtig browserfreundlich gecacht
+
+### PWA und iPhone-Nutzung
+
+- Überarbeitetes Web App Manifest
+- Verbesserter Service Worker für eine stabilere App-Shell
+- Kleine Offline-Seite für kurze Verbindungsabbrüche
+- Bessere Einbindung für Homescreen-Nutzung auf iPhones
+
+### Backup und Stabilität
+
+- Admin-Bereich in den Optionen für Backup-Export und Restore
+- Backup als ZIP mit App-Daten und Uploads
+- Restore mit klarer Bestätigung statt versehentlicher Überschreibung
+- Freundlichere Behandlung von zu großen Bild-Uploads
+- Robusterer Umgang mit vorhandenen älteren Datenstrukturen
+- Startet lokal jetzt auch ohne Pillow-Build auf Python 3.14, statt schon beim Import zu scheitern
+
+### Planung und Vorschläge
+
+- Automatische Mahlzeitenvorschläge robuster aufgebaut
+- Bausteinlogik für Protein, Kohlenhydrate und Gemüse verbessert
+- Bestehende Kombinationen werden beim Übernehmen besser wiederverwendet
+- Suche beim Zusammenstellen von Mahlzeiten zeigt nur die drei passendsten Treffer
+- Kategorie-Richtung von „Brot & Getreide“ in Richtung „Kohlenhydrate“ weitergeführt
+
+## Technische Änderungen
+
+- Neue Hilfsmodule für Bildverarbeitung und Backup/Restore
+- App-Metadaten-Tabelle für robustere Schema-Verwaltung vorbereitet
+- Cloudron-Version auf 0.6.0 angehoben
+- Pillow für Bildverarbeitung ergänzt und auf Python 3.14 lokal als optionale Abhängigkeit abgefedert
+
+## Hinweise zum Update
+
+- Nach dem Update kann ein harter Reload im Browser sinnvoll sein, damit neue CSS-, JS- und PWA-Dateien sicher geladen werden.
+- Vor einem Restore empfiehlt sich immer zuerst ein frischer Backup-Export aus der laufenden App.
+- Vorhandene Kategorien und ältere Daten werden beim Start weiter normalisiert, statt hart ersetzt zu werden.

RELEASE_NOTES_1.0.0.md

@@ -0,0 +1,56 @@
+# Nouri 1.0.0
+
+Nouri 1.0.0 fasst die ruhige Alltagsplanung, gemeinsame Nutzung im Haushalt und die ersten echten Push-Erinnerungen in einen stabileren Release-Stand zusammen. Der Fokus dieser Version liegt auf Verlässlichkeit, klareren Vorschlägen und einem saubereren produktiven Betrieb auf Cloudron.
+
+## Highlights
+
+- Vorschläge lassen sich jetzt gezielter über drei Modi steuern:
+  - `Eher ausgewogen`
+  - `Fitness`
+  - `Proteinbetont`
+- Lebensmittel können zusätzlich als `Eher leicht`, `Neutral` oder `Eher gehaltvoll` markiert werden.
+- Push-Erinnerungen für fehlendes Frühstück, Mittagessen und Abendessen sind vorbereitet und in den Optionen pro Nutzer schaltbar.
+- Push öffnet direkt den passenden Tagesplan und kann eine schon vorbereitete Mahlzeitenidee mitbringen.
+- Saaten sind in der Kategorien-Logik jetzt separat unter `Passt eher zu` auswählbar.
+
+## Planung und Vorschläge
+
+- Nouri bevorzugt bei Vorschlägen weiterhin zuerst vorhandene Mahlzeitenideen.
+- Wenn noch keine passende Mahlzeitenidee da ist, werden Kombinationen aus den zuhause vorhandenen Lebensmitteln vorgeschlagen.
+- Für `Fitness` werden proteinbetonte und eher leichte Kombinationen bevorzugt.
+- Für `Proteinbetont` werden proteinreiche Kombinationen priorisiert, ohne zusätzlich auf „leicht“ zu ziehen.
+- Im Tagesplan können vorbereitete Vorschläge direkter übernommen werden.
+
+## Erinnerungen und Push
+
+- Neue Push-Schalter in den Optionen:
+  - Frühstück um `08:00`
+  - Mittagessen um `12:00`
+  - Abendessen um `18:00`
+- Die Push-Nachricht enthält nach Möglichkeit direkt einen passenden Vorschlag.
+- Für den Versand wurde ein kleiner Reminder-Worker ergänzt.
+- Push bleibt weiterhin optional und funktioniert nur auf Geräten, die sich aktiv registriert haben.
+
+## Sicherheit und Stabilität
+
+- Passwortprüfung wurde angezogen.
+- Sichere Cookie-Konfiguration für HTTPS ist vorbereitet.
+- Zusätzliche Sicherheitsheader werden gesetzt.
+- Die Schema-Upgrades wurden weitergezogen, damit neue Einstellungen und Reminder-Daten sauber in bestehende Installationen einlaufen.
+
+## Cloudron und Betrieb
+
+- README wurde für Cloudron klarer dokumentiert:
+  - Neuinstallation
+  - Update statt Neuinstallation
+  - persistente Daten unter `/app/data`
+  - wichtige Umgebungsvariablen
+  - VAPID- und Push-Einrichtung
+- Cloudron-Paketversion und App-Version stehen jetzt auf `1.0.0`.
+- Der Service Worker nutzt einen neuen Cache-Namen für den Release-Stand `1.0.0`.
+
+## Upgrade-Hinweis
+
+- Bestehende SQLite-Daten bleiben erhalten.
+- Neue Felder und Tabellen werden beim Start ergänzt.
+- Nach dem Update lohnt sich ein kurzer Blick in `Optionen`, damit Vorschlagsstil, Push und Erinnerungen einmal bewusst gesetzt sind.

RELEASE_NOTES_1.1.1.md

@@ -0,0 +1,53 @@
+# Nouri 1.1.1
+
+Nouri 1.1.1 bündelt die jüngsten Verbesserungen rund um Mahlzeiten-Vorschläge, Plan-Einträge, Push-Erinnerungen und den letzten Feinschliff bei Bezeichnungen und Versionierung. Der Release macht die App im Alltag direkter nutzbar und runder im Verhalten.
+
+## Highlights
+
+- generierte Mahlzeiten lassen sich pro Nutzer dauerhaft ausblenden
+- vorhandene Mahlzeiten mit nur 1 bis 2 fehlenden Zutaten werden jetzt ebenfalls vorgeschlagen
+- einzelne Plan-Einträge können nachträglich für `Für mich` oder `Gemeinsam` angepasst werden
+- Frühstück-, Mittag- und Abend-Erinnerungen arbeiten zuverlässiger über echte Zeitfenster
+- Begriffe wie `Mahlzeitideen` werden wieder korrekt großgeschrieben
+- App- und Cloudron-Version stehen jetzt auf `1.1.1`
+
+## Neu in 1.1.1
+
+### Mahlzeiten und Vorschläge
+
+- Im Bereich `Was zuhause gut zusammenpasst` werden die Aktionsbuttons wieder korrekt dargestellt.
+- Generierte Mahlzeiten können mit `Dauerhaft ausblenden` pro Nutzer aus den Vorschlägen entfernt werden.
+- Nouri zeigt jetzt nicht nur vollständige Kombinationen aus Zuhause an.
+- Auch vorhandene Mahlzeitenideen mit nur 1 oder 2 fehlenden Lebensmitteln werden vorgeschlagen.
+- Fehlende Dinge werden direkt kenntlich gemacht, zum Beispiel mit `Es fehlt noch: ...`.
+
+### Plan und Tagesansicht
+
+- Ein einzelner Planeintrag kann jetzt im Tagesplan direkt angepasst werden.
+- So lässt sich zum Beispiel ein geplanter Snack nachträglich nur für eine Person setzen, ohne die Grundeinstellungen der Mahlzeit oder des Lebensmittels zu ändern.
+- Die Anzeige `Für mich`, `Für alle` und persönliche Zuordnungen ist in diesem Zusammenhang klarer geworden.
+
+### Push und Erinnerungen
+
+- Die zeitgesteuerten Erinnerungen für fehlendes Frühstück, Mittagessen und Abendessen laufen nicht mehr nur in einem sehr kleinen Zeitfenster.
+- Stattdessen nutzt Nouri jetzt breitere Zeitfenster:
+  - Frühstück ab `08:00`
+  - Mittagessen ab `12:00`
+  - Abendessen ab `18:00`
+- Dadurch greifen die normalen Erinnerungen deutlich zuverlässiger, auch wenn der Reminder-Worker nicht exakt in derselben Minute läuft.
+
+### Oberfläche
+
+- Die automatisch kleingeschriebene Anzeige im Tagesplan wurde korrigiert.
+- Begriffe wie `Mahlzeitideen` erscheinen wieder so, wie sie in der App gedacht sind.
+
+### Versionierung
+
+- `CloudronManifest.json` wurde auf `1.1.1` angehoben.
+- Der interne Versions-Fallback in `nouri/__init__.py` wurde ebenfalls auf `1.1.1` gesetzt.
+- Die Schema-Version in `nouri/db.py` folgt jetzt ebenfalls `1.1.1`.
+
+## Cloudron
+
+- Das Update kann sauber als neue Version ausgerollt werden.
+- Footer, Release-Link und Versionsanzeige greifen damit wieder auf einen konsistenten Stand zu.

RELEASE_NOTES_1.2.0.md

@@ -0,0 +1,60 @@
+# Nouri 1.2.0
+
+Nouri 1.2.0 bündelt die Weiterentwicklung seit 1.1.1 zu einem ruhigeren und alltagstauglicheren Planungs-Release. Der Fokus lag auf weniger Überforderung im Plan, besseren kleinen Erinnerungen und einem sauberen PDF-Export für den Wochenplan.
+
+## Neu in 1.2.0
+
+### Snacks ruhiger im Tages- und Wochenplan
+
+- Hauptmahlzeiten bleiben immer sichtbar.
+- Snack-Bereiche werden nur bei Bedarf eingeblendet.
+- Leere Snack-Slots lassen sich wieder ausblenden.
+- In der Wochenansicht wurden die Snack-Aktionen sprachlich gestrafft:
+  - `Snacks ergänzen`
+  - `Vormittag`
+  - `Nachmittag`
+  - `Abend`
+
+### Bessere visuelle Betonung im Plan
+
+- Ausgewählte und eingetragene Mahlzeiten werden im Tagesplan klarer hervorgehoben.
+- Die Wochenansicht betont gefüllte Slots jetzt ähnlich wie die Tagesansicht.
+- Snack-Slots fügen sich in der Wochenansicht stimmiger ein und wirken ruhiger.
+
+### Kleine tägliche Snack-Erinnerung
+
+- Neue Option in den Einstellungen:
+  - `Am Nachmittag an etwas Kleines erinnern`
+- Wenn noch kein Snack geplant ist, kann Nouri einmal täglich eine kleine Push-Erinnerung schicken.
+- Die Push-Nachricht nimmt zuerst passende Mahlzeitenideen und sonst einfache Kombinationen aus dem, was zuhause da ist.
+
+### Wochenplan als PDF exportieren
+
+- Die Wochenansicht kann jetzt als PDF exportiert werden.
+- Der Export ist schlicht und druckfreundlich gehalten.
+- Es gibt zwei Varianten:
+  - `Meinen Essensplan`
+  - `Unseren Essensplan`
+- Im gemeinsamen PDF werden persönliche Einträge mit echten Namen gekennzeichnet, zum Beispiel `Für Flo`.
+- Snack-Zeilen erscheinen nur dann, wenn sie in der Woche tatsächlich genutzt werden.
+
+### Export-Menü vereinfacht
+
+- Statt zwei einzelner Export-Buttons gibt es jetzt einen einzigen Button:
+  - `PDF exportieren`
+- Darunter öffnet sich eine kleine Auswahl für die beiden PDF-Varianten.
+
+## Technische Änderungen
+
+- `fpdf2` wurde als Abhängigkeit ergänzt.
+- Cloudron-Version und Upstream-Version stehen jetzt auf `1.2.0`.
+- Die interne Schema-Version und der App-Version-Fallback wurden auf `1.2.0` angehoben.
+
+## Betroffene Bereiche
+
+- Tagesplan
+- Wochenansicht
+- Push-Erinnerungen
+- Einstellungen
+- PDF-Export
+- Cloudron-Paketierung

RELEASE_NOTES_1.2.1.md

@@ -0,0 +1,43 @@
+# Nouri 1.2.1
+
+Nouri 1.2.1 ist ein Feinschliff-Release auf Basis von 1.2.0. Der Schwerpunkt lag auf einer ruhigeren mobilen Navigation, klareren Theme-Bedienelementen und besser lesbaren Tageszeiten-Icons in Hell und Dunkel.
+
+## Neu in 1.2.1
+
+### Mobile Navigation ruhiger abgestimmt
+
+- Der `Mehr`-Button in der mobilen Bottom-Navigation bleibt im Ruhezustand jetzt neutral.
+- Wenn `Mehr` geöffnet ist, nutzt der Button dieselbe aktive Markierung wie die übrige Navigation.
+- `Hell` und `Abmelden` wirken im mobilen Dark Mode zurückhaltender und sind nicht mehr unnötig stark eingefärbt.
+
+### Besseres Theme-Umschalten
+
+- Für den Wechsel zwischen Hell und Dunkel gibt es jetzt eigene Sonne- und Mond-Icons.
+- Die Theme-Anzeige schaltet in Mobile und Desktop sichtbar mit um.
+- Die Bedienelemente für den Darstellungswechsel wirken dadurch klarer und weniger technisch.
+
+### Eigene Icons für Tageszeiten
+
+- `Frühstück`, `Mittagessen`, `Abendessen` und die Snack-Zeiten haben jetzt eigene Symbole statt eines gemeinsamen Standardsymbols.
+- Die Icons wurden aus `heinz.marketing` übernommen und lokal ins Projekt eingebunden.
+- Dadurch sind Tageszeiten im Tagesplan und in der Wochenansicht schneller erfassbar.
+
+### Icons auf Mobile lesbarer gemacht
+
+- Die Tageszeiten-Kacheln nutzen jetzt quadratischere Icon-Flächen mit abgerundeten Ecken.
+- Die Symbole wurden vergrößert und farblich klarer abgestimmt.
+- Im Dark Mode wirken die Icon-Flächen weniger verwaschen.
+- Im Light Mode wurde der Kontrast erhöht, damit die Symbole nicht mehr im Kartenhintergrund verschwinden.
+
+## Technische Änderungen
+
+- Cloudron-Version und Upstream-Version stehen jetzt auf `1.2.1`.
+- Die interne Schema-Version und der App-Version-Fallback wurden auf `1.2.1` angehoben.
+
+## Betroffene Bereiche
+
+- Mobile Navigation
+- Theme-Umschaltung
+- Tagesplan
+- Wochenansicht
+- Cloudron-Paketierung

nouri/__init__.py

@@ -1,11 +1,12 @@
 from __future__ import annotations
 
+import json
 import os
 import secrets
 from datetime import date, timedelta
 from pathlib import Path
 
-from flask import Flask, g, send_from_directory
+from flask import Flask, flash, g, redirect, request, send_from_directory, url_for
 
 from . import db
 from .admin import admin_bp
@@ -16,19 +17,33 @@ from .constants import (
     BUILDER_OPTIONS,
     DAYPARTS,
     DEFAULT_CATEGORIES,
+    ENERGY_DENSITY_LABELS,
+    ENERGY_DENSITY_OPTIONS,
     ITEM_KIND_LABELS,
     ITEM_KIND_SINGULAR_LABELS,
     NOTIFICATION_CHANNEL_OPTIONS,
     ROLE_LABELS,
+    SUGGESTION_STYLE_LABELS,
+    SUGGESTION_STYLE_OPTIONS,
     VISIBILITY_DESCRIPTIONS,
     VISIBILITY_LABELS,
     WEEKDAY_OPTIONS,
 )
+from .images import ensure_upload_structure, image_sizes, image_srcset, image_url
 from .main import main_bp
 
 
 WEEKDAY_NAMES = ["Montag", "Dienstag", "Mittwoch", "Donnerstag", "Freitag", "Samstag", "Sonntag"]
 WEEKDAY_SHORT_NAMES = ["Mo", "Di", "Mi", "Do", "Fr", "Sa", "So"]
+DEFAULT_RELEASE_URL = "https://git.hnz.io/hnzio/nouri-App/releases"
+DAYPART_ICON_CLASSES = {
+    "breakfast": "icon-daypart-breakfast",
+    "morning-snack": "icon-daypart-morning-snack",
+    "lunch": "icon-daypart-lunch",
+    "afternoon-snack": "icon-daypart-afternoon-snack",
+    "dinner": "icon-daypart-dinner",
+    "late-snack": "icon-daypart-late-snack",
+}
 
 
 def load_secret_key(data_dir: Path) -> str:
@@ -49,14 +64,41 @@ def load_secret_key(data_dir: Path) -> str:
     return secret_value
 
 
+def load_app_version(root_dir: Path) -> str:
+    env_version = os.environ.get("NOURI_APP_VERSION", "").strip()
+    if env_version:
+        return env_version
+
+    manifest_path = root_dir / "CloudronManifest.json"
+    if manifest_path.exists():
+        try:
+            manifest_data = json.loads(manifest_path.read_text(encoding="utf-8"))
+        except json.JSONDecodeError:
+            manifest_data = {}
+        manifest_version = str(
+            manifest_data.get("upstreamVersion")
+            or manifest_data.get("version")
+            or ""
+        ).strip()
+        if manifest_version:
+            return manifest_version
+    return "1.2.1"
+
+
+def load_release_url() -> str:
+    return os.environ.get("NOURI_RELEASE_URL", DEFAULT_RELEASE_URL).strip() or DEFAULT_RELEASE_URL
+
+
 def create_app() -> Flask:
     root_dir = Path(__file__).resolve().parent.parent
     data_dir = Path(os.environ.get("NOURI_DATA_DIR", root_dir / "data")).resolve()
     upload_dir = data_dir / "uploads"
     db_path = data_dir / "nouri.sqlite3"
+    app_version = load_app_version(root_dir)
+    release_url = load_release_url()
 
     data_dir.mkdir(parents=True, exist_ok=True)
-    upload_dir.mkdir(parents=True, exist_ok=True)
+    ensure_upload_structure(upload_dir)
 
     app = Flask(__name__, instance_relative_config=False)
     app.config.update(
@@ -68,7 +110,10 @@ def create_app() -> Flask:
         PERMANENT_SESSION_LIFETIME=timedelta(days=30),
         SESSION_COOKIE_HTTPONLY=True,
         SESSION_COOKIE_SAMESITE="Lax",
-        APP_VERSION="0.5.1",
+        SESSION_COOKIE_SECURE=os.environ.get("NOURI_SECURE_COOKIES", "0") == "1",
+        APP_VERSION=app_version,
+        RELEASE_URL=release_url,
+        TIMEZONE=os.environ.get("NOURI_TIMEZONE", "Europe/Berlin"),
         VAPID_PUBLIC_KEY=os.environ.get("NOURI_VAPID_PUBLIC_KEY", ""),
         VAPID_PRIVATE_KEY=os.environ.get("NOURI_VAPID_PRIVATE_KEY", ""),
         VAPID_SUBJECT=os.environ.get("NOURI_VAPID_SUBJECT", "mailto:mail@hnz.io"),
@@ -83,6 +128,11 @@ def create_app() -> Flask:
 
     @app.context_processor
     def inject_globals() -> dict[str, object]:
+        def asset_url(filename: str) -> str:
+            file_path = root_dir / "nouri" / "static" / filename
+            version = int(file_path.stat().st_mtime) if file_path.exists() else app.config["APP_VERSION"]
+            return url_for("static", filename=filename, v=version)
+
         return {
             "item_kind_labels": ITEM_KIND_LABELS,
             "item_kind_singular_labels": ITEM_KIND_SINGULAR_LABELS,
@@ -91,6 +141,10 @@ def create_app() -> Flask:
             "builder_descriptions": BUILDER_DESCRIPTIONS,
             "builder_options": BUILDER_OPTIONS,
             "daypart_suggestions": DAYPARTS,
+            "energy_density_options": ENERGY_DENSITY_OPTIONS,
+            "energy_density_labels": ENERGY_DENSITY_LABELS,
+            "suggestion_style_options": SUGGESTION_STYLE_OPTIONS,
+            "suggestion_style_labels": SUGGESTION_STYLE_LABELS,
             "visibility_labels": VISIBILITY_LABELS,
             "visibility_descriptions": VISIBILITY_DESCRIPTIONS,
             "role_labels": ROLE_LABELS,
@@ -98,23 +152,71 @@ def create_app() -> Flask:
             "notification_channel_options": NOTIFICATION_CHANNEL_OPTIONS,
             "today": date.today(),
             "app_version": app.config["APP_VERSION"],
+            "app_release_url": app.config["RELEASE_URL"],
             "push_public_key": app.config["VAPID_PUBLIC_KEY"],
             "push_available": bool(app.config["VAPID_PUBLIC_KEY"] and app.config["VAPID_PRIVATE_KEY"]),
             "weekday_name": lambda value: WEEKDAY_NAMES[value.weekday()],
             "weekday_short_name": lambda value: WEEKDAY_SHORT_NAMES[value.weekday()],
+            "daypart_icon_class": lambda slug: DAYPART_ICON_CLASSES.get(slug, "icon-calendar"),
             "is_admin": lambda: bool(getattr(g, "user", None)) and g.user["role"] == "admin",
+            "asset_url": asset_url,
+            "image_url": lambda filename, variant="md": image_url(
+                filename,
+                url_for,
+                variant,
+                upload_folder=app.config["UPLOAD_FOLDER"],
+            ),
+            "image_srcset": lambda filename: image_srcset(
+                filename,
+                url_for,
+                upload_folder=app.config["UPLOAD_FOLDER"],
+            ),
+            "image_sizes": image_sizes,
         }
 
     @app.get("/uploads/<path:filename>")
     def uploaded_file(filename: str):
-        return send_from_directory(app.config["UPLOAD_FOLDER"], filename)
+        response = send_from_directory(app.config["UPLOAD_FOLDER"], filename, max_age=60 * 60 * 24 * 30)
+        response.headers["Cache-Control"] = "public, max-age=2592000, immutable"
+        return response
 
     @app.get("/app.webmanifest")
     def webmanifest():
-        return send_from_directory(root_dir / "nouri" / "static" / "pwa", "app.webmanifest", mimetype="application/manifest+json")
+        response = send_from_directory(
+            root_dir / "nouri" / "static" / "pwa",
+            "app.webmanifest",
+            mimetype="application/manifest+json",
+            max_age=60 * 30,
+        )
+        response.headers["Cache-Control"] = "public, max-age=1800"
+        return response
 
     @app.get("/service-worker.js")
     def service_worker():
-        return send_from_directory(root_dir / "nouri" / "static" / "pwa", "service-worker.js", mimetype="application/javascript")
+        response = send_from_directory(
+            root_dir / "nouri" / "static" / "pwa",
+            "service-worker.js",
+            mimetype="application/javascript",
+            max_age=0,
+        )
+        response.headers["Cache-Control"] = "no-store"
+        return response
+
+    @app.after_request
+    def apply_cache_policy(response):
+        if response.direct_passthrough:
+            return response
+        content_type = response.headers.get("Content-Type", "")
+        if content_type.startswith("text/html"):
+            response.headers.setdefault("Cache-Control", "no-store, max-age=0")
+        response.headers.setdefault("X-Content-Type-Options", "nosniff")
+        response.headers.setdefault("Referrer-Policy", "same-origin")
+        response.headers.setdefault("X-Frame-Options", "SAMEORIGIN")
+        return response
+
+    @app.errorhandler(413)
+    def upload_too_large(_error):
+        flash("Das hochgeladene Bild ist etwas zu groß. Eine kleinere Datei passt hier besser.", "error")
+        return redirect(request.referrer or url_for("main.dashboard"))
 
     return app

nouri/admin.py

@@ -289,3 +289,31 @@ def category_update(category_id: int):
     get_db().commit()
     flash("Die Zuordnung wurde aktualisiert.", "success")
     return redirect(url_for("admin.category_settings"))
+
+
+@admin_bp.post("/categories/<int:category_id>/delete")
+@admin_required
+def category_delete(category_id: int):
+    category = get_db().execute(
+        """
+        SELECT *
+        FROM household_categories
+        WHERE id = ? AND household_id = ?
+        """,
+        (category_id, g.user["household_id"]),
+    ).fetchone()
+    if category is None:
+        flash("Die Kategorie wurde nicht gefunden.", "error")
+        return redirect(url_for("admin.category_settings"))
+
+    if category["name"] in DEFAULT_CATEGORIES:
+        flash("Standardkategorien bleiben erhalten. Du kannst sie bei Bedarf pausieren.", "info")
+        return redirect(url_for("admin.category_settings"))
+
+    get_db().execute(
+        "DELETE FROM household_categories WHERE id = ? AND household_id = ?",
+        (category_id, g.user["household_id"]),
+    )
+    get_db().commit()
+    flash("Die Kategorie wurde entfernt.", "success")
+    return redirect(url_for("admin.category_settings"))

nouri/auth.py

@@ -57,6 +57,12 @@ def normalize_login_value(raw: str) -> str:
     return raw.strip().lower()
 
 
+def validate_password_strength(password: str) -> str | None:
+    if len(password or "") < 10:
+        return "Bitte ein etwas längeres Passwort wählen."
+    return None
+
+
 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."
@@ -140,6 +146,8 @@ def setup():
             error = "Bitte ein Passwort vergeben."
         elif error is None and password != password_repeat:
             error = "Die Passwörter stimmen nicht überein."
+        elif error is None:
+            error = validate_password_strength(password)
 
         if error is None:
             database.execute(
@@ -244,6 +252,8 @@ def change_password():
         error = "Bitte ein neues Passwort eintragen."
     elif new_password != new_password_repeat:
         error = "Die neuen Passwörter stimmen nicht überein."
+    else:
+        error = validate_password_strength(new_password)
 
     if error is None:
         get_db().execute(
@@ -289,6 +299,10 @@ def validate_admin_user_form(
         return "Bitte ein Passwort vergeben."
     if password and password != password_repeat:
         return "Die Passwörter stimmen nicht überein."
+    if password:
+        password_error = validate_password_strength(password)
+        if password_error:
+            return password_error
     if current_user_id == g.user["id"] and not is_active:
         return "Du kannst deinen eigenen Zugang hier nicht deaktivieren."
     return None

nouri/backup.py

@@ -0,0 +1,154 @@
+from __future__ import annotations
+
+import io
+import json
+import shutil
+import sqlite3
+import tempfile
+import zipfile
+from datetime import datetime, timezone
+from pathlib import Path
+
+
+BACKUP_FILENAME_PREFIX = "nouri-backup"
+RESTORE_CONFIRMATION_TEXT = "WIEDERHERSTELLEN"
+
+
+def list_backup_tables(database: sqlite3.Connection) -> list[str]:
+    rows = database.execute(
+        """
+        SELECT name
+        FROM sqlite_master
+        WHERE type = 'table' AND name NOT LIKE 'sqlite_%'
+        ORDER BY name
+        """
+    ).fetchall()
+    return [row["name"] for row in rows]
+
+
+def export_backup_archive(
+    database: sqlite3.Connection,
+    upload_folder: str | Path,
+    app_version: str,
+) -> tuple[str, str]:
+    timestamp = datetime.now(timezone.utc).strftime("%Y%m%d-%H%M%S")
+    backup_name = f"{BACKUP_FILENAME_PREFIX}-{timestamp}.zip"
+    temp_handle = tempfile.NamedTemporaryFile(prefix="nouri-backup-", suffix=".zip", delete=False)
+    temp_handle.close()
+    archive_path = temp_handle.name
+
+    tables = list_backup_tables(database)
+    payload = {
+        "meta": {
+            "created_at": datetime.now(timezone.utc).isoformat(),
+            "app_version": app_version,
+            "format_version": 1,
+        },
+        "tables": {},
+    }
+
+    for table_name in tables:
+        rows = database.execute(f"SELECT * FROM {table_name}").fetchall()
+        payload["tables"][table_name] = [dict(row) for row in rows]
+
+    uploads_root = Path(upload_folder)
+    with zipfile.ZipFile(archive_path, "w", compression=zipfile.ZIP_DEFLATED) as archive:
+        archive.writestr("backup.json", json.dumps(payload, ensure_ascii=False, indent=2))
+        if uploads_root.exists():
+            for file_path in uploads_root.rglob("*"):
+                if file_path.is_file():
+                    relative_path = file_path.relative_to(uploads_root)
+                    archive.write(file_path, f"uploads/{relative_path.as_posix()}")
+
+    return archive_path, backup_name
+
+
+def _extract_uploads_to_temp(archive: zipfile.ZipFile) -> Path:
+    temp_dir = Path(tempfile.mkdtemp(prefix="nouri-restore-uploads-"))
+    for member in archive.infolist():
+        if not member.filename.startswith("uploads/") or member.is_dir():
+            continue
+        relative_target = member.filename.removeprefix("uploads/").lstrip("/")
+        if not relative_target:
+            continue
+        target_path = temp_dir / relative_target
+        target_path.parent.mkdir(parents=True, exist_ok=True)
+        with archive.open(member, "r") as source, target_path.open("wb") as destination:
+            shutil.copyfileobj(source, destination)
+    return temp_dir
+
+
+def _replace_uploads(temp_dir: Path, upload_folder: str | Path) -> None:
+    upload_root = Path(upload_folder)
+    previous_root = upload_root.with_name(f"{upload_root.name}-previous")
+    if previous_root.exists():
+        shutil.rmtree(previous_root)
+    if upload_root.exists():
+        upload_root.rename(previous_root)
+    upload_root.mkdir(parents=True, exist_ok=True)
+    for file_path in temp_dir.rglob("*"):
+        if not file_path.is_file():
+            continue
+        relative_path = file_path.relative_to(temp_dir)
+        target_path = upload_root / relative_path
+        target_path.parent.mkdir(parents=True, exist_ok=True)
+        shutil.copy2(file_path, target_path)
+    shutil.rmtree(temp_dir, ignore_errors=True)
+    shutil.rmtree(previous_root, ignore_errors=True)
+
+
+def restore_backup_archive(
+    database: sqlite3.Connection,
+    upload_folder: str | Path,
+    backup_file,
+) -> dict:
+    backup_bytes = backup_file.read()
+    if not backup_bytes:
+        raise ValueError("Bitte ein gültiges Backup auswählen.")
+
+    with zipfile.ZipFile(io.BytesIO(backup_bytes)) as archive:
+        try:
+            backup_payload = json.loads(archive.read("backup.json").decode("utf-8"))
+        except KeyError as exc:
+            raise ValueError("Im Backup fehlt die Datei backup.json.") from exc
+        except json.JSONDecodeError as exc:
+            raise ValueError("Das Backup konnte nicht gelesen werden.") from exc
+
+        tables = backup_payload.get("tables")
+        if not isinstance(tables, dict):
+            raise ValueError("Das Backup enthält keine gültigen Tabellen-Daten.")
+
+        current_tables = list_backup_tables(database)
+        restore_tables = [table for table in current_tables if table in tables]
+
+        upload_temp_dir = _extract_uploads_to_temp(archive)
+
+        try:
+            database.execute("PRAGMA foreign_keys = OFF")
+            try:
+                for table_name in reversed(restore_tables):
+                    database.execute(f"DELETE FROM {table_name}")
+                database.execute("DELETE FROM sqlite_sequence")
+
+                for table_name in restore_tables:
+                    rows = tables.get(table_name, [])
+                    if not rows:
+                        continue
+                    columns = list(rows[0].keys())
+                    placeholders = ", ".join(["?"] * len(columns))
+                    column_list = ", ".join(columns)
+                    for row in rows:
+                        values = [row.get(column) for column in columns]
+                        database.execute(
+                            f"INSERT INTO {table_name} ({column_list}) VALUES ({placeholders})",
+                            values,
+                        )
+            finally:
+                database.execute("PRAGMA foreign_keys = ON")
+
+            _replace_uploads(upload_temp_dir, upload_folder)
+        except Exception:
+            shutil.rmtree(upload_temp_dir, ignore_errors=True)
+            raise
+
+    return backup_payload.get("meta", {})

nouri/constants.py

@@ -8,7 +8,7 @@ DAYPARTS = [
 ]
 
 DEFAULT_CATEGORIES = [
-    "Brot & Getreide",
+    "Kohlenhydrate",
     "Milchprodukt",
     "Obst",
     "Gemüse",
@@ -21,6 +21,7 @@ DEFAULT_CATEGORIES = [
 ]
 
 DEFAULT_CATEGORY_BUILDERS = {
+    "Kohlenhydrate": "carb",
     "Brot & Getreide": "carb",
     "Milchprodukt": "dairy",
     "Obst": "fruit",
@@ -37,7 +38,8 @@ BUILDER_LABELS = {
     "protein": "Proteinquelle",
     "carb": "Kohlenhydratquelle",
     "veg": "Gemüse / Ballaststoffquelle",
-    "nuts": "Nüsse / Samen",
+    "nuts": "Nüsse",
+    "seeds": "Saaten",
     "fruit": "Obst",
     "dairy": "Milchprodukt",
     "neutral": "Neutral / sonstiges",
@@ -47,7 +49,8 @@ BUILDER_DESCRIPTIONS = {
     "protein": "Passt eher zu sättigenden Eiweißquellen.",
     "carb": "Passt eher zu Brot, Getreide, Reis, Kartoffeln oder ähnlichem.",
     "veg": "Passt eher zu Gemüse oder ballaststoffreichen Begleitern.",
-    "nuts": "Passt eher zu Nüssen oder Samen.",
+    "nuts": "Passt eher zu Nüssen.",
+    "seeds": "Passt eher zu Saaten.",
     "fruit": "Passt eher zu Obst.",
     "dairy": "Passt eher zu Joghurt, Milch, Käse oder ähnlichem.",
     "neutral": "Ohne feste Zuordnung, aber weiterhin gut nutzbar.",
@@ -55,6 +58,30 @@ BUILDER_DESCRIPTIONS = {
 
 BUILDER_OPTIONS = [(key, label) for key, label in BUILDER_LABELS.items()]
 
+ENERGY_DENSITY_OPTIONS = [
+    ("low", "Eher leicht"),
+    ("neutral", "Neutral"),
+    ("high", "Eher gehaltvoll"),
+]
+
+ENERGY_DENSITY_LABELS = {
+    "low": "Eher leicht",
+    "neutral": "Neutral",
+    "high": "Eher gehaltvoll",
+}
+
+SUGGESTION_STYLE_OPTIONS = [
+    ("balanced", "Eher ausgewogen"),
+    ("fitness", "Fitness"),
+    ("protein", "Proteinbetont"),
+]
+
+SUGGESTION_STYLE_LABELS = {
+    "balanced": "Eher ausgewogen",
+    "fitness": "Fitness",
+    "protein": "Proteinbetont",
+}
+
 WEEKDAY_OPTIONS = [
     (0, "Montag"),
     (1, "Dienstag"),

nouri/db.py

@@ -10,15 +10,19 @@ from werkzeug.security import generate_password_hash
 
 from .constants import DAYPARTS, DEFAULT_CATEGORIES, DEFAULT_CATEGORY_BUILDERS
 
+CURRENT_SCHEMA_VERSION = "1.2.1"
+
 
 def get_db() -> sqlite3.Connection:
     if "db" not in g:
         g.db = sqlite3.connect(
             current_app.config["DATABASE_PATH"],
             detect_types=sqlite3.PARSE_DECLTYPES,
+            timeout=30,
         )
         g.db.row_factory = sqlite3.Row
         g.db.execute("PRAGMA foreign_keys = ON")
+        g.db.execute("PRAGMA busy_timeout = 30000")
     return g.db
 
 
@@ -47,7 +51,36 @@ def add_column_if_missing(database: sqlite3.Connection, table_name: str, definit
         database.execute(f"ALTER TABLE {table_name} ADD COLUMN {definition}")
 
 
+def ensure_meta_table(database: sqlite3.Connection) -> None:
+    database.execute(
+        """
+        CREATE TABLE IF NOT EXISTS app_meta (
+            key TEXT PRIMARY KEY,
+            value TEXT,
+            updated_at TEXT NOT NULL DEFAULT CURRENT_TIMESTAMP
+        )
+        """
+    )
+
+
+def get_meta(database: sqlite3.Connection, key: str) -> str | None:
+    row = database.execute("SELECT value FROM app_meta WHERE key = ?", (key,)).fetchone()
+    return row["value"] if row else None
+
+
+def set_meta(database: sqlite3.Connection, key: str, value: str) -> None:
+    database.execute(
+        """
+        INSERT INTO app_meta (key, value, updated_at)
+        VALUES (?, ?, CURRENT_TIMESTAMP)
+        ON CONFLICT(key) DO UPDATE SET value = excluded.value, updated_at = CURRENT_TIMESTAMP
+        """,
+        (key, value),
+    )
+
+
 def bootstrap_legacy_schema(database: sqlite3.Connection) -> None:
+    ensure_meta_table(database)
     database.execute(
         """
         CREATE TABLE IF NOT EXISTS households (
@@ -96,6 +129,7 @@ def bootstrap_legacy_schema(database: sqlite3.Connection) -> None:
         add_column_if_missing(database, "items", "owner_user_id INTEGER")
         add_column_if_missing(database, "items", "target_user_id INTEGER")
         add_column_if_missing(database, "items", "visibility TEXT NOT NULL DEFAULT 'shared'")
+        add_column_if_missing(database, "items", "energy_density TEXT NOT NULL DEFAULT 'neutral'")
 
     if table_exists(database, "shopping_entries"):
         add_column_if_missing(database, "shopping_entries", "household_id INTEGER")
@@ -117,12 +151,18 @@ def bootstrap_legacy_schema(database: sqlite3.Connection) -> None:
             reminders_enabled INTEGER NOT NULL DEFAULT 1,
             push_enabled INTEGER NOT NULL DEFAULT 0,
             notification_channel TEXT NOT NULL DEFAULT 'in_app',
+            suggestion_style TEXT NOT NULL DEFAULT 'balanced',
+            energy_preference TEXT NOT NULL DEFAULT 'neutral',
             remind_before_shopping INTEGER NOT NULL DEFAULT 1,
             remind_on_shopping_day INTEGER NOT NULL DEFAULT 1,
             show_missing_for_upcoming_week INTEGER NOT NULL DEFAULT 1,
             show_planned_not_shopped INTEGER NOT NULL DEFAULT 1,
             remind_tomorrow_if_sparse INTEGER NOT NULL DEFAULT 1,
             remind_week_if_sparse INTEGER NOT NULL DEFAULT 1,
+            push_missing_breakfast INTEGER NOT NULL DEFAULT 0,
+            push_missing_lunch INTEGER NOT NULL DEFAULT 0,
+            push_missing_dinner INTEGER NOT NULL DEFAULT 0,
+            push_small_snack INTEGER NOT NULL DEFAULT 0,
             suggest_home_for_today INTEGER NOT NULL DEFAULT 1,
             remind_small_snack INTEGER NOT NULL DEFAULT 0,
             remind_nuts INTEGER NOT NULL DEFAULT 0,
@@ -153,6 +193,32 @@ def bootstrap_legacy_schema(database: sqlite3.Connection) -> None:
         """
     )
 
+    database.execute(
+        """
+        CREATE TABLE IF NOT EXISTS reminder_events (
+            id INTEGER PRIMARY KEY AUTOINCREMENT,
+            user_id INTEGER NOT NULL,
+            event_key TEXT NOT NULL,
+            created_at TEXT NOT NULL DEFAULT CURRENT_TIMESTAMP,
+            UNIQUE (user_id, event_key),
+            FOREIGN KEY (user_id) REFERENCES users(id) ON DELETE CASCADE
+        )
+        """
+    )
+
+    database.execute(
+        """
+        CREATE TABLE IF NOT EXISTS hidden_generated_suggestions (
+            id INTEGER PRIMARY KEY AUTOINCREMENT,
+            user_id INTEGER NOT NULL,
+            suggestion_key TEXT NOT NULL,
+            created_at TEXT NOT NULL DEFAULT CURRENT_TIMESTAMP,
+            UNIQUE (user_id, suggestion_key),
+            FOREIGN KEY (user_id) REFERENCES users(id) ON DELETE CASCADE
+        )
+        """
+    )
+
     database.execute(
         """
         CREATE TABLE IF NOT EXISTS shopping_needs (
@@ -185,6 +251,14 @@ def bootstrap_legacy_schema(database: sqlite3.Connection) -> None:
         add_column_if_missing(database, "plan_entries", "owner_user_id INTEGER")
         add_column_if_missing(database, "plan_entries", "visibility TEXT NOT NULL DEFAULT 'shared'")
 
+    if table_exists(database, "user_settings"):
+        add_column_if_missing(database, "user_settings", "suggestion_style TEXT NOT NULL DEFAULT 'balanced'")
+        add_column_if_missing(database, "user_settings", "energy_preference TEXT NOT NULL DEFAULT 'neutral'")
+        add_column_if_missing(database, "user_settings", "push_missing_breakfast INTEGER NOT NULL DEFAULT 0")
+        add_column_if_missing(database, "user_settings", "push_missing_lunch INTEGER NOT NULL DEFAULT 0")
+        add_column_if_missing(database, "user_settings", "push_missing_dinner INTEGER NOT NULL DEFAULT 0")
+        add_column_if_missing(database, "user_settings", "push_small_snack INTEGER NOT NULL DEFAULT 0")
+
 
 def ensure_default_household(database: sqlite3.Connection) -> int:
     household = database.execute(
@@ -211,6 +285,41 @@ def first_user_id(database: sqlite3.Connection) -> int | None:
 
 def sync_default_categories(database: sqlite3.Connection) -> None:
     for household_id in household_ids(database):
+        legacy = database.execute(
+            """
+            SELECT id
+            FROM household_categories
+            WHERE household_id = ? AND name = 'Brot & Getreide'
+            LIMIT 1
+            """,
+            (household_id,),
+        ).fetchone()
+        updated = database.execute(
+            """
+            SELECT id
+            FROM household_categories
+            WHERE household_id = ? AND name = 'Kohlenhydrate'
+            LIMIT 1
+            """,
+            (household_id,),
+        ).fetchone()
+        if legacy and not updated:
+            database.execute(
+                """
+                UPDATE household_categories
+                SET name = 'Kohlenhydrate', builder_key = 'carb'
+                WHERE id = ?
+                """,
+                (legacy["id"],),
+            )
+            database.execute(
+                """
+                UPDATE items
+                SET category = 'Kohlenhydrate'
+                WHERE household_id = ? AND category = 'Brot & Getreide'
+                """,
+                (household_id,),
+            )
         for sort_order, name in enumerate(DEFAULT_CATEGORIES, start=10):
             database.execute(
                 """
@@ -230,6 +339,7 @@ def sync_default_categories(database: sqlite3.Connection) -> None:
 
 
 def ensure_schema_upgrades(database: sqlite3.Connection) -> None:
+    ensure_meta_table(database)
     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'")
@@ -237,10 +347,10 @@ def ensure_schema_upgrades(database: sqlite3.Connection) -> None:
     add_column_if_missing(database, "users", "updated_at TEXT")
 
     default_household_id = ensure_default_household(database)
-    database.execute("UPDATE households SET shopping_weekday = COALESCE(shopping_weekday, 5)")
+    database.execute("UPDATE households SET shopping_weekday = 5 WHERE shopping_weekday IS NULL")
-    database.execute("UPDATE households SET shopping_prep_days = COALESCE(shopping_prep_days, 1)")
+    database.execute("UPDATE households SET shopping_prep_days = 1 WHERE shopping_prep_days IS NULL")
     database.execute(
-        "UPDATE households SET shopping_reminder_time = COALESCE(NULLIF(shopping_reminder_time, ''), '18:00')"
+        "UPDATE households SET shopping_reminder_time = '18:00' WHERE shopping_reminder_time IS NULL OR shopping_reminder_time = ''"
     )
     database.execute(
         "UPDATE users SET household_id = ? WHERE household_id IS NULL",
@@ -265,8 +375,15 @@ def ensure_schema_upgrades(database: sqlite3.Connection) -> None:
         add_column_if_missing(database, table_name, "owner_user_id INTEGER")
         add_column_if_missing(database, table_name, "visibility TEXT NOT NULL DEFAULT 'shared'")
     add_column_if_missing(database, "items", "target_user_id INTEGER")
+    add_column_if_missing(database, "items", "energy_density TEXT NOT NULL DEFAULT 'neutral'")
     add_column_if_missing(database, "shopping_entries", "needed_for_date TEXT")
     add_column_if_missing(database, "shopping_entries", "needed_for_daypart_id INTEGER")
+    add_column_if_missing(database, "user_settings", "suggestion_style TEXT NOT NULL DEFAULT 'balanced'")
+    add_column_if_missing(database, "user_settings", "energy_preference TEXT NOT NULL DEFAULT 'neutral'")
+    add_column_if_missing(database, "user_settings", "push_missing_breakfast INTEGER NOT NULL DEFAULT 0")
+    add_column_if_missing(database, "user_settings", "push_missing_lunch INTEGER NOT NULL DEFAULT 0")
+    add_column_if_missing(database, "user_settings", "push_missing_dinner INTEGER NOT NULL DEFAULT 0")
+    add_column_if_missing(database, "user_settings", "push_small_snack INTEGER NOT NULL DEFAULT 0")
 
     if default_owner_id is not None:
         database.execute(
@@ -311,6 +428,13 @@ def ensure_schema_upgrades(database: sqlite3.Connection) -> None:
         SELECT id FROM users
         """
     )
+    database.execute("UPDATE items SET energy_density = 'neutral' WHERE energy_density IS NULL OR energy_density = ''")
+    database.execute("UPDATE user_settings SET suggestion_style = 'balanced' WHERE suggestion_style IS NULL OR suggestion_style = ''")
+    database.execute("UPDATE user_settings SET energy_preference = 'neutral' WHERE energy_preference IS NULL OR energy_preference = ''")
+    database.execute("UPDATE user_settings SET push_missing_breakfast = 0 WHERE push_missing_breakfast IS NULL")
+    database.execute("UPDATE user_settings SET push_missing_lunch = 0 WHERE push_missing_lunch IS NULL")
+    database.execute("UPDATE user_settings SET push_missing_dinner = 0 WHERE push_missing_dinner IS NULL")
+    database.execute("UPDATE user_settings SET push_small_snack = 0 WHERE push_small_snack IS NULL")
 
     database.execute(
         """
@@ -349,6 +473,13 @@ def ensure_schema_upgrades(database: sqlite3.Connection) -> None:
         ON shopping_needs (household_id, activation_date, is_activated)
         """
     )
+    database.execute(
+        """
+        CREATE INDEX IF NOT EXISTS idx_hidden_generated_suggestions_user
+        ON hidden_generated_suggestions (user_id)
+        """
+    )
+    set_meta(database, "schema_version", CURRENT_SCHEMA_VERSION)
 
 
 def apply_schema(database: sqlite3.Connection) -> None:

nouri/images.py

@@ -0,0 +1,175 @@
+from __future__ import annotations
+
+import os
+import uuid
+from pathlib import Path
+
+from werkzeug.datastructures import FileStorage
+from werkzeug.utils import secure_filename
+
+try:
+    from PIL import Image, ImageOps, UnidentifiedImageError
+    PILLOW_AVAILABLE = True
+except ImportError:  # pragma: no cover - local fallback when Pillow is unavailable
+    Image = None
+    ImageOps = None
+    UnidentifiedImageError = OSError
+    PILLOW_AVAILABLE = False
+
+
+ALLOWED_IMAGE_EXTENSIONS = {"png", "jpg", "jpeg", "gif", "webp"}
+IMAGE_VARIANTS = {
+    "sm": {"width": 320, "quality": 76},
+    "md": {"width": 720, "quality": 82},
+    "lg": {"width": 1280, "quality": 86},
+}
+DEFAULT_RENDERED_FORMAT = "webp"
+ORIGINAL_MAX_WIDTH = 1600
+
+
+def allowed_image_file(filename: str) -> bool:
+    return "." in filename and filename.rsplit(".", 1)[1].lower() in ALLOWED_IMAGE_EXTENSIONS
+
+
+def ensure_upload_structure(upload_folder: str | Path) -> None:
+    upload_root = Path(upload_folder)
+    upload_root.mkdir(parents=True, exist_ok=True)
+    (upload_root / "variants").mkdir(parents=True, exist_ok=True)
+    for variant_name in IMAGE_VARIANTS:
+        (upload_root / "variants" / variant_name).mkdir(parents=True, exist_ok=True)
+
+
+def build_variant_filename(filename: str, variant_name: str) -> str:
+    source = Path(filename)
+    return f"{source.stem}__{variant_name}.webp"
+
+
+def build_variant_relative_path(filename: str, variant_name: str) -> str:
+    return f"variants/{variant_name}/{build_variant_filename(filename, variant_name)}"
+
+
+def remove_photo_assets(upload_folder: str | Path, filename: str | None) -> None:
+    if not filename:
+        return
+    upload_root = Path(upload_folder)
+    original_path = upload_root / filename
+    if original_path.exists():
+        original_path.unlink()
+    for variant_name in IMAGE_VARIANTS:
+        variant_path = upload_root / build_variant_relative_path(filename, variant_name)
+        if variant_path.exists():
+            variant_path.unlink()
+
+
+def _open_image(upload: FileStorage) -> Image.Image:
+    if not PILLOW_AVAILABLE or Image is None or ImageOps is None:
+        raise OSError("Pillow ist nicht verfügbar.")
+    upload.stream.seek(0)
+    image = Image.open(upload.stream)
+    image.load()
+    return ImageOps.exif_transpose(image)
+
+
+def _prepare_image(image: Image.Image) -> Image.Image:
+    if not PILLOW_AVAILABLE:
+        return image
+    if image.mode not in {"RGB", "RGBA"}:
+        image = image.convert("RGBA" if "A" in image.getbands() else "RGB")
+    return image
+
+
+def _resize_copy(image: Image.Image, width: int) -> Image.Image:
+    resized = image.copy()
+    resized.thumbnail((width, width * 3), Image.Resampling.LANCZOS)
+    return resized
+
+
+def _save_image(image: Image.Image, destination: Path, quality: int) -> None:
+    destination.parent.mkdir(parents=True, exist_ok=True)
+    image.save(
+        destination,
+        format=DEFAULT_RENDERED_FORMAT.upper(),
+        quality=quality,
+        method=6,
+    )
+
+
+def save_photo_with_variants(
+    upload: FileStorage | None,
+    upload_folder: str | Path,
+    current_filename: str | None = None,
+) -> str | None:
+    if not upload or not upload.filename:
+        return current_filename
+
+    if not allowed_image_file(upload.filename):
+        raise ValueError("Bitte ein Bild als PNG, JPG, GIF oder WEBP hochladen.")
+
+    ensure_upload_structure(upload_folder)
+
+    original_name = secure_filename(upload.filename)
+    extension = original_name.rsplit(".", 1)[1].lower()
+
+    try:
+        image = _prepare_image(_open_image(upload))
+        filename = f"{uuid.uuid4().hex}.webp"
+        original_path = Path(upload_folder) / filename
+        optimized = _resize_copy(image, ORIGINAL_MAX_WIDTH)
+        _save_image(optimized, original_path, quality=88)
+        for variant_name, config in IMAGE_VARIANTS.items():
+            variant_image = _resize_copy(image, int(config["width"]))
+            variant_path = Path(upload_folder) / build_variant_relative_path(filename, variant_name)
+            _save_image(variant_image, variant_path, quality=int(config["quality"]))
+    except (UnidentifiedImageError, OSError, ValueError):
+        filename = f"{uuid.uuid4().hex}.{extension}"
+        original_path = Path(upload_folder) / filename
+        upload.stream.seek(0)
+        upload.save(original_path)
+
+    if current_filename and current_filename != filename:
+        remove_photo_assets(upload_folder, current_filename)
+
+    return filename
+
+
+def image_url(filename: str | None, url_builder, variant: str = "md", upload_folder: str | Path | None = None) -> str | None:
+    if not filename:
+        return None
+    if variant in IMAGE_VARIANTS:
+        if upload_folder is not None:
+            variant_path = Path(upload_folder) / build_variant_relative_path(filename, variant)
+            if variant_path.exists():
+                return url_builder("uploaded_file", filename=build_variant_relative_path(filename, variant))
+        else:
+            return url_builder("uploaded_file", filename=build_variant_relative_path(filename, variant))
+    return url_builder("uploaded_file", filename=filename)
+
+
+def image_srcset(filename: str | None, url_builder, upload_folder: str | Path | None = None) -> str:
+    if not filename:
+        return ""
+    parts = []
+    for variant_name, config in IMAGE_VARIANTS.items():
+        variant_url = image_url(filename, url_builder, variant_name, upload_folder=upload_folder)
+        if variant_url and (not upload_folder or variant_url != url_builder("uploaded_file", filename=filename)):
+            parts.append(f"{variant_url} {config['width']}w")
+    original_width = max(config["width"] for config in IMAGE_VARIANTS.values()) + 320
+    parts.append(f"{url_builder('uploaded_file', filename=filename)} {original_width}w")
+    return ", ".join(parts)
+
+
+def image_sizes(card: str = "grid") -> str:
+    if card == "detail":
+        return "(max-width: 720px) 100vw, 720px"
+    return "(max-width: 720px) 42vw, (max-width: 1080px) 28vw, 180px"
+
+
+def upload_file_size_ok(upload: FileStorage | None, max_bytes: int) -> bool:
+    if not upload or not upload.filename:
+        return True
+    stream = upload.stream
+    current_position = stream.tell()
+    stream.seek(0, os.SEEK_END)
+    size = stream.tell()
+    stream.seek(current_position)
+    return size <= max_bytes

nouri/reminders.py

@@ -0,0 +1,293 @@
+from __future__ import annotations
+
+import time
+from datetime import date, datetime
+from urllib.parse import quote
+from zoneinfo import ZoneInfo
+
+from flask import current_app, g
+
+from .db import get_db
+from .main import build_home_recipe_suggestions, get_user_settings
+from .push import send_push_message
+
+
+MEAL_PUSH_RULES = [
+    {"slug": "breakfast", "setting": "push_missing_breakfast", "hour": 8, "minute": 0, "end_hour": 12, "label": "Frühstück"},
+    {"slug": "lunch", "setting": "push_missing_lunch", "hour": 12, "minute": 0, "end_hour": 18, "label": "Mittagessen"},
+    {"slug": "dinner", "setting": "push_missing_dinner", "hour": 18, "minute": 0, "end_hour": 24, "label": "Abendessen"},
+]
+
+SNACK_PUSH_RULE = {
+    "slugs": ("morning-snack", "afternoon-snack", "late-snack"),
+    "setting": "push_small_snack",
+    "hour": 15,
+    "minute": 0,
+    "end_hour": 20,
+    "label": "Etwas Kleines",
+}
+
+
+def current_local_time() -> datetime:
+    timezone_name = current_app.config.get("TIMEZONE", "Europe/Berlin")
+    try:
+        timezone = ZoneInfo(timezone_name)
+    except Exception:
+        timezone = ZoneInfo("Europe/Berlin")
+    return datetime.now(timezone)
+
+
+def push_delivery_channel_enabled(settings: dict) -> bool:
+    return (
+        settings.get("reminders_enabled")
+        and settings.get("push_enabled")
+        and settings.get("notification_channel") in {"push", "both"}
+    )
+
+
+def fetch_push_ready_users() -> list:
+    return get_db().execute(
+        """
+        SELECT users.*
+        FROM users
+        JOIN user_settings ON user_settings.user_id = users.id
+        WHERE users.is_active = 1
+          AND user_settings.reminders_enabled = 1
+          AND user_settings.push_enabled = 1
+          AND user_settings.notification_channel IN ('push', 'both')
+        ORDER BY users.id
+        """
+    ).fetchall()
+
+
+def fetch_daypart_map() -> dict[str, dict]:
+    return {
+        row["slug"]: {"id": int(row["id"]), "name": row["name"]}
+        for row in get_db().execute("SELECT id, slug, name FROM dayparts").fetchall()
+    }
+
+
+def plan_exists_for_daypart(user, *, planned_date: date, daypart_id: int) -> bool:
+    row = get_db().execute(
+        """
+        SELECT COUNT(*) AS count
+        FROM plan_entries
+        WHERE household_id = ?
+          AND plan_date = ?
+          AND daypart_id = ?
+          AND (visibility = 'shared' OR owner_user_id = ?)
+        """,
+        (int(user["household_id"]), planned_date.isoformat(), daypart_id, int(user["id"])),
+    ).fetchone()
+    return bool(int(row["count"] or 0))
+
+
+def plan_exists_for_any_daypart(user, *, planned_date: date, daypart_ids: list[int]) -> bool:
+    if not daypart_ids:
+        return False
+    placeholders = ", ".join("?" for _ in daypart_ids)
+    row = get_db().execute(
+        f"""
+        SELECT COUNT(*) AS count
+        FROM plan_entries
+        WHERE household_id = ?
+          AND plan_date = ?
+          AND daypart_id IN ({placeholders})
+          AND (visibility = 'shared' OR owner_user_id = ?)
+        """,
+        [int(user["household_id"]), planned_date.isoformat(), *daypart_ids, int(user["id"])],
+    ).fetchone()
+    return bool(int(row["count"] or 0))
+
+
+def reminder_event_exists(user_id: int, event_key: str) -> bool:
+    row = get_db().execute(
+        "SELECT 1 FROM reminder_events WHERE user_id = ? AND event_key = ? LIMIT 1",
+        (user_id, event_key),
+    ).fetchone()
+    return row is not None
+
+
+def mark_reminder_event(user_id: int, event_key: str) -> None:
+    get_db().execute(
+        """
+        INSERT OR IGNORE INTO reminder_events (user_id, event_key)
+        VALUES (?, ?)
+        """,
+        (user_id, event_key),
+    )
+    get_db().commit()
+
+
+def due_for_rule(now: datetime, *, hour: int, minute: int, end_hour: int) -> bool:
+    current_minutes = (now.hour * 60) + now.minute
+    target_minutes = (hour * 60) + minute
+    end_minutes = end_hour * 60
+    return target_minutes <= current_minutes < end_minutes
+
+
+def build_push_target_url(*, planned_date: date, daypart_id: int, suggestion: dict | None) -> str:
+    base = f"/planner/day?date={planned_date.isoformat()}&daypart_id={daypart_id}"
+    if not suggestion:
+        return f"{base}#daypart-{daypart_id}"
+    if suggestion.get("existing_item_id"):
+        return f"{base}&item_id={int(suggestion['existing_item_id'])}#daypart-{daypart_id}"
+    component_ids = ",".join(str(component_id) for component_id in suggestion.get("component_ids", []))
+    if suggestion.get("title") and component_ids:
+        meal_name = quote(str(suggestion["title"]))
+        return f"{base}&meal_name={meal_name}&component_ids={component_ids}#daypart-{daypart_id}"
+    return f"{base}#daypart-{daypart_id}"
+
+
+def build_push_message(label: str, suggestion: dict | None) -> tuple[str, str]:
+    title = f"Nouri · {label}"
+    if suggestion and suggestion.get("title"):
+        return title, f"Für {label.lower()} ist noch nichts geplant. Möglich wäre gerade: {suggestion['title']}."
+    return title, f"Für {label.lower()} ist noch nichts geplant."
+
+
+def build_small_snack_push_message(suggestion: dict | None) -> tuple[str, str]:
+    title = "Nouri · Etwas Kleines"
+    if suggestion and suggestion.get("title"):
+        return title, f"Für später wäre etwas Kleines möglich. Zuhause passt gerade: {suggestion['title']}."
+    return title, "Für später wäre etwas Kleines möglich. Vielleicht passt heute etwas Einfaches wie Nüsse oder ein Apfel."
+
+
+def best_suggestion_for_user(user, daypart_id: int) -> dict | None:
+    previous_user = getattr(g, "user", None)
+    g.user = user
+    try:
+        suggestions = build_home_recipe_suggestions(daypart_id, limit=1)
+    finally:
+        g.user = previous_user
+    return suggestions[0] if suggestions else None
+
+
+def best_small_snack_suggestion_for_user(user, daypart_ids: list[int]) -> tuple[int | None, dict | None]:
+    previous_user = getattr(g, "user", None)
+    g.user = user
+    try:
+        for daypart_id in daypart_ids:
+            suggestions = build_home_recipe_suggestions(daypart_id, limit=1)
+            if suggestions:
+                return daypart_id, suggestions[0]
+    finally:
+        g.user = previous_user
+    return (daypart_ids[0] if daypart_ids else None), None
+
+
+def send_due_meal_pushes(now: datetime | None = None) -> int:
+    now = now or current_local_time()
+    planned_date = now.date()
+    sent_count = 0
+    dayparts = fetch_daypart_map()
+
+    for user in fetch_push_ready_users():
+        g.user = user
+        settings = get_user_settings()
+        if not push_delivery_channel_enabled(settings):
+            continue
+
+        subscriptions = get_db().execute(
+            """
+            SELECT endpoint, p256dh, auth
+            FROM push_subscriptions
+            WHERE user_id = ? AND is_active = 1
+            ORDER BY updated_at DESC
+            """,
+            (int(user["id"]),),
+        ).fetchall()
+        if not subscriptions:
+            continue
+
+        for rule in MEAL_PUSH_RULES:
+            if not settings.get(rule["setting"]):
+                continue
+            if not due_for_rule(now, hour=rule["hour"], minute=rule["minute"], end_hour=rule["end_hour"]):
+                continue
+
+            daypart = dayparts.get(rule["slug"])
+            if not daypart:
+                continue
+            if plan_exists_for_daypart(user, planned_date=planned_date, daypart_id=daypart["id"]):
+                continue
+
+            event_key = f"meal-push:{planned_date.isoformat()}:{rule['slug']}"
+            if reminder_event_exists(int(user["id"]), event_key):
+                continue
+
+            suggestion = best_suggestion_for_user(user, daypart["id"])
+            title, body = build_push_message(rule["label"], suggestion)
+            url = build_push_target_url(planned_date=planned_date, daypart_id=daypart["id"], suggestion=suggestion)
+
+            delivered = False
+            for subscription in subscriptions:
+                ok, _error = send_push_message(
+                    {
+                        "endpoint": subscription["endpoint"],
+                        "keys": {"p256dh": subscription["p256dh"], "auth": subscription["auth"]},
+                    },
+                    title=title,
+                    body=body,
+                    url=url,
+                )
+                delivered = delivered or ok
+
+            if delivered:
+                mark_reminder_event(int(user["id"]), event_key)
+                sent_count += 1
+
+        snack_rule = SNACK_PUSH_RULE
+        if settings.get(snack_rule["setting"]) and due_for_rule(
+            now,
+            hour=snack_rule["hour"],
+            minute=snack_rule["minute"],
+            end_hour=snack_rule["end_hour"],
+        ):
+            snack_daypart_ids = [
+                int(dayparts[slug]["id"])
+                for slug in snack_rule["slugs"]
+                if slug in dayparts
+            ]
+            if snack_daypart_ids and not plan_exists_for_any_daypart(
+                user,
+                planned_date=planned_date,
+                daypart_ids=snack_daypart_ids,
+            ):
+                event_key = f"meal-push:{planned_date.isoformat()}:small-snack"
+                if not reminder_event_exists(int(user["id"]), event_key):
+                    daypart_id, suggestion = best_small_snack_suggestion_for_user(user, snack_daypart_ids)
+                    title, body = build_small_snack_push_message(suggestion)
+                    url = build_push_target_url(
+                        planned_date=planned_date,
+                        daypart_id=daypart_id or snack_daypart_ids[0],
+                        suggestion=suggestion,
+                    )
+
+                    delivered = False
+                    for subscription in subscriptions:
+                        ok, _error = send_push_message(
+                            {
+                                "endpoint": subscription["endpoint"],
+                                "keys": {"p256dh": subscription["p256dh"], "auth": subscription["auth"]},
+                            },
+                            title=title,
+                            body=body,
+                            url=url,
+                        )
+                        delivered = delivered or ok
+
+                    if delivered:
+                        mark_reminder_event(int(user["id"]), event_key)
+                        sent_count += 1
+
+    return sent_count
+
+
+def reminder_worker_loop(sleep_seconds: int = 60) -> None:
+    while True:
+        try:
+            send_due_meal_pushes()
+        except Exception as exc:  # pragma: no cover - background worker fallback
+            current_app.logger.warning("Reminder worker skipped one cycle: %s", exc)
+        time.sleep(sleep_seconds)

nouri/schema.sql

@@ -1,5 +1,11 @@
 PRAGMA foreign_keys = ON;
 
+CREATE TABLE IF NOT EXISTS app_meta (
+    key TEXT PRIMARY KEY,
+    value TEXT,
+    updated_at TEXT NOT NULL DEFAULT CURRENT_TIMESTAMP
+);
+
 CREATE TABLE IF NOT EXISTS households (
     id INTEGER PRIMARY KEY AUTOINCREMENT,
     name TEXT NOT NULL,
@@ -44,12 +50,18 @@ CREATE TABLE IF NOT EXISTS user_settings (
     reminders_enabled INTEGER NOT NULL DEFAULT 1,
     push_enabled INTEGER NOT NULL DEFAULT 0,
     notification_channel TEXT NOT NULL DEFAULT 'in_app',
+    suggestion_style TEXT NOT NULL DEFAULT 'balanced',
+    energy_preference TEXT NOT NULL DEFAULT 'neutral',
     remind_before_shopping INTEGER NOT NULL DEFAULT 1,
     remind_on_shopping_day INTEGER NOT NULL DEFAULT 1,
     show_missing_for_upcoming_week INTEGER NOT NULL DEFAULT 1,
     show_planned_not_shopped INTEGER NOT NULL DEFAULT 1,
     remind_tomorrow_if_sparse INTEGER NOT NULL DEFAULT 1,
     remind_week_if_sparse INTEGER NOT NULL DEFAULT 1,
+    push_missing_breakfast INTEGER NOT NULL DEFAULT 0,
+    push_missing_lunch INTEGER NOT NULL DEFAULT 0,
+    push_missing_dinner INTEGER NOT NULL DEFAULT 0,
+    push_small_snack INTEGER NOT NULL DEFAULT 0,
     suggest_home_for_today INTEGER NOT NULL DEFAULT 1,
     remind_small_snack INTEGER NOT NULL DEFAULT 0,
     remind_nuts INTEGER NOT NULL DEFAULT 0,
@@ -74,6 +86,24 @@ CREATE TABLE IF NOT EXISTS push_subscriptions (
     FOREIGN KEY (user_id) REFERENCES users(id) ON DELETE CASCADE
 );
 
+CREATE TABLE IF NOT EXISTS reminder_events (
+    id INTEGER PRIMARY KEY AUTOINCREMENT,
+    user_id INTEGER NOT NULL,
+    event_key TEXT NOT NULL,
+    created_at TEXT NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    UNIQUE (user_id, event_key),
+    FOREIGN KEY (user_id) REFERENCES users(id) ON DELETE CASCADE
+);
+
+CREATE TABLE IF NOT EXISTS hidden_generated_suggestions (
+    id INTEGER PRIMARY KEY AUTOINCREMENT,
+    user_id INTEGER NOT NULL,
+    suggestion_key TEXT NOT NULL,
+    created_at TEXT NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    UNIQUE (user_id, suggestion_key),
+    FOREIGN KEY (user_id) REFERENCES users(id) ON DELETE CASCADE
+);
+
 CREATE TABLE IF NOT EXISTS dayparts (
     id INTEGER PRIMARY KEY AUTOINCREMENT,
     slug TEXT NOT NULL UNIQUE,
@@ -90,6 +120,7 @@ CREATE TABLE IF NOT EXISTS items (
     kind TEXT NOT NULL CHECK (kind IN ('food', 'meal')),
     name TEXT NOT NULL,
     category TEXT,
+    energy_density TEXT NOT NULL DEFAULT 'neutral',
     note TEXT,
     photo_filename TEXT,
     availability_state TEXT NOT NULL DEFAULT 'idea' CHECK (availability_state IN ('idea', 'home', 'archived')),

nouri/static/brand/favicon.svg

@@ -1,16 +1,6 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64">
+<svg width="64" height="64" viewBox="0 0 64 64" fill="none" xmlns="http://www.w3.org/2000/svg">
-  <defs>
+  <rect x="3" y="3" width="58" height="58" rx="18" fill="#E3A06B"/>
-    <linearGradient id="bg" x1="0%" y1="0%" x2="100%" y2="100%">
+  <path d="M16 36H48C46.9 44.2 40.0727 50 31.8 50H32.2C23.9273 50 17.1 44.2 16 36Z" fill="#FFF5EC"/>
-      <stop offset="0%" stop-color="#ffd7be"/>
+  <path d="M31.9997 19C36.9702 19 40.9997 23.0781 40.9997 28.1081V29.3848C40.9997 32.7262 39.6098 35.9158 37.1535 38.1417L29.9949 44.6282H24.5605L32.4863 37.4468C34.0025 36.0726 34.8571 34.1103 34.8571 32.0653V28.1081C34.8571 26.551 33.5671 25.2162 31.9997 25.2162C30.4324 25.2162 29.1424 26.551 29.1424 28.1081V29.3848H23C23 23.0781 27.0295 19 31.9997 19Z" fill="#8C533B"/>
-      <stop offset="100%" stop-color="#e39a63"/>
+  <rect x="24" y="39" width="16" height="6" rx="3" fill="#8C533B"/>
-    </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

@@ -1,21 +1,20 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 256 256" role="img" aria-labelledby="title">
+<svg width="512" height="512" viewBox="0 0 512 512" fill="none" xmlns="http://www.w3.org/2000/svg">
-  <title>Nouri</title>
   <defs>
-    <linearGradient id="bg" x1="0%" y1="0%" x2="100%" y2="100%">
+    <linearGradient id="nouriBg" x1="88" y1="72" x2="420" y2="440" gradientUnits="userSpaceOnUse">
-      <stop offset="0%" stop-color="#ffd7be"/>
+      <stop stop-color="#F6C394"/>
-      <stop offset="55%" stop-color="#f5b17a"/>
+      <stop offset="1" stop-color="#DE9862"/>
-      <stop offset="100%" stop-color="#d58c57"/>
     </linearGradient>
-    <linearGradient id="leaf" x1="0%" y1="0%" x2="100%" y2="100%">
+    <linearGradient id="nouriBowl" x1="161" y1="176" x2="349" y2="339" gradientUnits="userSpaceOnUse">
-      <stop offset="0%" stop-color="#b5dfc8"/>
+      <stop stop-color="#FFF8F0"/>
-      <stop offset="100%" stop-color="#70aa87"/>
+      <stop offset="1" stop-color="#FDE7D5"/>
     </linearGradient>
   </defs>
-  <rect width="256" height="256" rx="64" fill="url(#bg)"/>
+  <rect x="24" y="24" width="464" height="464" rx="122" fill="url(#nouriBg)"/>
-  <circle cx="128" cy="128" r="96" fill="rgba(255,255,255,0.16)"/>
+  <rect x="48" y="48" width="416" height="416" rx="104" fill="white" fill-opacity="0.12"/>
-  <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="M152 232C152 175.667 197.667 130 254 130H258C315.438 130 362 176.562 362 234V242C362 299.438 315.438 346 258 346H254C197.667 346 152 300.333 152 244V232Z" fill="url(#nouriBowl)"/>
-  <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="M175 244C175 201.474 209.474 167 252 167H258C300.526 167 335 201.474 335 244V244C335 286.526 300.526 321 258 321H252C209.474 321 175 286.526 175 244V244Z" fill="#EFC39F" fill-opacity="0.22"/>
-  <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="M164 287H348C344.6 332.419 307.445 368 261.2 368H250.8C204.555 368 167.4 332.419 164 287Z" fill="#F7B37D"/>
-  <path d="M129 143h41" stroke="#f0a46c" stroke-linecap="round" stroke-width="10"/>
+  <path d="M198 287H314C311.53 314.638 288.347 336 260.2 336H251.8C223.653 336 200.47 314.638 198 287Z" fill="#A86244" fill-opacity="0.2"/>
-  <path d="M92 96l-10 62" stroke="#fff9f4" stroke-linecap="round" stroke-width="10"/>
+  <path d="M255.999 171C271.513 171 284.246 183.574 284.246 199.27V205.573C284.246 216.441 279.591 226.794 271.487 233.994L246.435 256.256C241.017 261.07 237.906 268.003 237.906 275.283V295.246H212.906V275.283C212.906 260.722 219.129 246.854 229.965 237.227L255.016 214.966C257.705 212.578 259.246 209.146 259.246 205.573V199.27C259.246 197.28 257.651 195.6 255.999 195.6C254.347 195.6 252.752 197.28 252.752 199.27V205.091H227.752V199.27C227.752 183.574 240.485 171 255.999 171Z" fill="#8C533B"/>
+  <rect x="226" y="280" width="63" height="25" rx="12.5" fill="#8C533B"/>
 </svg>

nouri/static/icons/dayparts/afternoon-snack.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><!--! Font Awesome Pro 7.0.0 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license (Commercial License) Copyright 2025 Fonticons, Inc. --><path fill="currentColor" d="M362.2 37L213.9 16 81.7 86.7 16 222.1 42 370.4 149.8 475 298.1 496 430.3 425.3 496 289.9 470 141.6 362.2 37zM208 144a32 32 0 1 1 0 64 32 32 0 1 1 0-64zM144 336a32 32 0 1 1 64 0 32 32 0 1 1 -64 0zm224-64a32 32 0 1 1 0 64 32 32 0 1 1 0-64z"/></svg>

nouri/static/icons/dayparts/breakfast.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><!--! Font Awesome Pro 7.0.0 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license (Commercial License) Copyright 2025 Fonticons, Inc. --><path fill="currentColor" d="M243.2 .3c4.2-.2 8.5-.3 12.8-.3 62.1 0 118.9 22.1 163.3 58.8L314.6 163.4 243.2 .3zM194 7.6L307.4 266.6 267.3 306.8 12 178.3C38.8 94.2 107.7 29 194 7.6zM1.6 226.8l166 83.6-108.9 108.9C22.1 374.9 0 318.1 0 256 0 246.1 .6 236.4 1.6 226.8zM92.7 453.2l120.1-120.1 11.2 5.6 0 171.3c-49.5-6.2-94.7-26.5-131.3-56.8zM341.2 224l-5.9-13.4 117.9-117.9c30.3 36.6 50.6 81.7 56.8 131.3l-168.8 0z"/></svg>

nouri/static/icons/dayparts/dinner.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 640 512"><!--! Font Awesome Pro 7.0.0 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license (Commercial License) Copyright 2025 Fonticons, Inc. --><path fill="currentColor" d="M56 16L40 16 0 152c0 41.5 31.6 75.6 72 79.6l0 264.4 48 0 0-264.4c40.4-4 72-38.1 72-79.6l-40-136-16 0 0 136-16 0-16-136-16 0-16 136-16 0 0-136zm584 0S512 32 512 160l0 160 80 0 0 176 48 0 0-480zM336 32c-43.8 0-84.7 12.6-119.2 34.3l19.1 64.9c27.4-22 62.2-35.2 100.1-35.2 52.3 0 98.8 25.1 128 64 0-29.7 5.5-55.2 14.5-76.9-38.7-31.9-88.3-51.1-142.5-51.1zm0 384c-86.1 0-156.3-68-159.9-153.2-2.7 1.5-5.4 3-8.1 4.3l0 137c41 46.5 101.1 75.8 168 75.8 82.9 0 155.3-45 194-112l-66 0 0-16c-29.2 38.9-75.7 64-128 64zM448 256a112 112 0 1 0 -224 0 112 112 0 1 0 224 0z"/></svg>

nouri/static/icons/dayparts/late-snack.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><!--! Font Awesome Pro 7.0.0 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license (Commercial License) Copyright 2025 Fonticons, Inc. --><path fill="currentColor" d="M359.7 21.9C272.6 43.5 208 122.2 208 216 208 326.4 297.5 416 408 416 426.5 416 444.4 413.5 461.4 408.8 414.8 471.4 340.1 512 256 512 114.6 512 0 397.4 0 256S114.6 0 256 0c36.9 0 72 7.8 103.7 21.9z"/></svg>

nouri/static/icons/dayparts/lunch.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><!--! Font Awesome Pro 7.0.0 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license (Commercial License) Copyright 2025 Fonticons, Inc. --><path fill="currentColor" d="M0 64l512 0 0 112-512 0 0-112zM320 384l96-48 96 0 0 112-512 0 0-112 224 0 96 48zM144.2 209.1l111.8 29.8 111.8-29.8 8-2.1 8 2c74.8 18.7 117.2 29.3 127 31.8l-15.5 62.1c-11.2-2.8-50.9-12.7-119-29.8l-112 29.9-8.2 2.2-8.2-2.2-112-29.9c-68.1 17-107.8 27-119 29.8L1.2 240.7c9.9-2.5 52.2-13.1 127-31.8l8-2 8 2.1z"/></svg>

nouri/static/icons/dayparts/morning-snack.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 448 512"><!--! Font Awesome Pro 7.0.0 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license (Commercial License) Copyright 2025 Fonticons, Inc. --><path fill="currentColor" d="M208 96l0-16c0-44.2 35.8-80 80-80l32 0 0 32c0 44.2-35.8 80-80 80l-32 0 0-16zM0 288c0-76.3 35.7-160 112-160l112 32 112-32c76.3 0 112 83.7 112 160 0 128-80 224-160 224l-64-16-64 16C80 512 0 416 0 288z"/></svg>

nouri/static/icons/fa/theme-moon.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 576 576"><path fill="currentColor" d="M99.1 99.8c36.8-31.2 88.7-50.7 158.9-51.8 70.8 1.3 118.7 27.7 149.8 67.9 32.6 42.2 48.7 102.3 48.7 172s-16.1 129.8-48.7 172c-31 40.2-79 66.6-149.8 67.9-70.2-1.1-122.1-20.6-158.9-51.8 14.2 2.5 29.3 3.8 45.4 3.8 4.1 0 8.1-.1 12-.2l0 .2c80.4 0 138.3-19.7 176.2-55.9 38-36.3 51.8-85.6 51.8-136.1s-13.8-99.8-51.8-136.1C294.8 115.7 236.9 96 156.5 96l0 .2c-3.9-.2-7.9-.2-12-.2-16.1 0-31.2 1.3-45.4 3.8zM252.5 .2C125.1 3.6 42.8 62.2 3.5 150.3l38.2 27.5c21.9-20.1 54.9-33.8 102.8-33.8 53.4 0 88.4 16.9 110.2 41.2 22.3 24.8 33.8 60.5 33.8 102.8S277 366 254.7 390.8c-21.9 24.4-56.8 41.2-110.2 41.2-47.9 0-80.9-13.6-102.8-33.8L3.5 425.7c39.3 88.2 121.6 146.7 249 150.1l0 .2c1.9 0 3.8 0 5.6 0 2.1 0 4.2 0 6.4 0 97.8 0 170.8-31.5 219.2-85.3 47.9-53.4 68.8-125.7 68.8-202.7S531.6 138.7 483.6 85.3c-48.3-53.8-121.4-85.3-219.2-85.3-2.1 0-4.3 0-6.4 0-1.9 0-3.7 0-5.6 0l0 .2zM216.5 252c0-26.5-14.4-48-48-48s-48 21.5-48 48 14.4 48 48 48 48-21.5 48-48zm-144 96c25.2 0 36-16.1 36-36s-10.8-36-36-36-36 16.1-36 36 10.8 36 36 36z"/></svg>

nouri/static/icons/fa/theme-sun.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 576 576"><path fill="currentColor" d="M309.6 0L266.4 0 222 47.9c-13.9 15-33.5 23.3-53.9 23L89.2 63 63 89.4 70.9 164.2c.3 19.5-7.3 38.3-21.1 52.1L0 266.1 0 309.6 47.9 354c15 13.9 23.3 33.5 23 53.9l-7.9 78.8 28 26 73.3-12.8c23.9-2.2 47.3 7.7 62.4 26.4l40.2 49.6 42.3 0 40.2-49.6c15.1-18.7 38.5-28.5 62.4-26.4l73.3 12.8 28-26-7.9-78.8c-.3-20.4 8-40 23-53.9l47.9-44.4 0-43.5-49.8-49.8c-13.8-13.8-21.4-32.6-21.1-52.1l7.9-74.8-26.3-26.4-78.8 7.9c-20.4 .3-40-8-53.9-23L309.6 0zM288 64.4l4.8 9.4c26.8 52.1 87.4 77.2 143.2 59.3l10-3.2-3.2 10c-17.9 55.8 7.2 116.4 59.3 143.2l9.4 4.8-9.4 4.8c-52.1 26.8-77.2 87.4-59.3 143.2l3.2 10-10-3.2c-55.8-17.9-116.4 7.2-143.2 59.3l-4.8 9.4-4.8-9.4c-26.8-52.1-87.4-77.2-143.2-59.3l-10 3.2 3.2-10c17.9-55.8-7.2-116.4-59.3-143.2l-9.4-4.8 9.4-4.8c52.1-26.8 77.2-87.4 59.3-143.2l-3.2-10 10 3.2c55.8 17.9 116.4-7.2 143.2-59.3l4.8-9.4zM322.3 224c8.6 14.4 13.7 36.5 13.7 64s-5.1 49.6-13.7 64c-7.8 13.1-18.4 20-34.3 20s-26.5-6.9-34.3-20c-8.6-14.4-13.7-36.5-13.7-64s5.1-49.6 13.7-64c7.8-13.1 18.4-20 34.3-20s26.5 6.9 34.3 20zM288 156c-43.2 0-77.2 14-100.2 39.6-22.6 25.1-31.8 58.5-31.8 92.4s9.2 67.3 31.8 92.4c23 25.6 57 39.6 100.2 39.6s77.2-14 100.2-39.6C410.8 355.3 420 321.9 420 288s-9.2-67.3-31.8-92.4C365.2 170 331.2 156 288 156z"/></svg>

nouri/static/js/planner.js

@@ -4,6 +4,38 @@
         return meta ? meta.getAttribute("content") : "";
     };
 
+    const scrollKey = "nouri-week-scroll";
+
+    const rememberScroll = () => {
+        sessionStorage.setItem(scrollKey, String(window.scrollY));
+    };
+
+    const restoreScroll = () => {
+        const savedScroll = sessionStorage.getItem(scrollKey);
+        if (!savedScroll) return;
+        sessionStorage.removeItem(scrollKey);
+        window.requestAnimationFrame(() => {
+            window.scrollTo({ top: Number(savedScroll), left: 0, behavior: "auto" });
+        });
+    };
+
+    const postAndRefreshInPlace = async (form) => {
+        const payload = new URLSearchParams(new FormData(form));
+        const response = await fetch(form.action, {
+            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("request failed");
+        }
+        rememberScroll();
+        window.location.reload();
+    };
+
     const initWeekDragAndDrop = () => {
         const board = document.querySelector(".week-board");
         if (!board) return;
@@ -75,7 +107,185 @@
         });
     };
 
+    const initWeekCopyForward = () => {
+        document.querySelectorAll(".js-copy-forward-form").forEach((form) => {
+            form.addEventListener("submit", async (event) => {
+                event.preventDefault();
+                try {
+                    await postAndRefreshInPlace(form);
+                } catch (_error) {
+                    window.location.reload();
+                }
+            });
+        });
+    };
+
+    const initWeekSlotPicker = () => {
+        const board = document.querySelector(".week-board");
+        if (!board) return;
+
+        const closeAllPickers = () => {
+            board.querySelectorAll(".week-card").forEach((card) => {
+                card.classList.remove("has-open-picker");
+            });
+            board.querySelectorAll(".week-slot").forEach((slot) => {
+                slot.classList.remove("is-picker-open");
+            });
+            board.querySelectorAll(".week-slot-picker").forEach((picker) => {
+                picker.hidden = true;
+            });
+        };
+
+        board.querySelectorAll("[data-week-slot-picker-open]").forEach((button) => {
+            button.addEventListener("click", (event) => {
+                event.preventDefault();
+                const slot = button.closest(".week-slot");
+                if (!slot) return;
+                const picker = slot.querySelector(".week-slot-picker");
+                if (!picker) return;
+                const card = slot.closest(".week-card");
+                const shouldOpen = picker.hidden;
+                closeAllPickers();
+                if (shouldOpen) {
+                    picker.hidden = false;
+                    slot.classList.add("is-picker-open");
+                    if (card) {
+                        card.classList.add("has-open-picker");
+                    }
+                    const filterInput = picker.querySelector("[data-filter-input]");
+                    if (filterInput instanceof HTMLInputElement) {
+                        filterInput.value = "";
+                        filterInput.dispatchEvent(new Event("input", { bubbles: true }));
+                        window.requestAnimationFrame(() => filterInput.focus());
+                    }
+                }
+            });
+        });
+
+        board.querySelectorAll("[data-week-slot-picker-close]").forEach((button) => {
+            button.addEventListener("click", () => {
+                const slot = button.closest(".week-slot");
+                if (!slot) return;
+                const picker = slot.querySelector(".week-slot-picker");
+                const card = slot.closest(".week-card");
+                if (!picker) return;
+                picker.hidden = true;
+                slot.classList.remove("is-picker-open");
+                if (card) {
+                    card.classList.remove("has-open-picker");
+                }
+            });
+        });
+
+        board.querySelectorAll(".js-week-slot-submit").forEach((form) => {
+            form.addEventListener("submit", async (event) => {
+                event.preventDefault();
+                try {
+                    await postAndRefreshInPlace(form);
+                } catch (_error) {
+                    window.location.reload();
+                }
+            });
+        });
+
+        document.addEventListener("click", (event) => {
+            const target = event.target;
+            if (!(target instanceof Element)) return;
+            if (target.closest(".week-slot")) return;
+            closeAllPickers();
+        });
+    };
+
+    const syncActionContainerVisibility = (container) => {
+        if (!(container instanceof HTMLElement)) return;
+        const hasVisibleButtons = Array.from(container.querySelectorAll("button")).some((button) => {
+            return !button.hidden;
+        });
+        container.hidden = !hasVisibleButtons;
+    };
+
+    const revealActionButton = (container, selector) => {
+        if (!(container instanceof HTMLElement) || !selector) return;
+        const button = container.querySelector(`button[data-target="${selector}"]`);
+        if (!(button instanceof HTMLButtonElement)) return;
+        button.hidden = false;
+        container.hidden = false;
+    };
+
+    const initDaySnackReveal = () => {
+        document.querySelectorAll("[data-day-snack-open]").forEach((button) => {
+            button.addEventListener("click", () => {
+                const selector = button.getAttribute("data-target");
+                if (!selector) return;
+                const tile = document.querySelector(selector);
+                if (!(tile instanceof HTMLDetailsElement)) return;
+                tile.hidden = false;
+                tile.open = true;
+                button.hidden = true;
+                tile.scrollIntoView({ block: "nearest", inline: "nearest" });
+                syncActionContainerVisibility(button.closest("[data-day-snack-actions]"));
+            });
+        });
+
+        document.querySelectorAll("[data-day-snack-hide]").forEach((button) => {
+            button.addEventListener("click", () => {
+                const selector = button.getAttribute("data-target");
+                if (!selector) return;
+                const tile = document.querySelector(selector);
+                if (!(tile instanceof HTMLDetailsElement)) return;
+                tile.open = false;
+                tile.hidden = true;
+                revealActionButton(document.querySelector("[data-day-snack-actions]"), selector);
+            });
+        });
+    };
+
+    const initWeekSnackReveal = () => {
+        document.querySelectorAll("[data-week-snack-slot-open]").forEach((button) => {
+            button.addEventListener("click", () => {
+                const selector = button.getAttribute("data-target");
+                if (!selector) return;
+                const slot = document.querySelector(selector);
+                if (!(slot instanceof HTMLElement)) return;
+                slot.hidden = false;
+                button.hidden = true;
+                syncActionContainerVisibility(button.closest("[data-week-snack-actions]"));
+                const openButton = slot.querySelector("[data-week-slot-picker-open]");
+                if (openButton instanceof HTMLButtonElement) {
+                    openButton.click();
+                } else {
+                    slot.scrollIntoView({ block: "nearest", inline: "nearest" });
+                }
+            });
+        });
+
+        document.querySelectorAll("[data-week-snack-slot-hide]").forEach((button) => {
+            button.addEventListener("click", () => {
+                const selector = button.getAttribute("data-target");
+                if (!selector) return;
+                const slot = document.querySelector(selector);
+                if (!(slot instanceof HTMLElement)) return;
+                const picker = slot.querySelector(".week-slot-picker");
+                if (picker instanceof HTMLElement) {
+                    picker.hidden = true;
+                }
+                slot.classList.remove("is-picker-open");
+                slot.hidden = true;
+                const card = slot.closest(".week-card");
+                if (card) {
+                    card.classList.remove("has-open-picker");
+                }
+                revealActionButton(slot.closest(".week-card")?.querySelector("[data-week-snack-actions]"), selector);
+            });
+        });
+    };
+
     document.addEventListener("DOMContentLoaded", () => {
+        restoreScroll();
         initWeekDragAndDrop();
+        initWeekCopyForward();
+        initWeekSlotPicker();
+        initDaySnackReveal();
+        initWeekSnackReveal();
     });
 })();

nouri/static/js/theme.js

@@ -12,7 +12,22 @@
         root.dataset.theme = finalTheme;
 
         toggles().forEach((button) => {
-            button.textContent = finalTheme === "dark" ? "Hell" : "Dunkel";
+            const nextModeLabel = finalTheme === "dark" ? "Hell" : "Dunkel";
+            const label = button.querySelector("[data-theme-label]");
+            const icon = button.querySelector("[data-theme-icon]");
+
+            if (label) {
+                label.textContent = nextModeLabel;
+            } else {
+                button.textContent = nextModeLabel;
+            }
+
+            if (icon) {
+                icon.classList.toggle("icon-sun-theme", finalTheme === "dark");
+                icon.classList.toggle("icon-moon-theme", finalTheme !== "dark");
+            }
+
+            button.setAttribute("aria-label", `${nextModeLabel} aktivieren`);
         });
     };
 

nouri/static/js/ui.js

@@ -51,12 +51,57 @@
             if (!container) return;
 
             const items = Array.from(container.querySelectorAll("[data-filter-label]"));
+            const filterGroups = Array.from(container.querySelectorAll("[data-filter-group]"));
+            const resultLimit = Number.parseInt(input.getAttribute("data-filter-limit") || "", 10);
+            const hasLimit = Number.isFinite(resultLimit) && resultLimit > 0;
+
+            const scoreItem = (label, term) => {
+                if (label === term) return 0;
+                if (label.startsWith(term)) return 1;
+                if (label.split(/\s+/).some((part) => part.startsWith(term))) return 2;
+                if (label.includes(term)) return 3;
+                return 99;
+            };
+
+            const syncGroups = () => {
+                filterGroups.forEach((group) => {
+                    const visibleChildren = Array.from(group.querySelectorAll("[data-filter-label]")).some((item) => !item.hidden);
+                    const card = group.closest(".component-group, .template-list-card, .panel, .planner-subsection");
+                    if (card) {
+                        card.hidden = !visibleChildren;
+                    } else {
+                        group.hidden = !visibleChildren;
+                    }
+                });
+            };
+
             const applyFilter = () => {
                 const term = input.value.trim().toLowerCase();
+                if (!term) {
+                    items.forEach((item, index) => {
+                        item.hidden = hasLimit ? index >= resultLimit : false;
+                    });
+                    syncGroups();
+                    return;
+                }
+
+                const rankedMatches = items
+                    .map((item, index) => {
+                        const haystack = (item.getAttribute("data-filter-label") || "").toLowerCase();
+                        const score = scoreItem(haystack, term);
+                        return { item, index, score, matches: score < 99 };
+                    })
+                    .filter((entry) => entry.matches)
+                    .sort((left, right) => left.score - right.score || left.index - right.index);
+
+                const allowedItems = new Set(
+                    (hasLimit ? rankedMatches.slice(0, resultLimit) : rankedMatches).map((entry) => entry.item)
+                );
+
                 items.forEach((item) => {
-                    const haystack = (item.getAttribute("data-filter-label") || "").toLowerCase();
+                    item.hidden = !allowedItems.has(item);
-                    item.hidden = Boolean(term) && !haystack.includes(term);
                 });
+                syncGroups();
             };
 
             input.addEventListener("input", applyFilter);
@@ -64,8 +109,53 @@
         });
     };
 
+    const initIosPullToRefresh = () => {
+        const isAppleTouchDevice = /iP(ad|hone|od)/.test(navigator.userAgent)
+            || (navigator.platform === "MacIntel" && navigator.maxTouchPoints > 1);
+        if (!isAppleTouchDevice) return;
+
+        let startY = 0;
+        let maxPull = 0;
+        let tracking = false;
+
+        window.addEventListener("touchstart", (event) => {
+            if (window.scrollY > 0) {
+                tracking = false;
+                return;
+            }
+            startY = event.touches[0].clientY;
+            maxPull = 0;
+            tracking = true;
+        }, { passive: true });
+
+        window.addEventListener("touchmove", (event) => {
+            if (!tracking) return;
+            const currentY = event.touches[0].clientY;
+            maxPull = Math.max(maxPull, currentY - startY);
+        }, { passive: true });
+
+        window.addEventListener("touchend", () => {
+            if (tracking && maxPull > 96 && window.scrollY <= 2) {
+                window.location.reload();
+            }
+            tracking = false;
+            maxPull = 0;
+        }, { passive: true });
+
+        document.addEventListener("gesturestart", (event) => {
+            event.preventDefault();
+        });
+
+        document.addEventListener("touchmove", (event) => {
+            if (event.touches.length > 1) {
+                event.preventDefault();
+            }
+        }, { passive: false });
+    };
+
     document.addEventListener("DOMContentLoaded", () => {
         initMobileSheet();
         initFilterInputs();
+        initIosPullToRefresh();
     });
 })();

nouri/static/pwa/app.webmanifest

@@ -6,9 +6,16 @@
   "start_url": "/",
   "scope": "/",
   "display": "standalone",
+  "display_override": ["standalone", "minimal-ui"],
   "background_color": "#fff6ef",
-  "theme_color": "#efab72",
+  "theme_color": "#de9862",
+  "categories": ["food", "lifestyle", "productivity"],
   "icons": [
+    {
+      "src": "/static/brand/pwa-180.png",
+      "sizes": "180x180",
+      "type": "image/png"
+    },
     {
       "src": "/static/brand/pwa-192.png",
       "sizes": "192x192",
@@ -18,6 +25,12 @@
       "src": "/static/brand/pwa-512.png",
       "sizes": "512x512",
       "type": "image/png"
+    },
+    {
+      "src": "/static/brand/pwa-maskable-512.png",
+      "sizes": "512x512",
+      "type": "image/png",
+      "purpose": "maskable"
     }
   ]
 }

nouri/static/pwa/offline.html

@@ -0,0 +1,79 @@
+<!doctype html>
+<html lang="de">
+<head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <title>Nouri offline</title>
+    <style>
+        :root {
+            color-scheme: light;
+            --bg: #fff6ef;
+            --surface: rgba(255, 255, 255, 0.92);
+            --line: rgba(126, 104, 85, 0.14);
+            --text: #352d2b;
+            --muted: #7d7069;
+            --accent: #de9862;
+        }
+
+        * {
+            box-sizing: border-box;
+        }
+
+        body {
+            margin: 0;
+            min-height: 100vh;
+            display: grid;
+            place-items: center;
+            padding: 1.5rem;
+            font-family: "Avenir Next", "Segoe UI", sans-serif;
+            color: var(--text);
+            background:
+                radial-gradient(circle at top left, rgba(255, 205, 174, 0.42), transparent 24rem),
+                radial-gradient(circle at 90% 8%, rgba(190, 226, 203, 0.34), transparent 24rem),
+                linear-gradient(180deg, var(--bg), #fdf0e6);
+        }
+
+        .card {
+            width: min(28rem, 100%);
+            padding: 1.4rem;
+            border-radius: 24px;
+            background: var(--surface);
+            border: 1px solid var(--line);
+            box-shadow: 0 22px 48px rgba(125, 92, 68, 0.12);
+        }
+
+        h1 {
+            margin: 0 0 0.45rem;
+            font-family: "Iowan Old Style", "Palatino Linotype", serif;
+            font-size: 2rem;
+        }
+
+        p {
+            margin: 0.35rem 0;
+            line-height: 1.55;
+        }
+
+        .muted {
+            color: var(--muted);
+        }
+
+        a {
+            display: inline-block;
+            margin-top: 1rem;
+            padding: 0.82rem 1.1rem;
+            border-radius: 999px;
+            background: var(--accent);
+            color: white;
+            text-decoration: none;
+        }
+    </style>
+</head>
+<body>
+    <main class="card">
+        <h1>Nouri ist gerade kurz offline</h1>
+        <p>Die App bleibt da und versucht es gleich wieder. Sobald die Verbindung zurück ist, kannst du normal weitermachen.</p>
+        <p class="muted">Ein Teil der Oberfläche ist schon lokal verfügbar. Für aktuelle Haushaltsdaten braucht Nouri aber wieder eine Verbindung.</p>
+        <a href="/">Erneut versuchen</a>
+    </main>
+</body>
+</html>

nouri/static/pwa/service-worker.js

@@ -1,15 +1,32 @@
-const CACHE_NAME = "nouri-v0-5-1-1";
+const CACHE_NAME = "nouri-v1-0-0";
+const OFFLINE_URL = "/static/pwa/offline.html";
 const STATIC_ASSETS = [
     "/static/css/styles.css",
     "/static/js/theme.js",
     "/static/js/ui.js",
     "/static/js/planner.js",
     "/static/js/pwa.js",
+    "/static/brand/pwa-180.png",
     "/static/brand/pwa-192.png",
     "/static/brand/pwa-512.png",
+    "/static/brand/pwa-maskable-512.png",
+    "/static/brand/pwa-badge.png",
     "/static/brand/favicon.svg",
+    "/app.webmanifest",
+    OFFLINE_URL,
 ];
 
+const cacheFirst = async (request) => {
+    const cached = await caches.match(request);
+    if (cached) return cached;
+    const response = await fetch(request);
+    if (response && response.ok && response.type === "basic") {
+        const cache = await caches.open(CACHE_NAME);
+        cache.put(request, response.clone());
+    }
+    return response;
+};
+
 self.addEventListener("install", (event) => {
     event.waitUntil(
         caches.open(CACHE_NAME).then((cache) => cache.addAll(STATIC_ASSETS)).then(() => self.skipWaiting())
@@ -28,40 +45,32 @@ self.addEventListener("fetch", (event) => {
     if (event.request.method !== "GET") return;
 
     const requestUrl = new URL(event.request.url);
-    const isStaticAsset =
+    const isSameOrigin = requestUrl.origin === self.location.origin;
-        requestUrl.origin === self.location.origin &&
+    const isStaticAsset = isSameOrigin && (
-        (
+        requestUrl.pathname.startsWith("/static/")
-            requestUrl.pathname.startsWith("/static/")
+        || requestUrl.pathname === "/app.webmanifest"
-            || requestUrl.pathname === "/app.webmanifest"
+        || requestUrl.pathname === "/service-worker.js"
-            || requestUrl.pathname === "/service-worker.js"
+    );
-        );
+    const isUpload = isSameOrigin && requestUrl.pathname.startsWith("/uploads/");
 
     if (event.request.mode === "navigate") {
         event.respondWith(
-            fetch(event.request).catch(() => caches.match(event.request))
+            fetch(event.request)
+                .then((response) => {
+                    const copy = response.clone();
+                    caches.open(CACHE_NAME).then((cache) => cache.put(event.request, copy));
+                    return response;
+                })
+                .catch(async () => {
+                    return (await caches.match(event.request)) || caches.match(OFFLINE_URL);
+                })
         );
         return;
     }
 
-    if (!isStaticAsset) {
+    if (isStaticAsset || isUpload) {
-        return;
+        event.respondWith(cacheFirst(event.request));
     }
-
-    event.respondWith(
-        caches.match(event.request).then((cached) => {
-            if (cached) {
-                return cached;
-            }
-            return fetch(event.request).then((response) => {
-                if (!response || response.status !== 200 || response.type !== "basic") {
-                    return response;
-                }
-                const clone = response.clone();
-                caches.open(CACHE_NAME).then((cache) => cache.put(event.request, clone));
-                return response;
-            });
-        })
-    );
 });
 
 self.addEventListener("push", (event) => {

nouri/templates/admin/categories.html

@@ -66,6 +66,12 @@
                         {% if category.is_active %}Pausieren{% else %}Wieder aktivieren{% endif %}
                     </button>
                 </form>
+                {% if category.name not in default_categories %}
+                    <form method="post" action="{{ url_for('admin.category_delete', category_id=category.id) }}">
+                        {{ csrf_input() }}
+                        <button class="ghost-button" type="submit">Löschen</button>
+                    </form>
+                {% endif %}
             </div>
         </article>
     {% endfor %}

nouri/templates/archive/list.html

@@ -44,7 +44,12 @@
             <article class="item-card">
                 <div class="item-media">
                     {% if item.photo_filename %}
-                        <img src="{{ url_for('uploaded_file', filename=item.photo_filename) }}" alt="{{ item.name }}">
+                        <img
+                            src="{{ image_url(item.photo_filename, 'md') }}"
+                            srcset="{{ image_srcset(item.photo_filename) }}"
+                            sizes="{{ image_sizes('grid') }}"
+                            alt="{{ item.name }}"
+                            loading="lazy">
                     {% else %}
                         <div class="placeholder-tile">{{ item.name[:1] }}</div>
                     {% endif %}

nouri/templates/auth/setup.html

@@ -5,7 +5,22 @@
     <div class="auth-card">
         <p class="eyebrow">Erster Start</p>
         <h1>Den ersten Haushalt-Zugang anlegen</h1>
-        <p class="lead">Danach könnt ihr Nouri gemeinsam nutzen. Persönliche und gemeinsame Einträge lassen sich später ruhig auseinanderhalten.</p>
+        <p class="lead">Danach könnt ihr Nouri gemeinsam nutzen. Der erste Einstieg bleibt bewusst klein: Zugang anlegen, Einkaufstag festlegen, erste Lebensmittel sammeln und bei Bedarf später eine Tagesvorlage merken.</p>
+
+        <div class="setup-intro-grid">
+            <div class="setup-tip">
+                <strong>1. Ruhig starten</strong>
+                <p class="muted">Ein erster Haushalt und ein Admin-Zugang reichen für den Anfang völlig.</p>
+            </div>
+            <div class="setup-tip">
+                <strong>2. Alltag festhalten</strong>
+                <p class="muted">Später könnt ihr Lebensmittel, Mahlzeitenideen und Planungen gemeinsam nutzen.</p>
+            </div>
+            <div class="setup-tip">
+                <strong>3. Als App nutzen</strong>
+                <p class="muted">Auf dem iPhone lässt sich Nouri später über Safari zum Home-Bildschirm hinzufügen.</p>
+            </div>
+        </div>
 
         <form method="post" class="stack-form">
             {{ csrf_input() }}

nouri/templates/base.html

@@ -2,63 +2,74 @@
 <html lang="de" data-theme="auto">
 <head>
     <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no, viewport-fit=cover">
     <title>{% block title %}Nouri{% endblock %}</title>
-    <meta name="theme-color" content="#efab72">
+    <meta name="theme-color" content="#de9862">
+    <meta name="mobile-web-app-capable" content="yes">
     <meta name="apple-mobile-web-app-capable" content="yes">
     <meta name="apple-mobile-web-app-status-bar-style" content="default">
     <meta name="apple-mobile-web-app-title" content="Nouri">
+    <meta name="application-name" content="Nouri">
     <meta name="csrf-token" content="{{ csrf_token_value }}">
     <meta name="nouri-push-public-key" content="{{ push_public_key }}">
-    <link rel="icon" type="image/svg+xml" href="{{ url_for('static', filename='brand/favicon.svg') }}">
+    <link rel="icon" type="image/svg+xml" href="{{ asset_url('brand/favicon.svg') }}">
-    <link rel="apple-touch-icon" href="{{ url_for('static', filename='brand/pwa-192.png') }}">
+    <link rel="apple-touch-icon" sizes="180x180" href="{{ asset_url('brand/pwa-180.png') }}">
     <link rel="manifest" href="{{ url_for('webmanifest') }}">
-    <link rel="stylesheet" href="{{ url_for('static', filename='css/styles.css') }}">
+    <link rel="stylesheet" href="{{ asset_url('css/styles.css') }}">
-    <script defer src="{{ url_for('static', filename='js/theme.js') }}"></script>
+    <script defer src="{{ asset_url('js/theme.js') }}"></script>
-    <script defer src="{{ url_for('static', filename='js/planner.js') }}"></script>
+    <script defer src="{{ asset_url('js/planner.js') }}"></script>
-    <script defer src="{{ url_for('static', filename='js/ui.js') }}"></script>
+    <script defer src="{{ asset_url('js/ui.js') }}"></script>
-    <script defer src="{{ url_for('static', filename='js/pwa.js') }}"></script>
+    <script defer src="{{ asset_url('js/pwa.js') }}"></script>
 </head>
 <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') }}">
+            <div class="desktop-header-main">
-                <span class="brand-mark">
+                <a class="brand" href="{{ url_for('main.dashboard') }}">
-                    <img src="{{ url_for('static', filename='brand/nouri-icon.svg') }}" alt="">
+                    <span class="brand-mark">
-                </span>
+                        <img src="{{ asset_url('brand/nouri-icon.svg') }}" alt="">
-                <span class="brand-copy">
+                    </span>
-                    <strong>Nouri</strong>
+                    <span class="brand-copy">
-                    <small>einfach essen planen</small>
+                        <strong>Nouri</strong>
-                </span>
+                        <small>einfach essen planen</small>
-            </a>
+                    </span>
+                </a>
+
+                {% if g.user %}
+                    <nav class="site-nav desktop-nav">
+                        <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.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.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.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.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.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.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.template_library') }}" class="{{ 'active' if (request.endpoint or '').startswith('main.day_template') or (request.endpoint or '').startswith('main.week_template') or (request.endpoint or '').startswith('main.item_set') or request.endpoint == 'main.template_library' else '' }}"><span class="nav-link-inner"><span class="ui-icon icon-leaf"></span><span>Vorlagen</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>
+                {% endif %}
+            </div>
 
             {% if g.user %}
-                <nav class="site-nav desktop-nav">
+                <div class="desktop-header-sub">
-                    <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>
+                    <div class="header-actions desktop-actions">
-                    <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>
+                        <button class="theme-toggle ghost-button" type="button" data-theme-toggle aria-label="Darstellung wechseln">
-                    <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>
+                            <span class="ui-icon icon-sun-theme" data-theme-icon></span>
-                    <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>
+                            <span data-theme-label>Hell</span>
-                    <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>
+                        </button>
-                    <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 class="ghost-button" href="{{ url_for('main.settings_view') }}">Optionen</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 class="user-chip" href="{{ url_for('auth.profile') }}">
-                    <a href="{{ url_for('main.template_library') }}" class="{{ 'active' if (request.endpoint or '').startswith('main.day_template') or (request.endpoint or '').startswith('main.week_template') or (request.endpoint or '').startswith('main.item_set') or request.endpoint == 'main.template_library' else '' }}"><span class="nav-link-inner"><span class="ui-icon icon-leaf"></span><span>Vorlagen</span></span></a>
+                            <span class="user-chip-title">{{ g.user.display_name or g.user.username }}</span>
-                    <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>
+                            <small>{{ role_labels[g.user.role] }}</small>
-                </nav>
+                        </a>
-
+                        {% if g.user.role == 'admin' %}
-                <div class="header-actions desktop-actions">
+                            <a class="ghost-button" href="{{ url_for('admin.user_list') }}">Nutzer</a>
-                    <button class="theme-toggle ghost-button" type="button" data-theme-toggle>Modus</button>
+                        {% endif %}
-                    <a class="ghost-button" href="{{ url_for('main.settings_view') }}">Optionen</a>
+                        <form method="post" action="{{ url_for('auth.logout') }}">
-                    <a class="user-chip" href="{{ url_for('auth.profile') }}">
+                            {{ csrf_input() }}
-                        <span class="user-chip-title">{{ g.user.display_name or g.user.username }}</span>
+                            <button class="ghost-button" type="submit">Abmelden</button>
-                        <small>{{ role_labels[g.user.role] }}</small>
+                        </form>
-                    </a>
+                    </div>
-                    {% if g.user.role == 'admin' %}
-                        <a class="ghost-button" href="{{ url_for('admin.user_list') }}">Nutzer</a>
-                    {% endif %}
-                    <form method="post" action="{{ url_for('auth.logout') }}">
-                        {{ csrf_input() }}
-                        <button class="ghost-button" type="submit">Abmelden</button>
-                    </form>
                 </div>
 
                 <button class="mobile-profile-link ghost-button" type="button" data-mobile-sheet-open aria-label="Mehr öffnen">
@@ -83,7 +94,7 @@
 
         <footer class="site-footer">
             <div class="footer-copy">
-                <span>Version {{ app_version }}</span>
+                <a href="{{ app_release_url }}" target="_blank" rel="noreferrer">Version {{ app_version }}</a>
                 <span>Made with <span class="ui-icon icon-heart"></span> in Göttingen</span>
             </div>
             <div class="footer-copy">
@@ -106,9 +117,9 @@
                     <a class="mobile-extra-link" href="{{ url_for('admin.user_list') }}"><span class="ui-icon icon-sparkles"></span><span>Nutzer</span></a>
                     <a class="mobile-extra-link" href="{{ url_for('admin.category_settings') }}"><span class="ui-icon icon-seedling"></span><span>Kategorien</span></a>
                 {% endif %}
-                <button class="mobile-extra-link mobile-extra-button" type="button" data-theme-toggle>
+                <button class="mobile-extra-link mobile-extra-button" type="button" data-theme-toggle aria-label="Darstellung wechseln">
-                    <span class="ui-icon icon-mobile-screen-button"></span>
+                    <span class="ui-icon icon-sun-theme" data-theme-icon></span>
-                    <span>Modus</span>
+                    <span data-theme-label>Hell</span>
                 </button>
                 <form method="post" action="{{ url_for('auth.logout') }}" class="mobile-extra-form">
                     {{ csrf_input() }}

nouri/templates/dashboard.html

@@ -13,6 +13,23 @@
     </div>
 </section>
 
+{% if setup_checklist %}
+    <section class="panel">
+        <div class="panel-head">
+            <h2>Gut anfangen</h2>
+        </div>
+        <div class="more-link-grid">
+            {% for step in setup_checklist %}
+                <a class="more-link-card" href="{{ step.url }}">
+                    <strong>{{ step.title }}</strong>
+                    <small>{{ step.text }}</small>
+                    <span class="chip">{{ step.label }}</span>
+                </a>
+            {% endfor %}
+        </div>
+    </section>
+{% endif %}
+
 <section class="stats-grid">
     <article class="stat-card">
         <span>Zuhause</span>
@@ -74,7 +91,7 @@
         {% endif %}
     </article>
 
-    <article class="panel">
+    <article class="panel dashboard-spaced-panel">
         <div class="panel-head">
             <h2>Kurz griffbereit</h2>
             <a href="{{ url_for('main.home_view') }}">Alles unter Zuhause</a>
@@ -105,7 +122,7 @@
 </section>
 
 <section class="two-column">
-    <article class="panel">
+    <article class="panel dashboard-spaced-panel">
         <div class="panel-head">
             <h2>Was zuhause gut zusammenpasst</h2>
             <a href="{{ url_for('main.home_view') }}">Zuhause öffnen</a>
@@ -117,8 +134,26 @@
                         <div>
                             <strong>{{ suggestion.title }}</strong>
                             <small>{{ suggestion.reason }}</small>
+                            {% if suggestion.needs_shopping and suggestion.missing_components %}
+                                <div class="chip-row">
+                                    <span class="chip status-idea">Es fehlt noch: {{ suggestion.missing_components|join(', ') }}</span>
+                                </div>
+                            {% endif %}
+                        </div>
+                        <div class="template-list-card-actions">
+                            {% if suggestion.existing_item_id %}
+                                <a class="ghost-button" href="{{ url_for('main.planner_day', date=today.isoformat(), item_id=suggestion.existing_item_id, daypart_id=suggestion.daypart_id or 1) }}">Im Tagesplan öffnen</a>
+                            {% else %}
+                                <a class="ghost-button" href="{{ url_for('main.item_create', kind='meal', name=suggestion.title, component_ids=suggestion.component_ids) }}">Als Mahlzeit anlegen</a>
+                                <form method="post" action="{{ url_for('main.suggestion_hide') }}">
+                                    {{ csrf_input() }}
+                                    {% for component_id in suggestion.component_ids %}
+                                        <input type="hidden" name="component_ids" value="{{ component_id }}">
+                                    {% endfor %}
+                                    <button class="ghost-button" type="submit">Dauerhaft ausblenden</button>
+                                </form>
+                            {% endif %}
                         </div>
-                        <a class="ghost-button" href="{{ url_for('main.item_create', kind='meal', name=suggestion.title, component_ids=suggestion.component_ids) }}">Als Mahlzeit anlegen</a>
                     </article>
                 {% endfor %}
             </div>

nouri/templates/home/list.html

@@ -51,8 +51,26 @@
                     <div>
                         <strong>{{ suggestion.title }}</strong>
                         <small>{{ suggestion.reason }}</small>
+                        {% if suggestion.needs_shopping and suggestion.missing_components %}
+                            <div class="chip-row">
+                                <span class="chip status-idea">Es fehlt noch: {{ suggestion.missing_components|join(', ') }}</span>
+                            </div>
+                        {% endif %}
+                    </div>
+                    <div class="template-list-card-actions">
+                        {% if suggestion.existing_item_id %}
+                            <a class="ghost-button" href="{{ url_for('main.planner_day', date=today.isoformat(), item_id=suggestion.existing_item_id, daypart_id=suggestion.daypart_id or 1) }}">Im Tagesplan öffnen</a>
+                        {% else %}
+                            <a class="ghost-button" href="{{ url_for('main.item_create', kind='meal', name=suggestion.title, component_ids=suggestion.component_ids) }}">Als Mahlzeit anlegen</a>
+                            <form method="post" action="{{ url_for('main.suggestion_hide') }}">
+                                {{ csrf_input() }}
+                                {% for component_id in suggestion.component_ids %}
+                                    <input type="hidden" name="component_ids" value="{{ component_id }}">
+                                {% endfor %}
+                                <button class="ghost-button" type="submit">Dauerhaft ausblenden</button>
+                            </form>
+                        {% endif %}
                     </div>
-                    <a class="ghost-button" href="{{ url_for('main.item_create', kind='meal', name=suggestion.title, component_ids=suggestion.component_ids) }}">Als Mahlzeit anlegen</a>
                 </article>
             {% endfor %}
         </div>
@@ -72,7 +90,12 @@
                         <article class="item-card compact">
                             <div class="item-media">
                                 {% if item.photo_filename %}
-                                    <img src="{{ url_for('uploaded_file', filename=item.photo_filename) }}" alt="{{ item.name }}">
+                                    <img
+                                        src="{{ image_url(item.photo_filename, 'md') }}"
+                                        srcset="{{ image_srcset(item.photo_filename) }}"
+                                        sizes="{{ image_sizes('grid') }}"
+                                        alt="{{ item.name }}"
+                                        loading="lazy">
                                 {% else %}
                                     <div class="placeholder-tile">{{ item.name[:1] }}</div>
                                 {% endif %}

nouri/templates/items/form.html

@@ -55,6 +55,16 @@
             </select>
         </label>
 
+        <label>
+            Energiedichte
+            <select name="energy_density">
+                {% for value, label in energy_density_options %}
+                    <option value="{{ value }}" {% if form_data.energy_density == value %}selected{% endif %}>{{ label }}</option>
+                {% endfor %}
+            </select>
+            <small class="helper-text">Hilft Nouri dabei, passende Ideen etwas ruhiger und persönlicher zu sortieren.</small>
+        </label>
+
         <label>
             Notiz
             <textarea name="note" rows="4" placeholder="Optional, wenn eine kleine Erinnerung hilfreich ist.">{{ form_data.note }}</textarea>
@@ -67,7 +77,12 @@
 
         {% if item and item.photo_filename %}
             <div class="inline-photo">
-                <img src="{{ url_for('uploaded_file', filename=item.photo_filename) }}" alt="{{ item.name }}">
+                <img
+                    src="{{ image_url(item.photo_filename, 'lg') }}"
+                    srcset="{{ image_srcset(item.photo_filename) }}"
+                    sizes="{{ image_sizes('detail') }}"
+                    alt="{{ item.name }}"
+                    loading="lazy">
             </div>
         {% endif %}
 
@@ -97,10 +112,12 @@
                             placeholder="z. B. Reis, Banane, Joghurt"
                             data-filter-input
                             data-filter-target="#meal-components-list"
+                            data-filter-limit="3"
                         >
                     </label>
                     <button class="secondary" type="submit" name="form_action" value="filter_foods">Suchen</button>
                 </div>
+                <p class="helper-text">Während der Suche zeigt Nouri nur die drei passendsten Lebensmittel, damit die Auswahl ruhig bleibt.</p>
                 {% if food_groups %}
                     <div class="stack-sections" id="meal-components-list">
                         {% for group in food_groups %}
@@ -142,6 +159,14 @@
                                 {% endfor %}
                             </select>
                         </label>
+                        <label>
+                            Energiedichte
+                            <select name="quick_food_energy_density">
+                                {% for value, label in energy_density_options %}
+                                    <option value="{{ value }}" {% if form_data.quick_food_energy_density == value %}selected{% endif %}>{{ label }}</option>
+                                {% endfor %}
+                            </select>
+                        </label>
                         <label class="wide">
                             Notiz
                             <input type="text" name="quick_food_note" value="{{ form_data.quick_food_note }}" placeholder="Optional">

nouri/templates/items/list.html

@@ -54,7 +54,12 @@
             <article class="item-card">
                 <div class="item-media">
                     {% if item.photo_filename %}
-                        <img src="{{ url_for('uploaded_file', filename=item.photo_filename) }}" alt="{{ item.name }}">
+                        <img
+                            src="{{ image_url(item.photo_filename, 'md') }}"
+                            srcset="{{ image_srcset(item.photo_filename) }}"
+                            sizes="{{ image_sizes('grid') }}"
+                            alt="{{ item.name }}"
+                            loading="lazy">
                     {% else %}
                         <div class="placeholder-tile">{{ item.name[:1] }}</div>
                     {% endif %}

nouri/templates/planner/day.html

@@ -54,24 +54,80 @@
 </section>
 
 <section class="planner-day-stack">
+    {% set hidden_snack_sections = sections | selectattr('is_snack_daypart') | rejectattr('visible_by_default') | list %}
+    {% if hidden_snack_sections %}
+        <section class="panel compact-form-panel snack-reveal-panel" data-day-snack-actions>
+            <div class="panel-head">
+                <h2>Zwischenmahlzeit hinzufügen</h2>
+            </div>
+            <div class="chip-row snack-reveal-actions">
+                {% for section in hidden_snack_sections %}
+                    <button
+                        class="ghost-button snack-reveal-button"
+                        type="button"
+                        data-day-snack-open
+                        data-target="#daypart-{{ section.daypart.id }}"
+                    >
+                        {{ section.daypart.name }}
+                    </button>
+                {% endfor %}
+            </div>
+        </section>
+    {% endif %}
+
     {% for section in sections %}
-        <details class="day-tile" id="daypart-{{ section.daypart.id }}" {% if section.is_open %}open{% endif %}>
+        <details
+            class="day-tile{% if section.entries %} has-entries{% endif %}{% if section.selected_quick_action %} has-selection{% endif %}"
+            id="daypart-{{ section.daypart.id }}"
+            {% if section.is_snack_daypart and not section.visible_by_default %}hidden data-day-snack-tile{% endif %}
+            {% 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 class="day-tile-icon"><span class="ui-icon {{ daypart_icon_class(section.daypart.slug) }}"></span></div>
                     <div>
                         <h2>{{ section.daypart.name }}</h2>
                         {% if section.summary_items %}
-                            <p class="muted">{{ section.summary_items|join(', ') }}</p>
+                            <p class="day-tile-summary-text">{{ 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>
+                <span class="status-pill{% if section.entries %} status-home{% endif %}">{{ section.entries|length }} geplant</span>
             </summary>
 
             <div class="day-tile-body">
+                {% if section.selected_quick_action %}
+                    <div class="suggestion-card selected-quick-action">
+                        <span class="status-pill status-home">Schon ausgewählt</span>
+                        <strong>{{ section.selected_quick_action.title }}</strong>
+                        <p class="muted">{{ section.selected_quick_action.subtitle }}</p>
+                        {% if section.selected_quick_action.type == 'existing' %}
+                            <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="{{ section.selected_quick_action.item_id }}">
+                                <input type="hidden" name="visibility" value="{{ section.selected_quick_action.visibility }}">
+                                <button class="secondary" type="submit">Jetzt nur noch speichern</button>
+                            </form>
+                        {% else %}
+                            <form method="post" action="{{ url_for('main.planner_generated_meal') }}">
+                                {{ 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="meal_name" value="{{ section.selected_quick_action.title }}">
+                                <input type="hidden" name="visibility" value="{{ section.selected_quick_action.visibility }}">
+                                {% for component_id in section.selected_quick_action.component_ids %}
+                                    <input type="hidden" name="component_ids" value="{{ component_id }}">
+                                {% endfor %}
+                                <button class="secondary" type="submit">Jetzt nur noch speichern</button>
+                            </form>
+                        {% endif %}
+                    </div>
+                {% endif %}
+
                 {% if section.balance_suggestion %}
                     <div class="suggestion-card">
                         <strong>{{ section.balance_suggestion.text }}</strong>
@@ -121,20 +177,34 @@
                         <h3>Passt gut dazu</h3>
                         <div class="quick-add-row compact-quick-row">
                             {% for suggestion in section.recipe_suggestions %}
-                                <form method="post" action="{{ url_for('main.planner_generated_meal') }}">
+                                {% if suggestion.existing_item_id %}
-                                    {{ csrf_input() }}
+                                    <form method="post" action="{{ url_for('main.planner_day', date=selected_date.isoformat()) }}">
-                                    <input type="hidden" name="plan_date" value="{{ selected_date.isoformat() }}">
+                                        {{ csrf_input() }}
-                                    <input type="hidden" name="daypart_id" value="{{ section.daypart.id }}">
+                                        <input type="hidden" name="plan_date" value="{{ selected_date.isoformat() }}">
-                                    <input type="hidden" name="meal_name" value="{{ suggestion.title }}">
+                                        <input type="hidden" name="daypart_id" value="{{ section.daypart.id }}">
-                                    <input type="hidden" name="visibility" value="shared">
+                                        <input type="hidden" name="item_id" value="{{ suggestion.existing_item_id }}">
-                                    {% for component_id in suggestion.component_ids %}
+                                        <input type="hidden" name="visibility" value="{{ suggestion.visibility or 'shared' }}">
-                                        <input type="hidden" name="component_ids" value="{{ component_id }}">
+                                        <button class="quick-add-button compact-button" type="submit">
-                                    {% endfor %}
+                                            <span>{{ suggestion.title }}</span>
-                                    <button class="quick-add-button compact-button" type="submit">
+                                            <small>{{ suggestion.reason }}</small>
-                                        <span>{{ suggestion.title }}</span>
+                                        </button>
-                                        <small>{{ suggestion.reason }}</small>
+                                    </form>
-                                    </button>
+                                {% else %}
-                                </form>
+                                    <form method="post" action="{{ url_for('main.planner_generated_meal') }}">
+                                        {{ 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="meal_name" value="{{ suggestion.title }}">
+                                        <input type="hidden" name="visibility" value="shared">
+                                        {% for component_id in suggestion.component_ids %}
+                                            <input type="hidden" name="component_ids" value="{{ component_id }}">
+                                        {% endfor %}
+                                        <button class="quick-add-button compact-button" type="submit">
+                                            <span>{{ suggestion.title }}</span>
+                                            <small>{{ suggestion.reason }}</small>
+                                        </button>
+                                    </form>
+                                {% endif %}
                             {% endfor %}
                         </div>
                     </div>
@@ -143,10 +213,10 @@
                 <div class="planner-subsection">
                     <label class="planner-search">
                         <span>Suche</span>
-                        <input type="text" placeholder="Lebensmittel oder Mahlzeiten suchen" data-filter-input data-filter-target="#planner-list-{{ section.daypart.id }}">
+                        <input type="text" placeholder="Lebensmittel oder Mahlzeiten suchen" data-filter-input data-filter-target="#planner-list-{{ section.daypart.id }}" data-filter-limit="3">
                     </label>
                     <div class="compact-picker-list" id="planner-list-{{ section.daypart.id }}">
-                        {% for item in section.food_candidates %}
+                        {% for item in section.search_candidates %}
                             <form method="post" action="{{ url_for('main.planner_day', date=selected_date.isoformat()) }}" data-filter-label="{{ item.name|lower }} {{ item.category|default('', true)|lower }}">
                                 {{ csrf_input() }}
                                 <input type="hidden" name="plan_date" value="{{ selected_date.isoformat() }}">
@@ -155,7 +225,10 @@
                                 <input type="hidden" name="visibility" value="{{ item.visibility }}">
                                 <button class="picker-row" type="submit">
                                     <span>{{ item.name }}</span>
-                                    {% if item.availability_state == 'home' %}<small>zuhause</small>{% endif %}
+                                    <small>
+                                        {{ item_kind_labels[item.kind] }}
+                                        {% if item.availability_state == 'home' %} · zuhause{% endif %}
+                                    </small>
                                 </button>
                             </form>
                         {% endfor %}
@@ -188,11 +261,45 @@
                                 {% if entry.note %}
                                     <p>{{ entry.note }}</p>
                                 {% endif %}
+                                {% if entry.can_edit %}
+                                    <details class="planner-entry-edit">
+                                        <summary class="ghost-button">Anpassen</summary>
+                                        <form method="post" action="{{ url_for('main.planner_update', entry_id=entry.id) }}" class="planner-entry-inline-form">
+                                            {{ csrf_input() }}
+                                            <input type="hidden" name="plan_date" value="{{ selected_date.isoformat() }}">
+                                            <label>
+                                                Für wen?
+                                                <select name="visibility">
+                                                    {% for value, label in visibility_options %}
+                                                        <option value="{{ value }}" {% if entry.visibility == value %}selected{% endif %}>{{ label }}</option>
+                                                    {% endfor %}
+                                                </select>
+                                            </label>
+                                            <label class="wide">
+                                                Notiz
+                                                <input type="text" name="note" value="{{ entry.note or '' }}" placeholder="Optional">
+                                            </label>
+                                            <button type="submit">Speichern</button>
+                                        </form>
+                                    </details>
+                                {% endif %}
                             </article>
                         {% endfor %}
                     </div>
                 {% else %}
                     <p class="empty-state">Hier ist noch nichts eingetragen. Ein kleiner Anfang reicht völlig.</p>
+                    {% if section.is_snack_daypart %}
+                        <div class="row-actions snack-inline-actions">
+                            <button
+                                class="ghost-button"
+                                type="button"
+                                data-day-snack-hide
+                                data-target="#daypart-{{ section.daypart.id }}"
+                            >
+                                Wieder ausblenden
+                            </button>
+                        </div>
+                    {% endif %}
                 {% endif %}
             </div>
         </details>

nouri/templates/planner/week.html

@@ -10,6 +10,13 @@
     <div class="week-nav">
         <a class="ghost-button" href="{{ url_for('main.planner', week=prev_week.isoformat()) }}">Vorige Woche</a>
         <span>{{ week_start.strftime('%d.%m.%Y') }} bis {{ week_end.strftime('%d.%m.%Y') }}</span>
+        <details class="export-menu">
+            <summary class="ghost-button export-menu-trigger">PDF exportieren</summary>
+            <div class="export-menu-panel">
+                <a href="{{ url_for('main.planner_export_pdf', week=week_start.isoformat(), mode='mine') }}">Meinen Essensplan</a>
+                <a href="{{ url_for('main.planner_export_pdf', week=week_start.isoformat(), mode='household') }}">Unseren Essensplan</a>
+            </div>
+        </details>
         <a class="ghost-button" href="{{ url_for('main.planner', week=next_week.isoformat()) }}">Nächste Woche</a>
     </div>
 </section>
@@ -80,24 +87,128 @@
                 {% endif %}
             </div>
 
-            {% if card.filled_dayparts %}
+            {% if not card.filled_dayparts %}
-                <p class="week-card-count">{{ card.planned_count }} Einträge</p>
+                <p class="empty-state week-card-empty-copy">Noch offen. Du kannst den Tag ganz leicht nach und nach füllen.</p>
-                <div class="chip-row">
+            {% endif %}
-                    {% for slot in card.filled_dayparts %}
+
-                        <span class="chip">{{ slot.name }} · {{ slot.count }}</span>
+            {% if card.hidden_snack_slots %}
-                    {% endfor %}
+                <div class="week-card-snack-actions" data-week-snack-actions>
+                    <div>
+                        <p class="eyebrow">Snacks ergänzen</p>
+                    </div>
+                    <div class="chip-row snack-reveal-actions">
+                        {% for hidden_slot in card.hidden_snack_slots %}
+                            <button
+                                class="ghost-button snack-reveal-button"
+                                type="button"
+                                data-week-snack-slot-open
+                                data-target="#week-slot-{{ card.date.isoformat() }}-{{ hidden_slot.id }}"
+                            >
+                                {% if hidden_slot.name == 'Vormittagssnack' %}
+                                    Vormittag
+                                {% elif hidden_slot.name == 'Nachmittagssnack' %}
+                                    Nachmittag
+                                {% elif hidden_slot.name == 'Später Snack' %}
+                                    Abend
+                                {% else %}
+                                    {{ hidden_slot.name }}
+                                {% endif %}
+                            </button>
+                        {% endfor %}
+                    </div>
                 </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 drop-slot{% if slot.entries %} has-entries{% endif %}{% if slot.is_snack_daypart %} week-slot-snack{% endif %}"
+                        id="week-slot-{{ card.date.isoformat() }}-{{ slot.daypart.id }}"
+                        data-target-date="{{ card.date.isoformat() }}"
+                        data-target-daypart-id="{{ slot.daypart.id }}"
+                        {% if slot.is_snack_daypart and not slot.visible_by_default %}hidden data-week-snack-slot{% endif %}
+                    >
                         <div class="week-slot-head">
-                            <strong>{{ slot.daypart.name }}</strong>
+                            <div class="week-slot-title">
-                            <span>{{ slot.entries|length }}</span>
+                                <span class="ui-icon {{ daypart_icon_class(slot.daypart.slug) }}"></span>
+                                <strong>{{ slot.daypart.name }}</strong>
+                            </div>
+                            <div class="week-slot-head-meta">
+                                <span class="week-slot-count{% if slot.entries %} status-home{% endif %}">{{ slot.entries|length }}</span>
+                                <button class="week-slot-add" type="button" data-week-slot-picker-open aria-label="{{ slot.daypart.name }} an {{ weekday_name(card.date) }} direkt ergänzen">+</button>
+                            </div>
+                        </div>
+                        <div class="week-slot-picker" hidden>
+                            <div class="week-slot-picker-head">
+                                <strong>{{ slot.daypart.name }} ergänzen</strong>
+                                <button class="ghost-button week-slot-picker-close" type="button" data-week-slot-picker-close>Schließen</button>
+                            </div>
+                            <label class="planner-search week-slot-picker-search">
+                                <span>Suche</span>
+                                <input type="text" placeholder="Mahlzeiten oder Ideen suchen" data-filter-input data-filter-target="#week-slot-picker-list-{{ card.date.isoformat() }}-{{ slot.daypart.id }}">
+                            </label>
+                            <div id="week-slot-picker-list-{{ card.date.isoformat() }}-{{ slot.daypart.id }}">
+                            {% if slot.picker.meal_candidates %}
+                                <div class="planner-subsection">
+                                    <h3>Mahlzeitenideen</h3>
+                                    <div class="quick-add-row compact-quick-row">
+                                        {% for item in slot.picker.meal_candidates %}
+                                            <form method="post" action="{{ url_for('main.planner_day', date=card.date.isoformat()) }}" class="js-week-slot-submit" data-filter-label="{{ item.name|lower }}">
+                                                {{ csrf_input() }}
+                                                <input type="hidden" name="plan_date" value="{{ card.date.isoformat() }}">
+                                                <input type="hidden" name="daypart_id" value="{{ slot.daypart.id }}">
+                                                <input type="hidden" name="item_id" value="{{ item.id }}">
+                                                <input type="hidden" name="visibility" value="{{ item.visibility }}">
+                                                <button class="quick-add-button compact-button" type="submit">
+                                                    <span>{{ item.name }}</span>
+                                                    {% if item.availability_state == 'home' %}<small>Zuhause vorhanden</small>{% endif %}
+                                                </button>
+                                            </form>
+                                        {% endfor %}
+                                    </div>
+                                </div>
+                            {% endif %}
+                            {% if slot.picker.recipe_suggestions %}
+                                <div class="planner-subsection">
+                                    <h3>Passt gut dazu</h3>
+                                    <div class="quick-add-row compact-quick-row">
+                                        {% for suggestion in slot.picker.recipe_suggestions %}
+                                            {% if suggestion.existing_item_id %}
+                                                <form method="post" action="{{ url_for('main.planner_day', date=card.date.isoformat()) }}" class="js-week-slot-submit" data-filter-label="{{ suggestion.title|lower }} {{ suggestion.reason|lower }}">
+                                                    {{ csrf_input() }}
+                                                    <input type="hidden" name="plan_date" value="{{ card.date.isoformat() }}">
+                                                    <input type="hidden" name="daypart_id" value="{{ slot.daypart.id }}">
+                                                    <input type="hidden" name="item_id" value="{{ suggestion.existing_item_id }}">
+                                                    <input type="hidden" name="visibility" value="{{ suggestion.visibility or 'shared' }}">
+                                                    <button class="quick-add-button compact-button" type="submit">
+                                                        <span>{{ suggestion.title }}</span>
+                                                        <small>{{ suggestion.reason }}</small>
+                                                    </button>
+                                                </form>
+                                            {% else %}
+                                                <form method="post" action="{{ url_for('main.planner_generated_meal') }}" class="js-week-slot-submit" data-filter-label="{{ suggestion.title|lower }} {{ suggestion.reason|lower }}">
+                                                    {{ csrf_input() }}
+                                                    <input type="hidden" name="plan_date" value="{{ card.date.isoformat() }}">
+                                                    <input type="hidden" name="daypart_id" value="{{ slot.daypart.id }}">
+                                                    <input type="hidden" name="meal_name" value="{{ suggestion.title }}">
+                                                    <input type="hidden" name="visibility" value="{{ suggestion.visibility or 'shared' }}">
+                                                    {% for component_id in suggestion.component_ids %}
+                                                        <input type="hidden" name="component_ids" value="{{ component_id }}">
+                                                    {% endfor %}
+                                                    <button class="quick-add-button compact-button" type="submit">
+                                                        <span>{{ suggestion.title }}</span>
+                                                        <small>{{ suggestion.reason }}</small>
+                                                    </button>
+                                                </form>
+                                            {% endif %}
+                                        {% endfor %}
+                                    </div>
+                                </div>
+                            {% endif %}
+                            {% if not slot.picker.meal_candidates and not slot.picker.recipe_suggestions %}
+                                <p class="empty-state">Hier ist gerade noch nichts vorbereitet. Im Tagesplan kannst du jederzeit etwas Neues anlegen.</p>
+                            {% endif %}
+                            </div>
                         </div>
                         {% if slot.entries %}
                             <div class="week-entry-stack">
@@ -108,8 +219,30 @@
                                     </article>
                                 {% endfor %}
                             </div>
+                            <div class="week-slot-actions">
+                                {% if slot.copy_allowed %}
+                                    <form method="post" action="{{ url_for('main.planner_slot_copy_forward') }}" class="js-copy-forward-form">
+                                        {{ csrf_input() }}
+                                        <input type="hidden" name="source_date" value="{{ card.date.isoformat() }}">
+                                        <input type="hidden" name="daypart_id" value="{{ slot.daypart.id }}">
+                                        <button class="ghost-button week-slot-copy" type="submit">Zum nächsten Tag kopieren</button>
+                                    </form>
+                                {% endif %}
+                            </div>
                         {% else %}
-                            <p class="week-slot-empty">Hierher ziehen</p>
+                            <div class="week-slot-empty">
+                                <p>Hierher ziehen</p>
+                                {% if slot.is_snack_daypart %}
+                                    <button
+                                        class="ghost-button week-slot-hide"
+                                        type="button"
+                                        data-week-snack-slot-hide
+                                        data-target="#week-slot-{{ card.date.isoformat() }}-{{ slot.daypart.id }}"
+                                    >
+                                        Wieder ausblenden
+                                    </button>
+                                {% endif %}
+                            </div>
                         {% endif %}
                     </div>
                 {% endfor %}

nouri/templates/settings.html

@@ -4,8 +4,8 @@
 <section class="page-intro">
     <div>
         <p class="eyebrow">Optionen</p>
-        <h1>Ruhige Einstellungen für Alltag, Einkauf und Erinnerungen</h1>
+        <h1>Ruhige Einstellungen für Alltag, Sicherung und iPhone-Nutzung</h1>
-        <p class="lead">Hier lässt sich festlegen, wann Einkäufe vorbereitet werden, welche Hinweise hilfreich sind und ob Nouri sich wie eine App auf dem Home-Bildschirm verhalten soll.</p>
+        <p class="lead">Hier lässt sich festlegen, wann Einkäufe vorbereitet werden, welche Hinweise hilfreich sind und wie Nouri sich auf dem Home-Bildschirm oder beim Backup verhalten soll.</p>
     </div>
 </section>
 
@@ -33,23 +33,29 @@
                 Erinnerung ungefähr um
                 <input type="time" name="shopping_reminder_time" value="{{ household_settings.shopping_reminder_time }}">
             </label>
-            <button type="submit">Speichern</button>
+            <div class="form-actions">
+                <button type="submit">Speichern</button>
+            </div>
         </form>
     </article>
 
     <article class="panel">
         <div class="panel-head">
-            <h2>Home-Bildschirm & Push</h2>
+            <h2>Für den Homescreen</h2>
         </div>
         <div class="stack-sections">
             <div class="pwa-card">
-                <strong>Als Web-App nutzen</strong>
+                <strong>Auf dem iPhone installieren</strong>
-                <p class="muted">Auf dem iPhone kannst du Nouri über Teilen → Zum Home-Bildschirm hinzufügen. Danach wirkt die App deutlich app-näher.</p>
+                <p class="muted">Öffne Nouri in Safari, tippe auf Teilen und dann auf <em>Zum Home-Bildschirm</em>. Danach startet Nouri deutlich app-näher und ruhiger.</p>
+            </div>
+            <div class="pwa-card">
+                <strong>Offline etwas stabiler</strong>
+                <p class="muted">Die wichtigsten Oberflächen und Brand-Dateien bleiben lokal greifbar. Wenn das Netz kurz weg ist, wirkt die App dadurch stabiler und klarer.</p>
             </div>
             <div class="pwa-card">
                 <strong>Push-Mitteilungen</strong>
                 {% if push_ready %}
-                    <p class="muted">Push ist vorbereitet. Du kannst es auf diesem Gerät freigeben und später testweise prüfen.</p>
+                    <p class="muted">Push ist vorbereitet. Wenn du möchtest, kannst du es auf diesem Gerät freigeben, testen und später für Frühstück, Mittagessen oder Abendessen nutzen.</p>
                     <div class="row-actions">
                         <button class="secondary" type="button" data-push-enable>Push erlauben</button>
                         <button class="ghost-button" type="button" data-push-disable>Push beenden</button>
@@ -61,7 +67,10 @@
                     </form>
                     <small class="helper-text">{{ push_subscription_count }} aktives Gerät{% if push_subscription_count != 1 %}e{% endif %}</small>
                 {% else %}
-                    <p class="muted">Push wird sichtbar, sobald VAPID-Schlüssel für die App gesetzt sind.</p>
+                    <p class="muted">Push wird sichtbar, sobald VAPID-Schlüssel für diese App gesetzt sind.</p>
+                    {% if push_public_key_value %}
+                        <small class="helper-text">Öffentlicher Schlüssel erkannt, privater Schlüssel fehlt noch.</small>
+                    {% endif %}
                 {% endif %}
             </div>
         </div>
@@ -89,6 +98,17 @@
                         {% endfor %}
                     </select>
                 </label>
+                <label>
+                    Vorschläge eher
+                    <select name="suggestion_style">
+                        {% for value, label in suggestion_style_options %}
+                            <option value="{{ value }}" {% if user_settings.suggestion_style == value %}selected{% endif %}>{{ label }}</option>
+                        {% endfor %}
+                    </select>
+                    <small class="helper-text">
+                        Ausgewogen bleibt offen. Fitness denkt stärker in proteinbetont und eher leicht. Proteinbetont priorisiert Eiweiß, ohne extra leicht zu werden.
+                    </small>
+                </label>
             </fieldset>
 
             <fieldset>
@@ -103,12 +123,17 @@
                 <legend>Planung</legend>
                 <label class="inline-check"><input type="checkbox" name="remind_tomorrow_if_sparse" value="1" {% if user_settings.remind_tomorrow_if_sparse %}checked{% endif %}><span>Für morgen erinnern, wenn noch wenig geplant ist</span></label>
                 <label class="inline-check"><input type="checkbox" name="remind_week_if_sparse" value="1" {% if user_settings.remind_week_if_sparse %}checked{% endif %}><span>Für die Woche erinnern, wenn noch wenig eingeplant ist</span></label>
+                <label class="inline-check"><input type="checkbox" name="push_missing_breakfast" value="1" {% if user_settings.push_missing_breakfast %}checked{% endif %}><span>Um 8:00 erinnern, wenn noch kein Frühstück geplant ist</span></label>
+                <label class="inline-check"><input type="checkbox" name="push_missing_lunch" value="1" {% if user_settings.push_missing_lunch %}checked{% endif %}><span>Um 12:00 erinnern, wenn noch kein Mittagessen geplant ist</span></label>
+                <label class="inline-check"><input type="checkbox" name="push_missing_dinner" value="1" {% if user_settings.push_missing_dinner %}checked{% endif %}><span>Um 18:00 erinnern, wenn noch kein Abendessen geplant ist</span></label>
                 <label class="inline-check"><input type="checkbox" name="suggest_home_for_today" value="1" {% if user_settings.suggest_home_for_today %}checked{% endif %}><span>Passende Dinge aus Zuhause vorschlagen</span></label>
                 <label class="inline-check"><input type="checkbox" name="show_meal_balancing" value="1" {% if user_settings.show_meal_balancing %}checked{% endif %}><span>Zum Abrunden von Mahlzeiten kleine Vorschläge zeigen</span></label>
+                <small class="helper-text">Für Push nimmt Nouri zuerst vorhandene Mahlzeitenideen. Wenn nichts passt, kommt eine Kombination aus dem, was zuhause da ist.</small>
             </fieldset>
 
             <fieldset>
                 <legend>Alltag</legend>
+                <label class="inline-check"><input type="checkbox" name="push_small_snack" value="1" {% if user_settings.push_small_snack %}checked{% endif %}><span>Am Nachmittag an etwas Kleines erinnern</span></label>
                 <label class="inline-check"><input type="checkbox" name="remind_small_snack" value="1" {% if user_settings.remind_small_snack %}checked{% endif %}><span>An kleine Zwischenmahlzeiten erinnern</span></label>
                 <label class="inline-check"><input type="checkbox" name="remind_nuts" value="1" {% if user_settings.remind_nuts %}checked{% endif %}><span>Heute schon an Nüsse gedacht?</span></label>
                 <label class="inline-check"><input type="checkbox" name="suggest_templates" value="1" {% if user_settings.suggest_templates %}checked{% endif %}><span>Häufig genutzte Tages- und Wochenvorlagen vorschlagen</span></label>
@@ -122,4 +147,45 @@
         </div>
     </form>
 </section>
+
+{% if is_admin() %}
+    <section class="two-column">
+        <article class="panel">
+            <div class="panel-head">
+                <h2>Backup exportieren</h2>
+            </div>
+            <div class="stack-sections">
+                <div class="pwa-card">
+                    <strong>Komplettes App-Backup</strong>
+                    <p class="muted">Das ZIP enthält Nutzer, Einstellungen, Lebensmittel, Mahlzeiten, Vorlagen, Planungen, Einkaufsdaten und hochgeladene Bilder.</p>
+                    <a class="button" href="{{ url_for('main.backup_export') }}">Backup herunterladen</a>
+                </div>
+            </div>
+        </article>
+
+        <article class="panel">
+            <div class="panel-head">
+                <h2>Backup wiederherstellen</h2>
+            </div>
+            <form method="post" action="{{ url_for('main.backup_restore') }}" class="stack-form" enctype="multipart/form-data">
+                {{ csrf_input() }}
+                <div class="restore-warning">
+                    <strong>Nur bewusst verwenden</strong>
+                    <p class="muted">Die Wiederherstellung ersetzt den aktuellen Datenstand dieses Haushalts. Vorher am besten selbst noch ein frisches Backup herunterladen.</p>
+                </div>
+                <label>
+                    Backup-Datei
+                    <input type="file" name="backup_file" accept=".zip" required>
+                </label>
+                <label>
+                    Zur Bestätigung bitte {{ restore_confirmation_text }} eintragen
+                    <input type="text" name="restore_confirmation" placeholder="{{ restore_confirmation_text }}" required>
+                </label>
+                <div class="form-actions">
+                    <button type="submit">Backup wiederherstellen</button>
+                </div>
+            </form>
+        </article>
+    </section>
+{% endif %}
 {% endblock %}

requirements.txt

@@ -1,3 +1,5 @@
 Flask==3.1.1
 gunicorn==23.0.0
 pywebpush==2.3.0
+Pillow==11.2.1; python_version < "3.14"
+fpdf2==2.8.3

scripts/generate_brand_assets.py

@@ -0,0 +1,106 @@
+from __future__ import annotations
+
+from pathlib import Path
+
+from PIL import Image, ImageDraw
+
+
+ROOT = Path(__file__).resolve().parents[1]
+BRAND_DIR = ROOT / "nouri" / "static" / "brand"
+
+BG_TOP = "#F6C394"
+BG_BOTTOM = "#DE9862"
+BOWL = "#FFF7EF"
+STROKE = "#8C533B"
+
+
+def rounded_gradient_icon(size: int, *, maskable: bool = False) -> Image.Image:
+    image = Image.new("RGBA", (size, size), (0, 0, 0, 0))
+    draw = ImageDraw.Draw(image)
+    radius = int(size * (0.28 if maskable else 0.24))
+
+    for y in range(size):
+        blend = y / max(size - 1, 1)
+        r1, g1, b1 = ImageColorTuple(BG_TOP)
+        r2, g2, b2 = ImageColorTuple(BG_BOTTOM)
+        color = (
+            int(r1 + (r2 - r1) * blend),
+            int(g1 + (g2 - g1) * blend),
+            int(b1 + (b2 - b1) * blend),
+            255,
+        )
+        draw.line((0, y, size, y), fill=color)
+
+    mask = Image.new("L", (size, size), 0)
+    ImageDraw.Draw(mask).rounded_rectangle((0, 0, size - 1, size - 1), radius=radius, fill=255)
+    image.putalpha(mask)
+
+    inset = int(size * (0.11 if maskable else 0.13))
+    inner = [inset, inset, size - inset, size - inset]
+    draw.rounded_rectangle(inner, radius=int(radius * 0.84), outline=(255, 255, 255, 54), width=max(2, size // 80))
+
+    bowl_top = int(size * 0.24)
+    bowl_left = int(size * 0.27)
+    bowl_right = int(size * 0.73)
+    bowl_bottom = int(size * 0.68)
+    draw.rounded_rectangle(
+        (bowl_left, bowl_top, bowl_right, bowl_bottom),
+        radius=int(size * 0.16),
+        fill=BOWL,
+    )
+    draw.rounded_rectangle(
+        (int(size * 0.31), int(size * 0.31), int(size * 0.69), int(size * 0.60)),
+        radius=int(size * 0.12),
+        fill=(239, 195, 159, 64),
+    )
+
+    bowl_curve_top = int(size * 0.56)
+    draw.pieslice(
+        (int(size * 0.24), bowl_curve_top, int(size * 0.76), int(size * 0.84)),
+        start=0,
+        end=180,
+        fill=(247, 179, 125, 255),
+    )
+
+    line_width = max(4, size // 26)
+    steam = [
+        (0.50, 0.31),
+        (0.56, 0.31),
+        (0.56, 0.40),
+        (0.45, 0.50),
+        (0.45, 0.58),
+    ]
+    draw.line([(int(size * x), int(size * y)) for x, y in steam], fill=STROKE, width=line_width, joint="curve")
+    draw.line(
+        [(int(size * 0.45), int(size * 0.58)), (int(size * 0.56), int(size * 0.58))],
+        fill=STROKE,
+        width=line_width,
+    )
+    return image
+
+
+def ImageColorTuple(hex_color: str) -> tuple[int, int, int]:
+    hex_color = hex_color.lstrip("#")
+    return tuple(int(hex_color[index:index + 2], 16) for index in (0, 2, 4))
+
+
+def badge_icon(size: int) -> Image.Image:
+    image = Image.new("RGBA", (size, size), (0, 0, 0, 0))
+    draw = ImageDraw.Draw(image)
+    draw.rounded_rectangle((0, 0, size - 1, size - 1), radius=size // 3, fill=BG_BOTTOM)
+    draw.ellipse((size * 0.18, size * 0.18, size * 0.82, size * 0.82), fill=BOWL)
+    draw.rectangle((size * 0.34, size * 0.52, size * 0.66, size * 0.63), fill=STROKE)
+    return image
+
+
+def save_assets() -> None:
+    BRAND_DIR.mkdir(parents=True, exist_ok=True)
+    rounded_gradient_icon(180).save(BRAND_DIR / "pwa-180.png")
+    rounded_gradient_icon(192).save(BRAND_DIR / "pwa-192.png")
+    rounded_gradient_icon(512).save(BRAND_DIR / "pwa-512.png")
+    rounded_gradient_icon(512, maskable=True).save(BRAND_DIR / "pwa-maskable-512.png")
+    badge_icon(96).save(BRAND_DIR / "pwa-badge.png")
+
+
+if __name__ == "__main__":
+    save_assets()

scripts/reminder_worker.py

@@ -0,0 +1,28 @@
+from __future__ import annotations
+
+import argparse
+import sys
+from pathlib import Path
+
+sys.path.insert(0, str(Path(__file__).resolve().parents[1]))
+
+from nouri import create_app
+from nouri.reminders import reminder_worker_loop, send_due_meal_pushes
+
+
+def main() -> None:
+    parser = argparse.ArgumentParser(description="Run Nouri meal reminder pushes.")
+    parser.add_argument("--once", action="store_true", help="Run one reminder cycle and exit.")
+    parser.add_argument("--sleep", type=int, default=60, help="Seconds between reminder cycles.")
+    args = parser.parse_args()
+
+    app = create_app()
+    with app.app_context():
+        if args.once:
+            send_due_meal_pushes()
+            return
+        reminder_worker_loop(sleep_seconds=max(15, args.sleep))
+
+
+if __name__ == "__main__":
+    main()

start.sh

@@ -13,4 +13,11 @@ if [ -d /app/bootstrap-data/uploads ] && [ -z "$(ls -A /app/data/uploads 2>/dev/
   cp -a /app/bootstrap-data/uploads/. /app/data/uploads/
 fi
 
-exec gunicorn --bind 0.0.0.0:8000 --workers 2 --threads 4 wsgi:app
+if [ "${NOURI_RUN_REMINDER_WORKER:-1}" = "1" ]; then
+  (
+    sleep "${NOURI_REMINDER_START_DELAY:-25}"
+    python /app/code/scripts/reminder_worker.py --sleep 60
+  ) &
+fi
+
+exec gunicorn --bind 0.0.0.0:8000 --workers 1 --threads 4 wsgi:app