Develop

README.md

@@ -29,7 +29,7 @@ Please leave this repository open in a browser tab so that you can follow along
 
 ## Next
 
-Next we will walk through the process of creating a Fork repository and setting up a local clone.
+Next we will walk through the process of creating a GitHub Fork and local clone of this repository.
 
 [Go](/walkthrough/1-setup.md)
 

app/index.md

@@ -8,16 +8,16 @@ 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/oatmeal-pancakes.md)
 
 ### [Eggs Benny](writer/eggs-benny.md) | englishmuffin@flavor.magazine
 
-[Vanilla Panna Cotta](recipe/jan/vanilla-panna-cotta.md)
+[Egg Benny](recipe/feb/egg-benny.md)
 
 ### [John Lemon](writer/john-lemon.md) | zestmaster@flavor.magazine
 
-[Homemade Sausages](recipe/jan/homemade-sausages.md)
+[John Lemon](recipe/feb/john-lemon.md)
 
 ### [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-feb.md)

app/recipe/feb/egg-benny.md

@@ -0,0 +1,19 @@
+#Egg Benny
+
+A short recipe description.
+
+Source: https://example.com/link/to/original/recipe/
+
+## Ingredients
+
+- Egg 
+- Pine nuts
+- dried cranberries
+- 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.
+

app/recipe/feb/john-lemon.md

@@ -0,0 +1,20 @@
+# Candied Carrots
+
+My family's favorite vegetable. They are great for the holidays, too!
+
+Source: https://www.allrecipes.com/recipe/18241/candied-carrots/
+
+## 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
+
+
+## Instructions
+
+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!
+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!
+

app/recipe/feb/madame-croque-feb.md

@@ -0,0 +1,34 @@
+# Roast Pork and Pickled Cucumber Sandwich
+
+The best roast pork you'll ever eat!
+
+Source: https://www.realsimple.com/food-recipes/browse-all-recipes/roast-pork-sandwich
+
+## Ingredients
+
+- IngredientsIngredient Checklist
+
+- 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
+
+- 2 teaspoons brown sugar
+
+- ⅓ cup mayonnaise
+
+- 4 Portuguese rolls, split
+
+# Instructions
+
+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. Meanwhile, combine the cucumber, vinegar, oil, brown sugar, and ¼ teaspoon each salt and black pepper in a medium bowl.
+3. Divide the mayonnaise, pork, and cucumber among the rolls.
+

app/recipe/feb/oatmeal-pancakes.md

@@ -0,0 +1,43 @@
+# Recipe Title
+
+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
+
+Step 1
+Place 1 cup milk in a microwave-safe bowl; heat in microwave until bubbling, about 2 minutes. Stir in the oats.
+
+Step 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.
+
+Step 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.

app/writer/cuba-pudding-jr.md

@@ -5,3 +5,5 @@
 Recipe Picks:
 
 - January: [Grilled Peach Salad](../recipe/jan/grilled-peach-salad.md)
+- February: [Oatmeal Pancakes](../recipe/feb/oatmeal-pancakes.md)
+

app/writer/eggs-benny.md

@@ -5,3 +5,5 @@
 Recipe Picks:
 
 - January: [Vanilla Panna Cotta](../recipe/jan/vanilla-panna-cotta.md)
+- Febuary: [Egg Benny](../recipe/feb/egg-benny.md)
+

app/writer/john-lemon.md

@@ -5,3 +5,4 @@
 Recipe Picks:
 
 - January: [Homemade Sausages](../recipe/jan/homemade-sausages.md)
+- Febuary: [John Lemon](../recipe/feb/john-lemon.md)

app/writer/madame-croque.md

@@ -5,3 +5,5 @@
 Recipe Picks:
 
 - January: [Chocolate Soup](../recipe/jan/chocolate-soup.md)
+- February: [Roast Pork and Pickled Cucumber Sandwich](../recipe/feb/madame-croque-feb.md)
+

walkthrough/1-setup.md

@@ -1,6 +1,6 @@
 # 1. Setup
 
-In order to contribute to a GitHub project, you will need two things: a Fork of the project and a local clone of your Fork.
+In order to contribute to a GitHub project, you will need two things: a GitHub Fork and a local clone of this project.
 
 ## :running: Activities
 
@@ -15,19 +15,22 @@ Fork the source repository:
    1. Visit https://github.com/source-username/repository-name.
    2. Click the "fork" button, and choose your personal GitHub account if prompted.
 
+---
+
+:cop: :raised_hand: - Please wait until everyone has caught up.
+
+:construction: :construction: :construction: :construction: :construction: :construction: :construction: :construction: :construction: :construction: :construction: :construction: :construction: :construction: :construction:
+
+---
 
 ### 2 - Clone your Fork
 
 __All Team Members__
 
-Fork the source repository:
-   1. Visit https://github.com/source-username/repository-name.
-   2. Click the "fork" button, and choose your personal GitHub account if prompted.
-
-Clone your fork to your local machine:
+Clone this project to your local machine:
 ```sh
 $ cd ~/my/parent/directory
-$ git clone https://github.com/username/repository-name.git
+$ git clone https://github.com/source-username/repository-name.git
 # clone the fork repository from GitHub
 
 $ cd repository-name
@@ -40,16 +43,16 @@ $ git remote
 origin
 
 $ git remote -v
-origin https://github.com/username/repository-name.git (fetch)
-origin https://github.com/username/repository-name.git (push)
+origin https://github.com/source-username/repository-name.git (fetch)
+origin https://github.com/source-username/repository-name.git (push)
 ```
 
