small bug fixes and wording

Author: bradwestfall

README.md

@@ -51,15 +51,15 @@ Then **clone**, **install**, and **run** the app:
 
 ```sh
 # Clone the repo to your local machine (This just clones, it does not "install")
-$ git clone https://github.com/ReactTraining/node-workshop.git
+$ git clone https://github.com/ReactTraining/javascript-node-workshop.git
 
 # Whichever directory you run the above command from, that directory should
-# now have a folder called `node-workshop`.
+# now have a folder called `javascript-node-workshop`.
 
-# Change directory to the `node-workshop` folder:
-$ cd node-workshop
+# Change directory to the `javascript-node-workshop` folder:
+$ cd javascript-node-workshop
 
-# Install and run. Make sure you do these two commands from within the `node-workshop` folder:
+# Install and run. Make sure you do these two commands from within the `javascript-node-workshop` folder:
 $ npm install
 $ npm start
 

lessons/01-js-and-node/lecture/NOTES.md

@@ -7,7 +7,7 @@
   - MDN is the official documentation for JS?
   - NVM
   - How version numbers work
-  - Now NPM and package.json works
+  - How NPM and package.json works
   - package.json scripts
   - Modules (CommonJS vs ESM)
 - ✅ Scope

lessons/05-cli/practice/index.ts

@@ -11,7 +11,7 @@ let selectedLesson = ''
 let lessonType = ''
 let lessonFiles: string[] = []
 
-const lessonsPath = path.resolve(__dirname /* 🔴 FINISH THIS - SEE README */)
+const lessonsPath = path.resolve(__dirname /* 🔴 FINISH THIS - SEE GUIDE.md */)
 const lessonFolders = fs.readdirSync(lessonsPath).filter((item) => {
   return fs.lstatSync(path.resolve(lessonsPath, item)).isDirectory()
 })

lessons/06-server/practice/GUIDE.md

@@ -7,13 +7,13 @@ You need to get two paths working:
 - `/users` needs to return an array of user objects
 - `/users/:id` needs to return a user object
 
-Both routes are already made. In each one, use the `db.query('SELECT * FROM ...')` API to perform an SQL search for what you want. We also gave you some SQL examples in the file. The users in this mini database have id's ranging from 1 to 4.
+Both routes are already made. In each one, use the `query('SELECT * FROM ...')` API to perform an SQL search for what you want. We also gave you some SQL examples in the file. The users in this mini database have id's ranging from 1 to 4.
 
 **Here's what you have to do:**
 
-- `db.query` returns a promise with an array of results. since the results are an array, you'll need to use `res.json(results)` to serialize them into a JSON response.
+- `query` returns a promise with an array of results. since the results are an array, you'll need to use `res.json(results)` to serialize them into a JSON response.
 - If `results.length` is 0, then we should respond with a 404 status code since they're trying to access a user that doesn't exist. Also respond with a 404 status if the parameter that was given is not an integer.
 - For 404 status codes, we already have a route towards the end that handles all requests that were not handled by previous routes. So in the user-based routes, all you would have to do is call `next()` which is sort of like doing `continue` in a loop -- `next()` will move on from the route it's called in to the next route that matches. But no other routes will match, thus our 404 response will work like a charm ☘️
-- If you pass a string into `db.query` that doesn't start with `SELECT`, the promise will reject, so be sure to have a `.catch` that will respond with a status code of 500. Similar to the 404 code, all you have to do is call `next(err)` but this time with a string argument:
+- If you pass a string into `query` that doesn't start with `SELECT`, the promise will reject, so be sure to have a `.catch` that will respond with a status code of 500. Similar to the 404 code, all you have to do is call `next(err)` but this time with a string argument:
 
 Calling `next()` with no argument just tells express to go to the next route. Calling `next(str)` with an argument tells express to go to the error handling route.

lessons/06-server/practice/index.ts

@@ -10,7 +10,7 @@ app.get('/', (req, res) => {
 })
 
 app.get('/users', (req, res, next) => {
-  // db.query('SELECT * FROM user')
+  // query('SELECT * FROM user')
   res.json({})
 })
 
@@ -20,7 +20,7 @@ app.get('/users/:id', (req, res, next) => {
   // Parameters always come as strings. So verify it's a valid numeric string with `isInteger(id)`
   // and respond with a 404 not found if it's not valid
 
-  // db.query('SELECT * FROM user WHERE user.id = 1')
+  // query('SELECT * FROM user WHERE user.id = 1')
   res.json({})
 })