From 315e78ace560824be14b67f20faf1ad79b511d95 Mon Sep 17 00:00:00 2001 From: callistalyq Date: Mon, 29 Mar 2021 14:49:45 +0800 Subject: [PATCH 01/15] Adding Madame Croque Feb Recipe --- app/recipe/feb/madame-croque.md | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 app/recipe/feb/madame-croque.md diff --git a/app/recipe/feb/madame-croque.md b/app/recipe/feb/madame-croque.md new file mode 100644 index 00000000..9e3c8ed1 --- /dev/null +++ b/app/recipe/feb/madame-croque.md @@ -0,0 +1,31 @@ +# Madame Croque + +Roast Pork and Pickled Cucumber Sandwich + +Source: http://www.realsimple.com/food-recipes/browse-all-recipes/roast-pork-sandwich/ + +## Ingredients + +- 1 pound boneless pork loin + +- ½ teaspoon cayenne pepper + +- kosher salt and black pepper + +- 1 cucumber, thinly sliced + +- 3 tablespoons cider vinegar + +- 2 tablespoons olive oil + + +# Instructions + +1. Step 1 +Heat oven to 450° F. Season the pork with the cayenne and ¼ teaspoon salt. Roast on a rimmed baking sheet until an instant-read thermometer inserted in the center reaches 145° F, 20 to 25 minutes; thinly slice. + +2. Step 2 +Meanwhile, combine the cucumber, vinegar, oil, brown sugar, and ¼ teaspoon each salt and black pepper in a medium bowl. + +3. Step 3 +Divide the mayonnaise, pork, and cucumber among the rolls. \ No newline at end of file From d9fab41427d5b63a83fa2e70707579c93ddd257f Mon Sep 17 00:00:00 2001 From: Yung Keong Wong Date: Mon, 29 Mar 2021 14:50:26 +0800 Subject: [PATCH 02/15] comments --- app/writer/cuba-pudding-jr.md | 1 + 1 file changed, 1 insertion(+) diff --git a/app/writer/cuba-pudding-jr.md b/app/writer/cuba-pudding-jr.md index dc2bfe39..f3fc0e0e 100644 --- a/app/writer/cuba-pudding-jr.md +++ b/app/writer/cuba-pudding-jr.md @@ -5,3 +5,4 @@ Recipe Picks: - January: [Grilled Peach Salad](../recipe/jan/grilled-peach-salad.md) +- February: [Quick OAtmeal Pudding] (../recipe/feb/quick-oatmeal-pudding.md) \ No newline at end of file From e3726d1c4d16c2bb2d89a1c73ef4f98aa52f1a63 Mon Sep 17 00:00:00 2001 From: Walter Chen Date: Mon, 29 Mar 2021 14:58:28 +0800 Subject: [PATCH 03/15] Adding John Lemon's Feb Recipe --- app/recipe/feb/john-lemon.md | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 app/recipe/feb/john-lemon.md diff --git a/app/recipe/feb/john-lemon.md b/app/recipe/feb/john-lemon.md new file mode 100644 index 00000000..63542bb2 --- /dev/null +++ b/app/recipe/feb/john-lemon.md @@ -0,0 +1,16 @@ +# John Lemon +Ingredients: + +1 pound carrots, cut into 2 inch pieces +2 tablespoons butter, diced +¼ cup packed brown sugar +1 pinch salt +1 pinch ground black pepper + +Directions: + +Step 1 +Place carrots in a pot of salted water. Bring water to a boil, reduce heat to a high simmer and cook about 20 to 30 minutes. Do not cook the carrots to a mushy stage! + + Step 2 +Drain the carrots, reduce the heat to its lowest possible setting and return the carrots to the pan. Stir in butter, brown sugar, salt and pepper. Cook for about 3 to 5 minutes, until sugar is bubbly. Serve hot! \ No newline at end of file From 50fd0b7858344214d6effef9f4ebd4303efac966 Mon Sep 17 00:00:00 2001 From: Yung Keong Wong Date: Mon, 29 Mar 2021 15:04:19 +0800 Subject: [PATCH 04/15] Adding Feb Recipe --- app/recipe/feb/quick-oatmeal.md | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 app/recipe/feb/quick-oatmeal.md diff --git a/app/recipe/feb/quick-oatmeal.md b/app/recipe/feb/quick-oatmeal.md new file mode 100644 index 00000000..45eb6afc --- /dev/null +++ b/app/recipe/feb/quick-oatmeal.md @@ -0,0 +1,28 @@ +# Quick Oatmeal Pancakes + +A short recipe description. + +Source: https://www.allrecipes.com/recipe/228654/quick-oatmeal-pancakes/ + +## Ingredients + +- 1 cup milk +- ⅔ cup quick-cooking oats +- ⅔ cup all-purpose flour +- 2 tablespoons brown sugar +- 1 ½ teaspoons baking powder +- ½ teaspoon salt +- ¼ teaspoon ground cinnamon +- 2 eggs +- 2 teaspoons butter, melted +- ½ teaspoon vanilla extract +- ¼ cup milk, or more as needed +- 2 teaspoons butter, or as needed + + +# Instructions + +1. Place 1 cup milk in a microwave-safe bowl; heat in microwave until bubbling, about 2 minutes. Stir in the oats. +2. Mix flour, brown sugar, baking powder, salt, and cinnamon together in a bowl. Whisk eggs, 2 teaspoons melted butter, and vanilla extract together in a separate bowl; add 1/4 cup milk. Mix oat mixture and egg mixture with flour mixture; stir to combine. +3. Heat 2 teaspoons butter on a griddle or skillet over medium heat; pour about 1/3 cup batter into the hot butter. Cook pancakes until bubbles appear on top layer, about 5 minutes. Flip and cook other side until evenly browned, about 5 more minutes. + From 35993bb1e8218822443e4576b9a700c940593fe9 Mon Sep 17 00:00:00 2001 From: mohdgit95 Date: Mon, 29 Mar 2021 15:05:30 +0800 Subject: [PATCH 05/15] Adding eggs benny --- app/recipe/feb/eggs-benny.md | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 app/recipe/feb/eggs-benny.md diff --git a/app/recipe/feb/eggs-benny.md b/app/recipe/feb/eggs-benny.md new file mode 100644 index 00000000..3d55545a --- /dev/null +++ b/app/recipe/feb/eggs-benny.md @@ -0,0 +1,23 @@ +# Eggs Benny + +- Febuary: [Eggs Benny] + + + +A short recipe description. + +Source: http://allrecipes.com/recipe/174361/asparagus-with-cranberries-and-pine-nuts/ + +## Ingredients + +- 1 bunch asparagus +- 3 tablespoons olive oil +- ⅓ cup pine nuts +- ⅓ cup dried cranberries +- 1 pinch salt + + +# Instructions + +1. Break off or trim the woody ends from the asparagus and discard. Set the spears aside. +2. Heat the olive oil in a skillet over medium heat. Stir in the pine nuts, cranberries, and salt. Cook and stir until the pine nuts start to look translucent, 5 to 6 minutes. Add the asparagus spears and cook, adding a little more olive oil if needed, until stalks are bright green and tender, about 5 to 8 minutes. Serve on a platter with the cranberries and nuts spooned over the top of the asparagus. From 0a1d8e5ae6b89bdd72dad2274e8f1f33b83b1f4b Mon Sep 17 00:00:00 2001 From: callistalyq Date: Mon, 29 Mar 2021 15:15:55 +0800 Subject: [PATCH 06/15] update writer feb madame croque --- app/index.md | 2 +- app/writer/madame-croque.md | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/index.md b/app/index.md index 60586822..b4b1d2f2 100644 --- a/app/index.md +++ b/app/index.md @@ -20,4 +20,4 @@ Welcome to _Flavor_, the only place on the planet where your taste buds won't be ### [Madame Croque](writer/madame-croque.md) | mmecroque@flavor.magazine -[Chocolate Soup](recipe/jan/chocolate-soup.md) +[Roast Pork and Pickled Cucumber Sandwich](recipe/feb/madame-croque.md) diff --git a/app/writer/madame-croque.md b/app/writer/madame-croque.md index 68c5fbe8..e888fffd 100644 --- a/app/writer/madame-croque.md +++ b/app/writer/madame-croque.md @@ -1,7 +1,7 @@ # Madame Croque - + Recipe Picks: -- January: [Chocolate Soup](../recipe/jan/chocolate-soup.md) +- Feburary: [Roast Pork and Pickled Cucumber Sandwich](http://www.realsimple.com/food-recipes/browse-all-recipes/roast-pork-sandwich/) From d79320c90cbc43f2f1244109a3ccbe4e841558df Mon Sep 17 00:00:00 2001 From: Walter Chen Date: Mon, 29 Mar 2021 15:27:27 +0800 Subject: [PATCH 07/15] Editing John Lemon's Feb Recipe --- app/recipe/feb/john-lemon.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/recipe/feb/john-lemon.md b/app/recipe/feb/john-lemon.md index 63542bb2..8bbe1728 100644 --- a/app/recipe/feb/john-lemon.md +++ b/app/recipe/feb/john-lemon.md @@ -1,4 +1,8 @@ # John Lemon +Candied Carrots + + + Ingredients: 1 pound carrots, cut into 2 inch pieces From c00f8fe4a7f6587734957880c8d2e57c8bbfe798 Mon Sep 17 00:00:00 2001 From: Yung Keong Wong Date: Mon, 29 Mar 2021 15:31:48 +0800 Subject: [PATCH 08/15] Adding Feb Writer --- app/writer/cuba-pudding-jr.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/writer/cuba-pudding-jr.md b/app/writer/cuba-pudding-jr.md index f3fc0e0e..8680d180 100644 --- a/app/writer/cuba-pudding-jr.md +++ b/app/writer/cuba-pudding-jr.md @@ -1,8 +1,8 @@ # Cuba Pudding Jr. - +Quick Oatmeal Pancakes Recipe Picks: - January: [Grilled Peach Salad](../recipe/jan/grilled-peach-salad.md) -- February: [Quick OAtmeal Pudding] (../recipe/feb/quick-oatmeal-pudding.md) \ No newline at end of file +- February: [Quick Oatmeal Pudding] (../recipe/feb/quick-oatmeal-pudding.md) \ No newline at end of file From 28b73e6b0b572a464766be80bb3a5622e2ab880a Mon Sep 17 00:00:00 2001 From: Yung Keong Wong Date: Mon, 29 Mar 2021 15:33:02 +0800 Subject: [PATCH 09/15] Adding Feb Index --- app/index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/index.md b/app/index.md index 60586822..d9dc8cb2 100644 --- a/app/index.md +++ b/app/index.md @@ -8,7 +8,7 @@ Welcome to _Flavor_, the only place on the planet where your taste buds won't be ### [Cuba Pudding Jr.](writer/cuba-pudding-jr.md) | cubapud@flavor.magazine -[Grilled Peach Salad](recipe/jan/grilled-peach-salad.md) +[Grilled Peach Salad](recipe/feb/quick-oatmeal.md) ### [Eggs Benny](writer/eggs-benny.md) | englishmuffin@flavor.magazine From c34d494c47f2accf7c473675d2bbf8671524b3be Mon Sep 17 00:00:00 2001 From: mohdgit95 Date: Mon, 29 Mar 2021 15:34:19 +0800 Subject: [PATCH 10/15] Adding eggs benny picture --- app/writer/eggs-benny.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/writer/eggs-benny.md b/app/writer/eggs-benny.md index 18d7bb16..4c606077 100644 --- a/app/writer/eggs-benny.md +++ b/app/writer/eggs-benny.md @@ -1,7 +1,8 @@ # Eggs Benny - + Recipe Picks: - January: [Vanilla Panna Cotta](../recipe/jan/vanilla-panna-cotta.md) +- Febuary: [Eggs benny](git-flow-exercise/app/recipe/feb/eggs-benny.md) \ No newline at end of file From ae3d8ee886495bbedbcc75a797f4a9134fecd04d Mon Sep 17 00:00:00 2001 From: Yung Keong Wong Date: Mon, 29 Mar 2021 15:44:43 +0800 Subject: [PATCH 11/15] Revise Image of recipe --- app/writer/cuba-pudding-jr.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/writer/cuba-pudding-jr.md b/app/writer/cuba-pudding-jr.md index 8680d180..51fd1941 100644 --- a/app/writer/cuba-pudding-jr.md +++ b/app/writer/cuba-pudding-jr.md @@ -1,7 +1,6 @@ # Cuba Pudding Jr. -Quick Oatmeal Pancakes - + Recipe Picks: - January: [Grilled Peach Salad](../recipe/jan/grilled-peach-salad.md) From c8ec1a4e8a57a33d422bd72f8bb19dceb20aa5d8 Mon Sep 17 00:00:00 2001 From: mohdgit95 Date: Mon, 29 Mar 2021 15:44:59 +0800 Subject: [PATCH 12/15] update of index --- app/index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/index.md b/app/index.md index 60586822..67e43694 100644 --- a/app/index.md +++ b/app/index.md @@ -12,7 +12,7 @@ Welcome to _Flavor_, the only place on the planet where your taste buds won't be ### [Eggs Benny](writer/eggs-benny.md) | englishmuffin@flavor.magazine -[Vanilla Panna Cotta](recipe/jan/vanilla-panna-cotta.md) +[Eggs Benny](git-flow-exercise/app/recipe/feb/eggs-benny.md) ### [John Lemon](writer/john-lemon.md) | zestmaster@flavor.magazine From 20a27cb47a6a782e81e3cb1d212d3a77926dd8e0 Mon Sep 17 00:00:00 2001 From: Walter Chen Date: Mon, 29 Mar 2021 15:45:16 +0800 Subject: [PATCH 13/15] Adding John Lemon to Index --- app/index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/index.md b/app/index.md index b4b1d2f2..08a76200 100644 --- a/app/index.md +++ b/app/index.md @@ -16,7 +16,7 @@ Welcome to _Flavor_, the only place on the planet where your taste buds won't be ### [John Lemon](writer/john-lemon.md) | zestmaster@flavor.magazine -[Homemade Sausages](recipe/jan/homemade-sausages.md) +[Candied Carrots](recipe/feb/john-lemon.md) ### [Madame Croque](writer/madame-croque.md) | mmecroque@flavor.magazine From 37805c0f083843a8f7e1fe2a9f334be8d6925d4e Mon Sep 17 00:00:00 2001 From: mohdgit95 Date: Mon, 29 Mar 2021 15:49:06 +0800 Subject: [PATCH 14/15] update of writer --- app/writer/eggs-benny.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/writer/eggs-benny.md b/app/writer/eggs-benny.md index 4c606077..f95a3911 100644 --- a/app/writer/eggs-benny.md +++ b/app/writer/eggs-benny.md @@ -1,6 +1,6 @@ # Eggs Benny - + Recipe Picks: From 7b9a7414a0bae901d62b0c4769a8865599fe0baf Mon Sep 17 00:00:00 2001 From: Yung Keong Wong Date: Mon, 29 Mar 2021 15:49:17 +0800 Subject: [PATCH 15/15] Revise Image of recipe --- app/writer/cuba-pudding-jr.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/writer/cuba-pudding-jr.md b/app/writer/cuba-pudding-jr.md index 51fd1941..4dc8c687 100644 --- a/app/writer/cuba-pudding-jr.md +++ b/app/writer/cuba-pudding-jr.md @@ -1,6 +1,6 @@ # Cuba Pudding Jr. - + Recipe Picks: - January: [Grilled Peach Salad](../recipe/jan/grilled-peach-salad.md)