From fd8797e2b74aba48881d3ead35c18c3e1591d66c Mon Sep 17 00:00:00 2001 From: Kaibu Date: Mon, 13 Sep 2021 19:28:16 +0200 Subject: [PATCH] cookbook view refactored, minor ui fixes --- cookbook/serializer.py | 2 +- vue/package.json | 1 + vue/src/apps/CookbookView/CookbookView.vue | 40 +- vue/src/components/CookbookEditCard.vue | 107 + vue/src/components/CookbookSlider.vue | 232 +- vue/src/components/CookbookToc.vue | 44 + vue/src/components/Ingredient.vue | 58 +- vue/src/components/Keywords.vue | 4 +- vue/src/components/LastCooked.vue | 4 +- vue/src/components/RecipeCard.vue | 60 +- vue/src/utils/utils.js | 3 + vue/webpack-stats.json | 3596 +++++++++++++++++++- 12 files changed, 3956 insertions(+), 195 deletions(-) create mode 100644 vue/src/components/CookbookEditCard.vue create mode 100644 vue/src/components/CookbookToc.vue diff --git a/cookbook/serializer.py b/cookbook/serializer.py index 8bada6ca4..423b29d48 100644 --- a/cookbook/serializer.py +++ b/cookbook/serializer.py @@ -550,7 +550,7 @@ class RecipeBookEntrySerializer(serializers.ModelSerializer): return RecipeBookSerializer(context={'request': self.context['request']}).to_representation(obj.book) def get_recipe_content(self, obj): - return RecipeOverviewSerializer(context={'request': self.context['request']}).to_representation(obj.recipe) + return RecipeSerializer(context={'request': self.context['request']}).to_representation(obj.recipe) def create(self, validated_data): book = validated_data['book'] diff --git a/vue/package.json b/vue/package.json index 5ec72f13d..ca36178c0 100644 --- a/vue/package.json +++ b/vue/package.json @@ -25,6 +25,7 @@ "vue-multiselect": "^2.1.6", "vue-property-decorator": "^9.1.2", "vue-template-compiler": "^2.6.14", + "vue2-touch-events": "^3.2.2", "vuedraggable": "^2.24.3", "vuex": "^3.6.0", "workbox-webpack-plugin": "^6.1.5" diff --git a/vue/src/apps/CookbookView/CookbookView.vue b/vue/src/apps/CookbookView/CookbookView.vue index 98d1de435..a66de2c1c 100644 --- a/vue/src/apps/CookbookView/CookbookView.vue +++ b/vue/src/apps/CookbookView/CookbookView.vue @@ -1,18 +1,18 @@