Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
config2
node_modules
.vscode/*
2 changes: 0 additions & 2 deletions config/.env

This file was deleted.

19 changes: 0 additions & 19 deletions config/database.js

This file was deleted.

33 changes: 0 additions & 33 deletions config/passport.js

This file was deleted.

49 changes: 25 additions & 24 deletions controllers/auth.js
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,12 @@ const User = require('../models/User')

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('/')
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('/')
})
})
}

Expand All @@ -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' })
Expand All @@ -74,23 +74,24 @@ 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) }
if (existingUser) {
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) }
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.'})
return res.redirect('../signup')
}
await user.save()

req.logIn(user, (err) => {
if (err) {
return next(err)
}
res.redirect('/todos')
if (err) return next(err)
res.redirect('/todos')
})
})
})
}
catch (err) {
return next(err)
}
}
7 changes: 5 additions & 2 deletions controllers/todos.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,18 @@ module.exports = {
console.log(req.user)
try{
const todoItems = await Todo.find({userId:req.user.id})
const high = todoItems.filter(list => list.priority === 'High')
const low = todoItems.filter(list => list.priority === 'Low')
const itemsLeft = await Todo.countDocuments({userId:req.user.id,completed: false})
res.render('todos.ejs', {todos: todoItems, left: itemsLeft, user: req.user})
console.log(low)
res.render('todos.ejs', {high: high, low: low, 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, priority: req.body.priority, completed: false, userId: req.user.id})
console.log('Todo has been added!')
res.redirect('/todos')
}catch(err){
Expand Down
4 changes: 4 additions & 0 deletions models/Todo.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@ const TodoSchema = new mongoose.Schema({
type: String,
required: true,
},
priority: {
type: String,
required: true,
},
completed: {
type: Boolean,
required: true,
Expand Down
17 changes: 6 additions & 11 deletions models/User.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,12 @@ const UserSchema = new mongoose.Schema({

// Password hash middleware.

UserSchema.pre('save', function save(next) {
const user = this
if (!user.isModified('password')) { return next() }
bcrypt.genSalt(10, (err, salt) => {
if (err) { return next(err) }
bcrypt.hash(user.password, salt, (err, hash) => {
if (err) { return next(err) }
user.password = hash
next()
})
})
UserSchema.pre('save', async function save(next) {
const user = this
if (!user.isModified('password')) { return next() }
let salt = await bcrypt.genSalt(10)
let hash = await bcrypt.hash(user.password, salt)
user.password = hash
})


Expand Down
Loading