Merge branch 'develop' into feature/importer_to_vue

# Conflicts: # vue/src/apps/RecipeEditView/RecipeEditView.vue # vue/src/utils/openapi/api.ts
2022-04-22 16:41:13 +02:00
parent 57ec6a2b3d 05383a2bc3
commit 2ddb0c719a
62 changed files with 2619 additions and 1380 deletions
--- a/vue/vue.config.js
+++ b/vue/vue.config.js
@ -49,6 +49,10 @@ const pages = {
        entry: "./src/apps/MealPlanView/main.js",
        chunks: ["chunk-vendors"],
    },
+    ingredient_editor_view: {
+        entry: "./src/apps/IngredientEditorView/main.js",
+        chunks: ["chunk-vendors"],
+    },
    shopping_list_view: {
        entry: "./src/apps/ShoppingListView/main.js",
        chunks: ["chunk-vendors"],