10 Commits

37 changed files with 2891 additions and 154 deletions
+2 -2
View File
@@ -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,
+89 -17
View File
@@ -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
+56
View File
@@ -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.
+53
View File
@@ -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.
+60
View File
@@ -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
+54 -1
View File
@@ -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,15 @@ from .main import main_bp
WEEKDAY_NAMES = ["Montag", "Dienstag", "Mittwoch", "Donnerstag", "Freitag", "Samstag", "Sonntag"]
WEEKDAY_SHORT_NAMES = ["Mo", "Di", "Mi", "Do", "Fr", "Sa", "So"]
DEFAULT_RELEASE_URL = "https://git.hnz.io/hnzio/nouri-App/releases"
DAYPART_ICON_CLASSES = {
"breakfast": "icon-daypart-breakfast",
"morning-snack": "icon-daypart-morning-snack",
"lunch": "icon-daypart-lunch",
"afternoon-snack": "icon-daypart-afternoon-snack",
"dinner": "icon-daypart-dinner",
"late-snack": "icon-daypart-late-snack",
}
def load_secret_key(data_dir: Path) -> str:
@@ -50,11 +64,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 +110,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 +141,10 @@ def create_app() -> Flask:
"builder_descriptions": BUILDER_DESCRIPTIONS,
"builder_options": BUILDER_OPTIONS,
"daypart_suggestions": DAYPARTS,
"energy_density_options": ENERGY_DENSITY_OPTIONS,
"energy_density_labels": ENERGY_DENSITY_LABELS,
"suggestion_style_options": SUGGESTION_STYLE_OPTIONS,
"suggestion_style_labels": SUGGESTION_STYLE_LABELS,
"visibility_labels": VISIBILITY_LABELS,
"visibility_descriptions": VISIBILITY_DESCRIPTIONS,
"role_labels": ROLE_LABELS,
@@ -104,10 +152,12 @@ def create_app() -> Flask:
"notification_channel_options": NOTIFICATION_CHANNEL_OPTIONS,
"today": date.today(),
"app_version": app.config["APP_VERSION"],
"app_release_url": app.config["RELEASE_URL"],
"push_public_key": app.config["VAPID_PUBLIC_KEY"],
"push_available": bool(app.config["VAPID_PUBLIC_KEY"] and app.config["VAPID_PRIVATE_KEY"]),
"weekday_name": lambda value: WEEKDAY_NAMES[value.weekday()],
"weekday_short_name": lambda value: WEEKDAY_SHORT_NAMES[value.weekday()],
"daypart_icon_class": lambda slug: DAYPART_ICON_CLASSES.get(slug, "icon-calendar"),
"is_admin": lambda: bool(getattr(g, "user", None)) and g.user["role"] == "admin",
"asset_url": asset_url,
"image_url": lambda filename, variant="md": image_url(
@@ -159,6 +209,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)
+28
View File
@@ -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"))
+14
View File
@@ -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
View File
@@ -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
View File
@@ -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)
+733 -51
View File
File diff suppressed because it is too large Load Diff
+293
View File
@@ -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)
+25
View File
@@ -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')),
+709 -30
View File
@@ -89,7 +89,8 @@ textarea {
}
button,
.button {
.button,
.ghost-button {
display: inline-flex;
align-items: center;
justify-content: center;
@@ -100,7 +101,7 @@ button,
background: var(--accent);
color: white;
cursor: pointer;
transition: transform 160ms ease, background 160ms ease, border-color 160ms ease;
transition: transform 160ms ease, background 160ms ease, border-color 160ms ease, box-shadow 160ms ease;
}
button:focus-visible,
@@ -123,19 +124,64 @@ button:hover,
.button.secondary,
button.secondary,
.ghost-button {
background: transparent;
background: linear-gradient(
180deg,
color-mix(in srgb, var(--surface-soft) 72%, #fff 28%),
color-mix(in srgb, var(--surface-strong) 82%, #fff 18%)
);
color: var(--text);
border-color: var(--line);
border-color: color-mix(in srgb, var(--accent) 34%, var(--line) 66%);
box-shadow:
inset 0 1px 0 rgba(255, 255, 255, 0.8),
0 8px 20px rgba(225, 181, 138, 0.12);
}
.button.secondary:hover,
button.secondary:hover,
.ghost-button:hover {
background: linear-gradient(
180deg,
color-mix(in srgb, var(--accent-soft) 58%, #fff 42%),
color-mix(in srgb, var(--surface-soft) 88%, #fff 12%)
);
border-color: color-mix(in srgb, var(--accent) 46%, var(--line) 54%);
box-shadow:
inset 0 1px 0 rgba(255, 255, 255, 0.84),
0 12px 28px rgba(212, 155, 104, 0.16);
}
[data-theme="dark"] button:not(.secondary):not(.ghost-button),
[data-theme="dark"] .button:not(.secondary):not(.ghost-button) {
background: #d7935f;
color: #201a17;
border-color: rgba(243, 177, 125, 0.28);
}
[data-theme="dark"] button:not(.secondary):not(.ghost-button):hover,
[data-theme="dark"] .button:not(.secondary):not(.ghost-button):hover {
background: #e0a270;
color: #181311;
}
[data-theme="dark"] .button.secondary,
[data-theme="dark"] button.secondary,
[data-theme="dark"] .ghost-button {
background: transparent;
color: var(--text);
border-color: var(--line);
box-shadow: none;
}
[data-theme="dark"] .button.secondary:hover,
[data-theme="dark"] button.secondary:hover,
[data-theme="dark"] .ghost-button:hover {
background: var(--accent-soft);
border-color: rgba(243, 177, 125, 0.2);
box-shadow: none;
}
.page-shell {
width: min(1320px, calc(100% - 2rem));
width: min(1680px, calc(100% - 2rem));
margin: 1rem auto 2rem;
}
@@ -232,6 +278,7 @@ h3,
}
.site-nav a {
flex: 0 0 auto;
padding: 0.55rem 0.85rem;
border-radius: 999px;
color: var(--muted);
@@ -260,32 +307,61 @@ 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;
padding-left: 1rem;
padding-right: 1rem;
}
.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;
gap: 0.3rem;
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;
}
.desktop-nav a {
padding: 0.5rem 0.74rem;
}
}
.user-chip,
@@ -373,6 +449,14 @@ h3,
linear-gradient(180deg, color-mix(in srgb, var(--surface) 86%, #fff 14%), color-mix(in srgb, var(--surface) 80%, #ffe5d2 20%));
}
[data-theme="dark"] .hero {
background:
linear-gradient(135deg, rgba(255, 255, 255, 0.06), transparent 42%),
linear-gradient(180deg, rgba(64, 55, 52, 0.98), rgba(49, 42, 39, 0.99));
border-color: rgba(243, 177, 125, 0.14);
box-shadow: 0 20px 40px rgba(0, 0, 0, 0.24);
}
.hero h1,
.page-intro h1,
.panel h2 {
@@ -591,6 +675,11 @@ h3 {
background: var(--sky-soft);
}
[data-theme="dark"] .status-idea {
background: rgba(126, 143, 160, 0.24);
color: #ece8e4;
}
.status-soft {
background: var(--lilac-soft);
}
@@ -679,6 +768,10 @@ h3 {
gap: 1rem;
}
.dashboard-spaced-panel > .panel-head + * {
margin-top: 0.45rem;
}
.template-library-grid {
display: grid;
grid-template-columns: repeat(2, minmax(0, 1fr));
@@ -830,6 +923,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;
}
@@ -855,18 +980,84 @@ legend {
}
.day-tile-icon {
width: 2.8rem;
height: 2.8rem;
width: 2.95rem;
height: 2.95rem;
flex: 0 0 2.95rem;
display: grid;
place-items: center;
border-radius: 1rem;
background: linear-gradient(145deg, rgba(255, 255, 255, 0.92), var(--peach-soft));
color: var(--accent-strong);
border-radius: 0.9rem;
background: linear-gradient(
180deg,
color-mix(in srgb, var(--surface-soft) 72%, #fff 28%),
color-mix(in srgb, var(--surface-soft) 92%, #f7e2cf 8%)
);
border: 1px solid color-mix(in srgb, var(--accent) 26%, var(--line) 74%);
box-shadow:
inset 0 1px 0 rgba(255, 255, 255, 0.82),
0 10px 24px rgba(223, 177, 134, 0.12);
color: #cf8450;
}
.day-tile-icon .ui-icon {
width: 1.15rem;
height: 1.15rem;
width: 1.28rem;
height: 1.28rem;
}
[data-theme="dark"] .day-tile-icon {
background: linear-gradient(180deg, rgba(86, 74, 69, 0.98), rgba(67, 58, 55, 0.98));
border: 1px solid rgba(243, 177, 125, 0.14);
box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.04);
color: #f3bf90;
}
.day-tile.has-entries .day-tile-icon {
background: linear-gradient(
180deg,
color-mix(in srgb, var(--surface-soft) 82%, #fff 18%),
color-mix(in srgb, var(--accent-soft) 72%, #fff 28%)
);
border-color: color-mix(in srgb, var(--accent) 36%, var(--line) 64%);
box-shadow:
inset 0 1px 0 rgba(255, 255, 255, 0.84),
0 12px 26px 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(180deg, rgba(97, 82, 76, 0.98), rgba(76, 65, 61, 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"] .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 {
@@ -874,6 +1065,38 @@ legend {
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 +1138,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 +1172,43 @@ legend {
background: color-mix(in srgb, var(--surface-strong) 84%, #fff 16%);
}
[data-theme="dark"] .template-card,
[data-theme="dark"] .template-list-card,
[data-theme="dark"] .suggestion-card {
background: linear-gradient(180deg, rgba(66, 57, 54, 0.98), rgba(54, 47, 44, 0.99));
border-color: rgba(243, 177, 125, 0.12);
box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.02);
}
.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;
@@ -951,6 +1230,12 @@ legend {
border: 1px solid var(--line);
}
[data-theme="dark"] .hint-chip {
background: linear-gradient(180deg, rgba(77, 68, 64, 0.96), rgba(63, 56, 53, 0.98));
border-color: rgba(243, 177, 125, 0.12);
color: #f0e8e2;
}
.suggestion-row {
display: grid;
grid-template-columns: repeat(auto-fit, minmax(180px, 1fr));
@@ -1083,24 +1368,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 +1475,105 @@ legend {
margin-bottom: 0.5rem;
}
.week-slot-title {
display: inline-flex;
align-items: center;
gap: 0.5rem;
min-width: 0;
}
.week-slot-title .ui-icon {
width: 1rem;
height: 1rem;
color: var(--accent-strong);
flex: 0 0 auto;
}
.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 +1592,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;
@@ -1171,6 +1729,11 @@ legend {
min-width: 5rem;
}
.theme-toggle,
.mobile-extra-button[data-theme-toggle] {
gap: 0.55rem;
}
.ui-icon {
width: 1rem;
height: 1rem;
@@ -1215,6 +1778,36 @@ legend {
mask-image: url("../icons/fa/calendar-days.svg");
}
.icon-daypart-breakfast {
-webkit-mask-image: url("../icons/dayparts/breakfast.svg");
mask-image: url("../icons/dayparts/breakfast.svg");
}
.icon-daypart-morning-snack {
-webkit-mask-image: url("../icons/dayparts/morning-snack.svg");
mask-image: url("../icons/dayparts/morning-snack.svg");
}
.icon-daypart-lunch {
-webkit-mask-image: url("../icons/dayparts/lunch.svg");
mask-image: url("../icons/dayparts/lunch.svg");
}
.icon-daypart-afternoon-snack {
-webkit-mask-image: url("../icons/dayparts/afternoon-snack.svg");
mask-image: url("../icons/dayparts/afternoon-snack.svg");
}
.icon-daypart-dinner {
-webkit-mask-image: url("../icons/dayparts/dinner.svg");
mask-image: url("../icons/dayparts/dinner.svg");
}
.icon-daypart-late-snack {
-webkit-mask-image: url("../icons/dayparts/late-snack.svg");
mask-image: url("../icons/dayparts/late-snack.svg");
}
.icon-archive {
-webkit-mask-image: url("../icons/fa/archive.svg");
mask-image: url("../icons/fa/archive.svg");
@@ -1260,6 +1853,16 @@ legend {
mask-image: url("../icons/fa/mobile-screen-button.svg");
}
.icon-sun-theme {
-webkit-mask-image: url("../icons/fa/theme-sun.svg");
mask-image: url("../icons/fa/theme-sun.svg");
}
.icon-moon-theme {
-webkit-mask-image: url("../icons/fa/theme-moon.svg");
mask-image: url("../icons/fa/theme-moon.svg");
}
.icon-apple-whole {
-webkit-mask-image: url("../icons/fa/apple-whole.svg");
mask-image: url("../icons/fa/apple-whole.svg");
@@ -1411,6 +2014,18 @@ legend {
display: none;
}
.day-tile-icon {
width: 2.8rem;
height: 2.8rem;
flex-basis: 2.8rem;
border-radius: 0.85rem;
}
.day-tile-icon .ui-icon {
width: 1.12rem;
height: 1.12rem;
}
.hero,
.page-intro,
.panel,
@@ -1483,6 +2098,10 @@ legend {
min-width: 100%;
}
.planner-entry-inline-form {
grid-template-columns: 1fr;
}
.mobile-nav-stack {
position: fixed;
left: 0.75rem;
@@ -1565,6 +2184,10 @@ legend {
.mobile-nav-button {
cursor: pointer;
font: inherit;
background: transparent;
color: var(--muted);
border: 0;
box-shadow: none;
}
.mobile-bottom-nav a.active,
@@ -1572,6 +2195,62 @@ legend {
.mobile-nav-button.is-open {
background: var(--accent-soft);
color: var(--text);
box-shadow: none;
}
[data-theme="dark"] .mobile-nav-button.is-open {
background: var(--accent-soft);
color: var(--text);
border: 0;
box-shadow: none;
}
[data-theme="dark"] .mobile-nav-stack button.mobile-nav-button:not(.secondary):not(.ghost-button) {
background: transparent;
color: var(--muted);
border: 0;
box-shadow: none;
}
[data-theme="dark"] .mobile-nav-stack button.mobile-nav-button:not(.secondary):not(.ghost-button):hover {
background: transparent;
color: var(--muted);
border: 0;
box-shadow: none;
transform: none;
}
[data-theme="dark"] .mobile-nav-stack button.mobile-nav-button.is-open:not(.secondary):not(.ghost-button),
[data-theme="dark"] .mobile-nav-stack button.mobile-nav-button.is-open:not(.secondary):not(.ghost-button):hover {
background: var(--accent-soft);
color: var(--text);
border: 0;
box-shadow: none;
transform: none;
}
[data-theme="dark"] .mobile-nav-extension .mobile-extra-button,
[data-theme="dark"] .mobile-nav-extension .mobile-extra-form .mobile-extra-button {
background: transparent;
color: var(--muted);
border: 0;
box-shadow: none;
}
[data-theme="dark"] .mobile-nav-extension .mobile-extra-button[data-theme-toggle] {
background: transparent;
color: var(--muted);
border: 0;
box-shadow: none;
}
[data-theme="dark"] .mobile-nav-extension .mobile-extra-button:hover,
[data-theme="dark"] .mobile-nav-extension .mobile-extra-button:focus-visible,
[data-theme="dark"] .mobile-nav-extension .mobile-extra-form .mobile-extra-button:hover,
[data-theme="dark"] .mobile-nav-extension .mobile-extra-form .mobile-extra-button:focus-visible {
background: var(--accent-soft);
color: var(--text);
box-shadow: none;
}
.mobile-profile-link {
@@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><!--! Font Awesome Pro 7.0.0 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license (Commercial License) Copyright 2025 Fonticons, Inc. --><path fill="currentColor" d="M362.2 37L213.9 16 81.7 86.7 16 222.1 42 370.4 149.8 475 298.1 496 430.3 425.3 496 289.9 470 141.6 362.2 37zM208 144a32 32 0 1 1 0 64 32 32 0 1 1 0-64zM144 336a32 32 0 1 1 64 0 32 32 0 1 1 -64 0zm224-64a32 32 0 1 1 0 64 32 32 0 1 1 0-64z"/></svg>

After

Width:  |  Height:  |  Size: 505 B

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

After

Width:  |  Height:  |  Size: 648 B

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

After

Width:  |  Height:  |  Size: 820 B

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

After

Width:  |  Height:  |  Size: 464 B

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

After

Width:  |  Height:  |  Size: 572 B

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

After

Width:  |  Height:  |  Size: 466 B

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

After

Width:  |  Height:  |  Size: 1.1 KiB

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

After

Width:  |  Height:  |  Size: 1.3 KiB

+210
View File
@@ -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();
});
})();
+16 -1
View File
@@ -12,7 +12,22 @@
root.dataset.theme = finalTheme;
toggles().forEach((button) => {
button.textContent = finalTheme === "dark" ? "Hell" : "Dunkel";
const nextModeLabel = finalTheme === "dark" ? "Hell" : "Dunkel";
const label = button.querySelector("[data-theme-label]");
const icon = button.querySelector("[data-theme-icon]");
if (label) {
label.textContent = nextModeLabel;
} else {
button.textContent = nextModeLabel;
}
if (icon) {
icon.classList.toggle("icon-sun-theme", finalTheme === "dark");
icon.classList.toggle("icon-moon-theme", finalTheme !== "dark");
}
button.setAttribute("aria-label", `${nextModeLabel} aktivieren`);
});
};
+47 -2
View File
@@ -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 -1
View File
@@ -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",
+6
View File
@@ -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 %}
+9 -6
View File
@@ -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">
@@ -53,7 +53,10 @@
{% if g.user %}
<div class="desktop-header-sub">
<div class="header-actions desktop-actions">
<button class="theme-toggle ghost-button" type="button" data-theme-toggle>Hell</button>
<button class="theme-toggle ghost-button" type="button" data-theme-toggle aria-label="Darstellung wechseln">
<span class="ui-icon icon-sun-theme" data-theme-icon></span>
<span data-theme-label>Hell</span>
</button>
<a class="ghost-button" href="{{ url_for('main.settings_view') }}">Optionen</a>
<a class="user-chip" href="{{ url_for('auth.profile') }}">
<span class="user-chip-title">{{ g.user.display_name or g.user.username }}</span>
@@ -91,7 +94,7 @@
<footer class="site-footer">
<div class="footer-copy">
<span>Version {{ app_version }}</span>
<a href="{{ app_release_url }}" target="_blank" rel="noreferrer">Version {{ app_version }}</a>
<span>Made with <span class="ui-icon icon-heart"></span> in Göttingen</span>
</div>
<div class="footer-copy">
@@ -114,9 +117,9 @@
<a class="mobile-extra-link" href="{{ url_for('admin.user_list') }}"><span class="ui-icon icon-sparkles"></span><span>Nutzer</span></a>
<a class="mobile-extra-link" href="{{ url_for('admin.category_settings') }}"><span class="ui-icon icon-seedling"></span><span>Kategorien</span></a>
{% endif %}
<button class="mobile-extra-link mobile-extra-button" type="button" data-theme-toggle>
<span class="ui-icon icon-mobile-screen-button"></span>
<span>Modus</span>
<button class="mobile-extra-link mobile-extra-button" type="button" data-theme-toggle aria-label="Darstellung wechseln">
<span class="ui-icon icon-sun-theme" data-theme-icon></span>
<span data-theme-label>Hell</span>
</button>
<form method="post" action="{{ url_for('auth.logout') }}" class="mobile-extra-form">
{{ csrf_input() }}
+21 -3
View File
@@ -91,7 +91,7 @@
{% endif %}
</article>
<article class="panel">
<article class="panel dashboard-spaced-panel">
<div class="panel-head">
<h2>Kurz griffbereit</h2>
<a href="{{ url_for('main.home_view') }}">Alles unter Zuhause</a>
@@ -122,7 +122,7 @@
</section>
<section class="two-column">
<article class="panel">
<article class="panel dashboard-spaced-panel">
<div class="panel-head">
<h2>Was zuhause gut zusammenpasst</h2>
<a href="{{ url_for('main.home_view') }}">Zuhause öffnen</a>
@@ -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>
<a class="ghost-button" href="{{ url_for('main.item_create', kind='meal', name=suggestion.title, component_ids=suggestion.component_ids) }}">Als Mahlzeit anlegen</a>
</article>
{% endfor %}
</div>
+19 -1
View File
@@ -51,8 +51,26 @@
<div>
<strong>{{ suggestion.title }}</strong>
<small>{{ suggestion.reason }}</small>
{% if suggestion.needs_shopping and suggestion.missing_components %}
<div class="chip-row">
<span class="chip status-idea">Es fehlt noch: {{ suggestion.missing_components|join(', ') }}</span>
</div>
{% endif %}
</div>
<div class="template-list-card-actions">
{% if suggestion.existing_item_id %}
<a class="ghost-button" href="{{ url_for('main.planner_day', date=today.isoformat(), item_id=suggestion.existing_item_id, daypart_id=suggestion.daypart_id or 1) }}">Im Tagesplan öffnen</a>
{% else %}
<a class="ghost-button" href="{{ url_for('main.item_create', kind='meal', name=suggestion.title, component_ids=suggestion.component_ids) }}">Als Mahlzeit anlegen</a>
<form method="post" action="{{ url_for('main.suggestion_hide') }}">
{{ csrf_input() }}
{% for component_id in suggestion.component_ids %}
<input type="hidden" name="component_ids" value="{{ component_id }}">
{% endfor %}
<button class="ghost-button" type="submit">Dauerhaft ausblenden</button>
</form>
{% endif %}
</div>
<a class="ghost-button" href="{{ url_for('main.item_create', kind='meal', name=suggestion.title, component_ids=suggestion.component_ids) }}">Als Mahlzeit anlegen</a>
</article>
{% endfor %}
</div>
+18
View File
@@ -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">
+128 -21
View File
@@ -54,24 +54,80 @@
</section>
<section class="planner-day-stack">
{% set hidden_snack_sections = sections | selectattr('is_snack_daypart') | rejectattr('visible_by_default') | list %}
{% if hidden_snack_sections %}
<section class="panel compact-form-panel snack-reveal-panel" data-day-snack-actions>
<div class="panel-head">
<h2>Zwischenmahlzeit hinzufügen</h2>
</div>
<div class="chip-row snack-reveal-actions">
{% for section in hidden_snack_sections %}
<button
class="ghost-button snack-reveal-button"
type="button"
data-day-snack-open
data-target="#daypart-{{ section.daypart.id }}"
>
{{ section.daypart.name }}
</button>
{% endfor %}
</div>
</section>
{% endif %}
{% for section in sections %}
<details class="day-tile" id="daypart-{{ section.daypart.id }}" {% if section.is_open %}open{% endif %}>
<details
class="day-tile{% if section.entries %} has-entries{% endif %}{% if section.selected_quick_action %} has-selection{% endif %}"
id="daypart-{{ section.daypart.id }}"
{% if section.is_snack_daypart and not section.visible_by_default %}hidden data-day-snack-tile{% endif %}
{% if section.is_open %}open{% endif %}
>
<summary class="day-tile-summary">
<div class="day-tile-summary-main">
<div class="day-tile-icon"><span class="ui-icon icon-calendar"></span></div>
<div class="day-tile-icon"><span class="ui-icon {{ daypart_icon_class(section.daypart.slug) }}"></span></div>
<div>
<h2>{{ section.daypart.name }}</h2>
{% if section.summary_items %}
<p class="muted">{{ section.summary_items|join(', ') }}</p>
<p class="day-tile-summary-text">{{ section.summary_items|join(', ') }}</p>
{% else %}
<p class="muted">Noch frei. Öffnen, wenn du etwas ergänzen möchtest.</p>
{% endif %}
</div>
</div>
<span class="status-pill">{{ section.entries|length }} geplant</span>
<span class="status-pill{% if section.entries %} status-home{% endif %}">{{ section.entries|length }} geplant</span>
</summary>
<div class="day-tile-body">
{% if section.selected_quick_action %}
<div class="suggestion-card selected-quick-action">
<span class="status-pill status-home">Schon ausgewählt</span>
<strong>{{ section.selected_quick_action.title }}</strong>
<p class="muted">{{ section.selected_quick_action.subtitle }}</p>
{% if section.selected_quick_action.type == 'existing' %}
<form method="post" action="{{ url_for('main.planner_day', date=selected_date.isoformat()) }}">
{{ csrf_input() }}
<input type="hidden" name="plan_date" value="{{ selected_date.isoformat() }}">
<input type="hidden" name="daypart_id" value="{{ section.daypart.id }}">
<input type="hidden" name="item_id" value="{{ section.selected_quick_action.item_id }}">
<input type="hidden" name="visibility" value="{{ section.selected_quick_action.visibility }}">
<button class="secondary" type="submit">Jetzt nur noch speichern</button>
</form>
{% else %}
<form method="post" action="{{ url_for('main.planner_generated_meal') }}">
{{ csrf_input() }}
<input type="hidden" name="plan_date" value="{{ selected_date.isoformat() }}">
<input type="hidden" name="daypart_id" value="{{ section.daypart.id }}">
<input type="hidden" name="meal_name" value="{{ section.selected_quick_action.title }}">
<input type="hidden" name="visibility" value="{{ section.selected_quick_action.visibility }}">
{% for component_id in section.selected_quick_action.component_ids %}
<input type="hidden" name="component_ids" value="{{ component_id }}">
{% endfor %}
<button class="secondary" type="submit">Jetzt nur noch speichern</button>
</form>
{% endif %}
</div>
{% endif %}
{% if section.balance_suggestion %}
<div class="suggestion-card">
<strong>{{ section.balance_suggestion.text }}</strong>
@@ -121,20 +177,34 @@
<h3>Passt gut dazu</h3>
<div class="quick-add-row compact-quick-row">
{% for suggestion in section.recipe_suggestions %}
<form method="post" action="{{ url_for('main.planner_generated_meal') }}">
{{ csrf_input() }}
<input type="hidden" name="plan_date" value="{{ selected_date.isoformat() }}">
<input type="hidden" name="daypart_id" value="{{ section.daypart.id }}">
<input type="hidden" name="meal_name" value="{{ suggestion.title }}">
<input type="hidden" name="visibility" value="shared">
{% for component_id in suggestion.component_ids %}
<input type="hidden" name="component_ids" value="{{ component_id }}">
{% endfor %}
<button class="quick-add-button compact-button" type="submit">
<span>{{ suggestion.title }}</span>
<small>{{ suggestion.reason }}</small>
</button>
</form>
{% 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() }}">
<input type="hidden" name="daypart_id" value="{{ section.daypart.id }}">
<input type="hidden" name="meal_name" value="{{ suggestion.title }}">
<input type="hidden" name="visibility" value="shared">
{% for component_id in suggestion.component_ids %}
<input type="hidden" name="component_ids" value="{{ component_id }}">
{% endfor %}
<button class="quick-add-button compact-button" type="submit">
<span>{{ suggestion.title }}</span>
<small>{{ suggestion.reason }}</small>
</button>
</form>
{% endif %}
{% endfor %}
</div>
</div>
@@ -143,10 +213,10 @@
<div class="planner-subsection">
<label class="planner-search">
<span>Suche</span>
<input type="text" placeholder="Lebensmittel oder Mahlzeiten suchen" data-filter-input data-filter-target="#planner-list-{{ section.daypart.id }}">
<input type="text" placeholder="Lebensmittel oder Mahlzeiten suchen" data-filter-input data-filter-target="#planner-list-{{ section.daypart.id }}" data-filter-limit="3">
</label>
<div class="compact-picker-list" id="planner-list-{{ section.daypart.id }}">
{% for item in section.food_candidates %}
{% for item in section.search_candidates %}
<form method="post" action="{{ url_for('main.planner_day', date=selected_date.isoformat()) }}" data-filter-label="{{ item.name|lower }} {{ item.category|default('', true)|lower }}">
{{ csrf_input() }}
<input type="hidden" name="plan_date" value="{{ selected_date.isoformat() }}">
@@ -155,7 +225,10 @@
<input type="hidden" name="visibility" value="{{ item.visibility }}">
<button class="picker-row" type="submit">
<span>{{ item.name }}</span>
{% if item.availability_state == 'home' %}<small>zuhause</small>{% endif %}
<small>
{{ item_kind_labels[item.kind] }}
{% if item.availability_state == 'home' %} · zuhause{% endif %}
</small>
</button>
</form>
{% endfor %}
@@ -188,11 +261,45 @@
{% if entry.note %}
<p>{{ entry.note }}</p>
{% endif %}
{% if entry.can_edit %}
<details class="planner-entry-edit">
<summary class="ghost-button">Anpassen</summary>
<form method="post" action="{{ url_for('main.planner_update', entry_id=entry.id) }}" class="planner-entry-inline-form">
{{ csrf_input() }}
<input type="hidden" name="plan_date" value="{{ selected_date.isoformat() }}">
<label>
Für wen?
<select name="visibility">
{% for value, label in visibility_options %}
<option value="{{ value }}" {% if entry.visibility == value %}selected{% endif %}>{{ label }}</option>
{% endfor %}
</select>
</label>
<label class="wide">
Notiz
<input type="text" name="note" value="{{ entry.note or '' }}" placeholder="Optional">
</label>
<button type="submit">Speichern</button>
</form>
</details>
{% endif %}
</article>
{% endfor %}
</div>
{% else %}
<p class="empty-state">Hier ist noch nichts eingetragen. Ein kleiner Anfang reicht völlig.</p>
{% if section.is_snack_daypart %}
<div class="row-actions snack-inline-actions">
<button
class="ghost-button"
type="button"
data-day-snack-hide
data-target="#daypart-{{ section.daypart.id }}"
>
Wieder ausblenden
</button>
</div>
{% endif %}
{% endif %}
</div>
</details>
+146 -13
View File
@@ -10,6 +10,13 @@
<div class="week-nav">
<a class="ghost-button" href="{{ url_for('main.planner', week=prev_week.isoformat()) }}">Vorige Woche</a>
<span>{{ week_start.strftime('%d.%m.%Y') }} bis {{ week_end.strftime('%d.%m.%Y') }}</span>
<details class="export-menu">
<summary class="ghost-button export-menu-trigger">PDF exportieren</summary>
<div class="export-menu-panel">
<a href="{{ url_for('main.planner_export_pdf', week=week_start.isoformat(), mode='mine') }}">Meinen Essensplan</a>
<a href="{{ url_for('main.planner_export_pdf', week=week_start.isoformat(), mode='household') }}">Unseren Essensplan</a>
</div>
</details>
<a class="ghost-button" href="{{ url_for('main.planner', week=next_week.isoformat()) }}">Nächste Woche</a>
</div>
</section>
@@ -80,24 +87,128 @@
{% endif %}
</div>
{% if card.filled_dayparts %}
<p class="week-card-count">{{ card.planned_count }} Einträge</p>
<div class="chip-row">
{% for slot in card.filled_dayparts %}
<span class="chip">{{ slot.name }} · {{ slot.count }}</span>
{% endfor %}
{% 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>
</div>
<p class="muted">{{ card.preview_items | join(', ') }}</p>
{% else %}
<p class="empty-state">Noch offen. Du kannst den Tag ganz leicht nach und nach füllen.</p>
{% endif %}
<div class="week-slot-stack">
{% for slot in card.slots %}
<div class="week-slot drop-slot" data-target-date="{{ card.date.isoformat() }}" data-target-daypart-id="{{ slot.daypart.id }}">
<div
class="week-slot drop-slot{% if slot.entries %} has-entries{% endif %}{% if slot.is_snack_daypart %} week-slot-snack{% endif %}"
id="week-slot-{{ card.date.isoformat() }}-{{ slot.daypart.id }}"
data-target-date="{{ card.date.isoformat() }}"
data-target-daypart-id="{{ slot.daypart.id }}"
{% if slot.is_snack_daypart and not slot.visible_by_default %}hidden data-week-snack-slot{% endif %}
>
<div class="week-slot-head">
<strong>{{ slot.daypart.name }}</strong>
<span>{{ slot.entries|length }}</span>
<div class="week-slot-title">
<span class="ui-icon {{ daypart_icon_class(slot.daypart.slug) }}"></span>
<strong>{{ slot.daypart.name }}</strong>
</div>
<div class="week-slot-head-meta">
<span class="week-slot-count{% if slot.entries %} status-home{% endif %}">{{ slot.entries|length }}</span>
<button class="week-slot-add" type="button" data-week-slot-picker-open aria-label="{{ slot.daypart.name }} an {{ weekday_name(card.date) }} direkt ergänzen">+</button>
</div>
</div>
<div class="week-slot-picker" hidden>
<div class="week-slot-picker-head">
<strong>{{ slot.daypart.name }} ergänzen</strong>
<button class="ghost-button week-slot-picker-close" type="button" data-week-slot-picker-close>Schließen</button>
</div>
<label class="planner-search week-slot-picker-search">
<span>Suche</span>
<input type="text" placeholder="Mahlzeiten oder Ideen suchen" data-filter-input data-filter-target="#week-slot-picker-list-{{ card.date.isoformat() }}-{{ slot.daypart.id }}">
</label>
<div id="week-slot-picker-list-{{ card.date.isoformat() }}-{{ slot.daypart.id }}">
{% if slot.picker.meal_candidates %}
<div class="planner-subsection">
<h3>Mahlzeitenideen</h3>
<div class="quick-add-row compact-quick-row">
{% for item in slot.picker.meal_candidates %}
<form method="post" action="{{ url_for('main.planner_day', date=card.date.isoformat()) }}" class="js-week-slot-submit" data-filter-label="{{ item.name|lower }}">
{{ csrf_input() }}
<input type="hidden" name="plan_date" value="{{ card.date.isoformat() }}">
<input type="hidden" name="daypart_id" value="{{ slot.daypart.id }}">
<input type="hidden" name="item_id" value="{{ item.id }}">
<input type="hidden" name="visibility" value="{{ item.visibility }}">
<button class="quick-add-button compact-button" type="submit">
<span>{{ item.name }}</span>
{% if item.availability_state == 'home' %}<small>Zuhause vorhanden</small>{% endif %}
</button>
</form>
{% endfor %}
</div>
</div>
{% endif %}
{% if slot.picker.recipe_suggestions %}
<div class="planner-subsection">
<h3>Passt gut dazu</h3>
<div class="quick-add-row compact-quick-row">
{% for suggestion in slot.picker.recipe_suggestions %}
{% if suggestion.existing_item_id %}
<form method="post" action="{{ url_for('main.planner_day', date=card.date.isoformat()) }}" class="js-week-slot-submit" data-filter-label="{{ suggestion.title|lower }} {{ suggestion.reason|lower }}">
{{ csrf_input() }}
<input type="hidden" name="plan_date" value="{{ card.date.isoformat() }}">
<input type="hidden" name="daypart_id" value="{{ slot.daypart.id }}">
<input type="hidden" name="item_id" value="{{ suggestion.existing_item_id }}">
<input type="hidden" name="visibility" value="{{ suggestion.visibility or 'shared' }}">
<button class="quick-add-button compact-button" type="submit">
<span>{{ suggestion.title }}</span>
<small>{{ suggestion.reason }}</small>
</button>
</form>
{% else %}
<form method="post" action="{{ url_for('main.planner_generated_meal') }}" class="js-week-slot-submit" data-filter-label="{{ suggestion.title|lower }} {{ suggestion.reason|lower }}">
{{ csrf_input() }}
<input type="hidden" name="plan_date" value="{{ card.date.isoformat() }}">
<input type="hidden" name="daypart_id" value="{{ slot.daypart.id }}">
<input type="hidden" name="meal_name" value="{{ suggestion.title }}">
<input type="hidden" name="visibility" value="{{ suggestion.visibility or 'shared' }}">
{% for component_id in suggestion.component_ids %}
<input type="hidden" name="component_ids" value="{{ component_id }}">
{% endfor %}
<button class="quick-add-button compact-button" type="submit">
<span>{{ suggestion.title }}</span>
<small>{{ suggestion.reason }}</small>
</button>
</form>
{% endif %}
{% endfor %}
</div>
</div>
{% endif %}
{% if not slot.picker.meal_candidates and not slot.picker.recipe_suggestions %}
<p class="empty-state">Hier ist gerade noch nichts vorbereitet. Im Tagesplan kannst du jederzeit etwas Neues anlegen.</p>
{% endif %}
</div>
</div>
{% if slot.entries %}
<div class="week-entry-stack">
@@ -108,8 +219,30 @@
</article>
{% endfor %}
</div>
<div class="week-slot-actions">
{% if slot.copy_allowed %}
<form method="post" action="{{ url_for('main.planner_slot_copy_forward') }}" class="js-copy-forward-form">
{{ csrf_input() }}
<input type="hidden" name="source_date" value="{{ card.date.isoformat() }}">
<input type="hidden" name="daypart_id" value="{{ slot.daypart.id }}">
<button class="ghost-button week-slot-copy" type="submit">Zum nächsten Tag kopieren</button>
</form>
{% endif %}
</div>
{% else %}
<p class="week-slot-empty">Hierher ziehen</p>
<div class="week-slot-empty">
<p>Hierher ziehen</p>
{% if slot.is_snack_daypart %}
<button
class="ghost-button week-slot-hide"
type="button"
data-week-snack-slot-hide
data-target="#week-slot-{{ card.date.isoformat() }}-{{ slot.daypart.id }}"
>
Wieder ausblenden
</button>
{% endif %}
</div>
{% endif %}
</div>
{% endfor %}
+17 -1
View File
@@ -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>
+1
View File
@@ -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
+28
View File
@@ -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()
+8 -1
View File
@@ -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