From 9c0dc64a47f3e10854bc74033ce335ab87a25967 Mon Sep 17 00:00:00 2001 From: vabene1111 Date: Mon, 10 Feb 2025 17:35:14 +0100 Subject: [PATCH] baisc implementation of books WIP --- cookbook/serializer.py | 1 + vue3/src/apps/tandoor/Tandoor.vue | 7 +- vue3/src/apps/tandoor/main.ts | 3 +- .../model_editors/RecipeBookEditor.vue | 130 +- vue3/src/locales/ar.json | 1 + vue3/src/locales/bg.json | 1 + vue3/src/locales/ca.json | 1 + vue3/src/locales/cs.json | 1 + vue3/src/locales/da.json | 1 + vue3/src/locales/de.json | 1 + vue3/src/locales/el.json | 1 + vue3/src/locales/en.json | 1 + vue3/src/locales/es.json | 1 + vue3/src/locales/fi.json | 1 + vue3/src/locales/fr.json | 1 + vue3/src/locales/he.json | 1 + vue3/src/locales/hu.json | 1 + vue3/src/locales/hy.json | 1 + vue3/src/locales/id.json | 1 + vue3/src/locales/is.json | 1 + vue3/src/locales/it.json | 1 + vue3/src/locales/lt.json | 1 + vue3/src/locales/nb_NO.json | 1 + vue3/src/locales/nl.json | 1 + vue3/src/locales/pl.json | 1 + vue3/src/locales/pt.json | 1 + vue3/src/locales/pt_BR.json | 1 + vue3/src/locales/ro.json | 1 + vue3/src/locales/ru.json | 1 + vue3/src/locales/sl.json | 1 + vue3/src/locales/sv.json | 1 + vue3/src/locales/tr.json | 1 + vue3/src/locales/uk.json | 1 + vue3/src/locales/zh_Hans.json | 1 + vue3/src/locales/zh_Hant.json | 1 + vue3/src/openapi/.openapi-generator/FILES | 20 +- vue3/src/openapi/apis/ApiApi.ts | 1787 ----------------- vue3/src/openapi/models/Automation.ts | 20 +- vue3/src/openapi/models/PatchedAutomation.ts | 20 +- vue3/src/openapi/models/PatchedRecipeBook.ts | 6 +- vue3/src/openapi/models/RecipeBook.ts | 6 +- vue3/src/openapi/models/index.ts | 20 +- vue3/src/pages/BooksPage.vue | 73 +- vue3/src/types/Models.ts | 4 +- vue3/src/vuetify.ts | 2 +- 45 files changed, 223 insertions(+), 1907 deletions(-) diff --git a/cookbook/serializer.py b/cookbook/serializer.py index 1d39defa4..d8a0796ac 100644 --- a/cookbook/serializer.py +++ b/cookbook/serializer.py @@ -1073,6 +1073,7 @@ class CustomFilterSerializer(SpacedModelSerializer, WritableNestedModelSerialize class RecipeBookSerializer(SpacedModelSerializer, WritableNestedModelSerializer): + created_by = UserSerializer(read_only=True) shared = UserSerializer(many=True) filter = CustomFilterSerializer(allow_null=True, required=False) diff --git a/vue3/src/apps/tandoor/Tandoor.vue b/vue3/src/apps/tandoor/Tandoor.vue index 0c7837c57..5a99c57b4 100644 --- a/vue3/src/apps/tandoor/Tandoor.vue +++ b/vue3/src/apps/tandoor/Tandoor.vue @@ -114,10 +114,11 @@ {{ useUserPreferenceStore().activeSpace.name }} - - - + + + + diff --git a/vue3/src/apps/tandoor/main.ts b/vue3/src/apps/tandoor/main.ts index 2069a9f4d..dd57d2aeb 100644 --- a/vue3/src/apps/tandoor/main.ts +++ b/vue3/src/apps/tandoor/main.ts @@ -28,6 +28,7 @@ import ModelListPage from "@/pages/ModelListPage.vue"; import ModelEditPage from "@/pages/ModelEditPage.vue"; import RecipeImportPage from "@/pages/RecipeImportPage.vue"; import IngredientEditorPage from "@/pages/IngredientEditorPage.vue"; +import BooksPage from "@/pages/BooksPage.vue"; const routes = [ {path: '/', component: StartPage, name: 'view_home'}, @@ -49,7 +50,7 @@ const routes = [ {path: '/search', component: SearchPage, name: 'view_search'}, {path: '/shopping', component: ShoppingListPage, name: 'view_shopping'}, {path: '/mealplan', component: MealPlanPage, name: 'view_mealplan'}, - {path: '/books', component: ShoppingListPage, name: 'view_books'}, + {path: '/books', component: BooksPage, name: 'BooksPage'}, {path: '/recipe/import', component: RecipeImportPage, name: 'RecipeImportPage'}, {path: '/recipe/:id', component: RecipeViewPage, name: 'view_recipe', props: true}, diff --git a/vue3/src/components/model_editors/RecipeBookEditor.vue b/vue3/src/components/model_editors/RecipeBookEditor.vue index 68606b15a..fa975a3a2 100644 --- a/vue3/src/components/model_editors/RecipeBookEditor.vue +++ b/vue3/src/components/model_editors/RecipeBookEditor.vue @@ -9,55 +9,139 @@ :is-changed="editingObjChanged" :model-class="modelClass" :object-name="editingObjName()"> - - - - - - - - - - - - - + + {{ $t('Book') }} + {{ $t('Recipes') }} + + + + + + + + + + + + + + + + + + + + + + + + + + +