diff options
author | Joris | 2019-08-21 12:50:51 +0200 |
---|---|---|
committer | Joris | 2019-08-21 12:50:51 +0200 |
commit | 2814b04e7bbc187d6b9e0162f11a404379890d07 (patch) | |
tree | 2066fbdf4eed365e347e08b5a3aae37d0b474071 | |
parent | a7e57e1d54e97aa75b7226876dae1e46d7cc2074 (diff) |
Add cleaning section
-rw-r--r-- | .envrc | 1 | ||||
-rw-r--r-- | Makefile | 2 | ||||
-rw-r--r-- | README.md | 8 | ||||
-rw-r--r-- | package-lock.json | 84 | ||||
-rw-r--r-- | recettes/nettoyage/lessive-au-lierre.md | 23 | ||||
-rw-r--r-- | recettes/nettoyage/lessive-au-savon-de-marseille.md | 24 | ||||
-rw-r--r-- | shell.nix (renamed from default.nix) | 0 | ||||
-rw-r--r-- | src/Main.hs | 1 | ||||
-rw-r--r-- | templates/recipe-list.html | 10 |
9 files changed, 86 insertions, 67 deletions
@@ -0,0 +1 @@ +eval "$(lorri direnv)" @@ -1,7 +1,7 @@ all: build start: - @nix-shell --command "tmuxinator local" + @tmuxinator local stop: @tmux kill-session -t cooking @@ -6,19 +6,21 @@ Live [here](https://guyonvarch.gitlab.io/cooking). ## Gettings started -Install nix and follow the instructions: +1. Install nix and follow the instructions: ```bash curl https://nixos.org/nix/install | sh ``` -Then, start the environment with: +2. Setup `direnv`. + +3. Then, start the environment with: ```bash make start ``` -Later, stop the environment with: +4. Later, stop the environment with: ```bash make stop diff --git a/package-lock.json b/package-lock.json index 2d4a49a..dc3db58 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1137,8 +1137,7 @@ "ansi-regex": { "version": "2.1.1", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "aproba": { "version": "1.2.0", @@ -1159,14 +1158,12 @@ "balanced-match": { "version": "1.0.0", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "brace-expansion": { "version": "1.1.11", "bundled": true, "dev": true, - "optional": true, "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -1181,20 +1178,17 @@ "code-point-at": { "version": "1.1.0", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "concat-map": { "version": "0.0.1", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "console-control-strings": { "version": "1.1.0", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "core-util-is": { "version": "1.0.2", @@ -1311,8 +1305,7 @@ "inherits": { "version": "2.0.3", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "ini": { "version": "1.3.5", @@ -1324,7 +1317,6 @@ "version": "1.0.0", "bundled": true, "dev": true, - "optional": true, "requires": { "number-is-nan": "^1.0.0" } @@ -1339,7 +1331,6 @@ "version": "3.0.4", "bundled": true, "dev": true, - "optional": true, "requires": { "brace-expansion": "^1.1.7" } @@ -1347,14 +1338,12 @@ "minimist": { "version": "0.0.8", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "minipass": { "version": "2.3.5", "bundled": true, "dev": true, - "optional": true, "requires": { "safe-buffer": "^5.1.2", "yallist": "^3.0.0" @@ -1373,7 +1362,6 @@ "version": "0.5.1", "bundled": true, "dev": true, - "optional": true, "requires": { "minimist": "0.0.8" } @@ -1454,8 +1442,7 @@ "number-is-nan": { "version": "1.0.1", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "object-assign": { "version": "4.1.1", @@ -1467,7 +1454,6 @@ "version": "1.4.0", "bundled": true, "dev": true, - "optional": true, "requires": { "wrappy": "1" } @@ -1553,8 +1539,7 @@ "safe-buffer": { "version": "5.1.2", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "safer-buffer": { "version": "2.1.2", @@ -1590,7 +1575,6 @@ "version": "1.0.2", "bundled": true, "dev": true, - "optional": true, "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", @@ -1610,7 +1594,6 @@ "version": "3.0.1", "bundled": true, "dev": true, - "optional": true, "requires": { "ansi-regex": "^2.0.0" } @@ -1654,14 +1637,12 @@ "wrappy": { "version": "1.0.2", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "yallist": { "version": "3.0.3", "bundled": true, - "dev": true, - "optional": true + "dev": true } } }, @@ -2154,9 +2135,9 @@ "dev": true }, "mixin-deep": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.1.tgz", - "integrity": "sha512-8ZItLHeEgaqEvd5lYBXfm4EZSFCX29Jb9K+lAHhDKzReKBQKj3R+7NOF6tjqYi9t4oI8VUfaWITJQm86wnXGNQ==", + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.2.tgz", + "integrity": "sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==", "dev": true, "requires": { "for-in": "^1.0.2", @@ -2744,9 +2725,9 @@ } }, "set-value": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.0.tgz", - "integrity": "sha512-hw0yxk9GT/Hr5yJEYnHNKYXkIA8mVJgd9ditYZCe16ZczcaELYYcfvaXesNACk2O8O0nTiPQcQhGUQj8JLzeeg==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz", + "integrity": "sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==", "dev": true, "requires": { "extend-shallow": "^2.0.1", @@ -3186,38 +3167,15 @@ } }, "union-value": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.0.tgz", - "integrity": "sha1-XHHDTLW61dzr4+oM0IIHulqhrqQ=", + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz", + "integrity": "sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==", "dev": true, "requires": { "arr-union": "^3.1.0", "get-value": "^2.0.6", "is-extendable": "^0.1.1", - "set-value": "^0.4.3" - }, - "dependencies": { - "extend-shallow": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "dev": true, - "requires": { - "is-extendable": "^0.1.0" - } - }, - "set-value": { - "version": "0.4.3", - "resolved": "https://registry.npmjs.org/set-value/-/set-value-0.4.3.tgz", - "integrity": "sha1-fbCPnT0i3H945Trzw79GZuzfzPE=", - "dev": true, - "requires": { - "extend-shallow": "^2.0.1", - "is-extendable": "^0.1.1", - "is-plain-object": "^2.0.1", - "to-object-path": "^0.3.0" - } - } + "set-value": "^2.0.1" } }, "unset-value": { diff --git a/recettes/nettoyage/lessive-au-lierre.md b/recettes/nettoyage/lessive-au-lierre.md new file mode 100644 index 0000000..af504cb --- /dev/null +++ b/recettes/nettoyage/lessive-au-lierre.md @@ -0,0 +1,23 @@ +--- +title: Lessive au lierre +--- + +Ingrédients (1L de lessive) +=========================== + +- 100 g de feuilles de lierre +- 1 L d’eau + +Recette +======= + +#. Laver les feuilles à l’eau claire. +#. Froisser les feuilles à la main. +#. Mettre les feuilles à l’eau dans une casserole. +#. Porter l’eau à ébullition. +#. Laisser cuire à feux doux 15 minutes avec un couvercle. +#. Laisser refroidir et macérer 24 heures avec un couvercle. +#. Presser les feuilles. +#. Verser dans une bouteille en filtrant les feuilles avec un chiffon fin. + +La lessive se conserve 3 semaines à l’abri de la lumière. diff --git a/recettes/nettoyage/lessive-au-savon-de-marseille.md b/recettes/nettoyage/lessive-au-savon-de-marseille.md new file mode 100644 index 0000000..73c9926 --- /dev/null +++ b/recettes/nettoyage/lessive-au-savon-de-marseille.md @@ -0,0 +1,24 @@ +--- +title: Lessive au savon de Marseille +--- + +Ingrédients (1L de lessive) +=========================== + +- 50 g de savon de Marseille (vert de préférence, avec au min. 72% d’huile végétale) +- 1 L d’eau +- 1 CS de bicarbonate de soude + +Recette +======= + +#. Râper le savon de Marseille. +#. Chauffer le savon dans l’eau. +#. Mélanger jusqu’à la dissolution du savon. +#. Laisser tiédir. +#. Ajouter le bicarbonate de soude. +#. Laisser refroidir. +#. Mixer pour éviter que la lessive ne devienne compact. +#. Verser dans un contenant. + +La lessive se met directement dans le tambour. diff --git a/src/Main.hs b/src/Main.hs index 11ea34a..72a4de8 100644 --- a/src/Main.hs +++ b/src/Main.hs @@ -39,6 +39,7 @@ main = hakyllWith configuration $ do listField "mainDishes" defaultContext (loadAll "recettes/plats/*") `mappend` listField "lowCarbDesserts" defaultContext (loadAll "recettes/desserts/hypoglucidique/*") `mappend` listField "highCarbDesserts" defaultContext (loadAll "recettes/desserts/hyperglucidique/*") `mappend` + listField "cleaningRecipes" defaultContext (loadAll "recettes/nettoyage/*") `mappend` defaultContext compile $ getResourceBody diff --git a/templates/recipe-list.html b/templates/recipe-list.html index 32e033a..64ae045 100644 --- a/templates/recipe-list.html +++ b/templates/recipe-list.html @@ -27,3 +27,13 @@ </li> $endfor$ </ul> + +<h1>Nettoyage</h1> + +<ul> + $for(cleaningRecipes)$ + <li> + <a href="$url$">$title$</a> + </li> + $endfor$ +</ul> |