Added titles to all the views. Added active port string in the console.log of app.listen

.gitignore

@@ -1,2 +1,3 @@
 node_modules
-.vscode/*
+.vscode/*
+config

config/.env

@@ -1,2 +1,2 @@
 PORT = 2121
-DB_STRING = mongodb+srv://demo:[email protected].mongodb.net/todos?retryWrites=true&w=majority
+DB_STRING = mongodb+srv://espar:[email protected].mongodb.net/?retryWrites=true&w=majority

config/passport.js

@@ -21,7 +21,6 @@ module.exports = function (passport) {
       })
     })
   }))
-
 
   passport.serializeUser((user, done) => {
     done(null, user.id)

controllers/auth.js

@@ -2,95 +2,113 @@ const passport = require('passport')
 const validator = require('validator')
 const User = require('../models/User')
 
- exports.getLogin = (req, res) => {
-    if (req.user) {
-      return res.redirect('/todos')
-    }
-    res.render('login', {
-      title: 'Login'
-    })
+exports.getLogin = (req, res) => {
+  if (req.user) {
+    return res.redirect('/todos')
+  }
+  res.render('login', {
+    title: 'Login'
+  })
+}
+
+exports.postLogin = (req, res, next) => {
+  const validationErrors = []
+  if (!validator.isEmail(req.body.email)) { validationErrors.push({ msg: 'Please enter a valid email address.' }) }
+  if (validator.isEmpty(req.body.password)) { validationErrors.push({ msg: 'Password cannot be blank.' }) }
+
+  if (validationErrors.length) {
+    req.flash('errors', validationErrors)
+    return res.redirect('/login')
   }
-
-  exports.postLogin = (req, res, next) => {
-    const validationErrors = []
-    if (!validator.isEmail(req.body.email)) validationErrors.push({ msg: 'Please enter a valid email address.' })
-    if (validator.isEmpty(req.body.password)) validationErrors.push({ msg: 'Password cannot be blank.' })
-
-    if (validationErrors.length) {
-      req.flash('errors', validationErrors)
+  req.body.email = validator.normalizeEmail(req.body.email, {
+    gmail_remove_dots: false
+  })
+
+  passport.authenticate('local', (err, user, info) => {
+    if (err) {
+      return next(err)
+    }
+    if (!user) {
+      req.flash('errors', info)
       return res.redirect('/login')
     }
-    req.body.email = validator.normalizeEmail(req.body.email, { gmail_remove_dots: false })
-
-    passport.authenticate('local', (err, user, info) => {
-      if (err) { return next(err) }
-      if (!user) {
-        req.flash('errors', info)
-        return res.redirect('/login')
+    req.logIn(user, (err) => {
+      if (err) {
+        return next(err)
       }
-      req.logIn(user, (err) => {
-        if (err) { return next(err) }
-        req.flash('success', { msg: 'Success! You are logged in.' })
-        res.redirect(req.session.returnTo || '/todos')
-      })
-    })(req, res, next)
-  }
-
-  exports.logout = (req, res) => {
-    req.logout(() => {
-      console.log('User has logged out.')
-    })
-    req.session.destroy((err) => {
-      if (err) console.log('Error : Failed to destroy the session during logout.', err)
-      req.user = null
-      res.redirect('/')
+      req.flash('success', { msg: 'Success! You are logged in.' })
+      res.redirect(req.session.returnTo || '/todos')
     })
+  })(req, res, next)
+}
+
+exports.logout = (req, res) => {
+  req.logout(() => {
+    console.log('User has logged out.')
+  })
+  req.session.destroy((err) => {
+    if (err) { console.log('Error : Failed to destroy the session during logout.', err) }
+    req.user = null
+    res.redirect('/')
+  })
+}
+
+exports.getSignup = (req, res) => {
+  if (req.user) {
+    return res.redirect('/todos')
   }
-
-  exports.getSignup = (req, res) => {
-    if (req.user) {
-      return res.redirect('/todos')
-    }
-    res.render('signup', {
-      title: 'Create Account'
+  res.render('signup', {
+    title: 'Create Account'
+  })
+}
+
+exports.postSignup = (req, res, next) => {
+  const validationErrors = []
+  if (!validator.isEmail(req.body.email)) { validationErrors.push({ msg: 'Please enter a valid email address.' }) }
+  if (!validator.isLength(req.body.password, { min: 8 })) {
+    validationErrors.push({
+      msg: 'Password must be at least 8 characters long'
     })
   }
-
-  exports.postSignup = (req, res, next) => {
-    const validationErrors = []
-    if (!validator.isEmail(req.body.email)) validationErrors.push({ msg: 'Please enter a valid email address.' })
-    if (!validator.isLength(req.body.password, { min: 8 })) validationErrors.push({ msg: 'Password must be at least 8 characters long' })
-    if (req.body.password !== req.body.confirmPassword) validationErrors.push({ msg: 'Passwords do not match' })
-
-    if (validationErrors.length) {
-      req.flash('errors', validationErrors)
-      return res.redirect('../signup')
-    }
-    req.body.email = validator.normalizeEmail(req.body.email, { gmail_remove_dots: false })
-
-    const user = new User({
-      userName: req.body.userName,
-      email: req.body.email,
-      password: req.body.password
-    })
-
-    User.findOne({$or: [
-      {email: req.body.email},
-      {userName: req.body.userName}
-    ]}, (err, existingUser) => {
-      if (err) { return next(err) }
+  if (req.body.password !== req.body.confirmPassword) { validationErrors.push({ msg: 'Passwords do not match' }) }
+
+  if (validationErrors.length) {
+    req.flash('errors', validationErrors)
+    return res.redirect('../signup')
+  }
+  req.body.email = validator.normalizeEmail(req.body.email, {
+    gmail_remove_dots: false
+  })
+
+  const user = new User({
+    userName: req.body.userName,
+    email: req.body.email,
+    password: req.body.password
+  })
+
+  User.findOne(
+    { $or: [{ email: req.body.email }, { userName: req.body.userName }] },
+    (err, existingUser) => {
+      if (err) {
+        return next(err)
+      }
       if (existingUser) {
-        req.flash('errors', { msg: 'Account with that email address or username already exists.' })
+        req.flash('errors', {
+          msg: 'Account with that email address or username already exists.'
+        })
         return res.redirect('../signup')
       }
       user.save((err) => {
-        if (err) { return next(err) }
+        if (err) {
+          return next(err)
+        }
         req.logIn(user, (err) => {
           if (err) {
             return next(err)
           }
           res.redirect('/todos')
         })
       })
-    })
-  }
+    }
+  )
+}

controllers/home.js

@@ -1,5 +1,5 @@
 module.exports = {
-    getIndex: (req,res)=>{
-        res.render('index.ejs')
-    }
-}
+  getIndex: (req, res) => {
+    res.render('index.ejs')
+  }
+}

controllers/todos.js

@@ -1,55 +1,73 @@
 const Todo = require('../models/Todo')
 
 module.exports = {
-    getTodos: async (req,res)=>{
-        console.log(req.user)
-        try{
-            const todoItems = await Todo.find({userId:req.user.id})
-            const itemsLeft = await Todo.countDocuments({userId:req.user.id,completed: false})
-            res.render('todos.ejs', {todos: todoItems, left: itemsLeft, user: req.user})
-        }catch(err){
-            console.log(err)
-        }
-    },
-    createTodo: async (req, res)=>{
-        try{
-            await Todo.create({todo: req.body.todoItem, completed: false, userId: req.user.id})
-            console.log('Todo has been added!')
-            res.redirect('/todos')
-        }catch(err){
-            console.log(err)
-        }
-    },
-    markComplete: async (req, res)=>{
-        try{
-            await Todo.findOneAndUpdate({_id:req.body.todoIdFromJSFile},{
-                completed: true
-            })
-            console.log('Marked Complete')
-            res.json('Marked Complete')
-        }catch(err){
-            console.log(err)
-        }
-    },
-    markIncomplete: async (req, res)=>{
-        try{
-            await Todo.findOneAndUpdate({_id:req.body.todoIdFromJSFile},{
-                completed: false
-            })
-            console.log('Marked Incomplete')
-            res.json('Marked Incomplete')
-        }catch(err){
-            console.log(err)
+  getTodos: async (req, res) => {
+    console.log(req.user)
+    try {
+      const todoItems = await Todo.find({ userId: req.user.id })
+      // TODO  refactor items left to do it locally
+      const itemsLeft = await Todo.countDocuments({
+        userId: req.user.id,
+        completed: false
+      })
+      res.render('todos.ejs', {
+        todos: todoItems,
+        left: itemsLeft,
+        user: req.user
+      })
+    } catch (err) {
+      console.log(err)
+    }
+  },
+  createTodo: async (req, res) => {
+    try {
+      await Todo.create({
+        todo: req.body.todoItem,
+        completed: false,
+        userId: req.user.id
+      })
+      console.log('Todo has been added!')
+      res.redirect('/todos')
+    } catch (err) {
+      console.log(err)
+    }
+  },
+  markComplete: async (req, res) => {
+    try {
+      await Todo.findOneAndUpdate(
+        { _id: req.body.todoIdFromJSFile },
+        {
+          completed: true
         }
-    },
-    deleteTodo: async (req, res)=>{
-        console.log(req.body.todoIdFromJSFile)
-        try{
-            await Todo.findOneAndDelete({_id:req.body.todoIdFromJSFile})
-            console.log('Deleted Todo')
-            res.json('Deleted It')
-        }catch(err){
-            console.log(err)
+      )
+      console.log('Marked Complete')
+      res.json('Marked Complete')
+    } catch (err) {
+      console.log(err)
+    }
+  },
+  markIncomplete: async (req, res) => {
+    try {
+      await Todo.findOneAndUpdate(
+        { _id: req.body.todoIdFromJSFile },
+        {
+          completed: false
         }
+      )
+      console.log('Marked Incomplete')
+      res.json('Marked Incomplete')
+    } catch (err) {
+      console.log(err)
+    }
+  },
+  deleteTodo: async (req, res) => {
+    console.log(req.body.todoIdFromJSFile)
+    try {
+      await Todo.findOneAndDelete({ _id: req.body.todoIdFromJSFile })
+      console.log('Deleted Todo')
+      res.json('Deleted It')
+    } catch (err) {
+      console.log(err)
     }
-}    
+  }
+}

middleware/auth.js

@@ -1,10 +1,9 @@
 module.exports = {
-    ensureAuth: function (req, res, next) {
-      if (req.isAuthenticated()) {
-        return next()
-      } else {
-        res.redirect('/')
-      }
+  ensureAuth: function (req, res, next) {
+    if (req.isAuthenticated()) {
+      return next()
+    } else {
+      res.redirect('/')
     }
   }
-  
+}

models/Todo.js

@@ -3,11 +3,11 @@ const mongoose = require('mongoose')
 const TodoSchema = new mongoose.Schema({
   todo: {
     type: String,
-    required: true,
+    required: true
   },
   completed: {
     type: Boolean,
-    required: true,
+    required: true
   },
   userId: {
     type: String,