From 7ec8c6f6b2e8c3551f335c0936de9c493e9ef65d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9ophile=20Bastian?= Date: Thu, 27 Aug 2020 13:21:23 +0200 Subject: [PATCH] Add quality recipe badge --- content/_index.md | 18 +++++++++++++----- content/recettes/boulangerie/pain_burger.md | 1 + content/recettes/boulangerie/pain_de_mie.md | 1 + content/recettes/entrees/gougeres.md | 1 + content/recettes/fermentations/ginger_beer.md | 1 + .../recettes/patisserie/caramel_beurre_sale.md | 1 + .../recettes/patisserie/creme_patissiere.md | 1 + .../recettes/patisserie/tartelette_abricots.md | 4 +++- .../recettes/pizza/courgettes_champignons.md | 1 + content/recettes/pizza/patate_poireaux.md | 1 + content/recettes/pizza/pate.md | 1 + .../recettes/pizza/tomates_sechees_parmesan.md | 1 + content/recettes/plats/base_de_cake.md | 1 + content/recettes/plats/frites.md | 1 + .../plats/muffins_tomates_sechees_parmesan.md | 1 + content/recettes/plats/patates_sautees.md | 1 + content/recettes/plats/pate_a_crepes.md | 1 + .../recettes/plats/salade_lentilles_patates.md | 1 + content/recettes/plats/semoule_grillee.md | 1 + content/recettes/sauces/bechamel.md | 1 + content/recettes/sauces/rouille_oeuf.md | 1 + layouts/partials/quality_badge.html | 6 ++++++ layouts/partials/recipe_list_entry.html | 17 +++++------------ layouts/partials/season_badge.html | 6 ++++++ layouts/partials/veganness_badge.html | 3 +++ layouts/recettes/single.html | 6 ++++++ layouts/shortcodes/partial1.html | 1 + scss/_params.scss | 3 +++ scss/style.scss | 10 ++++++++++ static/css/style.css | 6 ++++++ 30 files changed, 81 insertions(+), 18 deletions(-) create mode 100644 layouts/partials/quality_badge.html create mode 100644 layouts/partials/season_badge.html create mode 100644 layouts/partials/veganness_badge.html create mode 100644 layouts/shortcodes/partial1.html diff --git a/content/_index.md b/content/_index.md index ffc0461..1baf1b7 100644 --- a/content/_index.md +++ b/content/_index.md @@ -6,10 +6,18 @@ j'ai trouvées et que je veux garder, que j'ai adaptées d'une manière ou d'une autre, … et que j'ai pris la peine de noter ici parce qu'elles me semblaient en valoir le coup. -Les recettes ici sont toutes végétariennes, mais beaucoup d'entre elles sont -véganes ou trivialement véganisables. J'indique dans tous les cas leur +Les recettes ici sont toutes végétariennes {{< partial1 "veganness_badge" +"vege" >}}, mais beaucoup d'entre elles sont véganes {{< partial1 +"veganness_badge" "vegan" >}} ou trivialement véganisables {{< partial1 +"veganness_badge" "veganisable" >}}. J'indique dans tous les cas leur *veganness*. -Les recettes sont classées en vastes catégories de saison *été* ou *hiver*, ou -bien aucune des deux si ça ne nécessite pas de produits qui dépendent de la -saison. +Les recettes sont classées en vastes catégories de saison *été* {{< partial1 +"season_badge" "summer" >}} ou *hiver* {{< partial1 "season_badge" "winter" +>}}, ou bien aucune des deux si ça ne nécessite pas de produits qui dépendent +de la saison. + +Certaines recettes ont été plus testées que les autres et sont *bien rodées* +{{< partial1 "quality_badge" "true" >}}. Elles sont normalement très fiables en +termes de proportions — pour certaines, ça veut même dire que j'ai déjà fait +des batches pour de l'ordre de la centaine de personnes. diff --git a/content/recettes/boulangerie/pain_burger.md b/content/recettes/boulangerie/pain_burger.md index 6b1cd0b..97cda21 100644 --- a/content/recettes/boulangerie/pain_burger.md +++ b/content/recettes/boulangerie/pain_burger.md @@ -2,6 +2,7 @@ title: Pain à burger date: 2020-03-20T22:24:57+01:00 # FIXME? veganness: veganisable +quality: true portions: qt: 7 name: pains diff --git a/content/recettes/boulangerie/pain_de_mie.md b/content/recettes/boulangerie/pain_de_mie.md index a9b98a8..3ce84c1 100644 --- a/content/recettes/boulangerie/pain_de_mie.md +++ b/content/recettes/boulangerie/pain_de_mie.md @@ -2,6 +2,7 @@ title: Pain de mie date: 2020-05-17T19:02:21+02:00 # FIXME? veganness: veganisable +quality: true portions: qt: 1 name: pain diff --git a/content/recettes/entrees/gougeres.md b/content/recettes/entrees/gougeres.md index c24be2c..0b4a365 100644 --- a/content/recettes/entrees/gougeres.md +++ b/content/recettes/entrees/gougeres.md @@ -2,6 +2,7 @@ title: "Gougères au comté" date: 2019-12-01T15:29:33+01:00 veganness: vege +quality: true portions: qt: 20 name: gougères moyennes diff --git a/content/recettes/fermentations/ginger_beer.md b/content/recettes/fermentations/ginger_beer.md index df87933..1fe9f7d 100644 --- a/content/recettes/fermentations/ginger_beer.md +++ b/content/recettes/fermentations/ginger_beer.md @@ -2,6 +2,7 @@ title: Ginger beer date: 2020-03-31T23:19:25+02:00 veganness: vegan +quality: true portions: qt: 2 name: litres diff --git a/content/recettes/patisserie/caramel_beurre_sale.md b/content/recettes/patisserie/caramel_beurre_sale.md index cd003aa..a84d2d8 100644 --- a/content/recettes/patisserie/caramel_beurre_sale.md +++ b/content/recettes/patisserie/caramel_beurre_sale.md @@ -2,6 +2,7 @@ title: Caramel au beurre salé date: 2020-06-08T20:05:51+02:00 # FIXME? veganness: vege +quality: true portions: qt: 6 name: personnes (eg. dans des crêpes) diff --git a/content/recettes/patisserie/creme_patissiere.md b/content/recettes/patisserie/creme_patissiere.md index fefe7c8..913e50a 100644 --- a/content/recettes/patisserie/creme_patissiere.md +++ b/content/recettes/patisserie/creme_patissiere.md @@ -2,6 +2,7 @@ title: Crème pâtissière date: 2020-07-04T20:20:43+02:00 # FIXME? veganness: vege +quality: true portions: qt: 1L name: de lait diff --git a/content/recettes/patisserie/tartelette_abricots.md b/content/recettes/patisserie/tartelette_abricots.md index 2e03951..655acc5 100644 --- a/content/recettes/patisserie/tartelette_abricots.md +++ b/content/recettes/patisserie/tartelette_abricots.md @@ -2,6 +2,7 @@ title: Tartelettes abricots-romarin date: 2020-07-05T22:28:11+02:00 veganness: vege +quality: true portions: qt: 12 name: tartelettes @@ -29,7 +30,8 @@ entière de la recette.* **Pour la crème pâtissière,** chauffer le lait à petite ébullition, ajouter le romarin, laisser infuser avec couvercle hors du feu au moins 10 minutes, -filtrer, puis reprendre la préparation d'une crème pâtissière normale. Ajouter +filtrer, puis reprendre la préparation d'une [crème pâtissière +normale](/recettes/patisserie/creme_patissiere/). Ajouter un peu d'extrait de vanille en fin de cuisson. **Pour les abricots rôtis,** laisser au four beaucoup plus longtemps que dans diff --git a/content/recettes/pizza/courgettes_champignons.md b/content/recettes/pizza/courgettes_champignons.md index e36431c..8123eb8 100644 --- a/content/recettes/pizza/courgettes_champignons.md +++ b/content/recettes/pizza/courgettes_champignons.md @@ -3,6 +3,7 @@ title: Pizza courgettes et champignons date: 2020-03-19T16:15:15+01:00 veganness: vegan season: summer +quality: true portions: qt: 1 name: plaque 30x40cm diff --git a/content/recettes/pizza/patate_poireaux.md b/content/recettes/pizza/patate_poireaux.md index 70067ab..332be5d 100644 --- a/content/recettes/pizza/patate_poireaux.md +++ b/content/recettes/pizza/patate_poireaux.md @@ -3,6 +3,7 @@ title: Pizza (base crème) patates et poireaux date: 2020-03-19T16:23:54+01:00 veganness: vege season: winter +quality: true portions: qt: 1 name: plaque 30x40cm diff --git a/content/recettes/pizza/pate.md b/content/recettes/pizza/pate.md index 54ea01e..2930c0f 100644 --- a/content/recettes/pizza/pate.md +++ b/content/recettes/pizza/pate.md @@ -2,6 +2,7 @@ title: "Pâte à pizza" date: 2020-03-19T15:38:26+01:00 veganness: vegan +quality: true portions: qt: 1 name: plaque 30x40 cm diff --git a/content/recettes/pizza/tomates_sechees_parmesan.md b/content/recettes/pizza/tomates_sechees_parmesan.md index d07da14..4d8efd7 100644 --- a/content/recettes/pizza/tomates_sechees_parmesan.md +++ b/content/recettes/pizza/tomates_sechees_parmesan.md @@ -2,6 +2,7 @@ title: Pizza tomates séchées et parmesan date: 2020-03-19T16:15:15+01:00 veganness: vege +quality: true portions: qt: 1 name: plaque 30x40cm diff --git a/content/recettes/plats/base_de_cake.md b/content/recettes/plats/base_de_cake.md index 81710a9..f5f5cc5 100644 --- a/content/recettes/plats/base_de_cake.md +++ b/content/recettes/plats/base_de_cake.md @@ -2,6 +2,7 @@ title: Base de cake canonique date: 2018-10-03 veganness: vege +quality: true ingredients: - name: farine article: de diff --git a/content/recettes/plats/frites.md b/content/recettes/plats/frites.md index 85a27ed..6c48d8a 100644 --- a/content/recettes/plats/frites.md +++ b/content/recettes/plats/frites.md @@ -2,6 +2,7 @@ title: Frites date: 2020-03-31T22:53:32+02:00 veganness: vegan +quality: true portions: qt: 3 ingredients: diff --git a/content/recettes/plats/muffins_tomates_sechees_parmesan.md b/content/recettes/plats/muffins_tomates_sechees_parmesan.md index fb1ff34..3199d8a 100644 --- a/content/recettes/plats/muffins_tomates_sechees_parmesan.md +++ b/content/recettes/plats/muffins_tomates_sechees_parmesan.md @@ -2,6 +2,7 @@ title: "Muffins tomates séchées et parmesan" date: 2019-08-04T17:26:01+02:00 veganness: "vege" +quality: true portions: qt: 16 name: muffins (env.) diff --git a/content/recettes/plats/patates_sautees.md b/content/recettes/plats/patates_sautees.md index cf9871a..e9ada9d 100644 --- a/content/recettes/plats/patates_sautees.md +++ b/content/recettes/plats/patates_sautees.md @@ -2,6 +2,7 @@ title: Patates sautées date: 2020-01-09T00:27:04+01:00 # FIXME? veganness: vegan +quality: true portions: qt: 1 name: personne diff --git a/content/recettes/plats/pate_a_crepes.md b/content/recettes/plats/pate_a_crepes.md index 213ef9c..a68f281 100644 --- a/content/recettes/plats/pate_a_crepes.md +++ b/content/recettes/plats/pate_a_crepes.md @@ -2,6 +2,7 @@ title: Pâte à crêpes date: 2020-06-08T22:53:34+02:00 # FIXME? veganness: vege +quality: true portions: qt: 15 name: crêpes (3-4 personnes) diff --git a/content/recettes/plats/salade_lentilles_patates.md b/content/recettes/plats/salade_lentilles_patates.md index 98e6d23..8c71158 100644 --- a/content/recettes/plats/salade_lentilles_patates.md +++ b/content/recettes/plats/salade_lentilles_patates.md @@ -2,6 +2,7 @@ title: Salade lentilles et patates sautées date: 2020-03-10T22:02:40+01:00 veganness: veganisable +quality: true portions: qt: 2 ingredients: diff --git a/content/recettes/plats/semoule_grillee.md b/content/recettes/plats/semoule_grillee.md index 1742821..1ec949d 100644 --- a/content/recettes/plats/semoule_grillee.md +++ b/content/recettes/plats/semoule_grillee.md @@ -2,6 +2,7 @@ title: "Pavés de semoule grillés" date: 2019-12-30T19:00:31+01:00 # FIXME? veganness: vege +quality: true portions: qt: 4 ingredients: diff --git a/content/recettes/sauces/bechamel.md b/content/recettes/sauces/bechamel.md index fa92489..cd69bd8 100644 --- a/content/recettes/sauces/bechamel.md +++ b/content/recettes/sauces/bechamel.md @@ -2,6 +2,7 @@ title: Sauce béchamel date: 2019-05-16 veganness: vege +quality: true ingredients: - name: beurre qt: 50g diff --git a/content/recettes/sauces/rouille_oeuf.md b/content/recettes/sauces/rouille_oeuf.md index f6c7334..b1e1ddf 100644 --- a/content/recettes/sauces/rouille_oeuf.md +++ b/content/recettes/sauces/rouille_oeuf.md @@ -2,6 +2,7 @@ title: Rouille (au jaune d'œuf) date: 2020-03-19 veganness: vege +quality: true ingredients: - qt: 1 name: jaune d'œuf diff --git a/layouts/partials/quality_badge.html b/layouts/partials/quality_badge.html new file mode 100644 index 0000000..3735f73 --- /dev/null +++ b/layouts/partials/quality_badge.html @@ -0,0 +1,6 @@ +{{- if . -}} + + + +{{- end -}} diff --git a/layouts/partials/recipe_list_entry.html b/layouts/partials/recipe_list_entry.html index ccdb433..c92ad1d 100644 --- a/layouts/partials/recipe_list_entry.html +++ b/layouts/partials/recipe_list_entry.html @@ -3,20 +3,13 @@ {{ .Title }} {{ with .Params.veganness }} - v + {{- partial "veganness_badge.html" . -}} {{ end }} {{ with .Params.season }} - - {{- if . | eq "summer" -}}✿ - {{- else if . | eq "winter" -}} - {{- end -}} - + {{- partial "season_badge.html" . -}} + {{ end }} + {{ with .Params.quality }} + {{- partial "quality_badge.html" . -}} {{ end }} diff --git a/layouts/partials/season_badge.html b/layouts/partials/season_badge.html new file mode 100644 index 0000000..99af6ab --- /dev/null +++ b/layouts/partials/season_badge.html @@ -0,0 +1,6 @@ + + {{- if . | eq "summer" -}}✿ + {{- else if . | eq "winter" -}} + {{- end -}} + diff --git a/layouts/partials/veganness_badge.html b/layouts/partials/veganness_badge.html new file mode 100644 index 0000000..9344e8b --- /dev/null +++ b/layouts/partials/veganness_badge.html @@ -0,0 +1,3 @@ +v diff --git a/layouts/recettes/single.html b/layouts/recettes/single.html index 9b6e99b..748a4bd 100644 --- a/layouts/recettes/single.html +++ b/layouts/recettes/single.html @@ -22,6 +22,12 @@ {{ partial "humanize_season.html" . }} {{ end }} + + {{ with .Params.quality }}{{ if . }} +
+ Bien rodée +
+ {{ end }}{{ end }} {{ end }} diff --git a/layouts/shortcodes/partial1.html b/layouts/shortcodes/partial1.html new file mode 100644 index 0000000..08639b0 --- /dev/null +++ b/layouts/shortcodes/partial1.html @@ -0,0 +1 @@ +{{- partial (.Get 0) (.Get 1) -}} diff --git a/scss/_params.scss b/scss/_params.scss index d8e3996..fdddb5e 100644 --- a/scss/_params.scss +++ b/scss/_params.scss @@ -25,6 +25,9 @@ $veganness_vege_color: #ce8649; $season_winter_color: #02bace; $season_summer_color: #ff3838; +// Quality recipe +$quality_recipe_color: #ffee00; + // Responsiveness $width_xlarge: 1250px; $width_large: 1000px; diff --git a/scss/style.scss b/scss/style.scss index d29e304..25164b5 100644 --- a/scss/style.scss +++ b/scss/style.scss @@ -249,6 +249,11 @@ ul { color: $season_summer_color; } } + + &-quality { + border-color: $quality_recipe_color; + color: $quality_recipe_color; + } } .badges { @@ -293,4 +298,9 @@ ul { color: $season_summer_color; } } + + &-quality { + border-color: $quality_recipe_color; + color: $quality_recipe_color; + } } diff --git a/static/css/style.css b/static/css/style.css index 26d8edc..0c02d9b 100644 --- a/static/css/style.css +++ b/static/css/style.css @@ -177,6 +177,9 @@ ul { .headbadge-season-summer { border-color: #ff3838; color: #ff3838; } + .headbadge-quality { + border-color: #ffee00; + color: #ffee00; } .badges { display: inline-block; @@ -208,3 +211,6 @@ ul { .badge-season-summer { border-color: #ff3838; color: #ff3838; } + .badge-quality { + border-color: #ffee00; + color: #ffee00; }