diff --git a/frontend/src/components/Recipe/RecipeEditor/BulkAdd.vue b/frontend/src/components/Recipe/RecipeEditor/BulkAdd.vue deleted file mode 100644 index aba3835c5..000000000 --- a/frontend/src/components/Recipe/RecipeEditor/BulkAdd.vue +++ /dev/null @@ -1,64 +0,0 @@ - - - \ No newline at end of file diff --git a/frontend/src/components/Recipe/RecipeEditor/ImageUploadBtn.vue b/frontend/src/components/Recipe/RecipeEditor/ImageUploadBtn.vue deleted file mode 100644 index b1d543201..000000000 --- a/frontend/src/components/Recipe/RecipeEditor/ImageUploadBtn.vue +++ /dev/null @@ -1,75 +0,0 @@ - - - - - diff --git a/frontend/src/components/Recipe/RecipeEditor/InstructionsEditor.vue b/frontend/src/components/Recipe/RecipeEditor/InstructionsEditor.vue deleted file mode 100644 index 37c3dbea7..000000000 --- a/frontend/src/components/Recipe/RecipeEditor/InstructionsEditor.vue +++ /dev/null @@ -1,149 +0,0 @@ - - - - - \ No newline at end of file diff --git a/frontend/src/components/Recipe/RecipeEditor/NutritionEditor.vue b/frontend/src/components/Recipe/RecipeEditor/NutritionEditor.vue deleted file mode 100644 index 7050b3250..000000000 --- a/frontend/src/components/Recipe/RecipeEditor/NutritionEditor.vue +++ /dev/null @@ -1,81 +0,0 @@ - - - - - \ No newline at end of file diff --git a/frontend/src/components/Recipe/RecipeEditor/index.vue b/frontend/src/components/Recipe/RecipeEditor/index.vue index 1d059f41f..0c14f5939 100644 --- a/frontend/src/components/Recipe/RecipeEditor/index.vue +++ b/frontend/src/components/Recipe/RecipeEditor/index.vue @@ -91,7 +91,7 @@ rows="1" > mdi-plus - + + - +
@@ -198,22 +199,24 @@ const UPLOAD_EVENT = "upload"; import draggable from "vuedraggable"; import utils from "@/utils"; -import BulkAdd from "./BulkAdd"; +import BulkAdd from "@/components/Recipe/Parts/Helpers/BulkAdd"; import ExtrasEditor from "./ExtrasEditor"; import CategoryTagSelector from "@/components/FormHelpers/CategoryTagSelector"; -import NutritionEditor from "./NutritionEditor"; -import ImageUploadBtn from "./ImageUploadBtn.vue"; +import ImageUploadBtn from "@/components/Recipe/Parts/Helpers/ImageUploadBtn"; import { validators } from "@/mixins/validators"; -import InstructionsEditor from "./InstructionsEditor.vue"; +import Nutrition from "@/components/Recipe/Parts/Nutrition"; +import Instructions from "@/components/Recipe/Parts/Instructions"; +import Assets from "@/components/Recipe/Parts/Assets.vue"; export default { components: { BulkAdd, ExtrasEditor, draggable, CategoryTagSelector, - NutritionEditor, + Nutrition, ImageUploadBtn, - InstructionsEditor, + Instructions, + Assets, }, props: { value: Object, diff --git a/frontend/src/components/Recipe/RecipeViewer/index.vue b/frontend/src/components/Recipe/RecipeViewer/index.vue index 4cfa3925e..9b88d43b3 100644 --- a/frontend/src/components/Recipe/RecipeViewer/index.vue +++ b/frontend/src/components/Recipe/RecipeViewer/index.vue @@ -40,7 +40,8 @@ :isCategory="false" /> - + +
- +
- + +
@@ -82,21 +84,23 @@