diff --git a/vue3/src/apps/tandoor/Tandoor.vue b/vue3/src/apps/tandoor/Tandoor.vue index daf537e74..3e0eab88a 100644 --- a/vue3/src/apps/tandoor/Tandoor.vue +++ b/vue3/src/apps/tandoor/Tandoor.vue @@ -1,46 +1,46 @@ - - - - + + + + - - - - + + + + - - - - - + + + + + - - - - Recipes - + + + + Recipes + - - + + - MealPlan - + MealPlan + - - + + - Shopping - - - + Shopping + + + - Books - - + Books + + diff --git a/vue3/src/apps/tandoor/main.ts b/vue3/src/apps/tandoor/main.ts index 50e8b6964..6ba29b35f 100644 --- a/vue3/src/apps/tandoor/main.ts +++ b/vue3/src/apps/tandoor/main.ts @@ -12,7 +12,7 @@ import RecipeSearchPage from "@/pages/RecipeSearchPage.vue"; import RecipeViewPage from "@/pages/RecipeViewPage.vue"; const routes = [ - {path: '/', component: RecipeSearchPage}, + {path: '/search', component: RecipeSearchPage}, {path: '/shopping', component: ShoppingListPage}, {path: '/recipe/:id', component: RecipeViewPage, props: true}, ] diff --git a/vue3/src/components/display/KeywordsComponent.vue b/vue3/src/components/display/KeywordsComponent.vue index 887e95847..fec98280c 100644 --- a/vue3/src/components/display/KeywordsComponent.vue +++ b/vue3/src/components/display/KeywordsComponent.vue @@ -1,22 +1,21 @@ - {{ k?.label }} + + {{ k?.label }} + diff --git a/vue3/src/components/display/RecipeCardComponent.vue b/vue3/src/components/display/RecipeCardComponent.vue index 8d30bd6cd..d91060962 100644 --- a/vue3/src/components/display/RecipeCardComponent.vue +++ b/vue3/src/components/display/RecipeCardComponent.vue @@ -1,5 +1,5 @@ - + {{ recipe.description }} - - Open - + diff --git a/vue3/src/components/display/RecipeViewComponent.vue b/vue3/src/components/display/RecipeViewComponent.vue new file mode 100644 index 000000000..443151baa --- /dev/null +++ b/vue3/src/components/display/RecipeViewComponent.vue @@ -0,0 +1,89 @@ + + + {{ recipe.name }} + + + + + + + + + + + {{ recipe.workingTime }} min + Working Time + + + {{ recipe.waitingTime }} min + Waiting Time + + + {{ recipe.servings }} + {{ recipe.servingsText }}Servings + + + + + + {{ recipe.description }} + + + + + + + + + + {{ recipe.workingTime }} min + + + + {{ recipe.waitingTime }} min + + + + + + test + + + + + + + + {{recipe.servings / 2}} + + + + - + + {{recipe.servings * 2}} + + + + + + + + + + + + \ No newline at end of file diff --git a/vue3/src/pages/RecipeViewPage.vue b/vue3/src/pages/RecipeViewPage.vue index 7853fcae7..e75060e2f 100644 --- a/vue3/src/pages/RecipeViewPage.vue +++ b/vue3/src/pages/RecipeViewPage.vue @@ -1,18 +1,15 @@ - - {{ recipe.name }} - {{ recipe.description }} - - {{recipe}} +