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

Merge branch 'develop' of https://github.com/vabene1111/recipes into develop

Browse Source
This commit is contained in:
Kaibu
2021-06-30 15:37:18 +02:00
parent 5518199f64 a508fa81c0
commit cac643266b
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
requirements.txt
View File

@ -37,6 +37,6 @@ pytest==6.2.4
pytest-django==4.4.0 pytest-django==4.4.0
django-cors-headers==3.7.0 django-cors-headers==3.7.0
django-storages==1.11.1 django-storages==1.11.1
boto3==1.17.101 boto3==1.17.102
django-prometheus==2.1.0 django-prometheus==2.1.0
django-hCaptcha==0.1.0 django-hCaptcha==0.1.0

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

@ -24,12 +24,15 @@
<b-card-text style="text-overflow: ellipsis;"> <b-card-text style="text-overflow: ellipsis;">
<template v-if="recipe !== null"> <template v-if="recipe !== null">
<recipe-rating :recipe="recipe"></recipe-rating> <recipe-rating :recipe="recipe"></recipe-rating>
<span v-if="recipe.description.length > 120"> <template v-if="recipe.description !== null">
<span v-if="recipe.description.length > 120">
{{ recipe.description.substr(0, 120) + "\u2026" }} {{ recipe.description.substr(0, 120) + "\u2026" }}
</span> </span>
<span v-if="recipe.description.length <= 120"> <span v-if="recipe.description.length <= 120">
{{ recipe.description }} {{ recipe.description }}
</span> </span>
</template>
<br/> <!-- TODO UGLY! --> <br/> <!-- TODO UGLY! -->
<last-cooked :recipe="recipe"></last-cooked> <last-cooked :recipe="recipe"></last-cooked>
<keywords :recipe="recipe" style="margin-top: 4px"></keywords> <keywords :recipe="recipe" style="margin-top: 4px"></keywords>