Merge pull request #18 from githubtraining/edits

Edit course to work on GHE also

Author: brianamarie

config.yml

@@ -8,29 +8,27 @@ template:
   name: github-pages-with-jekyll
   repo: github-pages-with-jekyll-template
 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.
-    event: deployment_status
+  - 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: gate
-        left: '%payload.deployment_status.state%'
-        operator: ===
-        right: success
-      - type: gate
-        left: '%payload.deployment.environment%'
-        operator: ===
-        right: github-pages
+      - type: octokit
+        method: repos.getPages
+        owner: '%payload.repository.owner.login%'
+        repo: '%payload.repository.name%'
+        action_id: pagesUrl
       - type: respond
         issue: 1
-        with: 02_update-index.md
+        with: 01_update-index.md
         data:
-          url: 'https://%user.username%.github.io/%payload.repository.name%'
+          deploymentUrl: '%actions.pagesUrl.data.html_url%'
+      - type: updateBranchProtection
 
   - title: Customize your homepage
     description: Open a pull request with changes to the homepage.
@@ -42,23 +40,17 @@ 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%'
-      - 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'
       - 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.
@@ -71,56 +63,22 @@ 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: push
-    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: octokit
+        method: repos.getPages
+        owner: '%payload.repository.owner.login%'
+        repo: '%payload.repository.name%'
+        action_id: pagesUrl
       - type: createIssue
         action_id: issue
         title: Getting ready to blog
-        body: 05_change-theme.md
+        body: 03_change-theme.md
+        data:
+          deploymentUrl: '%actions.pagesUrl.data.html_url%'      
       - 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
 
   - title: Customize site details
     description: Edit the configuration file to display your information.
@@ -148,7 +106,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
@@ -159,10 +117,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%'
           date: '%payload.pull_request.created_at%'
@@ -216,7 +174,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%'
@@ -225,7 +183,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
@@ -270,24 +228,30 @@ 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: removeBranchProtection
       - type: createReview
-        body: 09_merge-and-celebrate.md
+        body: 06_merge-and-celebrate.md
         event: APPROVE
 
   - title: Merge your first post
     description: Merge the pull request so your blog post will appear on your GitHub Pages site.
     event: pull_request.closed
     link: '{{ repoUrl }}/pulls'
     actions:
+      - type: octokit
+        method: repos.getPages
+        owner: '%payload.repository.owner.login%'
+        repo: '%payload.repository.name%'
+        action_id: pagesUrl
       - 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%'
+          deploymentUrl: '%actions.pagesUrl.data.html_url%'

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

@@ -2,7 +2,7 @@
 
 Welcome to GitHub Pages and Jekyll :tada:!
 
-If you're new to GitHub Pages, or you want to learn how to build and host a [GitHub Pages](https://pages.github.com) site, you're in the right place. With GitHub Pages, you can host content like [documentation](https://flight-manual.atom.io/), [resumes](https://github.com/jglovier/resume-template), or any other static content you’d like.
+If you're new to GitHub Pages, or you want to learn how to build and host a [GitHub Pages](https://pages.github.com) site, you're in the right place. With GitHub Pages, you can host content like [documentation](https://flight-manual.atom.io/), [resumes](https://github.com/jglovier/resume-template), or any other static content that you’d like.
 
 In this course, you'll create a blog hosted on GitHub Pages and learn how to:
 
@@ -12,23 +12,20 @@ In this course, you'll create a blog hosted on GitHub Pages and learn how to:
 
 ### New to GitHub?
 
-Before we can begin, 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 [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**]({{ repoUrl }}/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. Under your repository name, click [**Settings**]({{ repoUrl }}/settings).
+1. In the "GitHub Pages" section, in the Source drop-down, select **master branch**.
 
-After GitHub Pages is enabled, we'll be ready to create some content. 
-
-For a printable version of the steps in this course, check out the [Quick Reference Guide]({{ host }}/public/{{ course.slug }}.pdf).
+After GitHub Pages is enabled and the site is started, we'll be ready to create some more content. 
 
 > 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/01_update-index.md

@@ -0,0 +1,20 @@
+## Step 2: Customize your homepage
+
+Great job! Now that GitHub Pages is enabled, you can view your website here: {{ deploymentUrl }}
+
+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.
+
+### :keyboard: Activity: Create your homepage
+
+1. Navigate to the **Code** tab of this repository, and browse to the `index.md` file, or click this link [here]({{ repoUrl }}/blob/master/index.md)
+2. In the upper right corner, click the the icon to the right of the file to edit the `index.md` file
+3. Type the content you want on your homepage
+4. Scroll to the bottom, type a commit message, and click **Create a new branch for this commit and start a pull request**
+5. 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>

responses/01r_wrong-source.md

@@ -4,9 +4,9 @@ You can merge<sup>[:book:](https://help.github.com/articles/github-glossary/#mer
 
 ### :keyboard: Activity: Merge your pull request
 
-1. Click **Merge pull request** below
-1. Click **Confirm merge**
-1. Click **Delete branch**
+1. Click **Merge pull request** below.
+1. Click **Confirm merge**.
+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

@@ -0,0 +1,26 @@
+## Step 4: Customize Site Details
+
+Great work! You can see your published page [here]({{ deploymentUrl }}). If you don't see your changes right away, refresh the page.
+
+### Getting your page blog ready
+
+Jekyll uses a file titled `_config.yml` to store settings for your site, a your theme and reusable content like your site title and GitHub handle.
+
+You can check out the `_config.yml` file on the **Code** tab of your repository.
+
+### :keyboard: Activity: Modify the config file
+
+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 `jekyll-theme-minimal`.
+
+1. Navigate to the **Code** tab of this repository, and browse to the `_config.yml` file, or click this link [here]({{ repoUrl }}/blob/master/_config.yml).
+2. In the upper right corner, click :pencil2: to open the file editor.
+3. Add a `theme:` set to **jekyll-theme-minimal** so it shows in the `_config.yml` file as below:
+    ```
+    theme: jekyll-theme-minimal
+    ```
+4. Modify the other configuration variables such as `title:`, `author:`, and `description:` to customize your site.
+5. Click **Create a new branch for this commit and start a pull request**.
+6. Open a pull request.
+
+<hr>
+<h3 align="center">Look for my next response in your pull request.</h3>