Merge pull request #3 from briana-the-org/reorder-steps

Reorder steps

Author: brianamarie

config.yml

@@ -11,16 +11,17 @@ before:
   - type: updateBranchProtection
   - type: createIssue
     title: Welcome
-    body: 01_class-introduction-issue.md
+    body: 00_class-introduction-issue.md
+    
 steps:
-  - title: Enable GitHub Pages
-    description: Turn on GitHub Pages in your repository.
+  - title: Generate a GitHub Pages site
+    description: Generate a GitHub Pages site with the automatic page generator. 
     event: page_build
     link: '{{ repoUrl }}/issues/1'
     actions:
       - type: respond
         issue: 1
-        with: 02_update-index.md
+        with: 01_update-index.md
         data:
           url: 'https://%user.username%.github.io/%payload.repository.name%'
 
@@ -34,7 +35,7 @@ steps:
         required: false
         else:
           type: respond
-          with: 06a_pull-request-blank.md
+          with: 02_pull-request-blank.md
       - type: getTree
         action_id: tree
         sha: '%payload.pull_request.head.sha%'
@@ -43,14 +44,13 @@ steps:
           - left: '%actions.tree.data.tree%'
             operator: includes
             right: 'path:index.html'
-          - left: '%actions.tree.data.tree%'
-            operator: includes
-            right: 'path:index.md'
       - type: createReview
-        body: 02r_merge-pr.md
+        body: 02_merge-pr.md
         event: APPROVE
         data:
           branch: '%payload.pull_request.head.ref%'
+      - type: closeIssue
+        issue: Welcome
 
   - title: Merge your pull request
     description: Merge the pull request that customizes your homepage.
@@ -63,56 +63,16 @@ steps:
         left: '%payload.pull_request.base.ref%'
         operator: ===
         right: 'master'
-      - type: getTree
-        action_id: tree
-        sha: '%payload.pull_request.head.sha%'
-      - type: gate
-        gates:
-          - left: '%actions.tree.data.tree%'
-            operator: includes
-            right: 'path:index.html'
-          - left: '%actions.tree.data.tree%'
-            operator: includes
-            right: 'path:index.md'
-        else:
-          type: respond
-          with: 02_wrong-file-updated.md
-      - type: createIssue
-        action_id: issue
-        title: Adding a Theme
-        body: 03_add-a-theme.md
-      - type: closeIssue
-        issue: Welcome
-      - type: removeBranchProtection
-      - type: respond
-        with: 04_moving-on-pr.md
-        data:
-          url: '%actions.issue.data.html_url%'
-
-  - title: Add a theme
-    description: Using the theme chooser, select a theme for your site.
-    event: page_build
-    link: '{{ repoUrl }}/issues'
-    actions:
-      - type: getFileContents
-        action_id: fileContents
-        filename: _config.yml
-      - type: gate
-        left: '/^theme:/m'
-        operator: test
-        right: '%actions.fileContents%'
       - type: updateBranchProtection
       - type: createIssue
         action_id: issue
         title: Getting ready to blog
-        body: 05_change-theme.md
+        body: 03_change-theme.md
       - type: respond
-        with: 04_moving-on.md
-        issue: Adding a Theme
+        with: 03_merged-pr.md
         data:
           url: '%actions.issue.data.html_url%'
-      - type: closeIssue
-        issue: Adding a Theme
+      - type: removeBranchProtection
 
   - title: Customize site details
     description: Edit the configuration file to display your information.
@@ -140,7 +100,7 @@ steps:
         left: '%payload.pull_request.body%'
         else:
           type: respond
-          with: 06a_pull-request-blank.md
+          with: 02_pull-request-blank.md
       - type: getFileContents
         filename: _config.yml
         action_id: file
@@ -151,10 +111,10 @@ steps:
         else:
           type: createReview
           event: REQUEST_CHANGES
-          body: 05r_wrong-theme.md
+          body: 04_wrong-theme.md
       - type: createReview
         event: COMMENT
