diff --git a/frontend/src/api/meta.js b/frontend/src/api/meta.js index bcf6470fcf99..88ecd80be208 100644 --- a/frontend/src/api/meta.js +++ b/frontend/src/api/meta.js @@ -21,7 +21,6 @@ export const metaAPI = { async getIsDemo() { let response = await apiReq.get(debugURLs.demo); - console.log(response); return response.data; }, }; diff --git a/frontend/src/components/Admin/ManageUsers/TheUserTable.vue b/frontend/src/components/Admin/ManageUsers/TheUserTable.vue index 99b64ce4a14e..aecac70cec8c 100644 --- a/frontend/src/components/Admin/ManageUsers/TheUserTable.vue +++ b/frontend/src/components/Admin/ManageUsers/TheUserTable.vue @@ -273,7 +273,6 @@ export default { await this.initialize(); }, resetPassword() { - console.log(this.activeId); api.users.resetPassword(this.editedItem.id); }, }, diff --git a/frontend/src/components/MealPlan/MealPlanNew.vue b/frontend/src/components/MealPlan/MealPlanNew.vue index 2b86afb9ca20..51d4326b390a 100644 --- a/frontend/src/components/MealPlan/MealPlanNew.vue +++ b/frontend/src/components/MealPlan/MealPlanNew.vue @@ -125,7 +125,6 @@ export default { computed: { groupSettings() { - console.log(this.$store.getters.getCurrentGroup); return this.$store.getters.getCurrentGroup; }, actualStartDate() { diff --git a/frontend/src/components/Recipe/RecipeCard.vue b/frontend/src/components/Recipe/RecipeCard.vue index 13aca1f38386..299f983ba74e 100644 --- a/frontend/src/components/Recipe/RecipeCard.vue +++ b/frontend/src/components/Recipe/RecipeCard.vue @@ -26,21 +26,16 @@ - - - - - - - + + @@ -55,6 +50,7 @@ export default { description: String, rating: Number, image: String, + route: { default: true, }, diff --git a/frontend/src/components/Recipe/RecipeEditor/index.vue b/frontend/src/components/Recipe/RecipeEditor/index.vue index 7b0d28faac83..6917ad2c15d2 100644 --- a/frontend/src/components/Recipe/RecipeEditor/index.vue +++ b/frontend/src/components/Recipe/RecipeEditor/index.vue @@ -83,14 +83,16 @@ :key="generateKey('ingredient', index)" > - mdi-delete - + @@ -235,6 +237,7 @@ dense v-model="value.recipeInstructions[index]['text']" :key="generateKey('instructions', index)" + rows="4" > diff --git a/frontend/src/components/Recipe/RecipeViewer/Ingredients.vue b/frontend/src/components/Recipe/RecipeViewer/Ingredients.vue index 70a8c798ca0f..d9be60d9787e 100644 --- a/frontend/src/components/Recipe/RecipeViewer/Ingredients.vue +++ b/frontend/src/components/Recipe/RecipeViewer/Ingredients.vue @@ -1,27 +1,52 @@ \ No newline at end of file diff --git a/frontend/src/components/Recipe/RecipeViewer/RecipeChips.vue b/frontend/src/components/Recipe/RecipeViewer/RecipeChips.vue index 825f2e8d9732..f9196f2500c9 100644 --- a/frontend/src/components/Recipe/RecipeViewer/RecipeChips.vue +++ b/frontend/src/components/Recipe/RecipeViewer/RecipeChips.vue @@ -2,12 +2,12 @@

{{ title }}

{{ category }} @@ -20,7 +20,7 @@ export default { props: { items: Array, title: String, - category: { + isCategory: { default: true, }, }, @@ -28,11 +28,23 @@ export default { allCategories() { return this.$store.getters.getAllCategories; }, + allTags() { + return this.$store.getters.getAllTags; + }, + urlParam() { + return this.isCategory ? 'category' : 'tag' + } }, methods: { getSlug(name) { - if (this.category) { - return this.allCategories.filter(x => x.name == name)[0].slug; + if (!name) return; + + if (this.isCategory) { + const matches = this.allCategories.filter(x => x.name == name); + if (matches.length > 0) return matches[0].slug; + } else { + const matches = this.allTags.filter(x => x.name == name); + if (matches.length > 0) return matches[0].slug; } }, }, diff --git a/frontend/src/components/Recipe/RecipeViewer/index.vue b/frontend/src/components/Recipe/RecipeViewer/index.vue index 845c63c959e8..d50e8cd0198d 100644 --- a/frontend/src/components/Recipe/RecipeViewer/index.vue +++ b/frontend/src/components/Recipe/RecipeViewer/index.vue @@ -34,7 +34,11 @@
- +
diff --git a/frontend/src/components/UI/Search/SearchBar.vue b/frontend/src/components/UI/Search/SearchBar.vue index cb7f41fa7c64..b83fcbed419c 100644 --- a/frontend/src/components/UI/Search/SearchBar.vue +++ b/frontend/src/components/UI/Search/SearchBar.vue @@ -154,7 +154,6 @@ export default { return utils.getImageURL(image); }, selected(slug, name) { - console.log("Selected", slug, name); this.$emit("selected", slug, name); }, async onFocus() { diff --git a/frontend/src/components/UI/Search/SearchDialog.vue b/frontend/src/components/UI/Search/SearchDialog.vue index eda4be9fb785..d4abcde8fe86 100644 --- a/frontend/src/components/UI/Search/SearchDialog.vue +++ b/frontend/src/components/UI/Search/SearchDialog.vue @@ -1,6 +1,6 @@