mirrors/recipes
1
0
Fork 0
mirror of https://github.com/TandoorRecipes/recipes.git synced 2026-01-02 04:39:54 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feature/importer_to_vue' into develop

Browse Source 
# Conflicts:
#	vue/src/apps/RecipeView/RecipeView.vue
This commit is contained in:
vabene1111
2022-04-22 21:07:02 +02:00
parent d7bd731c73 c4f5b160a6
commit 4ecf77f431
40 changed files with 1512 additions and 1532 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
vue/src/components/KeywordsComponent.vue
View File

@@ -1,6 +1,6 @@
<template>
<div v-if="recipe.keywords.length > 0">
<span :key="k.id" v-for="k in recipe.keywords" class="pl-1">
<span :key="k.id" v-for="k in recipe.keywords.filter((kk) => { return kk.show || kk.show === undefined })" class="pl-1">
<a :href="`${resolveDjangoUrl('view_search')}?keyword=${k.id}`"><b-badge pill variant="light"
class="font-weight-normal">{{ k.label }}</b-badge></a>

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

@@ -2,7 +2,7 @@
<b-card no-body v-hover v-if="recipe">
<a :href="clickUrl()">
<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 float-right text-right pt-2 pr-1">
<div class="card-img-overlay h-100 d-flex flex-column justify-content-right float-right text-right pt-2 pr-1" v-if="show_context_menu">
<a>
<recipe-context-menu :recipe="recipe" class="float-right" v-if="recipe !== null"></recipe-context-menu>
</a>
@@ -24,7 +24,7 @@
<b-card-text style="text-overflow: ellipsis">
<template v-if="recipe !== null">
<recipe-rating :recipe="recipe"></recipe-rating>
<template v-if="recipe.description !== null">
<template v-if="recipe.description !== null && recipe.description !== undefined">
<span v-if="recipe.description.length > text_length">
{{ recipe.description.substr(0, text_length) + "\u2026" }}
</span>
@@ -78,6 +78,7 @@ export default {
footer_text: String,
footer_icon: String,
detailed: { type: Boolean, default: true },
show_context_menu: { type: Boolean, default: true }
},
mounted() {},
computed: {