Mongoose fixes per version and Added functionalities(priority tag with sorting and checkbox) and styling

config/database.js

@@ -2,12 +2,7 @@ const mongoose = require('mongoose')
 
 const connectDB = async () => {
   try {
-    const conn = await mongoose.connect(process.env.DB_STRING, {
-      useNewUrlParser: true,
-      useUnifiedTopology: true,
-      useFindAndModify: false,
-      useCreateIndex: true
-    })
+    const conn = await mongoose.connect(process.env.DB_STRING);
 
     console.log(`MongoDB Connected: ${conn.connection.host}`)
   } catch (err) {

config/passport.js

@@ -3,31 +3,38 @@ const mongoose = require('mongoose')
 const User = require('../models/User')
 
 module.exports = function (passport) {
-  passport.use(new LocalStrategy({ usernameField: 'email' }, (email, password, done) => {
-    User.findOne({ email: email.toLowerCase() }, (err, user) => {
-      if (err) { return done(err) }
-      if (!user) {
-        return done(null, false, { msg: `Email ${email} not found.` })
-      }
-      if (!user.password) {
-        return done(null, false, { msg: 'Your account was registered using a sign-in provider. To enable password login, sign in using a provider, and then set a password under your user profile.' })
-      }
-      user.comparePassword(password, (err, isMatch) => {
-        if (err) { return done(err) }
-        if (isMatch) {
-          return done(null, user)
+  passport.use(new LocalStrategy({ usernameField: 'email' }, async (email, password, done) => {
+    try {
+        const user = await User.findOne({ email: email.toLowerCase() });
+        if (!user) {
+          return done(null, false, { msg: `Email ${email} not found.` })
         }
-        return done(null, false, { msg: 'Invalid email or password.' })
-      })
-    })
-  }))
+        if (!user.password) {
+          return done(null, false, { msg: 'Your account was registered using a sign-in provider. To enable password login, sign in using a provider, and then set a password under your user profile.' })
+        }
+        user.comparePassword(password, (err, isMatch) => {
+          if (err) { return done(err) }
+          if (isMatch) {
+            return done(null, user)
+          }
+          return done(null, false, { msg: 'Invalid email or password.' })
+        })
+      } catch (err) {
+        return done(err);
+      }
+    }))
 
 
   passport.serializeUser((user, done) => {
     done(null, user.id)
   })
 
-  passport.deserializeUser((id, done) => {
-    User.findById(id, (err, user) => done(err, user))
+  passport.deserializeUser(async (id, done) => {
+    try {
+      const user = await User.findById(id);
+      done(null, user);
+    } catch(err) {
+      done(error);
+    }
   })
 }

controllers/auth.js

@@ -56,7 +56,7 @@ const User = require('../models/User')
     })
   }
 
-  exports.postSignup = (req, res, next) => {
+  exports.postSignup = async (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' })
@@ -74,23 +74,25 @@ const User = require('../models/User')
       password: req.body.password
     })
 
-    User.findOne({$or: [
-      {email: req.body.email},
-      {userName: req.body.userName}
-    ]}, (err, existingUser) => {
-      if (err) { return next(err) }
+    try{
+      const existingUser = await User.findOne({
+        $or: [
+          { email: req.body.email },
+          { userName: req.body.userName},
+        ]
+      });
       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) }
-        req.logIn(user, (err) => {
+      await user.save();
+      req.logIn(user, (err) => {
           if (err) {
             return next(err)
           }
           res.redirect('/todos')
         })
-      })
-    })
+      } catch (err) {
+    return next(err);
+    }
   }

controllers/todos.js

@@ -4,16 +4,20 @@ module.exports = {
     getTodos: async (req,res)=>{
         console.log(req.user)
         try{
-            const todoItems = await Todo.find({userId:req.user.id})
+            const todoItems = await Todo.find({userId:req.user.id}).lean()     // find todo item associated with userId
             const itemsLeft = await Todo.countDocuments({userId:req.user.id,completed: false})
-            res.render('todos.ejs', {todos: todoItems, left: itemsLeft, user: req.user})
+            const todosPriority = todoItems.filter(todo => todo.priority)
+            const todos = todoItems.filter(todo => !todo.priority)
+            res.render('todos.ejs', {
+                todosPriority: todosPriority, todos: todos, 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})
+            await Todo.create({todo: req.body.todoItem, completed: false, userId: req.user.id, priority: false})     // userId added to created todo item
             console.log('Todo has been added!')
             res.redirect('/todos')
         }catch(err){
@@ -23,25 +27,15 @@ module.exports = {
     markComplete: async (req, res)=>{
         try{
             await Todo.findOneAndUpdate({_id:req.body.todoIdFromJSFile},{
-                completed: true
+                completed: req.body.completed
             })
             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{
@@ -51,5 +45,19 @@ module.exports = {
         }catch(err){
             console.log(err)
         }
-    }
+    },
+    markPriority: async (req, res)=>{
+        try{
+            const todo = await Todo.findById(req.body.todoIdFromJSFile)
+            await Todo.findOneAndUpdate(
+                { _id: req.body.todoIdFromJSFile },
+                { priority: !todo.priority }
+            )
+            console.log('Toggled Priority')
+            res.json({ status: 'success', priority: !todo.priority })
+        }catch(err){
+            console.log(err)
+        }
+    },
+
 }    

models/Todo.js

@@ -12,7 +12,11 @@ const TodoSchema = new mongoose.Schema({
   userId: {
     type: String,
     required: true
-  }
+  },
+  priority: {
+    type: Boolean,
+    required: true,
+  },
 })
 
 module.exports = mongoose.model('Todo', TodoSchema)