Merge branch 'master' of https://github.com/wesbos/Learn-Node

.gitignore

@@ -2,6 +2,7 @@ node_modules/
 .DS_Store
 *.log
 .idea
+dist/
 haters/
 variables.env
 variables.env.now

readme.md

@@ -8,7 +8,7 @@ These are the starter files and stepped solutions to accompany the LearnNode.com
 
 You'll start your application in the `starter-files` directory — feel free to rename it.
 
-If you need help, each folder number corresponds with where you should be at the *start* of a video. So if you are having trouble with video **24**, look to video **25** for the answer.
+If you need help, each folder number corresponds with where you should be at the *start* of a video. So if you are having trouble with video **24**, look to folder **25** for the answer.
 
 The stepped solutions are meant for you to apply on top of your existing code - they don't stand on their own.
 

starter-files/.npmrc

@@ -0,0 +1,3 @@
+fund=false
+audit=false
+legacy-peer-deps=true

starter-files/app.js

@@ -1,10 +1,8 @@
 const express = require('express');
 const session = require('express-session');
-const mongoose = require('mongoose');
-const MongoStore = require('connect-mongo')(session);
+const MongoStore = require('connect-mongo');
 const path = require('path');
 const cookieParser = require('cookie-parser');
-const bodyParser = require('body-parser');
 const passport = require('passport');
 const promisify = require('es6-promisify');
 const flash = require('connect-flash');
@@ -24,8 +22,8 @@ app.set('view engine', 'pug'); // we use the engine pug, mustache or EJS work gr
 app.use(express.static(path.join(__dirname, 'public')));
 
 // Takes the raw requests and turns them into usable properties on req.body
-app.use(bodyParser.json());
-app.use(bodyParser.urlencoded({ extended: true }));
+app.use(express.json());
+app.use(express.urlencoded({ extended: true }));
 
 // Exposes a bunch of methods for validating data. Used heavily on userController.validateRegister
 app.use(expressValidator());
@@ -40,14 +38,14 @@ app.use(session({
   key: process.env.KEY,
   resave: false,
   saveUninitialized: false,
-  store: new MongoStore({ mongooseConnection: mongoose.connection })
+  store: new MongoStore({ mongoUrl: process.env.DATABASE })
 }));
 
-// // Passport JS is what we use to handle our logins
+// Passport JS is what we use to handle our logins
 app.use(passport.initialize());
 app.use(passport.session());
 
-// // The flash middleware let's us use req.flash('error', 'Shit!'), which will then pass that message to the next page the user requests
+// The flash middleware let's us use req.flash('error', 'Shit!'), which will then pass that message to the next page the user requests
 app.use(flash());
 
 // pass variables to our templates + all requests