hnzio/nouri-App
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 18 Wiki Activity

Release Nouri 1.3.0 with improved food states and quick entry flow

Browse Source
This commit is contained in:
Florian Heinz
2026-04-15 11:29:19 +02:00
parent 06be1371d3
commit 5e9beb1d98
22 changed files with 423 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nouri/templates/admin/user_form.html
+2 -1
View File
@@ -45,7 +45,8 @@
<input type="password" name="password_repeat" autocomplete="new-password" {% if not user %}required{% endif %}>
</label>
<div class="form-actions">
<button type="submit">Speichern</button>
<button type="submit" name="save_mode" value="stay">Speichern</button>
<button class="secondary" type="submit" name="save_mode" value="close">Speichern und schließen</button>
<a class="ghost-button" href="{{ url_for('admin.user_list') }}">Zurück</a>
</div>
</form>
nouri/templates/archive/list.html
+6 -4
View File
@@ -5,7 +5,7 @@
<div>
<p class="eyebrow">Archiv</p>
<h1>Frühere Ideen bleiben greifbar</h1>
<p class="lead">Das Archiv ist ein Erinnerungsspeicher. Von hier aus lassen sich vertraute Dinge leicht wieder einplanen oder einkaufen.</p>
<p class="lead">Archiv bedeutet bewusst ausgeblendet, nicht verbraucht. Von hier aus lassen sich Dinge jederzeit wieder aktivieren.</p>
</div>
</section>
@@ -93,13 +93,15 @@
<div class="item-actions">
<form method="post" action="{{ url_for('main.item_add_to_shopping', item_id=item.id) }}">
{{ csrf_input() }}
<button type="submit">Wieder einkaufen</button>
<button type="submit">Auf Einkaufsliste</button>
</form>
<a class="ghost-button" href="{{ url_for('main.planner_day', date=today.isoformat(), item_id=item.id, daypart_id=item.primary_daypart_id) }}">Im Tagesplan öffnen</a>
{% if item.can_edit %}
<a class="ghost-button" href="{{ url_for('main.item_edit', item_id=item.id) }}">Bearbeiten</a>
{% endif %}
{% if item.can_edit %}
<form method="post" action="{{ url_for('main.item_restore', item_id=item.id) }}">
{{ csrf_input() }}
<button class="ghost-button" type="submit">Zur aktiven Liste</button>
<button class="ghost-button" type="submit">Wieder aktivieren</button>
</form>
{% endif %}
</div>
nouri/templates/auth/profile.html
+4 -1
View File
@@ -41,7 +41,10 @@
E-Mail
<input type="email" name="email" value="{{ g.user.email or '' }}" autocomplete="email">
</label>
<button type="submit">Speichern</button>
<div class="form-actions">
<button type="submit" name="save_mode" value="stay">Speichern</button>
<button class="secondary" type="submit" name="save_mode" value="close">Speichern und schließen</button>
</div>
</form>
</article>
nouri/templates/dashboard.html
+1 -1
View File
@@ -80,7 +80,7 @@
<span class="chip">{{ entry.for_label }}</span>
</div>
</div>
{% if entry.availability_state == 'home' %}
{% if entry.is_home %}
<span class="status-pill status-home">zuhause</span>
{% endif %}
</li>
nouri/templates/home/list.html
+19 -9
View File
@@ -5,7 +5,7 @@
<div>
<p class="eyebrow">Zuhause</p>
<h1>Was aktuell da ist</h1>
<p class="lead">Sichtbar, ruhig und nach Tageszeiten sortiert. Wenn etwas aufgebraucht ist, bleibt es später im Archiv greifbar.</p>
<p class="lead">Hier erscheinen aktive Lebensmittel und Mahlzeitenideen, die gerade wirklich da sind. Wenn etwas leer ist, wird es einfach als gerade nicht da markiert.</p>
</div>
</section>
@@ -124,17 +124,27 @@
{% endif %}
</div>
<div class="item-actions">
<a class="ghost-button" href="{{ url_for('main.planner_day', date=today.isoformat(), item_id=item.id, daypart_id=item.primary_daypart_id) }}">Im Tagesplan öffnen</a>
{% if item.can_edit %}
<form method="post" action="{{ url_for('main.item_archive', item_id=item.id) }}">
{% if item.kind == 'meal' %}
<a class="ghost-button" href="{{ url_for('main.planner_day', date=today.isoformat(), item_id=item.id, daypart_id=item.primary_daypart_id) }}">Im Tagesplan öffnen</a>
{% else %}
{% if item.can_edit %}
<form method="post" action="{{ url_for('main.item_set_not_home', item_id=item.id) }}">
{{ csrf_input() }}
<button class="secondary" type="submit">Nicht mehr da</button>
</form>
{% endif %}
<form method="post" action="{{ url_for('main.item_add_to_shopping', item_id=item.id) }}">
{{ csrf_input() }}
<button class="ghost-button" type="submit">Verbraucht / nicht mehr da</button>
<button type="submit">Auf Einkaufsliste</button>
</form>
{% if item.can_edit %}
<a class="ghost-button" href="{{ url_for('main.item_edit', item_id=item.id) }}">Bearbeiten</a>
<form method="post" action="{{ url_for('main.item_archive', item_id=item.id) }}">
{{ csrf_input() }}
<button class="ghost-button" type="submit">Archivieren</button>
</form>
{% endif %}
{% endif %}
<form method="post" action="{{ url_for('main.item_add_to_shopping', item_id=item.id) }}">
{{ csrf_input() }}
<button type="submit">Erneut einkaufen</button>
</form>
</div>
</article>
{% endfor %}
nouri/templates/items/form.html
+2 -1
View File
@@ -351,7 +351,8 @@
{% endif %}
<div class="form-actions">
<button type="submit" name="form_action" value="save_item">Speichern</button>
<button type="submit" name="save_mode" value="stay">Speichern</button>
<button class="secondary" type="submit" name="save_mode" value="close">Speichern und schließen</button>
<a class="ghost-button" href="{{ url_for('main.item_list', kind=kind) }}">Zurück</a>
</div>
</form>
nouri/templates/items/quick_add.html
+128
View File
@@ -0,0 +1,128 @@
{% extends "base.html" %}
{% block title %}Schnell anlegen | Nouri{% endblock %}
{% block content %}
<section class="page-intro">
<div>
<p class="eyebrow">Lebensmittel</p>
<h1>Schnell anlegen</h1>
<p class="lead">Hier kannst du mehrere Lebensmittel in einem Schritt anlegen. Sie landen zuerst als ruhige Platzhalter auf der Einkaufsliste und lassen sich später einzeln weiter ordnen.</p>
</div>
<a class="ghost-button" href="{{ url_for('main.item_list', kind='food') }}">Zurück</a>
</section>
<section class="panel form-panel">
<form method="post" class="stack-form">
{{ csrf_input() }}
<label>
Namen untereinander
<textarea name="names_text" rows="10" placeholder="Erdbeeren&#10;Himbeeren&#10;Blaubeeren" required>{{ form_data.names_text }}</textarea>
<small class="helper-text">Jede Zeile wird als eigenes Lebensmittel angelegt.</small>
</label>
<div class="dual-grid">
<label>
Sichtbarkeit
<select name="visibility">
{% for value, label in visibility_options %}
<option value="{{ value }}" {% if form_data.visibility == value %}selected{% endif %}>{{ label }}</option>
{% endfor %}
</select>
</label>
<label>
Für wen?
<select name="target_user_id">
{% for option in target_user_options %}
<option value="{{ option.value }}" {% if form_data.target_user_raw == option.value %}selected{% endif %}>{{ option.label }}</option>
{% endfor %}
</select>
</label>
</div>
<div class="dual-grid">
<label>
Baustein
<select name="base_type">
{% for value, label in builder_options %}
<option value="{{ value }}" {% if form_data.base_type == value %}selected{% endif %}>{{ label }}</option>
{% endfor %}
</select>
</label>
<label>
Geschmacksrichtung
<select name="flavor_profile">
{% for value, label in food_flavor_options %}
<option value="{{ value }}" {% if form_data.flavor_profile == value %}selected{% endif %}>{{ label }}</option>
{% endfor %}
</select>
</label>
</div>
<div class="dual-grid">
<label>
Rolle in Vorschlägen
<select name="suggestion_role">
{% for value, label in food_role_options %}
<option value="{{ value }}" {% if form_data.suggestion_role == value %}selected{% endif %}>{{ label }}</option>
{% endfor %}
</select>
</label>
<label>
Wird eher vorgeschlagen
<select name="suggestion_priority">
{% for value, label in suggestion_priority_options %}
<option value="{{ value }}" {% if form_data.suggestion_priority == value %}selected{% endif %}>{{ label }}</option>
{% endfor %}
</select>
</label>
</div>
<div class="dual-grid">
<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>
</label>
<label class="inline-check">
<input type="checkbox" name="can_be_meal_core" value="1" {% if form_data.can_be_meal_core %}checked{% endif %}>
<span>Kann gut eine Mahlzeit tragen</span>
</label>
</div>
<fieldset>
<legend>Passende Tageszeiten</legend>
<div class="checkbox-grid daypart-option-grid">
{% for daypart in dayparts %}
<label class="daypart-option">
<input type="checkbox" name="daypart_ids" value="{{ daypart.id }}" {% if daypart.id in form_data.daypart_ids %}checked{% endif %}>
<span class="daypart-option-card">
<span class="daypart-option-icon">
<span class="ui-icon {{ daypart_icon_class(daypart.slug) }}"></span>
</span>
<span class="daypart-option-label">{{ daypart.name }}</span>
</span>
</label>
{% endfor %}
</div>
</fieldset>
<label>
Gemeinsame Notiz
<textarea name="note" rows="3" placeholder="Optional, wenn diese Gruppe etwas gemeinsam braucht.">{{ form_data.note }}</textarea>
<small class="helper-text">Die Einträge starten in „Unsortiert“, sind zunächst nicht zuhause und tauchen erst nach einer späteren Einordnung im Alltag regulär auf.</small>
</label>
<div class="form-actions">
<button type="submit">In Unsortiert anlegen</button>
<a class="ghost-button" href="{{ url_for('main.item_list', kind='food') }}">Abbrechen</a>
</div>
</form>
</section>
{% endblock %}
nouri/templates/library/day_form.html
+2 -1
View File
@@ -85,7 +85,8 @@
</div>
<div class="form-actions">
<button type="submit">Speichern</button>
<button type="submit" name="save_mode" value="stay">Speichern</button>
<button class="secondary" type="submit" name="save_mode" value="close">Speichern und schließen</button>
<a class="ghost-button" href="{{ url_for('main.template_library') }}">Zurück</a>
</div>
</form>
nouri/templates/library/set_form.html
+2 -1
View File
@@ -155,7 +155,8 @@
</fieldset>
<div class="form-actions">
<button type="submit">Speichern</button>
<button type="submit" name="save_mode" value="stay">Speichern</button>
<button class="secondary" type="submit" name="save_mode" value="close">Speichern und schließen</button>
<a class="ghost-button" href="{{ url_for('main.template_library') }}">Zurück</a>
</div>
</form>
nouri/templates/library/week_form.html
+2 -1
View File
@@ -71,7 +71,8 @@
</div>
<div class="form-actions">
<button type="submit">Speichern</button>
<button type="submit" name="save_mode" value="stay">Speichern</button>
<button class="secondary" type="submit" name="save_mode" value="close">Speichern und schließen</button>
<a class="ghost-button" href="{{ url_for('main.template_library') }}">Zurück</a>
</div>
</form>
nouri/templates/planner/day.html
+3 -3
View File
@@ -127,7 +127,7 @@
<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 %}
{% if item.is_home %}<small>zuhause vorhanden</small>{% endif %}
</button>
</form>
{% endfor %}
@@ -190,7 +190,7 @@
<span>{{ item.name }}</span>
<small>
{{ item_kind_labels[item.kind] }}
{% if item.availability_state == 'home' %} · zuhause{% endif %}
{% if item.is_home %} · zuhause{% endif %}
</small>
</button>
</form>
@@ -205,7 +205,7 @@
<div class="planner-entry-top">
<div>
<strong>{{ entry.item_name }}</strong>
<small>{{ item_kind_labels[entry.item_kind] }}{% if entry.availability_state == 'home' %} · zuhause{% else %} · bei Bedarf auf Einkaufsliste{% endif %}</small>
<small>{{ item_kind_labels[entry.item_kind] }}{% if entry.is_home %} · zuhause{% else %} · bei Bedarf auf Einkaufsliste{% endif %}</small>
<div class="chip-row">
<span class="chip">{{ entry.visibility_label }}</span>
<span class="chip status-soft">{{ entry.owner_label }}</span>
nouri/templates/planner/week.html
+1 -1
View File
@@ -161,7 +161,7 @@
<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 %}
{% if item.is_home %}<small>Zuhause vorhanden</small>{% endif %}
</button>
</form>
{% endfor %}
nouri/templates/settings.html
+4 -2
View File
@@ -34,7 +34,8 @@
<input type="time" name="shopping_reminder_time" value="{{ household_settings.shopping_reminder_time }}">
</label>
<div class="form-actions">
<button type="submit">Speichern</button>
<button type="submit" name="save_mode" value="stay">Speichern</button>
<button class="secondary" type="submit" name="save_mode" value="close">Speichern und schließen</button>
</div>
</form>
</article>
@@ -151,7 +152,8 @@
</div>
<div class="form-actions">
<button type="submit">Speichern</button>
<button type="submit" name="save_mode" value="stay">Speichern</button>
<button class="secondary" type="submit" name="save_mode" value="close">Speichern und schließen</button>
<a class="ghost-button" href="{{ url_for('auth.profile') }}">Zum Profil</a>
</div>
</form>