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') }} + + + + + + + + + + + + + + + + + + + + + + + + + + +