-        body: 07_create-blog-post.md
+        body: 04_create-blog-post.md
         data:
           branch: '%payload.pull_request.head.ref%'
 
@@ -207,7 +167,7 @@ steps:
           - left: '%actions.filename%'
         else:
           - type: createReview
-            body: 07b_incorrect-post.md
+            body: 05_incorrect-post.md
             event: REQUEST_CHANGES
             data:
               directory: '%actions.directory%'
@@ -216,7 +176,7 @@ steps:
               extension: '%actions.extension%'
               filename: '%actions.filename%'
       - type: createReview
-        body: 08_add-front-matter.md
+        body: 05_add-front-matter.md
         event: COMMENT
 
   - title: Add blog post metadata
@@ -261,14 +221,14 @@ steps:
           - left: '%actions.date%'
         else:
           - type: createReview
-            body: 08r_incorrect-front-matter.md
+            body: 06_incorrect-front-matter.md
             event: REQUEST_CHANGES
             data:
               date: '%actions.date%'
               title: '%actions.title%'
               dashes: '%actions.dashes%'
       - type: createReview
-        body: 09_merge-and-celebrate.md
+        body: 06_merge-and-celebrate.md
         event: APPROVE
 
   - title: Merge your first post
@@ -279,6 +239,6 @@ steps:
       - type: gate
         left: '%payload.pull_request.merged%'
       - type: respond
-        with: 10_next-steps.md
+        with: 07_next-steps.md
         data:
           url: 'https://%user.username%.github.io/%payload.repository.name%'

responses/01_class-introduction-issue.md responses/00_class-introduction-issue.mdresponses/01_class-introduction-issue.md renamed to responses/00_class-introduction-issue.md

@@ -12,23 +12,26 @@ In this course, you'll create a blog hosted on GitHub Pages and learn how to:
 
 ### New to GitHub?
 
-For this course, you'll need to know how to create a branch on GitHub, commit changes using Git, and open a pull request on GitHub. If you need a refresher on the GitHub flow, check out the [the Introduction to GitHub course]({{ host}}/courses/introduction-to-github).
+For this course, you'll need to know how to create a branch on GitHub, commit changes using Git, and open a pull request on GitHub. If you need a refresher on the GitHub flow, check out the [the Introduction to GitHub course]({{ host }}/courses/introduction-to-github).
 