-You should see an `origin` remote that points to your GitHub fork:
+You should see an `origin` remote that points to the source GitHub project:
 ```sh
 $ git remote show origin
 * remote origin
-  Fetch URL: https://github.com/username/repository-name.git
-  Push  URL: https://github.com/username/repository-name.git
+  Fetch URL: https://github.com/source-username/repository-name.git
+  Push  URL: https://github.com/source-username/repository-name.git
   HEAD branch: master
   Remote branches:
     develop tracked
@@ -88,66 +91,54 @@ $ git branch -a
 
 ---
 
-### 3 - Add Remote for Source Repository
+### 3 - Add Remote for your GitHub Fork
 
 __All Team Members__
 
-Add a `source` remote:
+Add a `me` remote:
 ```sh
-$ git remote add source https://github.com/source-username/repository-name.git
-# add the source remote
+$ git remote add me https://github.com/your-username/repository-name.git
+# add the me remote
 
 $ git remote -v
-origin https://github.com/username/repository-name.git (fetch)
-origin https://github.com/username/repository-name.git (push)
-source https://github.com/source-username/repository-name.git (fetch)
-source https://github.com/source-username/repository-name.git (push)
+origin https://github.com/source-username/repository-name.git (fetch)
+origin https://github.com/source-username/repository-name.git (push)
+me https://github.com/your-username/repository-name.git (fetch)
+me https://github.com/your-username/repository-name.git (push)
 ```
 
-You should see a `source` remote that points to the upstream GitHub source repository:
+You should see a `me` remote that points to your GitHub Fork repository:
 ```sh
-$ git remote show source
-* remote origin
-  Fetch URL: https://github.com/source-username/repository-name.git
-  Push  URL: https://github.com/source-username/repository-name.git
+$ git remote show me
+* remote me
+  Fetch URL: https://github.com/your-username/repository-name.git
+  Push  URL: https://github.com/your-username/repository-name.git
   HEAD branch: master
   Remote branches:
-    develop new (next fetch will store in remotes/source)
-    master  new (next fetch will store in remotes/source)
+    develop new (next fetch will store in remotes/me)
+    master  new (next fetch will store in remotes/me)
   Local ref configured for 'git push':
     master  pushes to master (up to date)
 ```
 
 Maintainers will need to create branches and push directly to the source repository.
 
-All team members will need to pull changes from the source repository and merge them into
-their own branches.
+All team members will need to pull changes from the source repository in order to branch from for feature branches.
 
-Fetch branch data from the `source` remote:
+Fetch branch data from the `origin` remote:
 ```sh
-$ git fetch source
+$ git fetch origin
 From https://github.com/source-username/repository-name
-* [new branch]      develop    -> source/develop
-* [new branch]      master     -> source/master
+* [new branch]      develop    -> origin/develop
+* [new branch]      master     -> origin/master
 
 $ git branch -a
 * master
   remotes/origin/HEAD -> origin/master
   remotes/origin/develop
   remotes/origin/master
-  remotes/source/develop
-  remotes/source/master
-
-$ git remote show source
-* remote source
-  Fetch URL: https://github.com/source-username/repository-name.git
-  Push  URL: https://github.com/source-username/repository-name.git
-  HEAD branch: master
-  Remote branches:
-    develop tracked
-    master tracked
-  Local ref configured for 'git push':
-     master pushes to master (up to date)
+  remotes/me/develop
+  remotes/me/master
 ```
 
 ---
@@ -164,19 +155,19 @@ __All Team Members__
 
 By now you should have noticed that you do not have a local `develop` branch
 ```sh
-git branch
+$ git branch
 * master
 ```
 
-Create a `develop` branch that tracks from your GitHub fork's `develop` branch:
+Create a `develop` branch that tracks from `origin`'s `develop` branch:
 ```sh
-git branch develop origin/develop
+$ git checkout -b develop --track origin/develop
 Branch develop set up to track remote branch develop from origin
 ```
 
-Notice that viewing the details for the `origin` remote indicates that the local `develop` and `master` branches are configured to push to and pull from your GitHub fork's branches:
+Notice that viewing the details for the `origin` remote indicates that the local `develop` and `master` branches are configured to push to and pull from the source GitHub repository's branches:
 ```sh
-git remote show origin
+$ git remote show origin
 ...
    Local branches configured for 'git pull':
      develop merges with remote develop
@@ -188,11 +179,13 @@ git remote show origin
 
 :bulb: The `-vv` flag for the `git branch` command will also show the remote branches that are tracked by your local branches (in brackets):
 ```sh
-git branch --vv
-  develop 3e03a92 [origin/develop] Create example app
-* master  3e03a92 [origin/master] Create example app
+$ git branch -vv
+* develop 3e03a92 [origin/develop] Create example app
+  master  3e03a92 [origin/master] Create example app
 ```
 
+You should now be ready to move on to the rest of the walkthrough. If you'd like to see the repository you've created on your local machine in GitHub desktop, you can add a repository by choosing a local path.
+
 ---
 
 :cop: :raised_hand: - Please wait until everyone has caught up.
@@ -201,8 +194,6 @@ git branch --vv
 
 ---
 
-You should now be ready to move on to the rest of the walkthrough. If you'd like to see the repository you've created on your local machine in GitHub desktop, you can add a repository by choosing a local path.
-
 ## Next
 
 Next we will walk through the process of creating feature branches, publishing changes to GitHub, and making a request to merge changes into the source repository using a Pull Request.