Compare commits
8 Commits
b0d1cee5f5
..
V1.2.0
| Author | SHA1 | Date | |
|---|---|---|---|
| 7faa65d6c9 | |||
| 57b56bc797 | |||
| 1c87d653d6 | |||
| 1490fc8f1d | |||
| 40bab48806 | |||
| ed14dd4aef | |||
| 35e6a7b56e | |||
| 325101da99 |
@@ -4,8 +4,8 @@
|
||||
"author": "Florian Heinz",
|
||||
"description": "Private Flask app for meals, shopping and gentle food planning",
|
||||
"tagline": "einfach essen planen",
|
||||
"version": "0.6.0",
|
||||
"upstreamVersion": "0.6.0",
|
||||
"version": "1.2.0",
|
||||
"upstreamVersion": "1.2.0",
|
||||
"healthCheckPath": "/",
|
||||
"httpPort": 8000,
|
||||
"manifestVersion": 2,
|
||||
|
||||
@@ -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
|
||||
- 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
|
||||
- PWA-Grundlage 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
|
||||
|
||||
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:
|
||||
Wichtig für die Trennung zwischen lokal und Produktion:
|
||||
|
||||
- lokal nutzt Nouri ohne gesetzte Variable standardmäßig `./data`
|
||||
- auf Cloudron nutzt Nouri `/app/data`
|
||||
- `data/` ist in `.gitignore` und `.dockerignore` ausgeschlossen und wird weder eingecheckt noch ins Image kopiert
|
||||
- `/app/data` ist auf Cloudron persistent und bleibt bei App-Updates erhalten
|
||||
- `data/` ist nicht für Git oder das Paket gedacht
|
||||
- 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
|
||||
|
||||
|
||||
@@ -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.
|
||||
@@ -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.
|
||||
@@ -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
|
||||
+45
-1
@@ -1,5 +1,6 @@
|
||||
from __future__ import annotations
|
||||
|
||||
import json
|
||||
import os
|
||||
import secrets
|
||||
from datetime import date, timedelta
|
||||
@@ -16,10 +17,14 @@ 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,
|
||||
@@ -30,6 +35,7 @@ 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"
|
||||
|
||||
|
||||
def load_secret_key(data_dir: Path) -> str:
|
||||
@@ -50,11 +56,38 @@ 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.0"
|
||||
|
||||
|
||||
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)
|
||||
ensure_upload_structure(upload_dir)
|
||||
@@ -69,7 +102,10 @@ def create_app() -> Flask:
|
||||
PERMANENT_SESSION_LIFETIME=timedelta(days=30),
|
||||
SESSION_COOKIE_HTTPONLY=True,
|
||||
SESSION_COOKIE_SAMESITE="Lax",
|
||||
APP_VERSION="0.6.0",
|
||||
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"),
|
||||
@@ -97,6 +133,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,
|
||||
@@ -104,6 +144,7 @@ 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()],
|
||||
@@ -159,6 +200,9 @@ def create_app() -> Flask:
|
||||
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)
|
||||
|
||||
@@ -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"))
|
||||
|
||||
@@ -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
|
||||
|
||||
+28
-2
@@ -38,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",
|
||||
@@ -48,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.",
|
||||
@@ -56,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"),
|
||||
|
||||
+64
-1
@@ -10,7 +10,7 @@ from werkzeug.security import generate_password_hash
|
||||
|
||||
from .constants import DAYPARTS, DEFAULT_CATEGORIES, DEFAULT_CATEGORY_BUILDERS
|
||||
|
||||
CURRENT_SCHEMA_VERSION = "0.6.0"
|
||||
CURRENT_SCHEMA_VERSION = "1.2.0"
|
||||
|
||||
|
||||
def get_db() -> sqlite3.Connection:
|
||||
@@ -18,9 +18,11 @@ def get_db() -> sqlite3.Connection:
|
||||
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
|
||||
|
||||
|
||||
@@ -127,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")
|
||||
@@ -148,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,
|
||||
@@ -184,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 (
|
||||
@@ -216,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(
|
||||
@@ -332,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(
|
||||
@@ -378,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(
|
||||
"""
|
||||
@@ -416,6 +473,12 @@ 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)
|
||||
|
||||
|
||||
|
||||
+729
-47
File diff suppressed because it is too large
Load Diff
@@ -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)
|
||||
@@ -50,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,
|
||||
@@ -80,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,
|
||||
@@ -96,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')),
|
||||
|
||||
+459
-19
@@ -89,7 +89,8 @@ textarea {
|
||||
}
|
||||
|
||||
button,
|
||||
.button {
|
||||
.button,
|
||||
.ghost-button {
|
||||
display: inline-flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
@@ -260,32 +261,54 @@ h3,
|
||||
|
||||
@media (min-width: 1081px) {
|
||||
.site-header {
|
||||
grid-template-columns: 1fr;
|
||||
grid-template-columns: auto minmax(0, 1fr);
|
||||
column-gap: 1.5rem;
|
||||
row-gap: 0.9rem;
|
||||
align-items: center;
|
||||
}
|
||||
|
||||
.desktop-header-main {
|
||||
display: grid;
|
||||
grid-template-columns: auto minmax(0, 1fr);
|
||||
align-items: center;
|
||||
gap: 1.4rem;
|
||||
display: contents;
|
||||
}
|
||||
|
||||
.desktop-header-sub {
|
||||
display: flex;
|
||||
justify-content: flex-start;
|
||||
display: contents;
|
||||
}
|
||||
|
||||
.desktop-nav {
|
||||
width: 100%;
|
||||
grid-column: 2;
|
||||
grid-row: 1;
|
||||
display: flex;
|
||||
flex-wrap: nowrap;
|
||||
justify-content: flex-start;
|
||||
align-items: center;
|
||||
overflow-x: auto;
|
||||
scrollbar-width: none;
|
||||
}
|
||||
|
||||
.desktop-nav::-webkit-scrollbar {
|
||||
display: none;
|
||||
}
|
||||
|
||||
.desktop-actions {
|
||||
width: 100%;
|
||||
grid-column: 2;
|
||||
grid-row: 2;
|
||||
display: flex;
|
||||
flex-wrap: nowrap;
|
||||
justify-content: flex-start;
|
||||
align-self: center;
|
||||
}
|
||||
|
||||
.brand {
|
||||
grid-column: 1;
|
||||
grid-row: 1 / span 2;
|
||||
align-self: center;
|
||||
}
|
||||
|
||||
.nav-link-inner,
|
||||
.desktop-actions > * {
|
||||
white-space: nowrap;
|
||||
}
|
||||
}
|
||||
|
||||
.user-chip,
|
||||
@@ -830,6 +853,38 @@ legend {
|
||||
overflow: hidden;
|
||||
}
|
||||
|
||||
.day-tile.has-selection {
|
||||
border-color: color-mix(in srgb, var(--accent) 34%, var(--line) 66%);
|
||||
box-shadow: 0 20px 36px rgba(94, 68, 49, 0.16);
|
||||
}
|
||||
|
||||
.day-tile.has-entries {
|
||||
position: relative;
|
||||
border-color: color-mix(in srgb, var(--accent) 24%, var(--line) 76%);
|
||||
background:
|
||||
linear-gradient(180deg, color-mix(in srgb, var(--surface) 90%, #ffe8d8 10%), color-mix(in srgb, var(--surface) 96%, #fff 4%));
|
||||
box-shadow: 0 18px 34px rgba(94, 68, 49, 0.14);
|
||||
}
|
||||
|
||||
.day-tile.has-entries::before {
|
||||
content: "";
|
||||
position: absolute;
|
||||
inset: 0 auto 0 0;
|
||||
width: 4px;
|
||||
background: linear-gradient(180deg, color-mix(in srgb, var(--accent-strong) 76%, white 24%), color-mix(in srgb, var(--accent) 72%, transparent 28%));
|
||||
opacity: 0.9;
|
||||
}
|
||||
|
||||
.day-tile.has-entries .day-tile-summary {
|
||||
background:
|
||||
linear-gradient(180deg, rgba(255, 236, 221, 0.28), rgba(255, 255, 255, 0));
|
||||
}
|
||||
|
||||
.day-tile.has-entries .status-pill {
|
||||
background: color-mix(in srgb, var(--mint-soft) 78%, var(--surface) 22%);
|
||||
border: 1px solid color-mix(in srgb, var(--mint-soft) 54%, var(--line) 46%);
|
||||
}
|
||||
|
||||
.day-tile > summary::-webkit-details-marker {
|
||||
display: none;
|
||||
}
|
||||
@@ -869,11 +924,85 @@ legend {
|
||||
height: 1.15rem;
|
||||
}
|
||||
|
||||
.day-tile.has-entries .day-tile-icon {
|
||||
background: linear-gradient(145deg, rgba(255, 255, 255, 0.98), color-mix(in srgb, var(--accent-soft) 68%, #fff 32%));
|
||||
box-shadow: 0 10px 22px rgba(94, 68, 49, 0.14);
|
||||
}
|
||||
|
||||
.day-tile-summary-text {
|
||||
margin: 0.2rem 0 0;
|
||||
color: color-mix(in srgb, var(--text) 84%, white 16%);
|
||||
font-size: 1.08rem;
|
||||
}
|
||||
|
||||
.day-tile.has-entries .day-tile-summary-text {
|
||||
color: color-mix(in srgb, var(--text) 90%, white 10%);
|
||||
font-weight: 600;
|
||||
}
|
||||
|
||||
[data-theme="dark"] .day-tile.has-entries {
|
||||
border-color: color-mix(in srgb, var(--accent) 30%, var(--line) 70%);
|
||||
background:
|
||||
linear-gradient(180deg, color-mix(in srgb, var(--surface) 96%, #3f3430 4%), color-mix(in srgb, var(--surface) 100%, #000 0%));
|
||||
box-shadow: 0 18px 38px rgba(0, 0, 0, 0.26);
|
||||
}
|
||||
|
||||
[data-theme="dark"] .day-tile.has-entries .day-tile-summary {
|
||||
background:
|
||||
linear-gradient(90deg, rgba(243, 177, 125, 0.10), rgba(243, 177, 125, 0.03) 38%, rgba(255, 255, 255, 0) 68%);
|
||||
}
|
||||
|
||||
[data-theme="dark"] .day-tile.has-entries .day-tile-icon {
|
||||
background: linear-gradient(145deg, rgba(255, 255, 255, 0.12), rgba(243, 177, 125, 0.16));
|
||||
box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.08);
|
||||
}
|
||||
|
||||
[data-theme="dark"] .day-tile.has-entries .status-pill {
|
||||
background: rgba(155, 198, 175, 0.20);
|
||||
border-color: rgba(155, 198, 175, 0.16);
|
||||
}
|
||||
|
||||
[data-theme="dark"] .day-tile.has-entries .day-tile-summary-text {
|
||||
color: #f3ece7;
|
||||
}
|
||||
|
||||
.day-tile-body {
|
||||
padding: 0 1.25rem 1.25rem;
|
||||
border-top: 1px solid var(--line);
|
||||
}
|
||||
|
||||
.snack-reveal-panel {
|
||||
padding: 1rem 1.1rem;
|
||||
}
|
||||
|
||||
.snack-reveal-actions {
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
gap: 0.65rem;
|
||||
}
|
||||
|
||||
.snack-reveal-button {
|
||||
padding: 0.58rem 0.9rem;
|
||||
}
|
||||
|
||||
.week-card-snack-actions {
|
||||
display: grid;
|
||||
gap: 0.7rem;
|
||||
margin: 0.2rem 0 0.95rem;
|
||||
padding: 0.8rem 0.9rem;
|
||||
border-radius: 18px;
|
||||
border: 1px solid var(--line);
|
||||
background: color-mix(in srgb, var(--surface) 94%, var(--surface-strong) 6%);
|
||||
}
|
||||
|
||||
.week-card-snack-actions .eyebrow {
|
||||
margin: 0;
|
||||
}
|
||||
|
||||
.week-card-empty-copy {
|
||||
margin-bottom: 0.95rem;
|
||||
}
|
||||
|
||||
.quick-add-row {
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
@@ -915,6 +1044,31 @@ legend {
|
||||
background: color-mix(in srgb, var(--surface) 88%, #fff 12%);
|
||||
}
|
||||
|
||||
.planner-entry-edit {
|
||||
margin-top: 0.85rem;
|
||||
}
|
||||
|
||||
.planner-entry-edit > summary {
|
||||
width: fit-content;
|
||||
cursor: pointer;
|
||||
list-style: none;
|
||||
}
|
||||
|
||||
.planner-entry-edit > summary::-webkit-details-marker {
|
||||
display: none;
|
||||
}
|
||||
|
||||
.planner-entry-inline-form {
|
||||
display: grid;
|
||||
grid-template-columns: repeat(2, minmax(0, 1fr));
|
||||
gap: 0.8rem;
|
||||
margin-top: 0.8rem;
|
||||
}
|
||||
|
||||
.planner-entry-inline-form .wide {
|
||||
grid-column: 1 / -1;
|
||||
}
|
||||
|
||||
.template-card,
|
||||
.template-list-card,
|
||||
.suggestion-card {
|
||||
@@ -924,12 +1078,35 @@ legend {
|
||||
background: color-mix(in srgb, var(--surface-strong) 84%, #fff 16%);
|
||||
}
|
||||
|
||||
.selected-quick-action {
|
||||
background: linear-gradient(180deg, color-mix(in srgb, var(--accent-soft) 82%, #fff 18%), color-mix(in srgb, var(--surface-strong) 82%, #fff 18%));
|
||||
border-color: color-mix(in srgb, var(--accent) 36%, var(--line) 64%);
|
||||
box-shadow: 0 16px 30px rgba(94, 68, 49, 0.12);
|
||||
}
|
||||
|
||||
.template-list-card,
|
||||
.week-template-row {
|
||||
display: grid;
|
||||
gap: 0.9rem;
|
||||
}
|
||||
|
||||
.template-list-card-actions {
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
gap: 0.65rem;
|
||||
align-items: center;
|
||||
}
|
||||
|
||||
.template-list-card-actions form {
|
||||
margin: 0;
|
||||
}
|
||||
|
||||
.template-list-card .ghost-button,
|
||||
.template-list-card .button {
|
||||
width: auto;
|
||||
align-self: flex-start;
|
||||
}
|
||||
|
||||
.week-template-row {
|
||||
padding: 1rem;
|
||||
border-radius: 18px;
|
||||
@@ -1083,24 +1260,99 @@ legend {
|
||||
align-items: flex-start;
|
||||
}
|
||||
|
||||
.week-card-count {
|
||||
font-size: 1.25rem;
|
||||
font-family: var(--font-heading);
|
||||
margin: 0.8rem 0 0.2rem;
|
||||
}
|
||||
|
||||
.week-card-actions {
|
||||
margin-top: 1rem;
|
||||
}
|
||||
|
||||
.export-menu {
|
||||
position: relative;
|
||||
}
|
||||
|
||||
.export-menu > summary {
|
||||
list-style: none;
|
||||
}
|
||||
|
||||
.export-menu > summary::-webkit-details-marker {
|
||||
display: none;
|
||||
}
|
||||
|
||||
.export-menu-trigger::after {
|
||||
content: "▾";
|
||||
font-size: 0.8rem;
|
||||
opacity: 0.7;
|
||||
}
|
||||
|
||||
.export-menu[open] .export-menu-trigger {
|
||||
background: var(--accent-soft);
|
||||
}
|
||||
|
||||
.export-menu-panel {
|
||||
position: absolute;
|
||||
top: calc(100% + 0.45rem);
|
||||
right: 0;
|
||||
z-index: 14;
|
||||
min-width: 13.5rem;
|
||||
display: grid;
|
||||
gap: 0.15rem;
|
||||
padding: 0.45rem;
|
||||
border-radius: 18px;
|
||||
border: 1px solid var(--line);
|
||||
background: color-mix(in srgb, var(--surface) 96%, #fff 4%);
|
||||
box-shadow: var(--shadow);
|
||||
}
|
||||
|
||||
.export-menu-panel a {
|
||||
display: block;
|
||||
padding: 0.8rem 0.9rem;
|
||||
border-radius: 14px;
|
||||
color: var(--text);
|
||||
text-decoration: none;
|
||||
}
|
||||
|
||||
.export-menu-panel a:hover {
|
||||
background: var(--accent-soft);
|
||||
}
|
||||
|
||||
.week-card {
|
||||
position: relative;
|
||||
overflow: visible;
|
||||
}
|
||||
|
||||
.week-card.has-open-picker {
|
||||
z-index: 6;
|
||||
}
|
||||
|
||||
.week-slot {
|
||||
position: relative;
|
||||
padding: 0.85rem;
|
||||
border-radius: 18px;
|
||||
background: color-mix(in srgb, var(--surface-strong) 80%, #fff 20%);
|
||||
background: linear-gradient(180deg, color-mix(in srgb, var(--surface-strong) 84%, #fff 16%), color-mix(in srgb, var(--surface) 90%, #fff 10%));
|
||||
border: 1px solid var(--line);
|
||||
transition: border-color 160ms ease, background 160ms ease, transform 160ms ease;
|
||||
}
|
||||
|
||||
.week-slot.has-entries {
|
||||
border-color: color-mix(in srgb, var(--accent) 24%, var(--line) 76%);
|
||||
background:
|
||||
linear-gradient(180deg, color-mix(in srgb, var(--surface) 90%, #ffe8d8 10%), color-mix(in srgb, var(--surface) 96%, #fff 4%));
|
||||
box-shadow: 0 18px 34px rgba(94, 68, 49, 0.12);
|
||||
}
|
||||
|
||||
.week-slot.has-entries::before {
|
||||
content: "";
|
||||
position: absolute;
|
||||
inset: 0 auto 0 0;
|
||||
width: 4px;
|
||||
border-radius: 18px 0 0 18px;
|
||||
background: linear-gradient(180deg, color-mix(in srgb, var(--accent-strong) 76%, white 24%), color-mix(in srgb, var(--accent) 72%, transparent 28%));
|
||||
opacity: 0.9;
|
||||
}
|
||||
|
||||
.week-slot.week-slot-snack.has-entries {
|
||||
background:
|
||||
linear-gradient(180deg, color-mix(in srgb, var(--surface) 92%, #ffe3cf 8%), color-mix(in srgb, var(--surface) 98%, #fff 2%));
|
||||
}
|
||||
|
||||
.week-slot.is-drag-over {
|
||||
background: var(--accent-soft);
|
||||
border-color: color-mix(in srgb, var(--accent) 60%, var(--line) 40%);
|
||||
@@ -1115,11 +1367,91 @@ legend {
|
||||
margin-bottom: 0.5rem;
|
||||
}
|
||||
|
||||
.week-slot-head-meta {
|
||||
display: inline-flex;
|
||||
align-items: center;
|
||||
gap: 0.45rem;
|
||||
}
|
||||
|
||||
.week-slot-count {
|
||||
min-width: 1.9rem;
|
||||
text-align: center;
|
||||
font-weight: 700;
|
||||
color: var(--muted);
|
||||
}
|
||||
|
||||
.week-slot.has-entries .week-slot-count {
|
||||
display: inline-flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
min-width: 2rem;
|
||||
height: 2rem;
|
||||
padding: 0 0.55rem;
|
||||
border-radius: 999px;
|
||||
border: 1px solid color-mix(in srgb, var(--mint-soft) 54%, var(--line) 46%);
|
||||
background: color-mix(in srgb, var(--mint-soft) 78%, var(--surface) 22%);
|
||||
color: color-mix(in srgb, var(--text) 86%, #173127 14%);
|
||||
}
|
||||
|
||||
.week-slot-add {
|
||||
width: 1.9rem;
|
||||
height: 1.9rem;
|
||||
display: inline-grid;
|
||||
place-items: center;
|
||||
padding: 0;
|
||||
border-radius: 999px;
|
||||
border: 1px solid var(--line);
|
||||
background: var(--accent-soft);
|
||||
color: var(--text);
|
||||
font-weight: 700;
|
||||
font-size: 1.15rem;
|
||||
line-height: 1;
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
.week-slot-add:hover {
|
||||
background: color-mix(in srgb, var(--accent-soft) 72%, #fff 28%);
|
||||
}
|
||||
|
||||
.week-slot-picker {
|
||||
position: absolute;
|
||||
top: calc(100% + 0.55rem);
|
||||
left: 0;
|
||||
right: 0;
|
||||
z-index: 12;
|
||||
display: grid;
|
||||
gap: 0.9rem;
|
||||
padding: 0.95rem;
|
||||
border-radius: 18px;
|
||||
border: 1px solid var(--line);
|
||||
background: color-mix(in srgb, var(--surface) 96%, #fff 4%);
|
||||
box-shadow: var(--shadow);
|
||||
}
|
||||
|
||||
.week-slot-picker[hidden] {
|
||||
display: none;
|
||||
}
|
||||
|
||||
.week-slot-picker-head {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
gap: 0.75rem;
|
||||
}
|
||||
|
||||
.week-slot-picker-close {
|
||||
padding: 0.5rem 0.85rem;
|
||||
}
|
||||
|
||||
.week-slot-picker-search {
|
||||
margin-bottom: 0.1rem;
|
||||
}
|
||||
|
||||
.plan-chip {
|
||||
padding: 0.7rem 0.8rem;
|
||||
border-radius: 16px;
|
||||
background: linear-gradient(180deg, rgba(255, 255, 255, 0.92), rgba(255, 246, 239, 0.92));
|
||||
border: 1px solid var(--line);
|
||||
background: linear-gradient(180deg, color-mix(in srgb, var(--surface) 72%, #fff 28%), color-mix(in srgb, var(--accent-soft) 55%, var(--surface) 45%));
|
||||
border: 1px solid color-mix(in srgb, var(--accent) 18%, var(--line) 82%);
|
||||
cursor: grab;
|
||||
box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.65);
|
||||
}
|
||||
@@ -1138,11 +1470,115 @@ legend {
|
||||
transform: scale(0.98);
|
||||
}
|
||||
|
||||
.week-slot-actions {
|
||||
display: flex;
|
||||
justify-content: flex-end;
|
||||
margin-top: 0.65rem;
|
||||
}
|
||||
|
||||
.week-slot-copy {
|
||||
padding: 0.55rem 0.85rem;
|
||||
}
|
||||
|
||||
.plan-chip small,
|
||||
.week-slot-empty {
|
||||
color: var(--muted);
|
||||
}
|
||||
|
||||
.week-slot-empty {
|
||||
display: grid;
|
||||
justify-items: start;
|
||||
gap: 0.65rem;
|
||||
padding: 0.85rem;
|
||||
border-radius: 16px;
|
||||
border: 1px dashed color-mix(in srgb, var(--line) 74%, var(--accent) 26%);
|
||||
background: color-mix(in srgb, var(--surface) 92%, #fff 8%);
|
||||
}
|
||||
|
||||
.week-slot-empty p {
|
||||
margin: 0;
|
||||
}
|
||||
|
||||
[data-theme="dark"] .week-slot {
|
||||
background: linear-gradient(180deg, rgba(66, 57, 54, 0.96), rgba(58, 50, 48, 0.98));
|
||||
border-color: rgba(243, 177, 125, 0.14);
|
||||
box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.04);
|
||||
}
|
||||
|
||||
[data-theme="dark"] .week-card-snack-actions {
|
||||
background: rgba(47, 40, 38, 0.72);
|
||||
border-color: rgba(243, 177, 125, 0.10);
|
||||
}
|
||||
|
||||
[data-theme="dark"] .export-menu-panel {
|
||||
background: rgba(43, 37, 35, 0.98);
|
||||
border-color: rgba(243, 177, 125, 0.14);
|
||||
box-shadow: 0 22px 46px rgba(0, 0, 0, 0.34);
|
||||
}
|
||||
|
||||
[data-theme="dark"] .export-menu-panel a:hover {
|
||||
background: rgba(243, 177, 125, 0.10);
|
||||
}
|
||||
|
||||
[data-theme="dark"] .week-slot.has-entries {
|
||||
border-color: rgba(243, 177, 125, 0.18);
|
||||
background:
|
||||
linear-gradient(180deg, rgba(70, 60, 57, 0.98), rgba(58, 50, 48, 0.99));
|
||||
box-shadow: 0 18px 34px rgba(0, 0, 0, 0.24);
|
||||
}
|
||||
|
||||
[data-theme="dark"] .week-slot.week-slot-snack.has-entries {
|
||||
background:
|
||||
linear-gradient(180deg, rgba(75, 64, 60, 0.98), rgba(60, 52, 49, 0.99));
|
||||
}
|
||||
|
||||
[data-theme="dark"] .week-slot.has-entries .week-slot-count {
|
||||
border-color: rgba(155, 198, 175, 0.16);
|
||||
background: rgba(155, 198, 175, 0.20);
|
||||
color: #eef8f2;
|
||||
}
|
||||
|
||||
[data-theme="dark"] .week-slot.is-drag-over {
|
||||
background: linear-gradient(180deg, rgba(87, 71, 64, 0.98), rgba(72, 58, 53, 0.98));
|
||||
border-color: rgba(243, 177, 125, 0.24);
|
||||
}
|
||||
|
||||
[data-theme="dark"] .week-slot-add {
|
||||
background: rgba(243, 177, 125, 0.16);
|
||||
border-color: rgba(243, 177, 125, 0.18);
|
||||
color: #f7efe9;
|
||||
}
|
||||
|
||||
[data-theme="dark"] .week-slot-add:hover {
|
||||
background: rgba(243, 177, 125, 0.22);
|
||||
}
|
||||
|
||||
[data-theme="dark"] .week-slot-picker {
|
||||
background: rgba(43, 37, 35, 0.98);
|
||||
border-color: rgba(243, 177, 125, 0.14);
|
||||
box-shadow: 0 22px 46px rgba(0, 0, 0, 0.34);
|
||||
}
|
||||
|
||||
[data-theme="dark"] .plan-chip {
|
||||
background: linear-gradient(180deg, rgba(86, 72, 66, 0.98), rgba(72, 60, 56, 0.98));
|
||||
border-color: rgba(243, 177, 125, 0.18);
|
||||
box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.05);
|
||||
}
|
||||
|
||||
[data-theme="dark"] .week-slot-copy {
|
||||
background: rgba(255, 255, 255, 0.03);
|
||||
border-color: rgba(243, 177, 125, 0.12);
|
||||
}
|
||||
|
||||
[data-theme="dark"] .week-slot-copy:hover {
|
||||
background: rgba(243, 177, 125, 0.10);
|
||||
}
|
||||
|
||||
[data-theme="dark"] .week-slot-empty {
|
||||
background: rgba(58, 50, 48, 0.72);
|
||||
border-color: rgba(243, 177, 125, 0.16);
|
||||
}
|
||||
|
||||
.flash-stack {
|
||||
display: grid;
|
||||
gap: 0.7rem;
|
||||
@@ -1483,6 +1919,10 @@ legend {
|
||||
min-width: 100%;
|
||||
}
|
||||
|
||||
.planner-entry-inline-form {
|
||||
grid-template-columns: 1fr;
|
||||
}
|
||||
|
||||
.mobile-nav-stack {
|
||||
position: fixed;
|
||||
left: 0.75rem;
|
||||
|
||||
@@ -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();
|
||||
});
|
||||
})();
|
||||
|
||||
+47
-2
@@ -78,8 +78,8 @@
|
||||
const applyFilter = () => {
|
||||
const term = input.value.trim().toLowerCase();
|
||||
if (!term) {
|
||||
items.forEach((item) => {
|
||||
item.hidden = false;
|
||||
items.forEach((item, index) => {
|
||||
item.hidden = hasLimit ? index >= resultLimit : false;
|
||||
});
|
||||
syncGroups();
|
||||
return;
|
||||
@@ -109,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();
|
||||
});
|
||||
})();
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
const CACHE_NAME = "nouri-v0-6-0";
|
||||
const CACHE_NAME = "nouri-v1-0-0";
|
||||
const OFFLINE_URL = "/static/pwa/offline.html";
|
||||
const STATIC_ASSETS = [
|
||||
"/static/css/styles.css",
|
||||
|
||||
@@ -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 %}
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
<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="#de9862">
|
||||
<meta name="mobile-web-app-capable" content="yes">
|
||||
@@ -91,7 +91,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">
|
||||
|
||||
@@ -134,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>
|
||||
</article>
|
||||
{% endfor %}
|
||||
</div>
|
||||
|
||||
@@ -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>
|
||||
</article>
|
||||
{% endfor %}
|
||||
</div>
|
||||
|
||||
@@ -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>
|
||||
@@ -149,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">
|
||||
|
||||
@@ -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>
|
||||
<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,6 +177,19 @@
|
||||
<h3>Passt gut dazu</h3>
|
||||
<div class="quick-add-row compact-quick-row">
|
||||
{% for suggestion in section.recipe_suggestions %}
|
||||
{% if suggestion.existing_item_id %}
|
||||
<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="{{ 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') }}">
|
||||
{{ csrf_input() }}
|
||||
<input type="hidden" name="plan_date" value="{{ selected_date.isoformat() }}">
|
||||
@@ -135,6 +204,7 @@
|
||||
<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>
|
||||
|
||||
@@ -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,125 @@
|
||||
{% endif %}
|
||||
</div>
|
||||
|
||||
{% if card.filled_dayparts %}
|
||||
<p class="week-card-count">{{ card.planned_count }} Einträge</p>
|
||||
<div class="chip-row">
|
||||
{% for slot in card.filled_dayparts %}
|
||||
<span class="chip">{{ slot.name }} · {{ slot.count }}</span>
|
||||
{% if not card.filled_dayparts %}
|
||||
<p class="empty-state week-card-empty-copy">Noch offen. Du kannst den Tag ganz leicht nach und nach füllen.</p>
|
||||
{% endif %}
|
||||
|
||||
{% if card.hidden_snack_slots %}
|
||||
<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>
|
||||
<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>
|
||||
</div>
|
||||
{% 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>
|
||||
<span>{{ slot.entries|length }}</span>
|
||||
<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 +216,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 %}
|
||||
|
||||
@@ -55,7 +55,7 @@
|
||||
<div class="pwa-card">
|
||||
<strong>Push-Mitteilungen</strong>
|
||||
{% if push_ready %}
|
||||
<p class="muted">Push ist vorbereitet. Wenn du möchtest, kannst du es auf diesem Gerät freigeben und mit einer Test-Mitteilung 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>
|
||||
@@ -98,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>
|
||||
@@ -112,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>
|
||||
|
||||
@@ -2,3 +2,4 @@ Flask==3.1.1
|
||||
gunicorn==23.0.0
|
||||
pywebpush==2.3.0
|
||||
Pillow==11.2.1; python_version < "3.14"
|
||||
fpdf2==2.8.3
|
||||
|
||||
@@ -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()
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user