Merge pull request #25 from githubtraining/suggested-changes

hectorsector · web-flow · commit 2c1c97131dce · 2019-05-30T15:35:05.000-04:00
Use suggested changes
diff --git a/config.yml b/config.yml
@@ -44,8 +44,11 @@ steps:
       - type: closeIssue
         issue: Welcome
         action_id: prev
-      - type: respond
-        with: 02-html-structure.md
+        required: false
+      - type: createPullRequestComment
+        body: 02-html-structure.md
+        file: index.html
+        position: 1
         data:
           welcomeLink: "%actions.prev.data.html_url%"
 
@@ -76,9 +79,10 @@ steps:
           type: createReview
           body: 03e-add-html.md
           event: REQUEST_CHANGES
-      - type: createReview
-        event: COMMENT
+      - type: createPullRequestComment
         body: 03-title-tag.md
+        file: index.html
+        position: 2
 
   - title: Add a title tag
     description: Add a title tag
@@ -159,6 +163,7 @@ steps:
         else:
           type: closeIssue
           issue: Add a header
+          required: false
       - type: getFileContents
         filename: index.html
         action_id: index_file
@@ -173,9 +178,10 @@ steps:
           type: createReview
           event: REQUEST_CHANGES
           body: 05e-troubleshoot-h1.md
-      - type: createReview
-        event: COMMENT
+      - type: createPullRequestComment
         body: 06-add-image.md
+        file: index.html
+        position: 5
 
   - title: Add an image
     description: Add an image
@@ -248,6 +254,7 @@ steps:
         else:
           type: closeIssue
           issue: Create a list
+          required: false
       - type: getFileContents
         filename: index.html
         action_id: index_file
@@ -269,9 +276,10 @@ steps:
           type: createReview
           body: 08e-list.md
           event: REQUEST_CHANGES
-      - type: createReview
+      - type: createPullRequestComment
         body: 09-add-links.md
-        event: COMMENT
+        file: index.html
+        position: 7
 
   - title: Add links
     description: Add links