-### :keyboard: Activity: Turn on GitHub Pages
+### :keyboard: Activity: Generate a GitHub Pages site
 
 The first step to publishing your blog to the web is to enable GitHub Pages on this repository <sup>[:book:](https://help.github.com/articles/github-glossary/#repository)</sup>. When you enable GitHub Pages on a repository, GitHub takes the content that's on the master branch and publishes a website based on its contents.
 
 1. Under your repository name, click [**Settings**](https://github.com/{{ owner }}/{{ repo }}/settings)
-1. In the "GitHub Pages" section, use the Select source drop-down menu to select the `master branch` as your GitHub Pages publishing source.
-1. Click **Save**
+1. In the "GitHub Pages" section, click **Launch automatic page generator**
+1. Edit the **Project name** and **Body** to be what you'd like your main page to display
+1. Click **Continue to layouts**
+1. Select a layout 
+1. Click **Publish page**
 
-After GitHub Pages is enabled, we'll be ready to create some content. 
+After GitHub Pages is enabled and the site is started, we'll be ready to create some more content. 
 
 For a printable version of the steps in this course, check out the [Quick Reference Guide]({{ host }}/public/{{ course.slug }}.pdf).
 
 > Turning on GitHub Pages creates a deployment of your repository. I may take up to a minute to respond as I await the deployment.
 
 <hr>
-<h3 align="center">Return to this issue for my next comment</h3>
+<h3 align="center">Return to this issue for my next comment.</h3>
 
 > _Sometimes I respond too fast for the page to update! If you perform an expected action and don't see a response from me, wait a few seconds and refresh the page for your next steps._

responses/02_update-index.md responses/01_update-index.mdresponses/02_update-index.md renamed to responses/01_update-index.md

@@ -4,17 +4,17 @@ Great job! Now that GitHub Pages is enabled, you can view your website here: htt
 
 You can customize your homepage by adding content to either an `index` file or the `README.md` file. GitHub Pages first looks for an `index` file. If an `index` file is found, GitHub Pages uses the content in the file to create the homepage. If an `index` file isn’t found, it uses the `README.md` to create the homepage.
 
-Your repository has an `index.md` file so we can update it to include your personalized content.
+Your repository has an `index.html` file so we can update it to include your personalized content.
 
 ### :keyboard: Activity: Create your homepage
 
-1. Navigate to the **Code** tab of this repository, and browse to the `index.md` file.
-1. In the upper right corner, click the :pencil2: pencil icon to open the file editor.
-1. Type the content you want on your homepage and remember, [you can use Markdown](https://help.github.com/articles/basic-writing-and-formatting-syntax/) to format your content.
-1. Scroll to the bottom, type a commit message, and click **Create a new branch for this commit and start a pull request**.
-1. Open a pull request.
+1. Navigate to the **Code** tab of this repository, and browse to the `index.html` file
+1. In the upper right corner, click the :pencil2: pencil icon to open the file editor
+2. Type the content you want on your homepage
+3. Scroll to the bottom, type a commit message, and click **Create a new branch for this commit and start a pull request**
+4. Open a pull request
 
 > Once you have created your pull request, I will move over there to discuss next steps.
 
 <hr>
-<h3 align="center">Look for my next response in your pull request</h3>
+<h3 align="center">Look for my next response in your pull request.</h3>

responses/01r_wrong-source.md

@@ -9,4 +9,4 @@ You can merge<sup>[:book:](https://help.github.com/articles/github-glossary/#mer
 1. Click **Delete branch**
 
 <hr>
-<h3 align="center">Watch below for my response</h3>
+<h3 align="center">Watch below for my response.</h3>

responses/02r_merge-pr.md responses/02_merge-pr.mdresponses/02r_merge-pr.md renamed to responses/02_merge-pr.md

@@ -8,4 +8,4 @@ For example, if you type `closes #2` in your pull request description, the open
 If you would like assistance troubleshooting the issue you are encountering, create a post on the [GitHub Community]({{ communityBoard }}) board. You might also want to search for your issue to see if other people have resolved it in the past.
 
 <hr>
-<h3 align="center">Check below for next steps</h3>
+<h3 align="center">Check below for next steps.</h3>

responses/06a_pull-request-blank.md responses/02_pull-request-blank.mdresponses/06a_pull-request-blank.md renamed to responses/02_pull-request-blank.md

@@ -1,4 +1,4 @@
-## Step 5: Customize Site Details
+## Step 4: Customize Site Details
 
 Great work! You can see your selected theme in action [here](https://{{ user.username }}.github.io/{{ repo }}). If you don't see your changes right away, refresh the page.
 
@@ -12,11 +12,11 @@ You can check out the `_config.yml` file on the **Code** tab of your repository.
 
 Let's change the `_config.yml` so it's a perfect fit for your new blog. First, we need to use a blog-ready theme. For this activity, we will use a theme named `minima`.
 
-1. Navigate to the **Code** tab of this repository, and browse to the `_config.yml` file.
-1. In the upper right corner, click :pencil2: to open the file editor.
-1. Change `theme:` to **minima** and modify the other configuration variables such as `title:`, `author:`, and `description:` to customize your site.
-1. Click **Create a new branch for this commit and start a pull request**.
-1. Open a pull request.
+1. Navigate to the **Code** tab of this repository, and browse to the `_config.yml` file
+1. In the upper right corner, click :pencil2: to open the file editor
+1. Change `theme:` to **minima** and modify the other configuration variables such as `title:`, `author:`, and `description:` to customize your site
+1. Click **Create a new branch for this commit and start a pull request**
+1. Open a pull request
 
 <hr>
-<h3 align="center">Look for my next response in your pull request</h3>
+<h3 align="center">Look for my next response in your pull request.</h3>