Merge remote-tracking branch 'upstream/master'

.github/workflows/pr.yaml

@@ -0,0 +1,12 @@
+on: pull_request
+
+jobs:
+  check_files:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+      - name: Check files for compliance
+        run: .github/workflows/scripts/check-files.sh
+

.github/workflows/scripts/check-files.sh

@@ -0,0 +1,153 @@
+#!/bin/sh
+set -eu
+
+SIZE_LIMIT=150000
+FAIL=0
+
+check_size() {
+	size="$(stat --printf="%s" "$1")"
+	if [ "$size" -gt "$SIZE_LIMIT" ]; then
+		echo "File $1 is bigger than specified $SIZE_LIMIT limit"
+		FAIL=1
+	fi
+}
+
+check_file_name() {
+	fileName="$1"
+	expectedFolder="$2"
+
+	shouldname="${expectedFolder}/$(basename "$fileName" |
+		iconv --to-code=utf-8 |
+		tr '[:upper:]' '[:lower:]' |
+		tr '_ ' '-')"
+
+	if [ "$shouldname" != "$fileName" ]; then
+		echo "$1 should be named $shouldname."
+		FAIL=1
+	fi
+}
+
+check_webp_name() {
+	check_file_name "$1" "data/pix"
+}
+
+check_recipe_name() {
+	check_file_name "$1" "src"
+}
+
+check_recipe_content() {
+	errMsgs="$(awk '
+		BEGIN {
+			HAS_TITLE                   = 0;
+			HAS_TAGS                    = 0;
+			HAS_INVALID_TAGS            = 0;
+			NUM_TAGS                    = 0;
+			HAS_INGREDIENTS             = 0;
+			HAS_DIRECTIONS              = 0;
+			HAS_CONSECUTIVE_EMPTY_LINES = 0;
+
+			CONSECUTIVE_EMPTY_LINES = 0;
+		}
+
+		# First line should be the title
+		NR == 1 && /^# / {
+			HAS_TITLE = 1;
+			next;
+		}
+
+		$0 == "## Ingredients" {
+			HAS_INGREDIENTS = 1;
+		}
+
+		$0 == "## Directions" {
+			HAS_DIRECTIONS = 1;
+		}
+
+		$0 == "" {
+			CONSECUTIVE_EMPTY_LINES++
+			if (CONSECUTIVE_EMPTY_LINES >= 2) {
+				HAS_CONSECUTIVE_EMPTY_LINES = 1;
+			}
+		}
+
+		$0 != "" {
+			CONSECUTIVE_EMPTY_LINES = 0;
+		}
+
+		END {
+			# Last line should be the tags list
+			if ($1 == ";tags:") {
+				HAS_TAGS = 1;
+				NUM_TAGS = NF - 1;
+
+				# Loop through all the tags
+				for (i = 2; i <= NF; i++) {
+					# Make sure that each tag only contains lowercase letters and hyphens
+					if ($i !~ "^[a-z-]+$") {
+						HAS_INVALID_TAGS = 1;
+						break;
+					}
+				}
+			}
+
+			if (!HAS_TITLE) {
+				print "Recipe does not have a properly formatted title on the first line."
+			}
+
+			if (!HAS_TAGS) {
+				print "Recipe does not have a properly formatted tags on the last line."
+			} else {
+				if (HAS_INVALID_TAGS) {
+					print "Recipe has invalid tags. Tags must be separated by spaces and contain only lowercase letters or hyphens (-)";
+				}
+
+				if (NUM_TAGS < 2) {
+					print "Recipe only has " NUM_TAGS " tags. Add some more."
+				} else if (NUM_TAGS > 5) {
+					print "Recipe has " NUM_TAGS " tags which is too many. Remove some tags."
+				}
+			}
+
+			if (!HAS_INGREDIENTS) {
+				print "Recipe does not have an ingredients list."
+			}
+
+			if (!HAS_DIRECTIONS) {
+				print "Recipe does not have a directions section."
+			}
+
+			if (HAS_CONSECUTIVE_EMPTY_LINES) {
+				print "Recipe has at least 2 consecutive empty lines.";
+			}
+		}
+	' "$1")"
+
+	if [ -n "$errMsgs" ]; then
+		echo "$errMsgs"
+		FAIL=1
+	fi
+}
+
+while IFS= read -r file; do
+	echo "Checking '$file'"
+	case "$file" in
+		# Ignore these files
+		index.md) ;;
+		.github/*.md) ;;
+
+		*.webp)
+			check_size "$file"
+			check_webp_name "$file"
+			;;
+		*.md)
+			check_recipe_name "$file"
+			check_recipe_content "$file"
+			;;
+	esac
+	# Separate each file for easier reading.
+	echo ""
+done <<EOF
+$(git diff --name-only "$(git merge-base origin/master HEAD)")
+EOF
+
+exit $FAIL

.github/workflows/upload.yml

@@ -28,5 +28,6 @@ jobs:
         port: ${{ secrets.based_port }}
         script: |
           cd repo
+          git stash
           git pull --force origin master
-          make clean deploy
+          make deploy

Makefile

@@ -18,7 +18,7 @@ BLOG_SRC ?= articles
 
 .PHONY: help init build deploy clean taglist
 
-ARTICLES = $(shell git ls-tree HEAD --name-only -- $(BLOG_SRC)/ 2>/dev/null)
+ARTICLES = $(shell git ls-tree HEAD --name-only -- $(BLOG_SRC)/*.md 2>/dev/null)
 TAGFILES = $(patsubst $(BLOG_SRC)/%.md,tags/%,$(ARTICLES))
 
 help:
@@ -59,7 +59,7 @@ config:
 
 tags/%: $(BLOG_SRC)/%.md
 	mkdir -p tags
-	grep -ih '^; *tags:' "$<" | cut -d: -f2- | tr '[:punct:]' ' ' | sed 's/  */\n/g' | sed '/^$$/d' | sort -u > $@
+	grep -ih '^; *tags:' "$<" | cut -d: -f2- | tr -c '[^a-z\-]' ' ' | sed 's/  */\n/g' | sed '/^$$/d' | sort -u > $@
 
 blog/index.html: index.md $(ARTICLES) $(TAGFILES) $(addprefix templates/,$(addsuffix .html,header index_header tag_list_header tag_entry tag_separator tag_list_footer article_list_header article_entry article_separator article_list_footer index_footer footer))
 	mkdir -p blog