diff --git a/course-description.md b/course-description.md
diff --git a/responses/01-welcome.md b/responses/01-welcome.md
@@ -27,4 +27,4 @@ It isn't enough to simply create a webpage on GitHub. You must deploy your webpa
 > _For more information, see [Configuring a publishing source for GitHub Pages](https://help.github.com/articles/configuring-a-publishing-source-for-github-pages/) in the GitHub Help._
 
 <hr>
-<h3 align="center">I'll respond in this issue after you've enabled GitHub Pages.</h3>
+<h3 align="center">I'll respond in this issue after GitHub Pages has finished deploying your site.</h3>
diff --git a/responses/02-html-structure.md b/responses/02-html-structure.md
@@ -23,13 +23,25 @@ In HTML, spacing doesn't really matter. We've added some tabs to make the code e
 
 ### :keyboard: Activity: Add the `html` and `body` tags to `index.html`
 
+Apply this suggested change, or follow the instructions below if you'd like to type out the code manually.
+
+```suggestion
+<html>
+
+  <body>
+    Hello there, awesome person! 
+  </body>
+
+</html>
+```
+
 1. Click on **Files Changed** to see the newly added `index.html` file.
-1. Click on the :pencil: to edit the file.
+1. Click on the ellipsis (...) and select **Edit file**.
 1. Before the existing content, add an opening `<html>` tag, and an opening `<body>` tag.
 1. After the existing content, add a closing `</body>` tag, and a closing `</html>` tag.
 1. In the _Commit changes_ section, enter a commit message that describes what you've done.
 1. Ensure you've selected _Commit directly to the `add-index` branch_.
 1. Click on **Commit changes**.
 
 <hr>
-<h3 align="center">Watch below for my response</h3>
+<h3 align="center">I'll respond when I detect you've committed in this pull request.</h3>
diff --git a/responses/03-title-tag.md b/responses/03-title-tag.md
@@ -34,8 +34,17 @@ Finally, the `head` and `title` tags, will be children of the `html` tag, but si
 
 ### :keyboard: Activity: Give your page a title
 
+Apply this suggested change, or follow the instructions below if you'd like to type out the code manually.
+
+```suggestion
+    <head>
+        <title>My awesome web page</title>
+    </head>
+
+```
+
 1. Click on **Files Changed**.
-1. Click on the :pencil: to edit the file.
+1. Click on the ellipsis (...) and select **Edit file**.
 1. Place an opening `<head>` tag and an opening `<title>` tag after the first opening `html` tag, but before the `body` tag.
 1. Write out a title after the opening `title` tag.
 1. Place a closing `</title>` tag and a closing `</head>` tag after your new title, but before the `body` tag. 
@@ -44,4 +53,4 @@ Finally, the `head` and `title` tags, will be children of the `html` tag, but si
 1. Click on **Commit changes**.
 
 <hr>
-<h3 align="center">Watch below for my response</h3>
+<h3 align="center">I'll respond when I detect you've committed in this pull request.</h3>
diff --git a/responses/03e-add-html.md b/responses/03e-add-html.md
@@ -9,9 +9,12 @@ Let's try again!
 ### :keyboard: Activity: Add the `html` and `body` tags to `index.html`
 
 1. Click on **Files Changed** to see the newly added `index.html` file.
-1. Click on the :pencil: to edit the file.
+1. Click on the ellipsis (...) and select **Edit file**.
 1. Before the existing content, add an opening `<html>` tag, and an opeining `<body>` tag.
 1. After the existing content, add a closing `</body>` tag, and a closing `</html>` tag.
 1. In the _Commit changes_ section, enter a commit message that describes what you've done.
 1. Ensure you've selected _Commit directly to the `add-index` branch_.
-1. Click on **Commit changes**.
+1. Click on **Commit changes**.
+
+<hr>
+<h3 align="center">I'll respond when I detect you've committed in this pull request.</h3>
diff --git a/responses/03e-add-title.md b/responses/03e-add-title.md
@@ -10,10 +10,13 @@ Let's try again!
 ### :keyboard: Activity: Give your page a title
 
 1. Click on **Files Changed**.
-1. Click on the :pencil: to edit the file.
+1. Click on the ellipsis (...) and select **Edit file**.
 1. Place an opening `<head>` tag and an opening `<title>` tag after the first opening HTML tag, but before the body tag.
 1. Write out a title after the opening title tag.
 1. Place a closing `</title>` tag and a closing `</head>` tag after your new title, but before the body tag. 
 1. In the _Commit changes_ section, enter a commit message that describes what you've done.
 1. Ensure you've selected _Commit directly to the `add-index` branch_.
-1. Click on **Commit changes**.
+1. Click on **Commit changes**.
+
+<hr>
+<h3 align="center">I'll respond when I detect you've committed in this pull request.</h3>
diff --git a/responses/04-merge-first-pr.md b/responses/04-merge-first-pr.md
@@ -9,4 +9,4 @@
 1. Click on **Delete branch**.
 
 <hr>
-<h3 align="center">Watch below for my response</h3>
+<h3 align="center">I'll respond when you've merged this pull request.</h3>
diff --git a/responses/05e-troubleshoot-h1.md b/responses/05e-troubleshoot-h1.md
@@ -18,4 +18,7 @@ Let's try again!
 1. Give your branch a descriptive name, like `add-headers-and-images`.
 1. Click on **Commit changes**.
 1. Give your pull request a title, and a comment.
-1. Click on **Create pull request.**
+1. Click on **Create pull request.**
+
+<hr>
+<h3 align="center">I'll respond when you open a pull request.</h3>
diff --git a/responses/06-add-image.md b/responses/06-add-image.md
@@ -12,12 +12,19 @@ You'll also notice that the image tag doesn't need to close since it is consider
 
 ### :keyboard: Activity: Add an image to your web page
 
+Apply this suggested change, or follow the instructions below if you'd like to type out the code manually.
+
+```suggestion
+<img src="{{ user.avatarUrl }}">
+
+```
+
 1. Click on **Files Changed**.
-1. Click on the :pencil: to edit the file.
+1. Click on the ellipsis (...) and select **Edit file**.
 1. Place an opening `<img>` tag between the body tags. Reminder: you don't need to close an `<img>` tag!
 1. Set the `src` attribute to the image you would like to display. You can use your GitHub profile picture: `{{ user.avatarUrl }}`
 1. In the _Commit changes_ section, enter a commit message that describes what you've done.
 1. Click on **Commit changes**.
 
 <hr>
-<h3 align="center">Watch below for my response</h3>
+<h3 align="center">I'll respond when I detect you've committed in this pull request.</h3>
diff --git a/responses/06e-image.md b/responses/06e-image.md
@@ -9,8 +9,11 @@ Let's try again!
 ### :keyboard: Activity: Add an image to your web page
 
 1. Click on **Files Changed**.
-1. Click on the :pencil: to edit the file.
+1. Click on the ellipsis (...) and select **Edit file**.
 1. Place an opening `<img>` tag inside the body tag.
 1. Set the `src` attribute to your GitHub profile picture: ``{{ user.avatarUrl }}``
 1. In the _Commit changes_ section, enter a commit message that describes what you've done.
 1. Click on **Commit changes**.
+
+<hr>
+<h3 align="center">I'll respond when I detect you've committed in this pull request.</h3>
diff --git a/responses/07-merge-second-pr.md b/responses/07-merge-second-pr.md
@@ -11,4 +11,4 @@ You can now merge in your pull request. Don't forget to delete your branch!
 1. Click on **Delete branch**.
 
 <hr>
-<h3 align="center">Watch below for my response</h3>
+<h3 align="center">I'll respond when you've merged this pull request.</h3>
diff --git a/responses/08e-list.md b/responses/08e-list.md
@@ -15,4 +15,7 @@ Let's try again!
 1. Give your branch a descriptive name, like `add-links-and-lists`.
 1. Click on **Commit changes**.
 1. Give your pull request a title, and a comment.
-1. Click on **Create pull request.**
+1. Click on **Create pull request.**
+
+<hr>
+<h3 align="center">I'll respond in your new pull request.</h3>
diff --git a/responses/09-add-links.md b/responses/09-add-links.md
@@ -23,8 +23,14 @@ Hyperlinks allow people to navigate through pages on the web. Links are achieved
 
 ### :keyboard: Activity: Create links to your favorite sites
 
+Apply this suggested change, or follow the instructions below if you'd like to type out the code manually. Please note that the suggested change may not be in the proper place for your list, so make sure it is inside of a set of `<ol>` or `<ul>` tags.
+
+```suggestion
+      <li>My favorite site is <a href="https://github.com">GitHub</a>!</li>
+```
+
 1. Click on **Files Changed**.
-1. Click on the :pencil: pencil icon to edit the file.
+1. Click on the ellipsis (...) and select **Edit file**.
 1. In the list you just created, add a link to each of your favorite sites to their respective URLs. You can do this by adding an opening anchor tag `<a>` tag with `href` attribute with your favorite site's URL, the name of the site inside the anchor tag, and a closing anchor `</a>` tag. Here is an example of a list item with a link:
 
 {% if GHE_HOST %}
@@ -41,4 +47,4 @@ Hyperlinks allow people to navigate through pages on the web. Links are achieved
 2. Click on **Commit changes**.
 
 <hr>
-<h3 align="center">Look for my next response below</h3>
+<h3 align="center">I'll respond when I detect you've committed in this pull request.</h3>
diff --git a/responses/09e-links.md b/responses/09e-links.md
@@ -9,9 +9,12 @@ Let's try again!
 ### :keyboard: Create links to your favorite sites
 
 1. Click on **Files Changed**.
-1. Click on the :pencil: to edit the file.
+1. Click on the ellipsis (...) and select **Edit file**.
 1. Link each of your favorite sites to their respective URLs. You can do this by adding an opening anchor tag `<a>` tag with `href` attribute with your favorite site's URL, the name of the site inside the anchor tag, and a closing anchor `</a>` tag. 
 1. In the _Commit changes_ section, enter a commit message that describes what you've done.
 1. Click on **Commit changes**.
 1. Give your pull request a title, and a comment.
-1. Click on **Create pull request.**
+1. Click on **Create pull request.**
+
+<hr>
+<h3 align="center">I'll respond in your new pull request.</h3>
diff --git a/responses/10-merge-third-pr.md b/responses/10-merge-third-pr.md
@@ -11,4 +11,4 @@ Go ahead and merge this pull request. Don't forget to delete your branch!
 1. Click on **Delete branch**.
 
 <hr>
-<h3 align="center">Watch below for my response</h3>
+<h3 align="center">I'll respond when you've merged this pull request.</h3>
diff --git a/responses/11-link-css.md b/responses/11-link-css.md
@@ -27,4 +27,4 @@ As an example, your `index.html` file might look like this:
 1. Click on **Commit changes**.
 
 <hr>
-<h3 align="center">Return to this pull request for next steps</h3>
+<h3 align="center">I'll respond when I detect you've committed in this pull request.</h3>
diff --git a/responses/11-style-fail.md b/responses/11-style-fail.md
@@ -8,7 +8,10 @@ Let's try again!
 ### :keyboard: Add the stylesheet
 
 1. Click on **Files Changed**.
-1. Click on the :pencil: to edit the file.
+1. Click on the ellipsis (...) and select **Edit file**.
 1. Add the link tag inside the `<head>` section of the index: `<link rel="stylesheet" href="style.css">`
 1. In the _Commit changes_ section, enter a commit message that describes what you've done.
 1. Click on **Commit changes**.
+
+<hr>
+<h3 align="center">I'll respond when I detect you've committed in this pull request.</h3>
diff --git a/responses/11-style-success.md b/responses/11-style-success.md
@@ -10,4 +10,4 @@ Go ahead and merge this pull request so we can all see the final result. Don't f
 1. Click on **Delete branch**.
 
 <hr>
-<h3 align="center">Watch below for my response</h3>
+<h3 align="center">I'll respond when you've merged this pull request.</h3>
