From 0b54fe255b6442f3dee5bd07e06345a674fc4312 Mon Sep 17 00:00:00 2001 From: Serhiy Bobrov Date: Tue, 21 Apr 2026 13:43:42 +0300 Subject: [PATCH] feat: add recipes module with CRUD functionality and integrate with meals - Implemented new recipes page with UI for managing recipes. - Added REST API routes for recipes including create, read, update, and delete operations. - Introduced database schema for recipes and recipe ingredients. - Updated meals to link with recipes, allowing meals to reference specific recipes. - Enhanced validation for recipe-related fields in meals. - Added styles for the recipes page and components. --- public/locales/ar.json | 33 +++- public/locales/de.json | 33 +++- public/locales/el.json | 33 +++- public/locales/en.json | 33 +++- public/locales/es.json | 33 +++- public/locales/fr.json | 33 +++- public/locales/hi.json | 33 +++- public/locales/it.json | 33 +++- public/locales/ja.json | 33 +++- public/locales/pt.json | 33 +++- public/locales/ru.json | 33 +++- public/locales/sv.json | 33 +++- public/locales/tr.json | 33 +++- public/locales/uk.json | 33 +++- public/locales/zh.json | 33 +++- public/pages/meals.js | 205 +++++++++++++++++++-- public/pages/recipes.js | 372 ++++++++++++++++++++++++++++++++++++++ public/router.js | 4 +- public/styles/recipes.css | 119 ++++++++++++ public/styles/tokens.css | 2 + server/db-schema-test.js | 35 ++++ server/db.js | 39 ++++ server/index.js | 2 + server/routes/meals.js | 26 ++- server/routes/recipes.js | 170 +++++++++++++++++ 25 files changed, 1421 insertions(+), 48 deletions(-) create mode 100644 public/pages/recipes.js create mode 100644 public/styles/recipes.css create mode 100644 server/routes/recipes.js diff --git a/public/locales/ar.json b/public/locales/ar.json index c4a3a40..33ad1f2 100644 --- a/public/locales/ar.json +++ b/public/locales/ar.json @@ -42,7 +42,8 @@ "settings": "الإعدادات", "main": "القائمة الرئيسية", "navigation": "التنقل", - "quickActions": "الإجراءات السريعة" + "quickActions": "الإجراءات السريعة", + "recipes": "Recipes" }, "dashboard": { "title": "لوحة التحكم", @@ -242,7 +243,11 @@ "loadingIndicator": "جارٍ التحميل…", "recipeUrlLabel": "رابط الوصفة (اختياري)", "recipeUrlPlaceholder": "https://…", - "openRecipe": "فتح الوصفة" + "openRecipe": "فتح الوصفة", + "savedRecipeLabel": "Saved recipe", + "savedRecipePlaceholder": "Select recipe", + "saveAsRecipe": "Save as recipe", + "recipeScaleLabel": "Scale ingredients" }, "calendar": { "title": "التقويم", @@ -604,5 +609,29 @@ "unitWeeks": "أسابيع", "unitMonth": "شهر", "unitMonths": "أشهر" + }, + "recipes": { + "title": "Recipes", + "addRecipe": "Add recipe", + "editRecipe": "Edit recipe", + "emptyTitle": "No recipes yet", + "emptyDescription": "Save your favorite recipes and reuse them in meal planning.", + "titleLabel": "Title *", + "titlePlaceholder": "e.g. Pasta Carbonara", + "notesLabel": "Notes", + "notesPlaceholder": "Optional...", + "urlLabel": "Recipe link", + "urlPlaceholder": "https://...", + "ingredientsLabel": "Ingredients", + "addToMeals": "Add to meal plan", + "openLink": "Open recipe link", + "deleteConfirm": "Delete recipe \"{{title}}\"?", + "created": "Recipe saved.", + "updated": "Recipe updated.", + "deleted": "Recipe deleted.", + "titleRequired": "Title is required", + "duplicate": "Duplicate", + "duplicated": "Recipe duplicated.", + "copySuffix": "copy" } } diff --git a/public/locales/de.json b/public/locales/de.json index 74f0e09..c4ff9bc 100644 --- a/public/locales/de.json +++ b/public/locales/de.json @@ -43,7 +43,8 @@ "main": "Hauptnavigation", "navigation": "Navigation", "quickActions": "Schnellaktionen", - "more": "Mehr" + "more": "Mehr", + "recipes": "Recipes" }, "search": { "title": "Suche", @@ -256,7 +257,11 @@ "loadingIndicator": "Lade…", "recipeUrlLabel": "Rezept-Link (optional)", "recipeUrlPlaceholder": "https://…", - "openRecipe": "Rezept öffnen" + "openRecipe": "Rezept öffnen", + "savedRecipeLabel": "Saved recipe", + "savedRecipePlaceholder": "Select recipe", + "saveAsRecipe": "Save as recipe", + "recipeScaleLabel": "Scale ingredients" }, "calendar": { "title": "Kalender", @@ -676,5 +681,29 @@ "notificationHint": "Erhalte Benachrichtigungen auch wenn die App geöffnet ist.", "pendingBadgeTitle": "{{count}} fällige Erinnerung", "pendingBadgeTitlePlural": "{{count}} fällige Erinnerungen" + }, + "recipes": { + "title": "Recipes", + "addRecipe": "Add recipe", + "editRecipe": "Edit recipe", + "emptyTitle": "No recipes yet", + "emptyDescription": "Save your favorite recipes and reuse them in meal planning.", + "titleLabel": "Title *", + "titlePlaceholder": "e.g. Pasta Carbonara", + "notesLabel": "Notes", + "notesPlaceholder": "Optional...", + "urlLabel": "Recipe link", + "urlPlaceholder": "https://...", + "ingredientsLabel": "Ingredients", + "addToMeals": "Add to meal plan", + "openLink": "Open recipe link", + "deleteConfirm": "Delete recipe \"{{title}}\"?", + "created": "Recipe saved.", + "updated": "Recipe updated.", + "deleted": "Recipe deleted.", + "titleRequired": "Title is required", + "duplicate": "Duplicate", + "duplicated": "Recipe duplicated.", + "copySuffix": "copy" } } diff --git a/public/locales/el.json b/public/locales/el.json index ffff781..3c33441 100644 --- a/public/locales/el.json +++ b/public/locales/el.json @@ -42,7 +42,8 @@ "settings": "Ρυθμίσεις", "main": "Κύρια πλοήγηση", "navigation": "Πλοήγηση", - "quickActions": "Γρήγορες ενέργειες" + "quickActions": "Γρήγορες ενέργειες", + "recipes": "Recipes" }, "dashboard": { "title": "Επισκόπηση", @@ -242,7 +243,11 @@ "loadingIndicator": "Φόρτωση…", "recipeUrlLabel": "Σύνδεσμος συνταγής (προαιρετικό)", "recipeUrlPlaceholder": "https://…", - "openRecipe": "Άνοιγμα συνταγής" + "openRecipe": "Άνοιγμα συνταγής", + "savedRecipeLabel": "Saved recipe", + "savedRecipePlaceholder": "Select recipe", + "saveAsRecipe": "Save as recipe", + "recipeScaleLabel": "Scale ingredients" }, "calendar": { "title": "Ημερολόγιο", @@ -604,5 +609,29 @@ "unitWeeks": "εβδομάδες", "unitMonth": "μήνα", "unitMonths": "μήνες" + }, + "recipes": { + "title": "Recipes", + "addRecipe": "Add recipe", + "editRecipe": "Edit recipe", + "emptyTitle": "No recipes yet", + "emptyDescription": "Save your favorite recipes and reuse them in meal planning.", + "titleLabel": "Title *", + "titlePlaceholder": "e.g. Pasta Carbonara", + "notesLabel": "Notes", + "notesPlaceholder": "Optional...", + "urlLabel": "Recipe link", + "urlPlaceholder": "https://...", + "ingredientsLabel": "Ingredients", + "addToMeals": "Add to meal plan", + "openLink": "Open recipe link", + "deleteConfirm": "Delete recipe \"{{title}}\"?", + "created": "Recipe saved.", + "updated": "Recipe updated.", + "deleted": "Recipe deleted.", + "titleRequired": "Title is required", + "duplicate": "Duplicate", + "duplicated": "Recipe duplicated.", + "copySuffix": "copy" } } diff --git a/public/locales/en.json b/public/locales/en.json index 873e2f1..9148647 100644 --- a/public/locales/en.json +++ b/public/locales/en.json @@ -42,7 +42,8 @@ "settings": "Settings", "main": "Main navigation", "navigation": "Navigation", - "quickActions": "Quick actions" + "quickActions": "Quick actions", + "recipes": "Recipes" }, "dashboard": { "title": "Overview", @@ -242,7 +243,11 @@ "loadingIndicator": "Loading…", "recipeUrlLabel": "Recipe link (optional)", "recipeUrlPlaceholder": "https://…", - "openRecipe": "Open recipe" + "openRecipe": "Open recipe", + "savedRecipeLabel": "Saved recipe", + "savedRecipePlaceholder": "Select recipe", + "saveAsRecipe": "Save as recipe", + "recipeScaleLabel": "Scale ingredients" }, "calendar": { "title": "Calendar", @@ -625,5 +630,29 @@ "notificationHint": "Receive notifications while the app is open.", "pendingBadgeTitle": "{{count}} reminder due", "pendingBadgeTitlePlural": "{{count}} reminders due" + }, + "recipes": { + "title": "Recipes", + "addRecipe": "Add recipe", + "editRecipe": "Edit recipe", + "emptyTitle": "No recipes yet", + "emptyDescription": "Save your favorite recipes and reuse them in meal planning.", + "titleLabel": "Title *", + "titlePlaceholder": "e.g. Pasta Carbonara", + "notesLabel": "Notes", + "notesPlaceholder": "Optional...", + "urlLabel": "Recipe link", + "urlPlaceholder": "https://...", + "ingredientsLabel": "Ingredients", + "addToMeals": "Add to meal plan", + "openLink": "Open recipe link", + "deleteConfirm": "Delete recipe \"{{title}}\"?", + "created": "Recipe saved.", + "updated": "Recipe updated.", + "deleted": "Recipe deleted.", + "titleRequired": "Title is required", + "duplicate": "Duplicate", + "duplicated": "Recipe duplicated.", + "copySuffix": "copy" } } diff --git a/public/locales/es.json b/public/locales/es.json index 2149472..163c657 100644 --- a/public/locales/es.json +++ b/public/locales/es.json @@ -42,7 +42,8 @@ "settings": "Ajustes", "main": "Navegación principal", "navigation": "Navegación", - "quickActions": "Acciones rápidas" + "quickActions": "Acciones rápidas", + "recipes": "Recipes" }, "dashboard": { "title": "Inicio", @@ -242,7 +243,11 @@ "loadingIndicator": "Cargando…", "recipeUrlLabel": "Enlace a la receta (opcional)", "recipeUrlPlaceholder": "https://…", - "openRecipe": "Abrir receta" + "openRecipe": "Abrir receta", + "savedRecipeLabel": "Saved recipe", + "savedRecipePlaceholder": "Select recipe", + "saveAsRecipe": "Save as recipe", + "recipeScaleLabel": "Scale ingredients" }, "calendar": { "title": "Calendario", @@ -604,5 +609,29 @@ "unitWeeks": "semanas", "unitMonth": "mes", "unitMonths": "meses" + }, + "recipes": { + "title": "Recipes", + "addRecipe": "Add recipe", + "editRecipe": "Edit recipe", + "emptyTitle": "No recipes yet", + "emptyDescription": "Save your favorite recipes and reuse them in meal planning.", + "titleLabel": "Title *", + "titlePlaceholder": "e.g. Pasta Carbonara", + "notesLabel": "Notes", + "notesPlaceholder": "Optional...", + "urlLabel": "Recipe link", + "urlPlaceholder": "https://...", + "ingredientsLabel": "Ingredients", + "addToMeals": "Add to meal plan", + "openLink": "Open recipe link", + "deleteConfirm": "Delete recipe \"{{title}}\"?", + "created": "Recipe saved.", + "updated": "Recipe updated.", + "deleted": "Recipe deleted.", + "titleRequired": "Title is required", + "duplicate": "Duplicate", + "duplicated": "Recipe duplicated.", + "copySuffix": "copy" } } diff --git a/public/locales/fr.json b/public/locales/fr.json index 3b606ca..1fc10d2 100644 --- a/public/locales/fr.json +++ b/public/locales/fr.json @@ -42,7 +42,8 @@ "settings": "Paramètres", "main": "Navigation principale", "navigation": "Navigation", - "quickActions": "Actions rapides" + "quickActions": "Actions rapides", + "recipes": "Recipes" }, "dashboard": { "title": "Accueil", @@ -242,7 +243,11 @@ "loadingIndicator": "Chargement…", "recipeUrlLabel": "Lien recette (optionnel)", "recipeUrlPlaceholder": "https://…", - "openRecipe": "Ouvrir la recette" + "openRecipe": "Ouvrir la recette", + "savedRecipeLabel": "Saved recipe", + "savedRecipePlaceholder": "Select recipe", + "saveAsRecipe": "Save as recipe", + "recipeScaleLabel": "Scale ingredients" }, "calendar": { "title": "Calendrier", @@ -604,5 +609,29 @@ "unitWeeks": "semaines", "unitMonth": "mois", "unitMonths": "mois" + }, + "recipes": { + "title": "Recipes", + "addRecipe": "Add recipe", + "editRecipe": "Edit recipe", + "emptyTitle": "No recipes yet", + "emptyDescription": "Save your favorite recipes and reuse them in meal planning.", + "titleLabel": "Title *", + "titlePlaceholder": "e.g. Pasta Carbonara", + "notesLabel": "Notes", + "notesPlaceholder": "Optional...", + "urlLabel": "Recipe link", + "urlPlaceholder": "https://...", + "ingredientsLabel": "Ingredients", + "addToMeals": "Add to meal plan", + "openLink": "Open recipe link", + "deleteConfirm": "Delete recipe \"{{title}}\"?", + "created": "Recipe saved.", + "updated": "Recipe updated.", + "deleted": "Recipe deleted.", + "titleRequired": "Title is required", + "duplicate": "Duplicate", + "duplicated": "Recipe duplicated.", + "copySuffix": "copy" } } diff --git a/public/locales/hi.json b/public/locales/hi.json index 6e083ad..f4f0c55 100644 --- a/public/locales/hi.json +++ b/public/locales/hi.json @@ -42,7 +42,8 @@ "settings": "सेटिंग्स", "main": "मुख्य नेविगेशन", "navigation": "नेविगेशन", - "quickActions": "त्वरित क्रियाएं" + "quickActions": "त्वरित क्रियाएं", + "recipes": "Recipes" }, "dashboard": { "title": "डैशबोर्ड", @@ -242,7 +243,11 @@ "loadingIndicator": "लोड हो रहा है…", "recipeUrlLabel": "रेसिपी लिंक (वैकल्पिक)", "recipeUrlPlaceholder": "https://…", - "openRecipe": "रेसिपी खोलें" + "openRecipe": "रेसिपी खोलें", + "savedRecipeLabel": "Saved recipe", + "savedRecipePlaceholder": "Select recipe", + "saveAsRecipe": "Save as recipe", + "recipeScaleLabel": "Scale ingredients" }, "calendar": { "title": "कैलेंडर", @@ -604,5 +609,29 @@ "unitWeeks": "सप्ताह", "unitMonth": "माह", "unitMonths": "माह" + }, + "recipes": { + "title": "Recipes", + "addRecipe": "Add recipe", + "editRecipe": "Edit recipe", + "emptyTitle": "No recipes yet", + "emptyDescription": "Save your favorite recipes and reuse them in meal planning.", + "titleLabel": "Title *", + "titlePlaceholder": "e.g. Pasta Carbonara", + "notesLabel": "Notes", + "notesPlaceholder": "Optional...", + "urlLabel": "Recipe link", + "urlPlaceholder": "https://...", + "ingredientsLabel": "Ingredients", + "addToMeals": "Add to meal plan", + "openLink": "Open recipe link", + "deleteConfirm": "Delete recipe \"{{title}}\"?", + "created": "Recipe saved.", + "updated": "Recipe updated.", + "deleted": "Recipe deleted.", + "titleRequired": "Title is required", + "duplicate": "Duplicate", + "duplicated": "Recipe duplicated.", + "copySuffix": "copy" } } diff --git a/public/locales/it.json b/public/locales/it.json index 49869a2..81ee7ce 100644 --- a/public/locales/it.json +++ b/public/locales/it.json @@ -42,7 +42,8 @@ "settings": "Impostazioni", "main": "Navigazione principale", "navigation": "Navigazione", - "quickActions": "Azioni rapide" + "quickActions": "Azioni rapide", + "recipes": "Recipes" }, "dashboard": { "title": "Panoramica", @@ -242,7 +243,11 @@ "loadingIndicator": "Caricamento…", "recipeUrlLabel": "Link ricetta (opzionale)", "recipeUrlPlaceholder": "https://…", - "openRecipe": "Apri ricetta" + "openRecipe": "Apri ricetta", + "savedRecipeLabel": "Saved recipe", + "savedRecipePlaceholder": "Select recipe", + "saveAsRecipe": "Save as recipe", + "recipeScaleLabel": "Scale ingredients" }, "calendar": { "title": "Calendario", @@ -604,5 +609,29 @@ "unitWeeks": "settimane", "unitMonth": "mese", "unitMonths": "mesi" + }, + "recipes": { + "title": "Recipes", + "addRecipe": "Add recipe", + "editRecipe": "Edit recipe", + "emptyTitle": "No recipes yet", + "emptyDescription": "Save your favorite recipes and reuse them in meal planning.", + "titleLabel": "Title *", + "titlePlaceholder": "e.g. Pasta Carbonara", + "notesLabel": "Notes", + "notesPlaceholder": "Optional...", + "urlLabel": "Recipe link", + "urlPlaceholder": "https://...", + "ingredientsLabel": "Ingredients", + "addToMeals": "Add to meal plan", + "openLink": "Open recipe link", + "deleteConfirm": "Delete recipe \"{{title}}\"?", + "created": "Recipe saved.", + "updated": "Recipe updated.", + "deleted": "Recipe deleted.", + "titleRequired": "Title is required", + "duplicate": "Duplicate", + "duplicated": "Recipe duplicated.", + "copySuffix": "copy" } } diff --git a/public/locales/ja.json b/public/locales/ja.json index 93c600f..53f94b5 100644 --- a/public/locales/ja.json +++ b/public/locales/ja.json @@ -42,7 +42,8 @@ "settings": "設定", "main": "メインナビゲーション", "navigation": "ナビゲーション", - "quickActions": "クイックアクション" + "quickActions": "クイックアクション", + "recipes": "Recipes" }, "dashboard": { "title": "ダッシュボード", @@ -242,7 +243,11 @@ "loadingIndicator": "読み込み中…", "recipeUrlLabel": "レシピリンク（任意）", "recipeUrlPlaceholder": "https://…", - "openRecipe": "レシピを開く" + "openRecipe": "レシピを開く", + "savedRecipeLabel": "Saved recipe", + "savedRecipePlaceholder": "Select recipe", + "saveAsRecipe": "Save as recipe", + "recipeScaleLabel": "Scale ingredients" }, "calendar": { "title": "カレンダー", @@ -604,5 +609,29 @@ "unitWeeks": "週", "unitMonth": "ヶ月", "unitMonths": "ヶ月" + }, + "recipes": { + "title": "Recipes", + "addRecipe": "Add recipe", + "editRecipe": "Edit recipe", + "emptyTitle": "No recipes yet", + "emptyDescription": "Save your favorite recipes and reuse them in meal planning.", + "titleLabel": "Title *", + "titlePlaceholder": "e.g. Pasta Carbonara", + "notesLabel": "Notes", + "notesPlaceholder": "Optional...", + "urlLabel": "Recipe link", + "urlPlaceholder": "https://...", + "ingredientsLabel": "Ingredients", + "addToMeals": "Add to meal plan", + "openLink": "Open recipe link", + "deleteConfirm": "Delete recipe \"{{title}}\"?", + "created": "Recipe saved.", + "updated": "Recipe updated.", + "deleted": "Recipe deleted.", + "titleRequired": "Title is required", + "duplicate": "Duplicate", + "duplicated": "Recipe duplicated.", + "copySuffix": "copy" } } diff --git a/public/locales/pt.json b/public/locales/pt.json index 3ed43e9..8afd852 100644 --- a/public/locales/pt.json +++ b/public/locales/pt.json @@ -42,7 +42,8 @@ "settings": "Configurações", "main": "Navegação principal", "navigation": "Navegação", - "quickActions": "Ações rápidas" + "quickActions": "Ações rápidas", + "recipes": "Recipes" }, "dashboard": { "title": "Painel", @@ -242,7 +243,11 @@ "loadingIndicator": "Carregando…", "recipeUrlLabel": "Link da receita (opcional)", "recipeUrlPlaceholder": "https://…", - "openRecipe": "Abrir receita" + "openRecipe": "Abrir receita", + "savedRecipeLabel": "Saved recipe", + "savedRecipePlaceholder": "Select recipe", + "saveAsRecipe": "Save as recipe", + "recipeScaleLabel": "Scale ingredients" }, "calendar": { "title": "Calendário", @@ -604,5 +609,29 @@ "unitWeeks": "semanas", "unitMonth": "mês", "unitMonths": "meses" + }, + "recipes": { + "title": "Recipes", + "addRecipe": "Add recipe", + "editRecipe": "Edit recipe", + "emptyTitle": "No recipes yet", + "emptyDescription": "Save your favorite recipes and reuse them in meal planning.", + "titleLabel": "Title *", + "titlePlaceholder": "e.g. Pasta Carbonara", + "notesLabel": "Notes", + "notesPlaceholder": "Optional...", + "urlLabel": "Recipe link", + "urlPlaceholder": "https://...", + "ingredientsLabel": "Ingredients", + "addToMeals": "Add to meal plan", + "openLink": "Open recipe link", + "deleteConfirm": "Delete recipe \"{{title}}\"?", + "created": "Recipe saved.", + "updated": "Recipe updated.", + "deleted": "Recipe deleted.", + "titleRequired": "Title is required", + "duplicate": "Duplicate", + "duplicated": "Recipe duplicated.", + "copySuffix": "copy" } } diff --git a/public/locales/ru.json b/public/locales/ru.json index 519ccc6..e51822c 100644 --- a/public/locales/ru.json +++ b/public/locales/ru.json @@ -42,7 +42,8 @@ "settings": "Настройки", "main": "Главная навигация", "navigation": "Навигация", - "quickActions": "Быстрые действия" + "quickActions": "Быстрые действия", + "recipes": "Recipes" }, "dashboard": { "title": "Обзор", @@ -242,7 +243,11 @@ "loadingIndicator": "Загрузка…", "recipeUrlLabel": "Ссылка на рецепт (необязательно)", "recipeUrlPlaceholder": "https://…", - "openRecipe": "Открыть рецепт" + "openRecipe": "Открыть рецепт", + "savedRecipeLabel": "Saved recipe", + "savedRecipePlaceholder": "Select recipe", + "saveAsRecipe": "Save as recipe", + "recipeScaleLabel": "Scale ingredients" }, "calendar": { "title": "Календарь", @@ -604,5 +609,29 @@ "unitWeeks": "недель", "unitMonth": "месяц", "unitMonths": "месяцев" + }, + "recipes": { + "title": "Recipes", + "addRecipe": "Add recipe", + "editRecipe": "Edit recipe", + "emptyTitle": "No recipes yet", + "emptyDescription": "Save your favorite recipes and reuse them in meal planning.", + "titleLabel": "Title *", + "titlePlaceholder": "e.g. Pasta Carbonara", + "notesLabel": "Notes", + "notesPlaceholder": "Optional...", + "urlLabel": "Recipe link", + "urlPlaceholder": "https://...", + "ingredientsLabel": "Ingredients", + "addToMeals": "Add to meal plan", + "openLink": "Open recipe link", + "deleteConfirm": "Delete recipe \"{{title}}\"?", + "created": "Recipe saved.", + "updated": "Recipe updated.", + "deleted": "Recipe deleted.", + "titleRequired": "Title is required", + "duplicate": "Duplicate", + "duplicated": "Recipe duplicated.", + "copySuffix": "copy" } } diff --git a/public/locales/sv.json b/public/locales/sv.json index 1cb208b..dab8915 100644 --- a/public/locales/sv.json +++ b/public/locales/sv.json @@ -42,7 +42,8 @@ "settings": "Inställningar", "main": "Huvudnavigering", "navigation": "Navigering", - "quickActions": "Snabba åtgärder" + "quickActions": "Snabba åtgärder", + "recipes": "Recipes" }, "dashboard": { "title": "Översikt", @@ -242,7 +243,11 @@ "loadingIndicator": "Laddar…", "recipeUrlLabel": "Receptlänk (valfri)", "recipeUrlPlaceholder": "https://…", - "openRecipe": "Öppna recept" + "openRecipe": "Öppna recept", + "savedRecipeLabel": "Saved recipe", + "savedRecipePlaceholder": "Select recipe", + "saveAsRecipe": "Save as recipe", + "recipeScaleLabel": "Scale ingredients" }, "calendar": { "title": "Kalender", @@ -604,5 +609,29 @@ "unitWeeks": "veckor", "unitMonth": "månad", "unitMonths": "månader" + }, + "recipes": { + "title": "Recipes", + "addRecipe": "Add recipe", + "editRecipe": "Edit recipe", + "emptyTitle": "No recipes yet", + "emptyDescription": "Save your favorite recipes and reuse them in meal planning.", + "titleLabel": "Title *", + "titlePlaceholder": "e.g. Pasta Carbonara", + "notesLabel": "Notes", + "notesPlaceholder": "Optional...", + "urlLabel": "Recipe link", + "urlPlaceholder": "https://...", + "ingredientsLabel": "Ingredients", + "addToMeals": "Add to meal plan", + "openLink": "Open recipe link", + "deleteConfirm": "Delete recipe \"{{title}}\"?", + "created": "Recipe saved.", + "updated": "Recipe updated.", + "deleted": "Recipe deleted.", + "titleRequired": "Title is required", + "duplicate": "Duplicate", + "duplicated": "Recipe duplicated.", + "copySuffix": "copy" } } diff --git a/public/locales/tr.json b/public/locales/tr.json index fc81daf..4e4a712 100644 --- a/public/locales/tr.json +++ b/public/locales/tr.json @@ -42,7 +42,8 @@ "settings": "Ayarlar", "main": "Ana gezinme", "navigation": "Gezinme", - "quickActions": "Hızlı işlemler" + "quickActions": "Hızlı işlemler", + "recipes": "Recipes" }, "dashboard": { "title": "Genel Bakış", @@ -242,7 +243,11 @@ "loadingIndicator": "Yükleniyor…", "recipeUrlLabel": "Tarif bağlantısı (isteğe bağlı)", "recipeUrlPlaceholder": "https://…", - "openRecipe": "Tarifi aç" + "openRecipe": "Tarifi aç", + "savedRecipeLabel": "Saved recipe", + "savedRecipePlaceholder": "Select recipe", + "saveAsRecipe": "Save as recipe", + "recipeScaleLabel": "Scale ingredients" }, "calendar": { "title": "Takvim", @@ -604,5 +609,29 @@ "unitWeeks": "hafta", "unitMonth": "ay", "unitMonths": "ay" + }, + "recipes": { + "title": "Recipes", + "addRecipe": "Add recipe", + "editRecipe": "Edit recipe", + "emptyTitle": "No recipes yet", + "emptyDescription": "Save your favorite recipes and reuse them in meal planning.", + "titleLabel": "Title *", + "titlePlaceholder": "e.g. Pasta Carbonara", + "notesLabel": "Notes", + "notesPlaceholder": "Optional...", + "urlLabel": "Recipe link", + "urlPlaceholder": "https://...", + "ingredientsLabel": "Ingredients", + "addToMeals": "Add to meal plan", + "openLink": "Open recipe link", + "deleteConfirm": "Delete recipe \"{{title}}\"?", + "created": "Recipe saved.", + "updated": "Recipe updated.", + "deleted": "Recipe deleted.", + "titleRequired": "Title is required", + "duplicate": "Duplicate", + "duplicated": "Recipe duplicated.", + "copySuffix": "copy" } } diff --git a/public/locales/uk.json b/public/locales/uk.json index d87d355..452b350 100644 --- a/public/locales/uk.json +++ b/public/locales/uk.json @@ -42,7 +42,8 @@ "settings": "Налаштування", "main": "Головна навігація", "navigation": "Навігація", - "quickActions": "Швидкі дії" + "quickActions": "Швидкі дії", + "recipes": "Recipes" }, "dashboard": { "title": "Огляд", @@ -242,7 +243,11 @@ "loadingIndicator": "Завантаження…", "recipeUrlLabel": "Посилання на рецепт (необов'язково)", "recipeUrlPlaceholder": "https://…", - "openRecipe": "Відкрити рецепт" + "openRecipe": "Відкрити рецепт", + "savedRecipeLabel": "Saved recipe", + "savedRecipePlaceholder": "Select recipe", + "saveAsRecipe": "Save as recipe", + "recipeScaleLabel": "Scale ingredients" }, "calendar": { "title": "Календар", @@ -625,5 +630,29 @@ "notificationHint": "Отримуйте сповіщення, поки додаток відкрито.", "pendingBadgeTitle": "{{count}} нагадування", "pendingBadgeTitlePlural": "{{count}} нагадувань" + }, + "recipes": { + "title": "Recipes", + "addRecipe": "Add recipe", + "editRecipe": "Edit recipe", + "emptyTitle": "No recipes yet", + "emptyDescription": "Save your favorite recipes and reuse them in meal planning.", + "titleLabel": "Title *", + "titlePlaceholder": "e.g. Pasta Carbonara", + "notesLabel": "Notes", + "notesPlaceholder": "Optional...", + "urlLabel": "Recipe link", + "urlPlaceholder": "https://...", + "ingredientsLabel": "Ingredients", + "addToMeals": "Add to meal plan", + "openLink": "Open recipe link", + "deleteConfirm": "Delete recipe \"{{title}}\"?", + "created": "Recipe saved.", + "updated": "Recipe updated.", + "deleted": "Recipe deleted.", + "titleRequired": "Title is required", + "duplicate": "Duplicate", + "duplicated": "Recipe duplicated.", + "copySuffix": "copy" } } diff --git a/public/locales/zh.json b/public/locales/zh.json index 4062696..4c18d63 100644 --- a/public/locales/zh.json +++ b/public/locales/zh.json @@ -42,7 +42,8 @@ "settings": "设置", "main": "主导航", "navigation": "导航", - "quickActions": "快捷操作" + "quickActions": "快捷操作", + "recipes": "Recipes" }, "dashboard": { "title": "概览", @@ -242,7 +243,11 @@ "loadingIndicator": "加载中…", "recipeUrlLabel": "食谱链接（可选）", "recipeUrlPlaceholder": "https://…", - "openRecipe": "打开食谱" + "openRecipe": "打开食谱", + "savedRecipeLabel": "Saved recipe", + "savedRecipePlaceholder": "Select recipe", + "saveAsRecipe": "Save as recipe", + "recipeScaleLabel": "Scale ingredients" }, "calendar": { "title": "日历", @@ -604,5 +609,29 @@ "unitWeeks": "周", "unitMonth": "个月", "unitMonths": "个月" + }, + "recipes": { + "title": "Recipes", + "addRecipe": "Add recipe", + "editRecipe": "Edit recipe", + "emptyTitle": "No recipes yet", + "emptyDescription": "Save your favorite recipes and reuse them in meal planning.", + "titleLabel": "Title *", + "titlePlaceholder": "e.g. Pasta Carbonara", + "notesLabel": "Notes", + "notesPlaceholder": "Optional...", + "urlLabel": "Recipe link", + "urlPlaceholder": "https://...", + "ingredientsLabel": "Ingredients", + "addToMeals": "Add to meal plan", + "openLink": "Open recipe link", + "deleteConfirm": "Delete recipe \"{{title}}\"?", + "created": "Recipe saved.", + "updated": "Recipe updated.", + "deleted": "Recipe deleted.", + "titleRequired": "Title is required", + "duplicate": "Duplicate", + "duplicated": "Recipe duplicated.", + "copySuffix": "copy" } } diff --git a/public/pages/meals.js b/public/pages/meals.js index 77c63ac..6b0e50f 100644 --- a/public/pages/meals.js +++ b/public/pages/meals.js @@ -36,6 +36,7 @@ const EXCLUDED_MEAL_CATEGORY_NAMES = new Set(['Haushalt', 'Drogerie']); let state = { currentWeek: null, // YYYY-MM-DD (Montag) meals: [], + recipes: [], lists: [], // Einkaufslisten für Transfer-Dropdown categories: [], // Einkaufskategorien für Zutaten modal: null, @@ -115,6 +116,15 @@ async function loadCategories() { } } +async function loadRecipes() { + try { + const res = await api.get('/recipes'); + state.recipes = res.data; + } catch { + state.recipes = []; + } +} + async function loadPreferences() { try { const res = await api.get('/preferences'); @@ -157,10 +167,19 @@ export async function render(container, { user }) { const today = new Date().toISOString().slice(0, 10); const monday = getMondayOf(today); - await Promise.all([loadWeek(monday), loadLists(), loadPreferences(), loadCategories()]); + await Promise.all([loadWeek(monday), loadLists(), loadPreferences(), loadCategories(), loadRecipes()]); renderWeekGrid(); wireNav(); + const selectedRecipeId = Number(new URLSearchParams(window.location.search).get('recipe')); + if (selectedRecipeId) { + const selectedRecipe = state.recipes.find((r) => r.id === selectedRecipeId); + if (selectedRecipe) { + const firstType = state.visibleMealTypes[0] ?? 'lunch'; + openMealModal({ mode: 'create', date: today, mealType: firstType, presetRecipeId: selectedRecipe.id }); + } + } + container.querySelector('#fab-new-meal').addEventListener('click', () => { const firstType = state.visibleMealTypes[0] ?? 'lunch'; openMealModal({ mode: 'create', date: today, mealType: firstType }); @@ -473,7 +492,7 @@ async function moveMeal(mealId, sourceDate, sourceType, targetDate, targetType, function openMealModal(opts) { state.modal = opts; - const { mode, date, mealType, meal } = opts; + const { mode, date, mealType, meal, presetRecipeId = null } = opts; const isEdit = mode === 'edit'; const content = buildModalContent(opts); @@ -523,6 +542,144 @@ function openMealModal(opts) { // Zutaten const ingList = panel.querySelector('#ingredient-list'); const addIngBtn = panel.querySelector('#add-ingredient-btn'); + const recipeSelect = panel.querySelector('#modal-recipe-id'); + const recipeScaleInput = panel.querySelector('#modal-recipe-scale'); + const saveAsRecipeBtn = panel.querySelector('#modal-save-as-recipe'); + let currentAppliedRecipe = null; + + const scaleQuantityText = (quantity, factor) => { + if (!quantity || factor === 1) return quantity; + + const formatNumber = (num, useComma = false) => { + const rounded = Math.round(num * 100) / 100; + if (Number.isInteger(rounded)) return String(rounded); + const text = String(rounded); + return useComma ? text.replace('.', ',') : text; + }; + + const mixed = quantity.match(/^(\d+)\s+(\d+)\/(\d+)(.*)$/); + if (mixed) { + const whole = Number(mixed[1]); + const num = Number(mixed[2]); + const den = Number(mixed[3]); + if (den > 0) { + const value = (whole + (num / den)) * factor; + return `${formatNumber(value)}${mixed[4]}`; + } + } + + const frac = quantity.match(/^(\d+)\/(\d+)(.*)$/); + if (frac) { + const num = Number(frac[1]); + const den = Number(frac[2]); + if (den > 0) { + const value = (num / den) * factor; + return `${formatNumber(value)}${frac[3]}`; + } + } + + const dec = quantity.match(/^(\d+(?:[.,]\d+)?)(.*)$/); + if (dec) { + const useComma = dec[1].includes(','); + const base = Number(dec[1].replace(',', '.')); + if (Number.isFinite(base)) { + return `${formatNumber(base * factor, useComma)}${dec[2]}`; + } + } + + return quantity; + }; + + const applyRecipe = (recipeId) => { + const id = Number(recipeId); + const factor = Math.max(Number(recipeScaleInput?.value || 1), 0.1); + if (!id) { + currentAppliedRecipe = null; + return; + } + const recipe = state.recipes.find((r) => r.id === id); + if (!recipe) return; + + currentAppliedRecipe = recipe; + + panel.querySelector('#modal-title').value = recipe.title || ''; + panel.querySelector('#modal-notes').value = recipe.notes || ''; + panel.querySelector('#modal-recipe-url').value = recipe.recipe_url || ''; + + ingList.innerHTML = (recipe.ingredients || []) + .map((ing) => { + const scaledQty = scaleQuantityText(ing.quantity ?? '', factor); + return ingredientRowHTML(ing.name, scaledQty, null, ing.category ?? DEFAULT_CATEGORY_NAME); + }) + .join(''); + + if (window.lucide) lucide.createIcons(); + }; + + recipeSelect?.addEventListener('change', () => { + if (recipeScaleInput) recipeScaleInput.value = '1'; + applyRecipe(recipeSelect.value); + }); + + recipeScaleInput?.addEventListener('input', () => { + const currentRecipeId = Number(recipeSelect?.value || 0); + if (!currentRecipeId || !currentAppliedRecipe) return; + + const factor = Number(recipeScaleInput.value || 1); + if (!Number.isFinite(factor) || factor <= 0) return; + + ingList.innerHTML = (currentAppliedRecipe.ingredients || []) + .map((ing) => ingredientRowHTML( + ing.name, + scaleQuantityText(ing.quantity ?? '', Math.max(factor, 0.1)), + null, + ing.category ?? DEFAULT_CATEGORY_NAME + )) + .join(''); + + if (window.lucide) lucide.createIcons(); + }); + + saveAsRecipeBtn?.addEventListener('click', async () => { + const title = panel.querySelector('#modal-title').value.trim(); + if (!title) { + window.oikos?.showToast(t('meals.titleRequired'), 'error'); + return; + } + + const notes = panel.querySelector('#modal-notes').value.trim() || null; + const recipe_url = panel.querySelector('#modal-recipe-url').value.trim() || null; + const ingredients = collectModalIngredients(panel).map((ing) => ({ + name: ing.name, + quantity: ing.quantity, + category: ing.category, + })); + + saveAsRecipeBtn.disabled = true; + try { + const created = await api.post('/recipes', { title, notes, recipe_url, ingredients }); + state.recipes.push(created.data); + + if (recipeSelect) { + const option = document.createElement('option'); + option.value = String(created.data.id); + option.textContent = created.data.title; + recipeSelect.appendChild(option); + recipeSelect.value = String(created.data.id); + } + + window.oikos?.showToast(t('recipes.created'), 'success'); + } catch (err) { + window.oikos?.showToast(err.data?.error ?? t('common.errorGeneric'), 'error'); + } finally { + saveAsRecipeBtn.disabled = false; + } + }); + + if (presetRecipeId && recipeSelect) { + recipeSelect.value = String(presetRecipeId); + applyRecipe(presetRecipeId); + } addIngBtn.addEventListener('click', () => { const tmp = document.createElement('div'); @@ -584,6 +741,11 @@ function buildModalContent({ mode, date, mealType, meal }) { const hasIngOpen = isEdit && meal.ingredients?.some((i) => !i.on_shopping_list); + const recipeOptions = [ + ``, + ...state.recipes.map((r) => ``), + ].join(''); + return `
@@ -605,6 +767,21 @@ function buildModalContent({ mode, date, mealType, meal }) {
+
+ + +
+ +
+
+ + +
+
+ +
+
+
+
+
+ + +
+
+ +
${ingredientRows}
+ +
+
+ + +
+ `, + onSave(panel) { + const ingList = panel.querySelector('#recipe-ingredient-list'); + panel.querySelector('#recipe-add-ingredient')?.addEventListener('click', () => { + const tmp = document.createElement('div'); + tmp.innerHTML = recipeIngredientRowHTML('', '', null); + const row = tmp.firstElementChild; + ingList.appendChild(row); + if (window.lucide) window.lucide.createIcons(); + }); + + ingList.addEventListener('click', (e) => { + const btn = e.target.closest('[data-action="remove-ingredient"]'); + if (!btn) return; + btn.closest('.recipe-ingredient-row')?.remove(); + }); + + panel.querySelector('#recipe-cancel')?.addEventListener('click', closeModal); + panel.querySelector('#recipe-save')?.addEventListener('click', () => saveRecipe(panel, mode, recipe)); + + if (window.lucide) window.lucide.createIcons(); + }, + }); +} + +function closeModal() { + closeSharedModal(); +} + +async function saveRecipe(panel, mode, recipe) { + const saveBtn = panel.querySelector('#recipe-save'); + const title = panel.querySelector('#recipe-title')?.value.trim() || ''; + const notes = panel.querySelector('#recipe-notes')?.value.trim() || null; + const recipe_url = panel.querySelector('#recipe-url')?.value.trim() || null; + + if (!title) { + window.oikos?.showToast(t('recipes.titleRequired'), 'error'); + return; + } + + const ingredients = []; + panel.querySelectorAll('.recipe-ingredient-row').forEach((row) => { + const name = row.querySelector('.recipe-ingredient-row__name')?.value.trim() || ''; + const quantity = row.querySelector('.recipe-ingredient-row__qty')?.value.trim() || null; + const category = row.querySelector('.recipe-ingredient-row__cat')?.value || DEFAULT_CATEGORY_NAME; + if (name) ingredients.push({ name, quantity, category }); + }); + + saveBtn.disabled = true; + + try { + if (mode === 'create') { + const res = await api.post('/recipes', { title, notes, recipe_url, ingredients }); + state.recipes.push(res.data); + } else { + const res = await api.put(`/recipes/${recipe.id}`, { title, notes, recipe_url, ingredients }); + const idx = state.recipes.findIndex((r) => r.id === recipe.id); + if (idx >= 0) state.recipes[idx] = res.data; + } + + closeModal(); + renderRecipeList(); + window.oikos?.showToast(mode === 'create' ? t('recipes.created') : t('recipes.updated'), 'success'); + } catch (err) { + saveBtn.disabled = false; + window.oikos?.showToast(err.data?.error ?? t('common.errorGeneric'), 'error'); + } +} + +async function removeRecipe(recipe) { + const ok = await confirmModal(t('recipes.deleteConfirm', { title: recipe.title }), { + danger: true, + confirmLabel: t('common.delete'), + }); + + if (!ok) return; + + try { + await api.delete(`/recipes/${recipe.id}`); + state.recipes = state.recipes.filter((r) => r.id !== recipe.id); + renderRecipeList(); + window.oikos?.showToast(t('recipes.deleted'), 'success'); + } catch (err) { + window.oikos?.showToast(err.data?.error ?? t('common.errorGeneric'), 'error'); + } +} + +async function duplicateRecipe(recipe) { + const copySuffix = t('recipes.copySuffix'); + const title = `${recipe.title} (${copySuffix})`; + const notes = recipe.notes || null; + const recipe_url = recipe.recipe_url || null; + const ingredients = (recipe.ingredients || []).map((ing) => ({ + name: ing.name, + quantity: ing.quantity || null, + category: ing.category || DEFAULT_CATEGORY_NAME, + })); + + try { + await api.post('/recipes', { title, notes, recipe_url, ingredients }); + await loadRecipes(); + renderRecipeList(); + window.oikos?.showToast(t('recipes.duplicated'), 'success'); + } catch (err) { + window.oikos?.showToast(err.data?.error ?? t('common.errorGeneric'), 'error'); + } +} diff --git a/public/router.js b/public/router.js index 8145077..d189621 100644 --- a/public/router.js +++ b/public/router.js @@ -20,6 +20,7 @@ const ROUTES = [ { path: '/meals', page: '/pages/meals.js', requiresAuth: true, module: 'meals' }, { path: '/calendar', page: '/pages/calendar.js', requiresAuth: true, module: 'calendar' }, { path: '/notes', page: '/pages/notes.js', requiresAuth: true, module: 'notes' }, + { path: '/recipes', page: '/pages/recipes.js', requiresAuth: true, module: 'recipes' }, { path: '/contacts', page: '/pages/contacts.js', requiresAuth: true, module: 'contacts' }, { path: '/budget', page: '/pages/budget.js', requiresAuth: true, module: 'budget' }, { path: '/settings', page: '/pages/settings.js', requiresAuth: true, module: 'settings' }, @@ -123,7 +124,7 @@ let _pendingLoginRedirect = false; // Router // -------------------------------------------------------- -const ROUTE_ORDER = ['/', '/tasks', '/calendar', '/meals', '/shopping', +const ROUTE_ORDER = ['/', '/tasks', '/calendar', '/meals', '/recipes', '/shopping', '/notes', '/contacts', '/budget', '/settings']; const PRIMARY_NAV = 4; @@ -581,6 +582,7 @@ function navItems() { { path: '/tasks', label: t('nav.tasks'), icon: 'check-square' }, { path: '/calendar', label: t('nav.calendar'), icon: 'calendar' }, { path: '/meals', label: t('nav.meals'), icon: 'utensils' }, + { path: '/recipes', label: t('nav.recipes'), icon: 'book-open-text' }, { path: '/shopping', label: t('nav.shopping'), icon: 'shopping-cart' }, { path: '/notes', label: t('nav.notes'), icon: 'sticky-note' }, { path: '/contacts', label: t('nav.contacts'), icon: 'book-user' }, diff --git a/public/styles/recipes.css b/public/styles/recipes.css new file mode 100644 index 0000000..17fffe2 --- /dev/null +++ b/public/styles/recipes.css @@ -0,0 +1,119 @@ +/** + * Modul: Rezepte (Recipes) + * Zweck: Styles fuer gespeicherte Rezepte und Aktionskarten + */ + +.recipes-page { + --module-accent: var(--module-recipes); + display: flex; + flex-direction: column; + height: calc(100dvh - var(--safe-area-inset-top) - var(--nav-bottom-height) - var(--safe-area-inset-bottom)); + max-width: var(--content-max-width); + margin: 0 auto; + overflow: hidden; +} + +@media (min-width: 1024px) { + .recipes-page { + height: 100dvh; + } +} + +.recipes-header { + display: flex; + align-items: center; + justify-content: space-between; + gap: var(--space-3); + padding: var(--space-4); + border-top: 3px solid var(--module-accent); + border-bottom: 1px solid var(--color-border); + background-color: var(--color-surface); +} + +.recipes-header__title { + margin: 0; + font-size: var(--text-xl); +} + +.recipes-list { + flex: 1; + overflow-y: auto; + padding: var(--space-4); + display: grid; + gap: var(--space-3); + align-content: start; +} + +.recipe-card { + border: 1px solid var(--color-border); + border-radius: var(--radius-md); + background: var(--color-surface); + box-shadow: var(--shadow-sm); + padding: var(--space-4); + display: grid; + gap: var(--space-2); +} + +.recipe-card__title { + margin: 0; + font-size: var(--text-base); + color: var(--color-text-primary); +} + +.recipe-card__notes { + margin: 0; + color: var(--color-text-secondary); + font-size: var(--text-sm); + white-space: pre-wrap; +} + +.recipe-card__ingredients { + margin: 0; + padding: 0; + list-style: none; + display: grid; + gap: var(--space-1); +} + +.recipe-card__ingredient { + font-size: var(--text-sm); + color: var(--color-text-secondary); +} + +.recipe-card__actions { + display: flex; + gap: var(--space-2); + flex-wrap: wrap; +} + +.recipe-ingredient-list { + display: grid; + gap: var(--space-2); +} + +.recipe-ingredient-row { + display: flex; + gap: var(--space-2); + align-items: center; +} + +.recipe-ingredient-row__name { + flex: 2; +} + +.recipe-ingredient-row__qty, +.recipe-ingredient-row__cat { + flex: 1; + min-width: 0; +} + +.recipe-ingredient-row__remove { + border: none; + background: none; + color: var(--color-text-secondary); + cursor: pointer; +} + +.recipe-add-ingredient { + align-self: flex-start; +} diff --git a/public/styles/tokens.css b/public/styles/tokens.css index 7ff0345..816c051 100644 --- a/public/styles/tokens.css +++ b/public/styles/tokens.css @@ -154,6 +154,8 @@ --module-calendar: var(--_module-calendar); /* Violett - Termine, Zeit */ --_module-meals: #C2410C; --module-meals: var(--_module-meals); /* Orange-700 - Essen, Wärme */ + --_module-recipes: #0D9488; + --module-recipes: var(--_module-recipes); /* Teal-600 - Rezepte */ --_module-shopping: #DB2777; --module-shopping: var(--_module-shopping); /* Pink-600 - Einkaufen (trennt von Meals) */ --_module-notes: #A16207; diff --git a/server/db-schema-test.js b/server/db-schema-test.js index fbbd7c0..c370072 100644 --- a/server/db-schema-test.js +++ b/server/db-schema-test.js @@ -232,6 +232,41 @@ const MIGRATIONS_SQL = { WHERE subscription_id IS NOT NULL; CREATE INDEX IF NOT EXISTS idx_calendar_sub ON calendar_events(subscription_id); `, + 12: ` + CREATE TABLE IF NOT EXISTS recipes ( + id INTEGER PRIMARY KEY AUTOINCREMENT, + title TEXT NOT NULL, + notes TEXT, + recipe_url TEXT, + created_by INTEGER NOT NULL REFERENCES users(id) ON DELETE CASCADE, + created_at TEXT NOT NULL DEFAULT (strftime('%Y-%m-%dT%H:%M:%SZ', 'now')), + updated_at TEXT NOT NULL DEFAULT (strftime('%Y-%m-%dT%H:%M:%SZ', 'now')) + ); + + CREATE TABLE IF NOT EXISTS recipe_ingredients ( + id INTEGER PRIMARY KEY AUTOINCREMENT, + recipe_id INTEGER NOT NULL REFERENCES recipes(id) ON DELETE CASCADE, + name TEXT NOT NULL, + quantity TEXT, + category TEXT NOT NULL DEFAULT 'Sonstiges', + created_at TEXT NOT NULL DEFAULT (strftime('%Y-%m-%dT%H:%M:%SZ', 'now')), + updated_at TEXT NOT NULL DEFAULT (strftime('%Y-%m-%dT%H:%M:%SZ', 'now')) + ); + + CREATE INDEX IF NOT EXISTS idx_recipes_title ON recipes(title); + CREATE INDEX IF NOT EXISTS idx_recipe_ingredients_recipe ON recipe_ingredients(recipe_id); + + CREATE TRIGGER IF NOT EXISTS trg_recipes_updated_at + AFTER UPDATE ON recipes FOR EACH ROW + BEGIN UPDATE recipes SET updated_at = strftime('%Y-%m-%dT%H:%M:%SZ', 'now') WHERE id = OLD.id; END; + + CREATE TRIGGER IF NOT EXISTS trg_recipe_ingredients_updated_at + AFTER UPDATE ON recipe_ingredients FOR EACH ROW + BEGIN UPDATE recipe_ingredients SET updated_at = strftime('%Y-%m-%dT%H:%M:%SZ', 'now') WHERE id = OLD.id; END; + + ALTER TABLE meals ADD COLUMN recipe_id INTEGER REFERENCES recipes(id) ON DELETE SET NULL; + CREATE INDEX IF NOT EXISTS idx_meals_recipe_id ON meals(recipe_id); + `, }; export { MIGRATIONS_SQL }; diff --git a/server/db.js b/server/db.js index 6c1a582..1c6f12c 100644 --- a/server/db.js +++ b/server/db.js @@ -484,6 +484,45 @@ const MIGRATIONS = [ ON calendar_events (subscription_id, external_calendar_id); `, }, + { + version: 13, + description: 'Rezepte-Tabelle und Mahlzeiten-Verknuepfung', + up: ` + CREATE TABLE IF NOT EXISTS recipes ( + id INTEGER PRIMARY KEY AUTOINCREMENT, + title TEXT NOT NULL, + notes TEXT, + recipe_url TEXT, + created_by INTEGER NOT NULL REFERENCES users(id) ON DELETE CASCADE, + created_at TEXT NOT NULL DEFAULT (strftime('%Y-%m-%dT%H:%M:%SZ', 'now')), + updated_at TEXT NOT NULL DEFAULT (strftime('%Y-%m-%dT%H:%M:%SZ', 'now')) + ); + + CREATE TABLE IF NOT EXISTS recipe_ingredients ( + id INTEGER PRIMARY KEY AUTOINCREMENT, + recipe_id INTEGER NOT NULL REFERENCES recipes(id) ON DELETE CASCADE, + name TEXT NOT NULL, + quantity TEXT, + category TEXT NOT NULL DEFAULT 'Sonstiges', + created_at TEXT NOT NULL DEFAULT (strftime('%Y-%m-%dT%H:%M:%SZ', 'now')), + updated_at TEXT NOT NULL DEFAULT (strftime('%Y-%m-%dT%H:%M:%SZ', 'now')) + ); + + CREATE INDEX IF NOT EXISTS idx_recipes_title ON recipes(title); + CREATE INDEX IF NOT EXISTS idx_recipe_ingredients_recipe ON recipe_ingredients(recipe_id); + + CREATE TRIGGER IF NOT EXISTS trg_recipes_updated_at + AFTER UPDATE ON recipes FOR EACH ROW + BEGIN UPDATE recipes SET updated_at = strftime('%Y-%m-%dT%H:%M:%SZ', 'now') WHERE id = OLD.id; END; + + CREATE TRIGGER IF NOT EXISTS trg_recipe_ingredients_updated_at + AFTER UPDATE ON recipe_ingredients FOR EACH ROW + BEGIN UPDATE recipe_ingredients SET updated_at = strftime('%Y-%m-%dT%H:%M:%SZ', 'now') WHERE id = OLD.id; END; + + ALTER TABLE meals ADD COLUMN recipe_id INTEGER REFERENCES recipes(id) ON DELETE SET NULL; + CREATE INDEX IF NOT EXISTS idx_meals_recipe_id ON meals(recipe_id); + `, + }, ]; /** diff --git a/server/index.js b/server/index.js index 321735f..8f49777 100644 --- a/server/index.js +++ b/server/index.js @@ -20,6 +20,7 @@ import dashboardRouter from './routes/dashboard.js'; import tasksRouter from './routes/tasks.js'; import shoppingRouter from './routes/shopping.js'; import mealsRouter from './routes/meals.js'; +import recipesRouter from './routes/recipes.js'; import calendarRouter from './routes/calendar.js'; import notesRouter from './routes/notes.js'; import contactsRouter from './routes/contacts.js'; @@ -172,6 +173,7 @@ app.use('/api/v1/dashboard', dashboardRouter); app.use('/api/v1/tasks', tasksRouter); app.use('/api/v1/shopping', shoppingRouter); app.use('/api/v1/meals', mealsRouter); +app.use('/api/v1/recipes', recipesRouter); app.use('/api/v1/calendar', calendarRouter); app.use('/api/v1/notes', notesRouter); app.use('/api/v1/contacts', contactsRouter); diff --git a/server/routes/meals.js b/server/routes/meals.js index 144216b..1c5e98e 100644 --- a/server/routes/meals.js +++ b/server/routes/meals.js @@ -7,7 +7,7 @@ import { createLogger } from '../logger.js'; import express from 'express'; import * as db from '../db.js'; -import { str, oneOf, date, collectErrors, MAX_TITLE, MAX_TEXT, MAX_SHORT, DATE_RE } from '../middleware/validate.js'; +import { str, oneOf, date, num, collectErrors, MAX_TITLE, MAX_TEXT, MAX_SHORT, DATE_RE } from '../middleware/validate.js'; const log = createLogger('Meals'); @@ -156,15 +156,21 @@ router.post('/', (req, res) => { const vTitle = str(req.body.title, 'Titel', { max: MAX_TITLE }); const vNotes = str(req.body.notes, 'Notizen', { max: MAX_TEXT, required: false }); const vRecipeUrl = str(req.body.recipe_url, 'Rezept-URL', { max: MAX_TEXT, required: false }); - const errors = collectErrors([vDate, vType, vTitle, vNotes, vRecipeUrl]); + const vRecipeId = num(req.body.recipe_id, 'Rezept-ID', { required: false }); + const errors = collectErrors([vDate, vType, vTitle, vNotes, vRecipeUrl, vRecipeId]); if (!req.body.meal_type) errors.push('Mahlzeit-Typ ist erforderlich.'); if (errors.length) return res.status(400).json({ error: errors.join(' '), code: 400 }); + if (vRecipeId.value !== null) { + const recipeExists = db.get().prepare('SELECT id FROM recipes WHERE id = ?').get(vRecipeId.value); + if (!recipeExists) return res.status(400).json({ error: 'Rezept nicht gefunden.', code: 400 }); + } + const meal = db.transaction(() => { const result = db.get().prepare(` - INSERT INTO meals (date, meal_type, title, notes, recipe_url, created_by) - VALUES (?, ?, ?, ?, ?, ?) - `).run(vDate.value, vType.value, vTitle.value, vNotes.value, vRecipeUrl.value, req.session.userId); + INSERT INTO meals (date, meal_type, title, notes, recipe_url, recipe_id, created_by) + VALUES (?, ?, ?, ?, ?, ?, ?) + `).run(vDate.value, vType.value, vTitle.value, vNotes.value, vRecipeUrl.value, vRecipeId.value, req.session.userId); const mealId = result.lastInsertRowid; @@ -217,16 +223,23 @@ router.put('/:id', (req, res) => { if (req.body.title !== undefined) checks.push(str(req.body.title, 'Titel', { max: MAX_TITLE, required: false })); if (req.body.notes !== undefined) checks.push(str(req.body.notes, 'Notizen', { max: MAX_TEXT, required: false })); if (req.body.recipe_url !== undefined) checks.push(str(req.body.recipe_url, 'Rezept-URL', { max: MAX_TEXT, required: false })); + if (req.body.recipe_id !== undefined) checks.push(num(req.body.recipe_id, 'Rezept-ID', { required: false })); const errors = collectErrors(checks); if (errors.length) return res.status(400).json({ error: errors.join(' '), code: 400 }); + if (req.body.recipe_id !== undefined && req.body.recipe_id !== null && req.body.recipe_id !== '') { + const recipeExists = db.get().prepare('SELECT id FROM recipes WHERE id = ?').get(req.body.recipe_id); + if (!recipeExists) return res.status(400).json({ error: 'Rezept nicht gefunden.', code: 400 }); + } + db.get().prepare(` UPDATE meals SET date = COALESCE(?, date), meal_type = COALESCE(?, meal_type), title = COALESCE(?, title), notes = ?, - recipe_url = ? + recipe_url = ?, + recipe_id = ? WHERE id = ? `).run( req.body.date ?? null, @@ -234,6 +247,7 @@ router.put('/:id', (req, res) => { req.body.title?.trim() ?? null, req.body.notes !== undefined ? (req.body.notes || null) : meal.notes, req.body.recipe_url !== undefined ? (req.body.recipe_url || null) : meal.recipe_url, + req.body.recipe_id !== undefined ? (req.body.recipe_id || null) : meal.recipe_id, id ); diff --git a/server/routes/recipes.js b/server/routes/recipes.js new file mode 100644 index 0000000..462b4f4 --- /dev/null +++ b/server/routes/recipes.js @@ -0,0 +1,170 @@ +/** + * Modul: Rezepte (Recipes) + * Zweck: REST-API-Routen fuer Rezept-CRUD inkl. Zutaten + * Abhaengigkeiten: express, server/db.js + */ + +import { createLogger } from '../logger.js'; +import express from 'express'; +import * as db from '../db.js'; +import { str, num, collectErrors, MAX_TITLE, MAX_TEXT, MAX_SHORT } from '../middleware/validate.js'; + +const log = createLogger('Recipes'); +const router = express.Router(); + +function loadRecipeWithIngredients(id) { + const recipe = db.get().prepare(` + SELECT r.*, u.display_name AS creator_name, u.avatar_color AS creator_color + FROM recipes r + LEFT JOIN users u ON u.id = r.created_by + WHERE r.id = ? + `).get(id); + + if (!recipe) return null; + + const ingredients = db.get().prepare(` + SELECT * FROM recipe_ingredients + WHERE recipe_id = ? + ORDER BY id ASC + `).all(id); + + return { ...recipe, ingredients }; +} + +router.get('/', (_req, res) => { + try { + const recipes = db.get().prepare(` + SELECT r.*, u.display_name AS creator_name, u.avatar_color AS creator_color + FROM recipes r + LEFT JOIN users u ON u.id = r.created_by + ORDER BY r.title COLLATE NOCASE ASC, r.id DESC + `).all(); + + const ids = recipes.map((r) => r.id); + let ingredientMap = {}; + + if (ids.length > 0) { + const placeholders = ids.map(() => '?').join(','); + const ingredients = db.get().prepare(` + SELECT * FROM recipe_ingredients + WHERE recipe_id IN (${placeholders}) + ORDER BY id ASC + `).all(...ids); + + for (const ing of ingredients) { + if (!ingredientMap[ing.recipe_id]) ingredientMap[ing.recipe_id] = []; + ingredientMap[ing.recipe_id].push(ing); + } + } + + res.json({ data: recipes.map((r) => ({ ...r, ingredients: ingredientMap[r.id] || [] })) }); + } catch (err) { + log.error('GET / Fehler:', err); + res.status(500).json({ error: 'Interner Fehler', code: 500 }); + } +}); + +router.post('/', (req, res) => { + try { + const { ingredients = [] } = req.body; + + const vTitle = str(req.body.title, 'Titel', { max: MAX_TITLE }); + const vNotes = str(req.body.notes, 'Notizen', { max: MAX_TEXT, required: false }); + const vRecipeUrl = str(req.body.recipe_url, 'Rezept-URL', { max: MAX_TEXT, required: false }); + + const errors = collectErrors([vTitle, vNotes, vRecipeUrl]); + if (errors.length) return res.status(400).json({ error: errors.join(' '), code: 400 }); + + const recipeId = db.transaction(() => { + const result = db.get().prepare(` + INSERT INTO recipes (title, notes, recipe_url, created_by) + VALUES (?, ?, ?, ?) + `).run(vTitle.value, vNotes.value, vRecipeUrl.value, req.session.userId); + + const rid = Number(result.lastInsertRowid); + const insertIng = db.get().prepare(` + INSERT INTO recipe_ingredients (recipe_id, name, quantity, category) + VALUES (?, ?, ?, ?) + `); + + for (const ing of ingredients) { + const name = String(ing.name || '').trim().slice(0, MAX_TITLE); + const quantity = String(ing.quantity || '').trim().slice(0, MAX_SHORT) || null; + const category = String(ing.category || '').trim().slice(0, MAX_SHORT) || 'Sonstiges'; + if (name) insertIng.run(rid, name, quantity, category); + } + + return rid; + }); + + const created = loadRecipeWithIngredients(recipeId); + res.status(201).json({ data: created }); + } catch (err) { + log.error('POST / Fehler:', err); + res.status(500).json({ error: 'Interner Fehler', code: 500 }); + } +}); + +router.put('/:id', (req, res) => { + try { + const id = parseInt(req.params.id, 10); + if (!id) return res.status(400).json({ error: 'Ungueltige Rezept-ID', code: 400 }); + + const existing = db.get().prepare('SELECT id FROM recipes WHERE id = ?').get(id); + if (!existing) return res.status(404).json({ error: 'Rezept nicht gefunden', code: 404 }); + + const { ingredients = [] } = req.body; + + const vTitle = str(req.body.title, 'Titel', { max: MAX_TITLE }); + const vNotes = str(req.body.notes, 'Notizen', { max: MAX_TEXT, required: false }); + const vRecipeUrl = str(req.body.recipe_url, 'Rezept-URL', { max: MAX_TEXT, required: false }); + const errors = collectErrors([vTitle, vNotes, vRecipeUrl]); + if (errors.length) return res.status(400).json({ error: errors.join(' '), code: 400 }); + + db.transaction(() => { + db.get().prepare(` + UPDATE recipes + SET title = ?, notes = ?, recipe_url = ? + WHERE id = ? + `).run(vTitle.value, vNotes.value, vRecipeUrl.value, id); + + db.get().prepare('DELETE FROM recipe_ingredients WHERE recipe_id = ?').run(id); + + const insertIng = db.get().prepare(` + INSERT INTO recipe_ingredients (recipe_id, name, quantity, category) + VALUES (?, ?, ?, ?) + `); + + for (const ing of ingredients) { + const name = String(ing.name || '').trim().slice(0, MAX_TITLE); + const quantity = String(ing.quantity || '').trim().slice(0, MAX_SHORT) || null; + const category = String(ing.category || '').trim().slice(0, MAX_SHORT) || 'Sonstiges'; + if (name) insertIng.run(id, name, quantity, category); + } + }); + + const updated = loadRecipeWithIngredients(id); + res.json({ data: updated }); + } catch (err) { + log.error('PUT /:id Fehler:', err); + res.status(500).json({ error: 'Interner Fehler', code: 500 }); + } +}); + +router.delete('/:id', (req, res) => { + try { + const id = parseInt(req.params.id, 10); + const existing = num(id, 'Rezept-ID', { required: true }); + if (existing.error) return res.status(400).json({ error: existing.error, code: 400 }); + + const result = db.get().prepare('DELETE FROM recipes WHERE id = ?').run(id); + if (result.changes === 0) return res.status(404).json({ error: 'Rezept nicht gefunden', code: 404 }); + + res.status(204).end(); + } catch (err) { + log.error('DELETE /:id Fehler:', err); + res.status(500).json({ error: 'Interner Fehler', code: 500 }); + } +}); + +export default router;