@@ -107,7 +107,7 @@ tagpages: $(TAGFILES)
 
 blog/@%.html: $(TAGFILES) $(addprefix templates/,$(addsuffix .html,header tag_index_header tag_list_header tag_entry tag_separator tag_list_footer article_list_header article_entry article_separator article_list_footer tag_index_footer footer))
 	mkdir -p blog
-	PAGE_TITLE="Articles tagged $* — $(BLOG_TITLE)"; \
+	PAGE_TITLE="Articles tagged $* -- $(BLOG_TITLE)"; \
 	TAGS="$*"; \
 	TITLE="$(BLOG_TITLE)"; \
 	export PAGE_TITLE; \
@@ -117,7 +117,7 @@ blog/@%.html: $(TAGFILES) $(addprefix templates/,$(addsuffix .html,header tag_in
 	envsubst < templates/tag_index_header.html >> $@; \
 	envsubst < templates/article_list_header.html >> $@; \
 	first=true; \
-	for f in $(shell grep -FH '$*' $(TAGFILES) | sed 's,^tags/\([^:]*\):.*,$(BLOG_SRC)/\1.md,'); do \
+	for f in $(shell awk '$$0 == "$*" { gsub("tags", "$(BLOG_SRC)", FILENAME); print FILENAME  ".md"; nextfile; }' $(TAGFILES)); do \
 		printf '%s ' "$$f"; \
 		git log -n 1 --diff-filter=A --date="format:%s $(BLOG_DATE_FORMAT_INDEX)" --pretty=format:'%ad%n' -- "$$f"; \
 	done | sort | cut -d" " -f1,3- | while IFS=" " read -r FILE DATE; do \
@@ -137,7 +137,7 @@ blog/%.html: $(BLOG_SRC)/%.md $(addprefix templates/,$(addsuffix .html,header ar
 	mkdir -p blog
 	TITLE="$(shell head -n1 $< | sed 's/^# \+//')"; \
 	export TITLE; \
-	PAGE_TITLE="$${TITLE} — $(BLOG_TITLE)"; \
+	PAGE_TITLE="$${TITLE} Recipe -- $(BLOG_TITLE)"; \
 	export PAGE_TITLE; \
 	AUTHOR="$(shell git log --format="%an" -- "$<" | tail -n 1)"; \
 	export AUTHOR; \

README.md

@@ -3,7 +3,7 @@
 [https://based.cooking](https://based.cooking)
 
 This is a simple cooking website where users can submit recipes here for credit.
-There are no ads, trackers, cookies (unless reciples thereof) or javascript.
+There are no ads, trackers, cookies (unless recipes thereof) or javascript.
 
 ## Ways to contribute
 
@@ -17,7 +17,7 @@ There are no ads, trackers, cookies (unless reciples thereof) or javascript.
 
 - Model submission files after [example.md](example.md). Put them in `src/`.
 - Recipes should start with a title, with a single `#`, *on the first line*. No
-  empty line at the top, not trailing line at the end. The file needs to be `\n`
+  empty line at the top, no trailing line at the end. The file needs to be `\n`
   terminated in linux-fashion (if you're on linux you don't need to care, it
   should be automatic).
 - File names should be the name of the dish with words separated by hyphens
@@ -49,12 +49,14 @@ List of special, categorical tags to use if relevant:
   to be incorporated in another recipe.
 - `breakfast`
 - `dessert`
-- `drink`
 - `quick`: for recipes that can be cooked in under ~20 minutes.
 - `side`: side dishes such as mash, fries, etc.
 - `snack`
 - `spread`
 
+If your recipe contains no meat or dairy, include the `fasting` tag.
+If it includes dairy but no milk, incude the `cheesefare` tag.
+
 ### Images
 
 Images are stored in `data/pix`.

data/pix/btc.svg

@@ -0,0 +1,7 @@
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="64" width="64" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+<g transform="translate(0.00630876,-0.00301984)">
+<path fill="#f7931a" d="m63.033,39.744c-4.274,17.143-21.637,27.576-38.782,23.301-17.138-4.274-27.571-21.638-23.295-38.78,4.272-17.145,21.635-27.579,38.775-23.305,17.144,4.274,27.576,21.64,23.302,38.784z"/>
+<path fill="#FFF" d="m46.103,27.444c0.637-4.258-2.605-6.547-7.038-8.074l1.438-5.768-3.511-0.875-1.4,5.616c-0.923-0.23-1.871-0.447-2.813-0.662l1.41-5.653-3.509-0.875-1.439,5.766c-0.764-0.174-1.514-0.346-2.242-0.527l0.004-0.018-4.842-1.209-0.934,3.75s2.605,0.597,2.55,0.634c1.422,0.355,1.679,1.296,1.636,2.042l-1.638,6.571c0.098,0.025,0.225,0.061,0.365,0.117-0.117-0.029-0.242-0.061-0.371-0.092l-2.296,9.205c-0.174,0.432-0.615,1.08-1.609,0.834,0.035,0.051-2.552-0.637-2.552-0.637l-1.743,4.019,4.569,1.139c0.85,0.213,1.683,0.436,2.503,0.646l-1.453,5.834,3.507,0.875,1.439-5.772c0.958,0.26,1.888,0.5,2.798,0.726l-1.434,5.745,3.511,0.875,1.453-5.823c5.987,1.133,10.489,0.676,12.384-4.739,1.527-4.36-0.076-6.875-3.226-8.515,2.294-0.529,4.022-2.038,4.483-5.155zm-8.022,11.249c-1.085,4.36-8.426,2.003-10.806,1.412l1.928-7.729c2.38,0.594,10.012,1.77,8.878,6.317zm1.086-11.312c-0.99,3.966-7.1,1.951-9.082,1.457l1.748-7.01c1.982,0.494,8.365,1.416,7.334,5.553z"/>
+</g>
+</svg>

data/pix/xmr.svg

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="256px" height="256px" viewBox="0 0 256 256" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" preserveAspectRatio="xMidYMid">
+	<g>
+		<path d="M127.9983,0.0005 C57.3183,0.0005 0.0003,57.3155 0.0003,127.9975 C0.0003,142.1255 2.2893,155.7145 6.5183,168.4275 L44.7993,168.4275 L44.7993,60.7335 L127.9983,143.9335 L211.1973,60.7335 L211.1973,168.4275 L249.4793,168.4275 C253.7103,155.7145 256.0003,142.1255 256.0003,127.9975 C256.0003,57.3155 198.6813,0.0005 127.9983,0.0005" fill="#FF6600"></path>
+		<path d="M108.8673,163.0617 L72.5573,126.7507 L72.5573,194.5157 L58.6773,194.5157 L44.7973,194.5157 L18.6233,194.5157 C41.0923,231.3787 81.6743,255.9967 127.9963,255.9967 C174.3183,255.9967 214.9033,231.3787 237.3703,194.5157 L211.1933,194.5157 L186.3673,194.5157 L183.4373,194.5157 L183.4373,126.7507 L147.1263,163.0617 L127.9963,182.1897 L108.8693,163.0617 L108.8673,163.0617 Z" fill="#4C4C4C"></path>
+	</g>
+</svg>

data/style.css

@@ -1,6 +1,6 @@
 body {
 	background: #151515 ;
-	color: white ;
+	color: #ccc ;
 	max-width: 800px ;
 	margin: auto ;
 	padding: 0 16px ;

example.md

@@ -6,11 +6,12 @@ If there is a title image of this dish, it should be above this paragraph.
 You may also include prep/cook time and the number of servings as below:
 
 - ⏲️ Prep time: 10 min
-- 🍳Cook time: 30 min
+- 🍳 Cook time: 30 min
 - 🍽️ Servings: 4
 
 ## Ingredients
 
+- There must be a blank line above all lists.
 - List the ingredients
 - in an unordered list
 - similar to this.
@@ -30,7 +31,7 @@ You may also include prep/cook time and the number of servings as below:
 
 Here, just put your name and links to yourself (maybe a website or donation link) if you want.
 You may say "Anonymous" or a screenname if desired.
-If you add something substantial to an already existing recipe (including and image) you may add your name below with the contribution in parens.
+If you add something substantial to an already existing recipe (including an image) you may add your name below with the contribution in parens.
 
 Note that your commit name will be used to sign the recipe, so for full
 anonymity either commit with a name that can't be traced back to you, or ask
@@ -41,6 +42,5 @@ If you add a Bitcoin/Monero address, put it in "code" between \`'s, like below.
 - Luke Smith - [website](https://lukesmith.xyz), [donate](https://lukesmith.xyz/donate)
 - Billy Smith - btc: `bc1q763s4ud0hgfa66ce64gyh6tsss49vyk5cqcm6w`
 - Sally Smith (photo credit) - [website](https://lukesmith.xyz), [donate](https://lukesmith.xyz/donate)
--
 
 ;tags: tag1 tag2 tag3 (see README for tag guidelines)

index.md

@@ -9,9 +9,15 @@ See the story of this site unfold in three videos:
 
 ### It's easy to contribute!
 
-- Submit new recipes via git via [Github](https://github.com/lukesmithxyz/based.cooking).
+- Submit new recipes using git via [GitHub](https://github.com/lukesmithxyz/based.cooking).
 - You may also improve recipes or add an image to those without them.
 - Donate to the individual people who contribute pages whose names are at the bottom of each page.
-- Donate to the site's long-term maintenance fund:
-	- ![BTC logo](https://lukesmith.xyz/pix/btc.svg) Bitcoin: `bc1q763s4ud0hgfa66ce64gyh6tsss49vyk5cqcm6w` ([QR code](pix/bitcoin-based-cooking.webp))
-	- ![XMR Logo](https://lukesmith.xyz/pix/xmr.svg) Monero: `48jewbtxe4jU3MnzJFjTs3gVFWh2nRrAMWdUuUd7Ubo375LL4SjLTnMRKBrXburvEh38QSNLrJy3EateykVCypnm6gcT9bh` ([QR code](https://lukesmith.xyz/pix/xmr.png))
+
+### Donate to the Based.Cooking maintenance fund
+
+We are funded by you only, not 20MB of ads or privacy-violating trackers per page.
+
+- ![BTC logo](pix/btc.svg) Bitcoin ([QR code](pix/bitcoin-based-cooking.png)): `bc1q763s4ud0hgfa66ce64gyh6tsss49vyk5cqcm6w`
+- ![XMR Logo](pix/xmr.svg) Monero ([QR code](pix/monero-based-cooking.png)): `84N9N3DMWhQ9cstHwGEjo8hEvm9bjeYgjV5fLrGK6TmA9iVPjnU7NMUT7gyAc22UgGAVTCUgReQ1J67znhWP3L52Usfw6jg`
+- [Donate to Luke](https://lukesmith.xyz/donate) and add a comment saying it's for Based.Cooking.
+- Brave users may also donate BAT to this website.

src/aelplermagronen.md

@@ -1,32 +1,35 @@
 # Älplermagronen (Alpine macaroni)
 
+![Älplermagronen](pix/aelplermagronen.webp)
+
 A swiss favorite, _Älplermagronen_ combines pretty much everything you have at your disposal in your alpine chalet.
 It's the definition of comfort food for the Swiss.
 
-Serves 5-6.
-
-Cooking time: ~30 minutes
+- 🍳 Cook time: ~30 minutes
+- 🍽️  Servings: 4
 
 ## Ingredients
 
 - ~150g (1/3 lb) bacon cubes
 - 3 onions (medium size)
 - 400g (15 oz) potatoes (firm/waxy)
-- 2L (1/2 gal) milk
-- 200g (7oz) macaroni (dry weight)
+- 1 - 2L (1/4 - 1/2 gal) milk
+- 400g (15 oz) macaroni (dry weight)
 - ~150g (1/3 lb) medium soft cheese. Appenzeller works best. Gruyère would be my go-to alternative.
 - a jar of apple sauce
 
+Feel free to vary these amounts, it's not like this is anything strict.
+
 ## Directions
 
-1. Fry bacon cubes in pot (this pot will be used for everything so choose an appropriately large one)
+1. Fry bacon cubes in pot (this pot will be used for everything so choose an appropriately large one).
 2. Cut onions into half-rings and let them sweat in the same pot. Add some butter if your bacon was not fatty enough.
-3. Peel potatoes and cut them into ~1 cm/half inch cubes
+3. Peel potatoes and cut them into ~1 cm/half inch cubes.
 4. When the onions have become sufficiently cooked, add potatoes.
 5. Top everything with milk and let the potatoes cook for about 10 minutes.
 7. Add macaroni and the remaining milk to cover everything. Most of the milk will be absorbed by the macaroni.
 8. Shred your cheese.
-9. A minute or two before the macaroni are done, add the shredded cheese into the pot. It should appear a bit too runny in the pot. While cooling it will increase in viscosity quite a bit. If the final texture is not creamy enough it is most likely due to using the wrong cheese.
+9. A minute or two before the macaroni are done, add the shredded cheese into the pot. It should appear a bit too runny in the pot. While cooling it will increase in viscosity quite a bit. If the final texture is not creamy enough, it is most likely due to using the wrong cheese.
 10. Season to taste. (Needs quite a bit of salt). Nutmeg also works well here.
 11. Serve with apple sauce. Should be eaten together, not as a dessert.
 

src/aglio-e-olio.md

@@ -0,0 +1,30 @@
+# Spaghetti aglio e olio
+
+Aglio e olio, pasta with garlic and olive oil, is one of the simplest yet greatest pasta dishes of all time. It's quick, easy, and uses a lot of basic pantry ingredients which makes this a convenient weeknight meal.
+
+- 🍳 Cook time: 15 min
+- 🍽️ Servings: 4
+
+## Ingredients
+
+- 1 pound (500g) spaghetti (or similarly shaped pasta)
+- 1/2 cup (110g) extra virgin olive oil
+- 5-6 cloves of garlic
+- 1/4 tsp red pepper flakes
+- A bunch of fresh parsley
+
+## Directions
+
+1. Heat a large skillet on medium-high heat, start [cooking the pasta](pasta.html).
+2. Finely slice or mince the garlic and finely chop the parsley.
+3. Add the oil and garlic to the skillet and gently cook it until it's lightly golden brown.
+4. Add the red pepper flakes to the skillet and turn down the heat to let its flavor infuse the oil.
+5. When the pasta has finished cooking, drain it, and reserve at least around a cup of the cooking water.
+6. Now add the drained pasta with some of the cooking water to the skillet and toss vigorously. The starch in the pasta water will help the sauce emulsify and get it to the right consistency.
+7. At the very last second add the parsley, to preserve its freshness. Adjust the seasoning to taste if necessary.
+
+## Contribution
+
+- Robert [github](https://github.com/robert5800)
+
+;tags: italian pasta

src/aljotta.md

@@ -1,8 +1,6 @@
 # Aljotta
 
-![aljotta](pix/aljotta.webp)
-
-Aljotta, 'jo' as in "Yo!", is a light fish soup with roots in french bouillabaisse and similarly refers to the method of serving the fish that are cooked in it. The most appropriate fish to use for both the stock and the accompanying meal are 'clean' white fish that don't turn the broth cloudy, ideally stargazers, monkfish, red gurnard, and moray eels but also hake, mullets, cod and haddock. There are a some variants; restaurant versions could very well include lemon juice and shellfish which I don't associate with aljotta. Rice eventually became a staple with it and how much you put in is up to you. I recommend just a little, in fact, there are no ingredient amounts, the picture should give you an idea of the density you're going for. **Fresh herbs are a must**.
+Aljotta ("jo" as in "Yo!") is a light fish soup with roots in french bouillabaisse and similarly refers to the method of serving the fish that are cooked in it. The most appropriate fish to use for both the stock and the accompanying meal are 'clean' white fish that don't turn the broth cloudy, ideally stargazers, monkfish, red gurnard, and moray eels but also hake, mullets, cod and haddock. There are a some variants; restaurant versions could very well include lemon juice and shellfish which I don't associate with aljotta. Rice eventually became a staple with it and how much you put in is up to you. I recommend just a little. In fact, there are no ingredient amounts; the picture should give you an idea of the density you're going for. **Fresh herbs are a must**.
 
 ## Ingredients
 
@@ -22,11 +20,11 @@ Aljotta, 'jo' as in "Yo!", is a light fish soup with roots in french bouillabais
 ## Directions
 
 1. Cook some rice and set aside. White short-grain is best but other types will do as long as it's not starchy. Don't use arborio or sushi rice.
-2. Prepare the stock, possibly the day before, by boiling fish and fish bones in a tall stock pot on medium heat for 1-2 hours. It's customary to have loose chunks of fish in the soup so you can boil the fish and seperate the meat as it starts to cook. As an example, the head, tail, skin and spine from the [anglerfish fillet recipe](https://based.cooking/fried-anglerfish-fillet) were used to make stock, then half a fillet and meat that separated from the offal became part of the soup.
+2. Prepare the stock, possibly the day before, by boiling fish and fish bones in a tall stock pot on medium heat for 1-2 hours. It's customary to have loose chunks of fish in the soup so you can boil the fish and separate the meat as it starts to cook. As an example, the head, tail, skin and spine from the [anglerfish fillet recipe](https://based.cooking/fried-anglerfish-fillet) were used to make stock, then half a fillet and meat that separated from the offal became part of the soup.
 3. In a pot, heat some oil on low heat and add in the onions. Saute until translucent.
-4. Add the garlic, tomato, herbs and salt if desired. Switch to medium heat, stirring occationally until the water starts to boil.
+4. Add the garlic, tomato, herbs and salt if desired. Switch to medium heat, stirring occasionally until the water starts to boil.
 5. Add the fish and let simmer on low heat until the fish are cooked thoroughly, being careful not to break them. Turn the heat off and add the olive oil.
-6. Take the fish out to be served seperately. They are traditionally served topped with olive oil and a squeeze of lemon with steamed vegetables.
+6. Take the fish out to be served separately. They are traditionally served topped with olive oil and a squeeze of lemon with steamed vegetables.
 7. If you are using lemon juice or rice, add them to each serving according to your preference.
 8. Leave some for tomorrow. It always tastes better the next day.
 
@@ -34,4 +32,4 @@ Aljotta, 'jo' as in "Yo!", is a light fish soup with roots in french bouillabais
 
 Shou, [website](https://shouganai.xyz)
 
-;tags: fish soup mediterranian
+;tags: fish soup mediterranean

src/apple-strudel.md

@@ -0,0 +1,36 @@
+# Apple strudel
+
+![apple-strudel-1](pix/apple-strudel-1.webp)
+
+- ⏲️ Prep time: 10 min
+- 🍳 Cook time: 40 min
+- 🍽️ Servings: 6
+
+## Ingredients
+
+- Puff pastry
+- Apricot jam (about 300 g | 10 oz)
+- 3 apples
+- Ground cinnamon
+- Breadcrumbs / crushed cookies
+- Butter (optional)
+- Powdered sugar (optional)
+
+## Directions
+
+1. Peel and cut the apples in thin slices.
+2. Roll out the puff pastry with a rolling pin.
+3. Spread the jam over the puff pastry with a spoon.
+4. Arrange the apple slices over the jam.
+5. Sprinkle with cinnamon and breadcrumbs.
+6. Cut tiny pieces of butter and arrange them over the apple slices.
+![apple-strudel-2](pix/apple-strudel-2.webp)
+7. Roll the puff pastry edges over, overlapping them.
+8. Bake for around 40 minutes at 180°C (360° F).
+9. Cover with powdered sugar.
+
+## Contribution
+
+- Lorenzo Iuri
+
+;tags: dessert breakfast

src/arroz-chaufa.md

@@ -1,12 +1,11 @@
 # Arroz Chaufa
 
-Peruvian-chinese dish, Easy to cook just add and mix everything.
+Peruvian-chinese dish. Easy to cook just add and mix everything.
 
-
-![Arroz Chaufa](pix/arroz_chaufa-2.webp)
+![Arroz Chaufa](pix/arroz-chaufa-2.webp)
 
 - ⏲️ Prep time: 40 min
-- 🍳Cook time: 10 min
+- 🍳 Cook time: 10 min
 - 🍽️ Servings: 4
 
 ## Ingredients
@@ -19,21 +18,20 @@ Peruvian-chinese dish, Easy to cook just add and mix everything.
 - Soy Sauce
 - Welsh Onion
 
-![Ingredients](pix/arroz_chaufa-1.webp)
+![Ingredients](pix/arroz-chaufa-1.webp)
 
 ## Directions
 
-1. Cut the chicken into pieces and fry it (don't forget the salt).
-2. Cook scrambled eggs (don't forget the salt).
-3. Cook the rice (if it is yesterday's rice better, preferably without salt).
+1. Cut the chicken into pieces and fry it. Don't forget the salt.
+2. Cook scrambled eggs. Don't forget the salt.
+3. Cook the rice. If it is yesterday's rice better, preferably without salt.
 4. Cut the welsh onion and bell pepper into small squares.
 5. Mix everything over low heat, adding soy sauce.
-6. Optional: add beacon, sesame oil.
-7. (Everything is salty, you can reduce it with just a teaspoon of sugar, especially if you cook the rice with salt.)
+6. Optional: Add bacon, sesame oil.
+7. If everything is salty, you can reduce it with just a teaspoon of sugar, especially if you cook the rice with salt.
 
 ## Contribution
 
-- Andy Rufasto
-- [![](https://img.shields.io/badge/Contact-andy@andyrufasto.cf-succes?style=social&logo=GNU-Privacy-Guard)](https://keyoxide.org/0A3D7C5B8C2499A8BEBCE72869D2E5C413569DA2)
+- Andy Rufasto - [contact](mailto:andy@andyrufasto.cf), [GPG](https://keyoxide.org/0A3D7C5B8C2499A8BEBCE72869D2E5C413569DA2)
 
 ;tags: peruvian chinese rice

src/asian-style-chicken-sticky-sauce.md

@@ -0,0 +1,46 @@
+# Asian Style Chicken with Sticky Sauce
+
+Asian style crispy coated chicken with sweetish sauce recipe. Served with boiled rice.
+
+![Asian Style Chicken with Sticky Sauce](pix/asian-style-chicken-sticky-sauce.webp)
+
+## Ingredients
+
+### Chicken with crispy coating
+
+- Around 14 ounces or 400 grams of chicken breast
+- 1 Egg
+- 3 tbsp of cornflour
+- 10 tbsp all-purpose flour
+- 1/2 tsp garlic powder
+- 2 tsp paprika powder
+- Around 5 tbsp of vegetable oil for frying the chicken
+
+### Sauce
+
+- 1 tbsp sesame oil
+- 2 garlic cloves, mashed to paste.
+- 1 tbsp Chinese rice vinegar or alternatively white wine vinegar
+- 3 tbsp honey
+- 2 tbsp ketchup
+- 2 tbsp brown sugar
+- 4 tbsp soy sauce
+
+## Directions
+
+1. Prepare the sauce by mixing the ingredients together in a bowl.
+2. Cut the chicken into bite sized pieces.
+3. Place all-purpose flour in a shallow bowl. Mix in garlic powder as well as salt and pepper, 1/2 tsp each.
+4. Place lightly beaten egg in another shallow bowl.
+5. Coat the chicken in corn flour, dip it in egg and finally coat with seasoned all purpose-flour.
+6. Heat a good amount of oil on a pan to fry the chicken in. The oil should be hot enough so that the chicken sizzles when placed in the pan. You may want to do this in a couple of batches depending on the size of your pan.
+7. Fry until chicken is cooked and has a nice golden-brownish coating.
+8. Pour out excess oil, put the sauce in and mix to coat the chicken. Or place the chicken in a bowl with kitchen towels and do another batch.
+9. Let the sauce bubble for one or two minutes and you're done.
+10. Serve with boiled rice.
+
+## Contribution
+
+- pazu - xmr: 48QiCovstDPbHtMR5DP8tp3fUgguVUcdUX2pjbh6utt88fMe5h233ZnY7PxxdQYCjrVuCBQA2D8JBYU7rH2MdVDHFKd7QJi - btc: 17FWEWrKuock7eeZY3DTne7LgES1uKYZK5
+
+;tags: asian chicken

src/assam-tea.md

@@ -0,0 +1,29 @@
+# Assam Tea
+
+![Assam Tea](pix/assam-tea.webp)
+
+This is a simple Assam tea recipe.
+
+- ⏲️ Prep time: 1 min
+- 🍳 Cook time: 5 min
+- 🍽️ Servings: 1
+
+## Ingredients
+
+- 2 teaspoons of Assam Tea
+- 150 ml of fresh water
+- Sugar (Optional)
+- Milk (Optional)
+
+## Directions
+
+1. Add 150 ml of water to a small pan and bring it to boil.
+2. Then add 2 teaspoons of tea into it and reduce the heat to low.
+3. Strain the tea using a tea filter into a cup.
+4. Add sugar and milk to taste.
+
+## Contribution
+
+- Chandra Kiran - [GitHub](https://github.com/ackr-8)
+
+;tags: drink quick

src/australian-snags.md

@@ -0,0 +1,31 @@
+# Australian snags (sausage sizzle)
+
+An australian BBQ classic tradition that is simple and very easy to make. Great for parties and outdoor events
+especially national events. Sometimes served at hardware chains.
+
+- ⏲️ Prep time: 2 min
+- 🍳 Cook time: 20 min
+- 🍽️ Servings: Depends
+
+## Ingredients
+
+- Sausages (thin)
+- Onions (4g per sausage)
+- Tomato sauce
+- Mustard (optional)
+- Bread
+- Butter
+- Oil
+- Wood chips (optional, fuel for smokey flavour)
+
+## Directions
+
+1. Chop up the onions into rings
+2. Bring the sausages to the grill, turning once every 5 mins
+3. Add oil of your choice to the hotplate then add the onions
+4. Use your tongs to toss the onions until they are golden brown
+5. When the onions are golden brown turn off the hotplate
+6. When the sausages are cooked, butter the bread then add a sausage (optionally split)
+7. Add onions then tomato sauce on top
+
+;tags: basic snack australian pork

src/babas-feta-pasta.md

@@ -0,0 +1,48 @@
+# Baba's Feta Pasta
+
+Greek Pasta Recipe with sauce made out of feta, stock, cream cheese and other ingredients.
+Uses mixed spice for special flavour, and is a great dinner or mid-day meal.
+
+- ⏲️ Prep time: 15-30 min
+- 🍳 Cook time: 25-30 min
+
+## Ingredients
+
+Serves Around 3 People. You can scale up to 4 If you increase most quantities by +1/4.
+
+- Medium Sweet Onion (Finely Chopped)
+- Virgin olive oil (not extra-virgin)
+- White Sugar
+- 3 Fresh Medium Garlic Cloves (Chopped Fine)
+- 15-20 Kalamon/Kalamata Olives (Cut into thirds)
+- Whole small courgette (Cut to small pieces)
+- 6 Medium Mushrooms (Cut smallish and small stalk)
+- 1/2 Broccli (Chopped small)
+- 8-10 Finely sliced cherry tomatoes
+- 1/2 Block of feta (Washed)
+- 1 Chicken stock (Added to 3/4 Mug boiling water)
+- Overfilled Teaspoon Mixed Spice
+- 3/4 Bowls fusilli pasta 
+- Overfilled tablespoon Creme Cheese
+- 1/3 Mug whole milk
+
+## Directions
+
+Make sure to prepare & chop most ingredients before you start. 
+
+1. Get a small deepish pan and heat it to low-medium temperature. Add a good amount of virgin olive oil and place one of the small onion pieces into the pan. Wait until it starts to sizzle and add the rest of the onion. Mix well and make sure the temperature is not too high as it can damage ingredients. Optional: You can sprinkle some sugar over the onion to make it sweeter. Then after a few minutes, when the onion has browned/softened, add in the garlic and wait 1-2 minutes, then you can turn off heat and put it to the side for later.
+2. Get a medium-large sized deepish pan, heat with oil and then add in the olives, courgettes and mushrooms. Sprinkle salt every now and then to enhance taste. After a few minutes when they are soft and are around the same color, then add in the onion and garlic from the smaller pan.
+3. Wait a couple minutes and then add the broccoli and tomato slices to the mix. Wait 2-3 more minutes and then get your rinsed feta and melt it in the pan (chop to speed up).
+4. Start [cooking the pasta](pasta.html).
+5. When the feta has nearly finished melting, add in the stock to the mix. Turn the pan temperature down slightly and then let it bubble for 5 mins (add a timer). Make sure to add the cover to the pan to keep in the flavor.
+6. After the 5 mins timer is up, add the overfilled tablespoon creme cheese to the main mix, stir, then re-add lid.
+7. Wait 2-3 more minutes and then you can test the sauce if you want. If you feel there is some missing, add more mixed spice or herbs such as parsley to it.
+8. Turn down the main mix again slightly and add the 1/3 Mug of Whole milk to the mix.
+9. Strain and serve your pasta and cover with the sauce. Enjoy!
+
+## Contribution
+
+- peepopoggers - [github](https://github.com/peepopoggers)
+- Original recipe.
+
+;tags: greek feta pasta supper

src/baked-mostaccioli.md

@@ -0,0 +1,34 @@
+# Baked Mostaccioli
+
+![baked mostaccioli in bowl](pix/baked-mostaccioli-00.webp "Baked Mostaccioli in Bowl")
+
+Baked pasta cooked in dish with spicy sauce
+
+- ⏲️ Prep time: 15 min
+- 🍳 Cook time: 15-20 min
+- 🍽️ Servings: 8 bowls
+
+## Ingredients
+
+- 24 oz or 1 jar of Fradiavolo Sauce ([Victoria](https://victoriapastasauces.com/product/fradiavolo-sauce/))
+- 1 box Mostaccioli Rigati or Penne Rigati ([Ronzoni](https://www.google.com/search?q=mostaccioli+rigati&tbm=shop))
+- ~8 oz shredded Mozzarella Cheese ([Poly-O](https://www.walmart.com/ip/Polly-O-Mozzarella-Cheese-Chunk-with-Whole-Milk-16-oz-Pack/10448265))
+  - I've found that pre-shredded cheese doesn't taste as good as shredding it right before cooking.
+- 2x 2 quart (8") baking dishes or 1 large baking dish (see picture below)
+
+## Directions
+
+1. Bring a pot to a boil and [cook pasta](pasta.html) for 6 minutes (very al dante).
+2. Put pasta and sauce in baking dish(es) and mix well.
+3. Cover pasta and sauce generously with grated cheese until you can't see the pasta.
+4. Bake at 350°F / 175°C for 20 minutes
+   - Or 375°F / 190°C for 15 minutes on convection bake.
+
+![baked mostaccioli on stove](pix/baked-mostaccioli-01.webp "Baked Mostaccioli right out of the Oven")
+
+## Contributors
+
+- Recipe created by Dan
+- Refined & Uploaded by Zyansheep.
+
+;tags: pasta italian

src/baked-pasta-with-broccoli.md

@@ -0,0 +1,37 @@
+# Baked pasta with broccoli, boiled eggs and scamorza cheese
+
+![baked-pasta-with-broccoli](pix/baked-pasta-with-broccoli.webp)
+
+- ⏲️ Prep time: 15 min
+- 🍳 Cook time: 20~30 min
+- 🍽️ Servings: 4
+
+## Ingredients
+
+- 500g pasta
+- 500g broccoli
+- 4 eggs 
+- 200g scamorza cheese
+- 400g béchamel 
+- sage (optional)
+- parmesan cheese (optional)
+
+## Directions
+
+1. Boil water and add salt (a handful for every liter), put pasta inside.
+2. Boil broccoli and eggs for 10 minutes.
+3. While everything is boiling dice scamorza cheese, prepare a pan.
+4. Put a layer of béchamel.
+5. Put a layer of pasta.
+6. Put a layer of broccoli, diced scamorza cheese, pepper, salt.
+7. Go to step 4 and repeat until ingredients end.
+8. Add sage leafs on top (optional).
+9. Put the pan inside the (preheated) oven at 180°C for 15~20 minutes.
+10. End with 5~10 minutes of cooking with the grill function.
+
+## Contribution
+
+Davide Costa - [website](davcloud.xyz),
+Monero: `4BD4REH2QyC5dhb7W4hYUnD3poGgpg9TGVrn1iRcdkQzBrm44eAre1GcfvsPakPF1thy2CBcBqZmzCLRsU6gZftY1Bg23f9`
+
+;tags: italian pasta broccoli cheesefare

src/baked-salmon.md

@@ -3,7 +3,7 @@
 Simple method for making a good serving of salmon. Goes well with just about anything.
 
 - ⏲️ Prep time: 5 min
-- 🍳Cook time: 19 min
+- 🍳 Cook time: 19 min
 
 ## Ingredients
 
@@ -21,7 +21,6 @@ Simple method for making a good serving of salmon. Goes well with just about any
 3. Squeeze lemon juice and place a teaspoon of butter on each salmon steak.
 4. Bake at 400°F / 200°C for 19 mins.
 
-
 ## Contribution
 
 - Carl Zimmerman -- [website](https://codingwithcarl.com)

src/banana-bread.md

@@ -34,4 +34,4 @@ Not too sweet. Great for when you have friends over for tea.
 
 - Martin Chrzanowski -- [website](https://m-chrzan.xyz), [donate](https://m-chrzan.xyz/crypto.html)
 
-;tags: bread dessert sweet
+;tags: bread dessert sweet fasting

src/banana-green-smoothie.md

@@ -1,20 +0,0 @@
-# Banana Green Smoothie
-
-## Ingredients
-
-- 2 cups baby spinach leaves, or to taste
-- 1 banana
-- 1 carrot, peeled and cut into large chunks
-- 3/4 cup plain fat-free Greek yogurt, or to taste
-- 3/4 cup ice
-- 2 tablespoons honey
-
-## Directions
-
-1. Put spinach, banana, carrot, yogurt, ice, and honey in a blender; blend until smooth.
-
-## Contribution
-
-Front3ndNinja - [Website](https://github.com/Front3ndNinja)
-
-;tags: drink sweet breakfast

src/banana-muffins-with-chocolate.md

@@ -1,5 +1,10 @@
 # Banana Muffins with Chocolate
 
+![banana-muffins](pix/banana-muffins.webp)
+
+- ⏲️ Prep time: 15 min
+- 🍳 Cook time: 30 min
+
 ## Ingredients
 
 - 3 bananas
@@ -19,11 +24,10 @@
 3. Melt the butter, cut the chocolate into smaller pieces, and whip the eggs.
 4. Pour the butter into the bananas, then add the flour, then the cooking powder, the chocolate, the whipped eggs and sugar, and the optional vanilla sugar; stirring it all the time.
 5. Pour the mass into your muffin dish.
-6. Heat up the oven to 160 °C / 320 °F and bake the muffins for around 20-30 minutes in 170 °C / 340 °F.
-
+6. Heat up the oven to 160 °C / 320 °F and bake the muffins for around 20-30 minutes at 170 °C / 340 °F.
 
 ## Contribution
 
 - Łukasz Drukała - [website](https://masflam.com), [donate](https://masflam.com/#donate)
 
-;tags: dessert sweet snack cake
+;tags: dessert sweet snack cake fasting

src/banana-pancakes.md

@@ -1,8 +1,8 @@
 # Banana Pancakes
 
-- Prep time: 10 minutes
-- Cook time: 10 minutes
-- Serves: 4 people
+- ⏲️ Prep time: 10 minutes
+- 🍳 Cook time: 10 minutes
+- 🍽️ Servings: 4 people
 
 ## Ingredients
 
@@ -27,4 +27,4 @@ Either eat the pancakes as they get ready or put a plate in a preheated oven (lo
 
 - Ricky Lindén - [website](https://rickylinden.com), [donate](https://rickylinden.com/donate.html)
 
-;tags: breakfast quick sweet cake
+;tags: breakfast quick sweet pancake cheesefare

src/basic-meatballs.md

@@ -0,0 +1,42 @@
+# Basic Meatballs
+Hybrid beef/pork meatballs perfect for spaghetti and meatballs or a meatball sub.
+
+- 🍳 Cook time: 25 min
+- 🍽️ Servings: 4
+
+## Ingredients
+
+- 1 pound ground beef (preferably 90/10 or 93/7)
+- 1 pound ground pork
+- 1/2 cup italian breadcrumbs
+- 1/3 cup milk (I use 2% but doesn't matter too much)
+- 1/4 cup yellow onion diced (about 1/2 small yellow onion)
+- 1 egg
+- 1/2 cup shredded parmesan
+- 1/4-1/2 cup chopped parsley
+- 2 tbsp red pepper flakes
+- 2 tbsp dried oregano
+- 1 tbsp rosemary
+- 1 tbsp basil
+- 1 tbsp garlic powder
+- Salt and pepper to taste
+
+## Directions
+
+1. Preheat oven to 200°C/400F
+1. In a bowl, combine all ingredients
+1. Hand form into balls by packing with your hands and then rolling. Set aside on a baking sheet, preferably one with a cooling rack
+    * I prefer large meatballs (larger than a golf ball) and shoot for 16-20 for 2 lbs of meat, but if you prefer smaller meatballs you can opt for as many as 48
+1. Either halfway through the packing process or after forming all meatballs, heat a large skillet to medium-high heat
+1. Add 1-2 tbsp of oil to the skillet (enough to evenly coat the skillet), and bring to heat
+1. Fill the skillet with meatballs, start by browning one face, flip once at after 2-3 minutes, and then remove to the baking sheet after another 2-3 minute. Continue in batches until all meatballs have been browned
+    * It is OK and expected for the meatballs to lose some of their spherical shape at this point
+    * You can skip this step and go straight the oven if you want to cut corners
+1. Transfer to the oven, and cook until the inside registers 60°C/140F on an instant read thermometer. This should be about 20 minutes for large meatballs (16 per batch), maybe 10 for small (48 per batch)
+1. Serve with pasta or on a meatball sub
+
+## Contribution
+
+- John Hubberts - [github](https://github.com/jhubberts)
+
+;tags: basic italian beef pork

src/beef-goulash.md

@@ -2,14 +2,14 @@
 
 ![Beef Goulash](pix/beef-goulash.webp)
 
-Although it takes some time to make - about 1hr 30 minutes, it is actually quite
-easy to make, and it is a really hearty and delicious recipe, if I do say so
-myself.
+Although it takes some time to make, it is actually quite easy to make, and it is a really hearty and delicious recipe, if I do say so myself.
+
+- ⏲️ Prep time: 20 min
+- 🍳 Cook time: 90 min
+- 🍽️ Servings: 2/3
 
 ## Ingredients
 
-The ingredients here are for about 2-3 portions, depending on your appetite:
-
 * 500g beef
 * 300-400g potatoes
 * 1 carrot
@@ -27,7 +27,7 @@ The ingredients here are for about 2-3 portions, depending on your appetite:
 * Cilantro (optional)
 * 2-3 champignon mushrooms (optional)
 
-## Instructions
+## Directions
 
 1. Heat up the frying pan and add some oil.
 2. Cut the potatoes into small pieces and fry them on the frying pan over
@@ -46,11 +46,11 @@ The ingredients here are for about 2-3 portions, depending on your appetite:
 9. Remove from stove, serve hot and enjoy with some beer or cider (or your
    favorite beverage).
 
-Originally published at [https://www.yaroslavps.com/food/beef-goulash/](https://www.yaroslavps.com/food/beef-goulash/)
-
 ## Contribution
 
-- Yaroslav de la Peña Smirnov — [website](https://www.yaroslavps.com/), 
+Originally published at [https://www.yaroslavps.com/food/beef-goulash/](https://www.yaroslavps.com/food/beef-goulash/)
+
+- Yaroslav de la Peña Smirnov -- [website](https://www.yaroslavps.com/), 
 [other website](https://saucesource.cc/),
 [donate](https://www.yaroslavps.com/donate)
 

src/beef-kidney

@@ -0,0 +1,36 @@
+# Beef Kidney
+
+My wife's beef kidney recipe
+
+- ⏲️ Prep time: 10 min
+- 🍳 Cook time: 45 min
+- 🍽️ Servings: 2
+
+## Ingredients
+
+- 1 beef kidney
+- 60g butter 
+- 2 onions
+- 2 shallots
+- 1 sprig of fresh parsley
+- 3 bay leaves
+- 400g croutons or toasted bread in pieces
+
+## Directions
+
+1. clean the kidney and remove the fat
+2. cut the kidney into small chunks (2cm or 3/4")
+3. put butter in a casserole dish
+4. add kidney, parsley, bay leaf, salt, pepper
+5. brown in the casserole for 10 minutes while stirring (don't burn)
+6. add 2 glasses of dry white wine
+7. add half a glass of water so that the mixture is well-bathed
+8. simmer for 35 minutes
+9. add about 400g of toasted bread in pieces
+10. simmer for another 10 minutes
+
+## Contribution
+
+Philip Wittamore - [Website](https://wittamore.com)
+
+;tags: kidney beef 

src/beef-stew.md

@@ -1,6 +1,6 @@
 # Traditional beef or lamb stew
 
-This is a recipe for a typical Irish stew. This is traditionally made with lamb since it's cheaper however, beef tastes a lot better and is more readily available in North America I've been told. This is good if you want to feed a family or if you just want to be lazy and eat the same thing for 2 or 3 days.
+This is a recipe for a typical Irish stew. This is traditionally made with lamb since it's cheaper however, beef tastes a lot better and is more readily available in North America I've been told. This is good if you want to feed a family or if you just want to be lazy and eat the same thing for 2 or 3 days. Besides browning the meat this is really just throwing stuff into a pot in a certain order. This is the kind of dish that tastes better the next day so it's ideal for making on a Sunday and eating for the next 2 or 3 days.
 
 Serve with mashed potatoes.
 
@@ -21,8 +21,6 @@ Serve with mashed potatoes.
 5. Add back in the meat and add in the stock and herbs. Lower the heat and allow to simmer for about 2 - 2.5 hours.
 6. After 2 hours the stew will be a bit thicker but probably still watery. The easiest thing to do is add some cut up potatoes for the last half hour. The starch will help thicken the stew considerably. Otherwise you can mix a teaspoon of flour with water in a cup and slowly add this to the stew while whisking.
 
-There you have it, an idiot-proof stew that should taste reasonably well. Besides browning the meat this is really just throwing stuff into a pot in a certain order. This is the kind of dish that tastes better the next day so it's ideal for making on a Sunday and eating for the next 2 or 3 days.
-
 ## Contribution
 
 - Eoin Coogan - [website](https://eoincoogan.com), [youtube](https://www.youtube.com/channel/UCehh50T6qtDpt_kEUF33GJw)