complete second pass edits

Author: grobergm

config.yml

@@ -1,9 +1,15 @@
 title: Introduction to Node with Express
 tagline: Learn how to make a basic server with Node.js and Express.js
 description: Node.js gives you the ability to run JavaScript files on the server-side. Express is a library for Node.js, that allows you to make requests to different "endpoints" and get a response back.
+tags:
+  - Node
+  - Express
+  - JavaScript
+  - JSON
+  - API
 
 template:
-  name: node-express-server-intro
+  name: node-express-course
   repo: node-express-template
   description: An introduction to Node.js and Express.js servers
 before:
@@ -115,9 +121,4 @@ steps:
         issue: 8
       - type: respond
         with: 08-complete.md
-        issue: 8
-
-tags:
-  - Node
-  - Express
-  - JavaScript
+        issue: 8

responses/01-environment.md

@@ -20,11 +20,10 @@ cd node-express-server-intro
 Open the folder you just cloned in your favorite text editor.
 You should have a few files already created:
 ```
-middleware.js
 .gitignore
 server.js
 ```
-The server file will be the main one we use, and middleware will be used near the end. In the .gitignore folder, you should see this line at the top `/node_modules`
+The server file will be the main one we use. In the .gitignore folder, you should see this line at the top `/node_modules`
 
 Express (the server library we will install) is a node_module. Rather than track the entire library in our git history, we will create a package.json file, which will allow us to install and save node modules.
 
@@ -44,7 +43,7 @@ In your package.json file and make sure you have something like this under your
 ```
 The number on the right is the version you downloaded. Since we aren't tracking the actual `node_modules` folder, this section is a reference used to re-install the modules your application depends on.
 
-When you are finished with this section, push your file to github for the next step:
+When you are finished with this section, push your file to GitHub for the next step:
 ```
 git add .
 git commit -m "initial file setup"

responses/03-get-json-data.md

@@ -12,7 +12,27 @@ app.get('/users', function(req,res){
  	})
 })
 ```
-Let's save your changes on github:
+Overall your file should look like this:
+```javascript
+const express = require('express');
+const app = express();
+
+const mockUserData=[
+	{name:'Mark'},
+	{name:'Jill'}
+]
+
+app.get('/users',function(req,res){
+	res.json({
+		success: true,
+		message: 'successfully got users. Nice!',
+		users: mockUserData
+	})
+})
+
+app.listen(8000,function(){console.log('server is listening')})
+```
+Let's save your changes on GitHub:
 ```
 git add server.js
 git commit -m"add first GET route"

responses/04-complete.md

@@ -1,5 +1,5 @@
 With this last push, your [repository]({{ repoUrl }}) should look [like this]({{ repoUrl }}/tree/04).
 
-💡 You can use dynamic variables to get specific data from the database.
+💡 You can use dynamic variables to search for specific data associated with an id in your database, and return that (instead of just returning the id).
 
 [Click here for the next step]({{ repoUrl }}/issues/6)

responses/04-get-data-with-var.md

@@ -1,14 +1,20 @@
 In Express, words with a colon in front of them in the url are treated as variables. You can access the value of each variable through req.params, like this:
 ```javascript 
 app.get('/users/:id',function(req,res){
-console.log(req.params.id)
+	console.log(req.params.id)
+	res.json({
+		success: true,
+		message: 'got one user',
+		user: req.params.id
+	})
 })
 ```
 
-After adding this code to your script.js file, and restarting the server, paste this into your browser url: http://localhost:8000/users/mark
-Now check the terminal for the console.log of req.params.id. You should see the name 'mark', since it is the value we passed in place of the 'id' variable.
+_Let's test it out!_
 
-Notice that we didn't actually return anything from the server this time, so the browser should appear unresponsive.
+Add the function above your `app.listen` function in your server.js file, restart the server, and paste this into your browser url: http://localhost:8000/users/mark
+
+Now check the terminal for the console.log of req.params.id. You should see the name 'mark', since it is the value we passed in place of the 'id' variable. Since we are running this in the terminal, our console.log will appear there (instead of the browser).
 
 After testing that it works, push your changes your GitHub repo:
 ```

responses/05-post-data.md

@@ -1,4 +1,5 @@
 So far, we have only made GET requests to our server. A POST request can send data securely through the request body. In order to make POST requests, first we need to include the "body-parser" library from our node_modules (included with express). Add these lines after the app variable:
+
 ```javascript
 const bodyParser = require('body-parser');
 app.use(bodyParser.json());
@@ -26,6 +27,66 @@ app.post('/login',function(req,res){
       	})
  	}
 })
+```
+
+Your entire file should look like this now:
+
+```javascript
+const express = require('express');
+const app = express();
+const bodyParser = require('body-parser');
+
+app.use(bodyParser.json())
+
+const mockUserData=[
+	{name:'Mark'},
+	{name:'Jill'}
+]
+
+app.get('/users',function(req,res){
+	res.json({
+		success: true,
+		message: 'successfully got users. Nice!',
+		users: mockUserData
+	})
+})
+// colons are used as variables that be viewed in the params
+app.get('/users/:id',function(req,res){
+	console.log(req.params.id)
+	res.json({
+		success: true,
+		message: 'got one user',
+		user: req.params.id
+	})
+})
+
+app.post('/login',function(req,res){
+	// Typically passwords are encrypted using something like bcrypt before sending to database
+	const username=req.body.username;
+	const password=req.body.password;
+
+	// This should come from the database
+	const mockUsername="billyTheKid";
+	const mockPassword="superSecret";
+
+	if (username===mockUsername && password===mockPassword){
+		// In practice, use JSON web token sign method here to make an encrypted token
+		res.json({
+			success: true,
+			message: 'password and username match!',
+			token: 'encrypted token goes here'
+		})
+	} else {
+		res.json({
+			success: false,
+			message: 'password and username do not match'
+		})
+	}
+
+})
+
+app.listen(8000,function(){console.log('server is listening')})
+
 ``` 
 Time to commit our changes!
 ```