cgiacofei/TandoorRecipes
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cookbook view refactored, minor ui fixes

Browse Source
This commit is contained in:
Kaibu 2021-09-13 19:28:16 +02:00
parent 0501dd9a0a
commit fd8797e2b7
12 changed files with 3956 additions and 195 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cookbook/serializer.py
View File

@ -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']

1
vue/package.json
View File

@ -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"

40
vue/src/apps/CookbookView/CookbookView.vue
View File

@ -1,18 +1,18 @@
<template>
<div id="app" class="col-12 col-xl-8 col-lg-10 offset-xl-2 offset-lg-1 offset">
<div class="mb-3" v-for="book in cookbooks" v-bind:key="book.id">
<div class="row mb-3">
<b-card class="d-flex flex-column" v-hover
<div class="row">
<div class="col-md-12">
<b-card class="d-flex flex-column" v-hover
v-on:click="openBook(book.id)">
<b-row no-gutters style="height:inherit;">
<b-col no-gutters md="3" style="height:inherit;">
<b-card-img-lazy style="object-fit: cover; height: 10vh;" :src="item_image"
v-bind:alt="$t('Recipe_Image')"></b-card-img-lazy>
<b-col no-gutters md="2" style="height:inherit;">
<h3>{{book.icon}}</h3>
</b-col>
<b-col no-gutters md="9" style="height:inherit;">
<b-col no-gutters md="10" style="height:inherit;">
<b-card-body class="m-0 py-0" style="height:inherit;">
<b-card-text class=" h-100 my-0 d-flex flex-column" style="text-overflow: ellipsis">
<h5 class="m-0 mt-1 text-truncate">{{ book.name }}</h5>
<b-card-text class="h-100 my-0 d-flex flex-column" style="text-overflow: ellipsis">
<h5 class="m-0 mt-1 text-truncate">{{ book.name }} <span class="float-right"><i class="fa fa-book"></i></span> </h5>
<div class="m-0 text-truncate">{{ book.description }}</div>
<div class="mt-auto mb-1 d-flex flex-row justify-content-end">
</div>
@ -21,10 +21,12 @@
</b-col>
</b-row>
</b-card>
</div>
</div>
<loading-spinner v-if="current_book === book.id && loading" ></loading-spinner>
<transition name="slide-fade">
<cookbook-slider :recipes="recipes" :book="book" v-if="current_book === book.id"></cookbook-slider>
<cookbook-slider :recipes="recipes" :book="book" v-if="current_book === book.id && !loading"></cookbook-slider>
</transition>
</div>
</div>
@ -37,19 +39,21 @@ import {BootstrapVue} from 'bootstrap-vue'
import 'bootstrap-vue/dist/bootstrap-vue.css'
import {ApiApiFactory} from "../../utils/openapi/api";
import CookbookSlider from "../../components/CookbookSlider";
import LoadingSpinner from "../../components/LoadingSpinner";
Vue.use(BootstrapVue)
export default {
name: 'CookbookView',
mixins: [],
components: {CookbookSlider},
components: {LoadingSpinner, CookbookSlider},
data() {
return {
cookbooks: [],
book_background: window.IMAGE_BOOK,
recipes: [],
current_book: undefined
current_book: undefined,
loading: false,
}
},
mounted() {
@ -65,12 +69,18 @@ export default {
})
},
openBook: function (book) {
if(book === this.current_book) {
this.current_book = undefined
this.recipes = []
return
}
this.loading = true
let apiClient = new ApiApiFactory()
this.current_book = book
console.log(this.current_book)
apiClient.listRecipeBookEntrys({options: {book: book.id}}).then(result => {
apiClient.listRecipeBookEntrys({query: {book: book}}).then(result => {
this.recipes = result.data
this.loading = false
})
}
},
@ -95,10 +105,6 @@ export default {
transition: all .6s ease;
}
.slide-fade-leave-active {
transition: all .5s cubic-bezier(1.0, 0.5, 0.8, 1.0);
}
.slide-fade-enter, .slide-fade-leave-to
/* .slide-fade-leave-active below version 2.1.8 */
{

107
vue/src/components/CookbookEditCard.vue Normal file
View File

@ -0,0 +1,107 @@
<template>
<b-card no-body v-hover>
<b-card-header class="p-4">
<h5>{{ book_copy.icon }}&nbsp;{{ book_copy.name }}
<span class="float-right" @click="editOrSave"><i
class="fa" v-bind:class="{ 'fa-pen': !editing, 'fa-save': editing }"
aria-hidden="true"></i></span></h5>
</b-card-header>
<b-card-body class="p-4">
<div class="form-group" v-if="editing">
<label for="inputName1">{{ $t('Name') }}</label>
<input class="form-control" id="inputName1"
placeholder="Name" v-model="book_copy.name">
</div>
<div class="form-group" v-if="editing">
<label for="inputIcon1">{{ $t('Icon') }}</label>
<input class="form-control" id="inputIcon1"
placeholder="Name" v-model="book_copy.icon">
<emoji-input :field="'icon'" :label="'icon'" :value="book_copy.icon"></emoji-input>
</div>
<div class="form-group" v-if="editing">
<label for="inputDesc1">{{ $t('Description') }}</label>
<textarea class="form-control" id="inputDesc1" rows="3" v-model="book_copy.description">
</textarea>
</div>
<b-card-text style="text-overflow: ellipsis;" v-if="!editing">
{{ book_copy.description }}
</b-card-text>
</b-card-body>
</b-card>
</template>
<script>
import {ApiApiFactory} from "../utils/openapi/api";
import {StandardToasts} from "../utils/utils";
import EmojiInput from "./Modals/EmojiInput";
export default {
name: "CookbookEditCard",
components: {EmojiInput},
props: {
book: Object
},
data() {
return {
editing: false,
book_copy: {},
users: []
}
},
mounted() {
this.book_copy = this.book
this.$root.$on('change', this.updateEmoji);
},
directives: {
hover: {
inserted: function (el) {
el.addEventListener('mouseenter', () => {
el.classList.add("shadow")
});
el.addEventListener('mouseleave', () => {
el.classList.remove("shadow")
});
}
}
},
methods: {
editOrSave: function () {
if (!this.editing) {
this.editing = true
this.$emit("editing", true)
} else {
this.editing = false
this.saveData()
this.$emit("editing", false)
}
},
updateEmoji: function (item, value) {
if (item === 'icon') {
this.book_copy.icon = value
}
},
saveData: function () {
let apiClient = new ApiApiFactory()
apiClient.updateRecipeBook(this.book_copy.id, this.book_copy).then(result => {
StandardToasts.makeStandardToast(StandardToasts.SUCCESS_UPDATE)
}).catch(error => {
StandardToasts.makeStandardToast(StandardToasts.FAIL_UPDATE)
})
},
refreshData: function () {
let apiClient = new ApiApiFactory()
apiClient.listUsers().then(result => {
this.users = result.data
})
},
}
}
</script>
<style scoped>
</style>

232
vue/src/components/CookbookSlider.vue
View File

@ -1,53 +1,43 @@
<template>
<div v-bind:style="{ backgroundImage: 'url(' + book_background + ')' }"
style="background-repeat: no-repeat; background-size: cover; padding-top: 76%;position: relative;"
class="pb-2 w-100">
<div id="book_carousel" class="carousel slide" data-interval="0"
style=" position: absolute;top: 0;left: 0;bottom: 0;right: 0;">
<div class="row m-0 pl-4 pr-4 pt-5 w-100" style="height: 15vh">
<a class="mb-3 col-6 pull-left" href="#book_carousel" role="button" data-slide="prev">
</a>
<a class="mb-3 col-6 text-right" href="#book_carousel" role="button" data-slide="next">
</a>
<div v-bind:class="{ bounceright: bounce_right, bounceleft: bounce_left }">
<div class="row">
<div class="col col-md-12 text-center pt-2 pb-4">
<b-pagination pills
v-model="current_page"
:total-rows="page_count_pagination"
:per-page="per_page_count"
@change="pageChange"
first-text="📖"
align="fill">
</b-pagination>
</div>
<div class="row m-0 w-100 pt-2">
<div class="carousel-item w-100 active">
<div class="row m-0 w-100">
<div class="col-6">
<b-card no-body v-hover class="ml-5 mr-5">
<b-card-header class="p-4">
<h5>{{ book.name }} <span class="pull-right">{{ book.icon }}</span></h5>
</b-card-header>
<b-card-body class="p-4">
<b-card-text style="text-overflow: ellipsis;">
{{ book.description }}
</b-card-text>
</b-card-body>
</b-card>
</div>
<div class="col-6">
<b-card no-body v-hover class="ml-5 mr-5">
<b-card-header class="p-4">
<h5>{{ $t('TableOfContents') }}</h5>
</b-card-header>
<b-card-body class="p-4">
<ol>
<li v-for="recipe in recipes" v-bind:key="recipe.name">
{{ recipe.recipe_content.name }}
</li>
</ol>
</b-card-body>
</b-card>
</div>
</div>
</div>
<div class="carousel-item w-100" v-for="(i, index) in Math.ceil(recipes.length / 2)" v-bind:key="index">
<div class="row m-0 w-100">
<div class="col-6" v-for="recipe in recipes.slice((i - 1) * 2, i * 2)" v-bind:key="recipe.id">
<recipe-card :recipe="recipe.recipe_content" class="ml-5 mr-5"></recipe-card>
</div>
</div>
</div>
</div>
<div class="row" v-touch:swipe.left="swipeLeft" v-touch:swipe.right="swipeRight">
<div class="col-md-1" @click="swipeRight" style="cursor: pointer;">
</div>
<div class="col-md-5">
<transition name="flip" mode="out-in">
<cookbook-edit-card :book="book" v-if="current_page === 1"
v-on:editing="cookbook_editing = $event"></cookbook-edit-card>
</transition>
<transition name="flip" mode="out-in">
<recipe-card :recipe="display_recipes[0].recipe_content"
v-if="current_page > 1" :key="display_recipes[0]"></recipe-card>
</transition>
</div>
<div class="col-md-5">
<transition name="flip" mode="out-in">
<cookbook-toc :recipes="recipes" v-if="current_page === 1"
v-on:switchRecipe="switchRecipe($event)"></cookbook-toc>
</transition>
<transition name="flip">
<recipe-card :recipe="display_recipes[1].recipe_content"
v-if="current_page > 1 && display_recipes.length === 2" :key="display_recipes[1]"></recipe-card>
</transition>
</div>
<div class="col-md-1" @click="swipeLeft" style="cursor: pointer;">
</div>
</div>
</div>
@ -56,18 +46,67 @@
<script>
import RecipeCard from "./RecipeCard";
import CookbookEditCard from "./CookbookEditCard";
import CookbookToc from "./CookbookToc";
import Vue2TouchEvents from "vue2-touch-events"
import Vue from "vue";
Vue.use(Vue2TouchEvents)
export default {
name: "CookbookSlider.vue",
components: {RecipeCard},
components: {CookbookToc, CookbookEditCard, RecipeCard},
props: {
recipes: Array,
book: Object
},
computed: {
page_count_pagination: function () {
return this.recipes.length + 2
},
page_count: function () {
return Math.ceil(this.page_count_pagination / this.per_page_count)
}
},
data() {
return {
cookbooks: [],
book_background: window.IMAGE_BOOK
display_recipes: [],
current_page: 1,
per_page_count: 2,
bounce_left: false,
bounce_right: false,
cookbook_editing: false
}
},
methods: {
pageChange: function (page) {
this.current_page = page
this.display_recipes = this.recipes.slice(((this.current_page - 1) - 1) * 2, (this.current_page - 1) * 2)
},
swipeLeft: function () {
if (this.cookbook_editing) {
return
}
if (this.current_page < this.page_count) {
this.pageChange(this.current_page + 1)
} else {
this.bounce_left = true
setTimeout(() => this.bounce_left = false, 500);
}
},
swipeRight: function () {
if (this.cookbook_editing) {
return
}
if (this.current_page > 1) {
this.pageChange(this.current_page - 1)
} else {
this.bounce_right = true
setTimeout(() => this.bounce_right = false, 500);
}
},
switchRecipe: function (index) {
this.pageChange(Math.ceil((index + 1) / this.per_page_count) + 1)
}
},
directives: {
@ -86,5 +125,96 @@ export default {
</script>
<style scoped>
.flip-enter-active {
-webkit-animation-name: bounceUp;
animation-name: bounceUp;
-webkit-animation-duration: .5s;
animation-duration: .5s;
-webkit-animation-fill-mode: both;
animation-fill-mode: both;
-webkit-animation-timing-function: linear;
animation-timing-function: linear;
animation-iteration-count: infinite;
-webkit-animation-iteration-count: infinite;
}
.bounceleft {
-webkit-animation-name: bounceLeft;
animation-name: bounceLeft;
-webkit-animation-duration: .5s;
animation-duration: .5s;
-webkit-animation-fill-mode: both;
animation-fill-mode: both;
-webkit-animation-timing-function: linear;
animation-timing-function: linear;
animation-iteration-count: 1;
-webkit-animation-iteration-count: 1;
}
.bounceright {
-webkit-animation-name: bounceRight;
animation-name: bounceRight;
-webkit-animation-duration: .5s;
animation-duration: .5s;
-webkit-animation-fill-mode: both;
animation-fill-mode: both;
-webkit-animation-timing-function: linear;
animation-timing-function: linear;
animation-iteration-count: 1;
-webkit-animation-iteration-count: 1;
}
@-webkit-keyframes bounceUp {
0%, 100% {
-webkit-transform: translateY(0);
}
50% {
-webkit-transform: translateY(-7px);
}
}
@keyframes bounceUp {
0%, 100% {
transform: translateY(0);
}
50% {
transform: translateY(-7px);
}
}
@-webkit-keyframes bounceLeft {
0%, 100% {
-webkit-transform: translateY(0);
}
50% {
-webkit-transform: translateX(-10px);
}
}
@keyframes bounceLeft {
0%, 100% {
transform: translateY(0);
}
50% {
transform: translateX(-10px);
}
}
@-webkit-keyframes bounceRight {
0%, 100% {
-webkit-transform: translateY(0);
}
50% {
-webkit-transform: translateX(10px);
}
}
@keyframes bounceRight {
0%, 100% {
transform: translateY(0);
}
50% {
transform: translateX(10px);
}
}
</style>

44
vue/src/components/CookbookToc.vue Normal file
View File

@ -0,0 +1,44 @@
<template>
<b-card no-body v-hover>
<b-card-header class="p-4">
<h5>{{ $t('TableOfContents') }}</h5>
</b-card-header>
<b-card-body class="p-4">
<ol style="max-height: 60vh;overflow-y:auto;-webkit-overflow-scrolling: touch;" class="mb-1">
<li v-for="(recipe, index) in recipes" v-bind:key="index" v-on:click="$emit('switchRecipe', index)">
<a href="#">{{ recipe.recipe_content.name }} <recipe-rating :recipe="recipe"></recipe-rating> </a>
</li>
</ol>
<b-card-text v-if="recipes.length === 0">
{{ $t('Empty')}}
</b-card-text>
</b-card-body>
</b-card>
</template>
<script>
import RecipeRating from "./RecipeRating";
export default {
name: "CookbookToc",
components: {RecipeRating},
props: {
recipes: Array
},
directives: {
hover: {
inserted: function (el) {
el.addEventListener('mouseenter', () => {
el.classList.add("shadow")
});
el.addEventListener('mouseleave', () => {
el.classList.remove("shadow")
});
}
}
}
}
</script>
<style scoped>
</style>

58
vue/src/components/Ingredient.vue
View File

@ -2,41 +2,41 @@
<tr @click="$emit('checked-state-changed', ingredient)">
<template v-if="ingredient.is_header">
<td colspan="5">
<b>{{ ingredient.note }}</b>
</td>
<td colspan="5">
<b>{{ ingredient.note }}</b>
</td>
</template>
<template v-else>
<td class="d-print-none">
<i class="far fa-check-circle text-success" v-if="ingredient.checked"></i>
<i class="far fa-check-circle text-primary" v-if="!ingredient.checked"></i>
</td>
<td>
<span v-if="ingredient.amount !== 0" v-html="calculateAmount(ingredient.amount)"></span>
</td>
<td>
<span v-if="ingredient.unit !== null && !ingredient.no_amount">{{ ingredient.unit.name }}</span>
</td>
<td>
<template v-if="ingredient.food !== null">
<a :href="resolveDjangoUrl('view_recipe', ingredient.food.recipe)" v-if="ingredient.food.recipe !== null"
target="_blank" rel="noopener noreferrer">{{ ingredient.food.name }}</a>
<span v-if="ingredient.food.recipe === null">{{ ingredient.food.name }}</span>
</template>
</td>
<td>
<div v-if="ingredient.note">
<td class="d-print-non" v-if="detailed">
<i class="far fa-check-circle text-success" v-if="ingredient.checked"></i>
<i class="far fa-check-circle text-primary" v-if="!ingredient.checked"></i>
</td>
<td>
<span v-if="ingredient.amount !== 0" v-html="calculateAmount(ingredient.amount)"></span>
</td>
<td>
<span v-if="ingredient.unit !== null && !ingredient.no_amount">{{ ingredient.unit.name }}</span>
</td>
<td>
<template v-if="ingredient.food !== null">
<a :href="resolveDjangoUrl('view_recipe', ingredient.food.recipe)" v-if="ingredient.food.recipe !== null"
target="_blank" rel="noopener noreferrer">{{ ingredient.food.name }}</a>
<span v-if="ingredient.food.recipe === null">{{ ingredient.food.name }}</span>
</template>
</td>
<td v-if="detailed">
<div v-if="ingredient.note">
<span v-b-popover.hover="ingredient.note"
class="d-print-none"> <i class="far fa-comment"></i>
</span>
<div class="d-none d-print-block">
<i class="far fa-comment-alt d-print-none"></i> {{ ingredient.note }}
</div>
<div class="d-none d-print-block">
<i class="far fa-comment-alt d-print-none"></i> {{ ingredient.note }}
</div>
</td>
</div>
</td>
</template>
</tr>
</tr>
</template>
@ -51,6 +51,10 @@ export default {
ingredient_factor: {
type: Number,
default: 1,
},
detailed: {
type: Boolean,
default: true
}
},
mixins: [

4
vue/src/components/Keywords.vue
View File

@ -1,7 +1,7 @@
<template>
<div v-if="recipe.keywords.length > 0">
<span :key="k.id" v-for="k in recipe.keywords" style="padding: 2px">
<b-badge pill variant="light">{{k.label}}</b-badge>
<span :key="k.id" v-for="k in recipe.keywords" class="pl-1">
<b-badge pill variant="light" class="font-weight-normal">{{k.label}}</b-badge>
</span>
</div>
</template>

4
vue/src/components/LastCooked.vue
View File

@ -1,6 +1,6 @@
<template>
<span>
<b-badge pill variant="primary" v-if="recipe.last_cooked !== null"><i class="fas fa-utensils"></i> {{
<span class="pl-1">
<b-badge pill variant="primary" v-if="recipe.last_cooked !== null" class="font-weight-normal"><i class="fas fa-utensils"></i> {{
formatDate(recipe.last_cooked)
}}</b-badge>
</span>

60
vue/src/components/RecipeCard.vue
View File

@ -6,12 +6,20 @@
<b-card-img-lazy style="height: 15vh; object-fit: cover" class="" :src=recipe_image
v-bind:alt="$t('Recipe_Image')"
top></b-card-img-lazy>
<div class="card-img-overlay h-100 d-flex flex-column justify-content-right"
style="float:right; text-align: right; padding-top: 10px; padding-right: 5px">
<div class="card-img-overlay h-100 d-flex flex-column justify-content-right float-right text-right pt-2 pr-1">
<a>
<recipe-context-menu :recipe="recipe" style="float:right" v-if="recipe !== null"></recipe-context-menu>
<recipe-context-menu :recipe="recipe" class="float-right" v-if="recipe !== null"></recipe-context-menu>
</a>
</div>
<div class="card-img-overlay w-50 d-flex flex-column justify-content-left float-left text-left pt-2"
v-if="recipe.waiting_time !== 0">
<b-badge pill variant="light" class="mt-1 font-weight-normal"><i class="fa fa-clock"></i>
{{ recipe.working_time }} {{ $t('min') }}
</b-badge>
<b-badge pill variant="secondary" class="mt-1 font-weight-normal"><i class="fa fa-pause"></i>
{{ recipe.waiting_time }} {{ $t('min') }}
</b-badge>
</div>
</a>
@ -25,18 +33,31 @@
<template v-if="recipe !== null">
<recipe-rating :recipe="recipe"></recipe-rating>
<template v-if="recipe.description !== null">
<span v-if="recipe.description.length > 120">
{{ recipe.description.substr(0, 120) + "\u2026" }}
<span v-if="recipe.description.length > text_length">
{{ recipe.description.substr(0, text_length) + "\u2026" }}
</span>
<span v-if="recipe.description.length <= 120">
<span v-if="recipe.description.length <= text_length">
{{ recipe.description }}
</span>
</template>
<br/> <!-- TODO UGLY! -->
<last-cooked :recipe="recipe"></last-cooked>
<keywords :recipe="recipe" style="margin-top: 4px"></keywords>
<p class="mt-1">
<last-cooked :recipe="recipe"></last-cooked>
<keywords :recipe="recipe" style="margin-top: 4px"></keywords>
</p>
<div class="row mt-3" v-if="detailed">
<div class="col-md-12">
<h6 class="card-title"><i class="fas fa-pepper-hot"></i> {{ $t('Ingredients') }}</h6>
<table class="table table-sm text-wrap">
<!-- eslint-disable vue/no-v-for-template-key-on-child -->
<template v-for="s in recipe.steps">
<template v-for="i in s.ingredients">
<Ingredient :detailed="false" :ingredient="i" :ingredient_factor="1" :key="i.id"></Ingredient>
</template>
</template>
<!-- eslint-enable vue/no-v-for-template-key-on-child -->
</table>
</div>
</div>
<b-badge pill variant="info" v-if="!recipe.internal">{{ $t('External') }}</b-badge>
<!-- <b-badge pill variant="success"
@ -65,6 +86,7 @@ import RecipeRating from "@/components/RecipeRating";
import moment from "moment/moment";
import Vue from "vue";
import LastCooked from "@/components/LastCooked";
import Ingredient from "./Ingredient";
Vue.prototype.moment = moment
@ -73,18 +95,30 @@ export default {
mixins: [
ResolveUrlMixin,
],
components: {LastCooked, RecipeRating, Keywords, RecipeContextMenu},
components: {LastCooked, RecipeRating, Keywords, RecipeContextMenu, Ingredient},
props: {
recipe: Object,
meal_plan: Object,
footer_text: String,
footer_icon: String,
footer_icon: String
},
data() {
return {
recipe_image: '',
}
},
computed: {
detailed: function () {
return this.recipe.steps !== undefined;
},
text_length: function () {
if (this.detailed) {
return 200
} else {
return 120
}
}
},
mounted() {
if (this.recipe == null || this.recipe.image === null) {

3
vue/src/utils/utils.js
View File

@ -124,6 +124,9 @@ export function resolveDjangoUrl(url, params = null) {
* */
export function getUserPreference(pref) {
if(window.USER_PREF === undefined) {
return undefined;
}
return window.USER_PREF[pref]
}

3596
vue/webpack-stats.json
View File

File diff suppressed because it is too large Load Diff