diff --git a/config/database.js b/config/database.js
index 4aac3a233..b4c51058f 100644
--- a/config/database.js
+++ b/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) {
diff --git a/config/passport.js b/config/passport.js
index 3058d7e09..d5c270592 100644
--- a/config/passport.js
+++ b/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);
+ }
})
}
diff --git a/controllers/auth.js b/controllers/auth.js
index c434c3c3a..161f9b002 100644
--- a/controllers/auth.js
+++ b/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);
+ }
}
\ No newline at end of file
diff --git a/controllers/todos.js b/controllers/todos.js
index b10950f93..4f85f6239 100644
--- a/controllers/todos.js
+++ b/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,7 +27,7 @@ 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')
@@ -31,17 +35,7 @@ module.exports = {
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)
+ }
+ },
+
}
\ No newline at end of file
diff --git a/models/Todo.js b/models/Todo.js
index 8698f6900..7a91868a8 100644
--- a/models/Todo.js
+++ b/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)
diff --git a/package-lock.json b/package-lock.json
index f5d8debf0..7ac6f6e02 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -17,7 +17,7 @@
"express-flash": "^0.0.2",
"express-session": "^1.17.1",
"mongodb": "^3.6.5",
- "mongoose": "^5.12.3",
+ "mongoose": "^8.16.5",
"morgan": "^1.10.0",
"nodemon": "^2.0.7",
"passport": "^0.6.0",
@@ -72,28 +72,27 @@
"node": ">=10"
}
},
- "node_modules/@types/bson": {
- "version": "4.0.3",
- "resolved": "https://registry.npmjs.org/@types/bson/-/bson-4.0.3.tgz",
- "integrity": "sha512-mVRvYnTOZJz3ccpxhr3wgxVmSeiYinW+zlzQz3SXWaJmD1DuL05Jeq7nKw3SnbKmbleW5qrLG5vdyWe/A9sXhw==",
+ "node_modules/@mongodb-js/saslprep": {
+ "version": "1.3.0",
+ "resolved": "https://registry.npmjs.org/@mongodb-js/saslprep/-/saslprep-1.3.0.tgz",
+ "integrity": "sha512-zlayKCsIjYb7/IdfqxorK5+xUMyi4vOKcFy10wKJYc63NSdKI8mNME+uJqfatkPmOSMMUiojrL58IePKBm3gvQ==",
"dependencies": {
- "@types/node": "*"
+ "sparse-bitfield": "^3.0.3"
}
},
- "node_modules/@types/mongodb": {
- "version": "3.6.12",
- "resolved": "https://registry.npmjs.org/@types/mongodb/-/mongodb-3.6.12.tgz",
- "integrity": "sha512-49aEzQD5VdHPxyd5dRyQdqEveAg9LanwrH8RQipnMuulwzKmODXIZRp0umtxi1eBUfEusRkoy8AVOMr+kVuFog==",
+ "node_modules/@types/webidl-conversions": {
+ "version": "7.0.3",
+ "resolved": "https://registry.npmjs.org/@types/webidl-conversions/-/webidl-conversions-7.0.3.tgz",
+ "integrity": "sha512-CiJJvcRtIgzadHCYXw7dqEnMNRjhGZlYK05Mj9OyktqV8uVT8fD2BFOB7S1uwBE3Kj2Z+4UyPmFw/Ixgw/LAlA=="
+ },
+ "node_modules/@types/whatwg-url": {
+ "version": "11.0.5",
+ "resolved": "https://registry.npmjs.org/@types/whatwg-url/-/whatwg-url-11.0.5.tgz",
+ "integrity": "sha512-coYR071JRaHa+xoEvvYqvnIHaVqaYrLPbsufM9BF63HkwI5Lgmy2QR8Q5K/lYDYo5AK82wOvSOS0UsLTpTG7uQ==",
"dependencies": {
- "@types/bson": "*",
- "@types/node": "*"
+ "@types/webidl-conversions": "*"
}
},
- "node_modules/@types/node": {
- "version": "14.14.37",
- "resolved": "https://registry.npmjs.org/@types/node/-/node-14.14.37.tgz",
- "integrity": "sha512-XYmBiy+ohOR4Lh5jE379fV2IU+6Jn4g5qASinhitfyO71b/sCo6MKsMLF5tc7Zf2CE8hViVQyYSobJNke8OvUw=="
- },
"node_modules/abbrev": {
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
@@ -263,11 +262,6 @@
"safe-buffer": "^5.1.1"
}
},
- "node_modules/bluebird": {
- "version": "3.5.1",
- "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.1.tgz",
- "integrity": "sha512-MKiLiV+I1AA596t9w1sQJ8jkiSr5+ZKi0WKrYGUn6d1Fx+Ij4tIj+m2WMQSGczs5jZVxV339chE8iwk6F64wjA=="
- },
"node_modules/body-parser": {
"version": "1.19.0",
"resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.19.0.tgz",
@@ -974,9 +968,12 @@
}
},
"node_modules/kareem": {
- "version": "2.3.2",
- "resolved": "https://registry.npmjs.org/kareem/-/kareem-2.3.2.tgz",
- "integrity": "sha512-STHz9P7X2L4Kwn72fA4rGyqyXdmrMSdxqHx9IXon/FXluXieaFA6KJ2upcHAHxQPQ0LeM/OjLrhFxifHewOALQ=="
+ "version": "2.6.3",
+ "resolved": "https://registry.npmjs.org/kareem/-/kareem-2.6.3.tgz",
+ "integrity": "sha512-C3iHfuGUXK2u8/ipq9LfjFfXFxAZMQJJq7vLS45r3D9Y2xQ/m4S8zaR4zMLFWh9AsNPXmcFfUDhTEO8UIC/V6Q==",
+ "engines": {
+ "node": ">=12.0.0"
+ }
},
"node_modules/lru-cache": {
"version": "6.0.0",
@@ -1022,8 +1019,7 @@
"node_modules/memory-pager": {
"version": "1.5.0",
"resolved": "https://registry.npmjs.org/memory-pager/-/memory-pager-1.5.0.tgz",
- "integrity": "sha512-ZS4Bp4r/Zoeq6+NLJpP+0Zzm0pR8whtGPf1XExKLJBAczGMnSi3It14OiNCStjQjM6NU1okjQGSxgEZN8eBYKg==",
- "optional": true
+ "integrity": "sha512-ZS4Bp4r/Zoeq6+NLJpP+0Zzm0pR8whtGPf1XExKLJBAczGMnSi3It14OiNCStjQjM6NU1okjQGSxgEZN8eBYKg=="
},
"node_modules/merge-descriptors": {
"version": "1.0.1",
@@ -1151,6 +1147,46 @@
}
}
},
+ "node_modules/mongodb-connection-string-url": {
+ "version": "3.0.2",
+ "resolved": "https://registry.npmjs.org/mongodb-connection-string-url/-/mongodb-connection-string-url-3.0.2.tgz",
+ "integrity": "sha512-rMO7CGo/9BFwyZABcKAWL8UJwH/Kc2x0g72uhDWzG48URRax5TCIcJ7Rc3RZqffZzO/Gwff/jyKwCU9TN8gehA==",
+ "dependencies": {
+ "@types/whatwg-url": "^11.0.2",
+ "whatwg-url": "^14.1.0 || ^13.0.0"
+ }
+ },
+ "node_modules/mongodb-connection-string-url/node_modules/tr46": {
+ "version": "5.1.1",
+ "resolved": "https://registry.npmjs.org/tr46/-/tr46-5.1.1.tgz",
+ "integrity": "sha512-hdF5ZgjTqgAntKkklYw0R03MG2x/bSzTtkxmIRw/sTNV8YXsCJ1tfLAX23lhxhHJlEf3CRCOCGGWw3vI3GaSPw==",
+ "dependencies": {
+ "punycode": "^2.3.1"
+ },
+ "engines": {
+ "node": ">=18"
+ }
+ },
+ "node_modules/mongodb-connection-string-url/node_modules/webidl-conversions": {
+ "version": "7.0.0",
+ "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-7.0.0.tgz",
+ "integrity": "sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==",
+ "engines": {
+ "node": ">=12"
+ }
+ },
+ "node_modules/mongodb-connection-string-url/node_modules/whatwg-url": {
+ "version": "14.2.0",
+ "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-14.2.0.tgz",
+ "integrity": "sha512-De72GdQZzNTUBBChsXueQUnPKDkg/5A5zp7pFDuQAj5UFoENpiACU0wlCvzpAGnTkj++ihpKwKyYewn/XNUbKw==",
+ "dependencies": {
+ "tr46": "^5.1.0",
+ "webidl-conversions": "^7.0.0"
+ },
+ "engines": {
+ "node": ">=18"
+ }
+ },
"node_modules/mongodb/node_modules/optional-require": {
"version": "1.1.8",
"resolved": "https://registry.npmjs.org/optional-require/-/optional-require-1.1.8.tgz",
@@ -1163,64 +1199,83 @@
}
},
"node_modules/mongoose": {
- "version": "5.13.15",
- "resolved": "https://registry.npmjs.org/mongoose/-/mongoose-5.13.15.tgz",
- "integrity": "sha512-cxp1Gbb8yUWkaEbajdhspSaKzAvsIvOtRlYD87GN/P2QEUhpd6bIvebi36T6M0tIVAMauNaK9SPA055N3PwF8Q==",
+ "version": "8.16.5",
+ "resolved": "https://registry.npmjs.org/mongoose/-/mongoose-8.16.5.tgz",
+ "integrity": "sha512-Ey84Jf1c426FEMj16+j/VqFKupFN2Ey5uAy6TTAN9HlFP4OcunL7j9O7vTuwAipzlZdjctxP0OK9MRJ4Aa/jNg==",
"dependencies": {
- "@types/bson": "1.x || 4.0.x",
- "@types/mongodb": "^3.5.27",
- "bson": "^1.1.4",
- "kareem": "2.3.2",
- "mongodb": "3.7.3",
- "mongoose-legacy-pluralize": "1.0.2",
- "mpath": "0.8.4",
- "mquery": "3.2.5",
- "ms": "2.1.2",
- "optional-require": "1.0.x",
- "regexp-clone": "1.0.0",
- "safe-buffer": "5.2.1",
- "sift": "13.5.2",
- "sliced": "1.0.1"
+ "bson": "^6.10.4",
+ "kareem": "2.6.3",
+ "mongodb": "~6.17.0",
+ "mpath": "0.9.0",
+ "mquery": "5.0.0",
+ "ms": "2.1.3",
+ "sift": "17.1.3"
},
"engines": {
- "node": ">=4.0.0"
+ "node": ">=16.20.1"
},
"funding": {
"type": "opencollective",
"url": "https://opencollective.com/mongoose"
}
},
- "node_modules/mongoose-legacy-pluralize": {
- "version": "1.0.2",
- "resolved": "https://registry.npmjs.org/mongoose-legacy-pluralize/-/mongoose-legacy-pluralize-1.0.2.tgz",
- "integrity": "sha512-Yo/7qQU4/EyIS8YDFSeenIvXxZN+ld7YdV9LqFVQJzTLye8unujAWPZ4NWKfFA+RNjh+wvTWKY9Z3E5XM6ZZiQ==",
- "peerDependencies": {
- "mongoose": "*"
+ "node_modules/mongoose/node_modules/bson": {
+ "version": "6.10.4",
+ "resolved": "https://registry.npmjs.org/bson/-/bson-6.10.4.tgz",
+ "integrity": "sha512-WIsKqkSC0ABoBJuT1LEX+2HEvNmNKKgnTAyd0fL8qzK4SH2i9NXg+t08YtdZp/V9IZ33cxe3iV4yM0qg8lMQng==",
+ "engines": {
+ "node": ">=16.20.1"
}
},
- "node_modules/mongoose/node_modules/ms": {
- "version": "2.1.2",
- "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
- "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
- },
- "node_modules/mongoose/node_modules/safe-buffer": {
- "version": "5.2.1",
- "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
- "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
- "funding": [
- {
- "type": "github",
- "url": "https://github.com/sponsors/feross"
+ "node_modules/mongoose/node_modules/mongodb": {
+ "version": "6.17.0",
+ "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-6.17.0.tgz",
+ "integrity": "sha512-neerUzg/8U26cgruLysKEjJvoNSXhyID3RvzvdcpsIi2COYM3FS3o9nlH7fxFtefTb942dX3W9i37oPfCVj4wA==",
+ "dependencies": {
+ "@mongodb-js/saslprep": "^1.1.9",
+ "bson": "^6.10.4",
+ "mongodb-connection-string-url": "^3.0.0"
+ },
+ "engines": {
+ "node": ">=16.20.1"
+ },
+ "peerDependencies": {
+ "@aws-sdk/credential-providers": "^3.188.0",
+ "@mongodb-js/zstd": "^1.1.0 || ^2.0.0",
+ "gcp-metadata": "^5.2.0",
+ "kerberos": "^2.0.1",
+ "mongodb-client-encryption": ">=6.0.0 <7",
+ "snappy": "^7.2.2",
+ "socks": "^2.7.1"
+ },
+ "peerDependenciesMeta": {
+ "@aws-sdk/credential-providers": {
+ "optional": true
},
- {
- "type": "patreon",
- "url": "https://www.patreon.com/feross"
+ "@mongodb-js/zstd": {
+ "optional": true
},
- {
- "type": "consulting",
- "url": "https://feross.org/support"
+ "gcp-metadata": {
+ "optional": true
+ },
+ "kerberos": {
+ "optional": true
+ },
+ "mongodb-client-encryption": {
+ "optional": true
+ },
+ "snappy": {
+ "optional": true
+ },
+ "socks": {
+ "optional": true
}
- ]
+ }
+ },
+ "node_modules/mongoose/node_modules/ms": {
+ "version": "2.1.3",
+ "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+ "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="
},
"node_modules/morgan": {
"version": "1.10.0",
@@ -1246,36 +1301,45 @@
}
},
"node_modules/mpath": {
- "version": "0.8.4",
- "resolved": "https://registry.npmjs.org/mpath/-/mpath-0.8.4.tgz",
- "integrity": "sha512-DTxNZomBcTWlrMW76jy1wvV37X/cNNxPW1y2Jzd4DZkAaC5ZGsm8bfGfNOthcDuRJujXLqiuS6o3Tpy0JEoh7g==",
+ "version": "0.9.0",
+ "resolved": "https://registry.npmjs.org/mpath/-/mpath-0.9.0.tgz",
+ "integrity": "sha512-ikJRQTk8hw5DEoFVxHG1Gn9T/xcjtdnOKIU1JTmGjZZlg9LST2mBLmcX3/ICIbgJydT2GOc15RnNy5mHmzfSew==",
"engines": {
"node": ">=4.0.0"
}
},
"node_modules/mquery": {
- "version": "3.2.5",
- "resolved": "https://registry.npmjs.org/mquery/-/mquery-3.2.5.tgz",
- "integrity": "sha512-VjOKHHgU84wij7IUoZzFRU07IAxd5kWJaDmyUzQlbjHjyoeK5TNeeo8ZsFDtTYnSgpW6n/nMNIHvE3u8Lbrf4A==",
+ "version": "5.0.0",
+ "resolved": "https://registry.npmjs.org/mquery/-/mquery-5.0.0.tgz",
+ "integrity": "sha512-iQMncpmEK8R8ncT8HJGsGc9Dsp8xcgYMVSbs5jgnm1lFHTZqMJTUWTDx1LBO8+mK3tPNZWFLBghQEIOULSTHZg==",
"dependencies": {
- "bluebird": "3.5.1",
- "debug": "3.1.0",
- "regexp-clone": "^1.0.0",
- "safe-buffer": "5.1.2",
- "sliced": "1.0.1"
+ "debug": "4.x"
},
"engines": {
- "node": ">=4.0.0"
+ "node": ">=14.0.0"
}
},
"node_modules/mquery/node_modules/debug": {
- "version": "3.1.0",
- "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
- "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+ "version": "4.4.1",
+ "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.1.tgz",
+ "integrity": "sha512-KcKCqiftBJcZr++7ykoDIEwSa3XWowTfNPo92BYxjXiyYEVrUQh2aLyhxBCwww+heortUFxEJYcRzosstTEBYQ==",
"dependencies": {
- "ms": "2.0.0"
+ "ms": "^2.1.3"
+ },
+ "engines": {
+ "node": ">=6.0"
+ },
+ "peerDependenciesMeta": {
+ "supports-color": {
+ "optional": true
+ }
}
},
+ "node_modules/mquery/node_modules/ms": {
+ "version": "2.1.3",
+ "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+ "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="
+ },
"node_modules/ms": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
@@ -1422,14 +1486,6 @@
"wrappy": "1"
}
},
- "node_modules/optional-require": {
- "version": "1.0.3",
- "resolved": "https://registry.npmjs.org/optional-require/-/optional-require-1.0.3.tgz",
- "integrity": "sha512-RV2Zp2MY2aeYK5G+B/Sps8lW5NHAzE5QClbFP15j+PWmP+T9PxlJXBOOLoSAdgwFvS4t0aMR4vpedMkbHfh0nA==",
- "engines": {
- "node": ">=4"
- }
- },
"node_modules/parseurl": {
"version": "1.3.3",
"resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz",
@@ -1525,6 +1581,14 @@
"resolved": "https://registry.npmjs.org/pstree.remy/-/pstree.remy-1.1.8.tgz",
"integrity": "sha512-77DZwxQmxKnu3aR542U+X8FypNzbfJ+C5XQDk3uWjWxn6151aIMGthWYRXTqT1E5oJvg+ljaa2OJi+VfvCOQ8w=="
},
+ "node_modules/punycode": {
+ "version": "2.3.1",
+ "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz",
+ "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==",
+ "engines": {
+ "node": ">=6"
+ }
+ },
"node_modules/qs": {
"version": "6.7.0",
"resolved": "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz",
@@ -1588,11 +1652,6 @@
"node": ">=8.10.0"
}
},
- "node_modules/regexp-clone": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/regexp-clone/-/regexp-clone-1.0.0.tgz",
- "integrity": "sha512-TuAasHQNamyyJ2hb97IuBEif4qBHGjPHBS64sZwytpLEqtBQ1gPJTnOaQ6qmpET16cK14kkjbazl6+p0RRv0yw=="
- },
"node_modules/require-at": {
"version": "1.0.6",
"resolved": "https://registry.npmjs.org/require-at/-/require-at-1.0.6.tgz",
@@ -1698,9 +1757,9 @@
"integrity": "sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw=="
},
"node_modules/sift": {
- "version": "13.5.2",
- "resolved": "https://registry.npmjs.org/sift/-/sift-13.5.2.tgz",
- "integrity": "sha512-+gxdEOMA2J+AI+fVsCqeNn7Tgx3M9ZN9jdi95939l1IJ8cZsqS8sqpJyOkic2SJk+1+98Uwryt/gL6XDaV+UZA=="
+ "version": "17.1.3",
+ "resolved": "https://registry.npmjs.org/sift/-/sift-17.1.3.tgz",
+ "integrity": "sha512-Rtlj66/b0ICeFzYTuNvX/EF1igRbbnGSvEyT79McoZa/DeGhMyC5pWKOEsZKnpkqtSeovd5FL/bjHWC3CIIvCQ=="
},
"node_modules/signal-exit": {
"version": "3.0.3",
@@ -1726,16 +1785,10 @@
"semver": "bin/semver.js"
}
},
- "node_modules/sliced": {
- "version": "1.0.1",
- "resolved": "https://registry.npmjs.org/sliced/-/sliced-1.0.1.tgz",
- "integrity": "sha1-CzpmK10Ewxd7GSa+qCsD+Dei70E="
- },
"node_modules/sparse-bitfield": {
"version": "3.0.3",
"resolved": "https://registry.npmjs.org/sparse-bitfield/-/sparse-bitfield-3.0.3.tgz",
"integrity": "sha1-/0rm5oZWBWuks+eSqzM004JzyhE=",
- "optional": true,
"dependencies": {
"memory-pager": "^1.0.2"
}
@@ -1975,28 +2028,27 @@
}
}
},
- "@types/bson": {
- "version": "4.0.3",
- "resolved": "https://registry.npmjs.org/@types/bson/-/bson-4.0.3.tgz",
- "integrity": "sha512-mVRvYnTOZJz3ccpxhr3wgxVmSeiYinW+zlzQz3SXWaJmD1DuL05Jeq7nKw3SnbKmbleW5qrLG5vdyWe/A9sXhw==",
+ "@mongodb-js/saslprep": {
+ "version": "1.3.0",
+ "resolved": "https://registry.npmjs.org/@mongodb-js/saslprep/-/saslprep-1.3.0.tgz",
+ "integrity": "sha512-zlayKCsIjYb7/IdfqxorK5+xUMyi4vOKcFy10wKJYc63NSdKI8mNME+uJqfatkPmOSMMUiojrL58IePKBm3gvQ==",
"requires": {
- "@types/node": "*"
+ "sparse-bitfield": "^3.0.3"
}
},
- "@types/mongodb": {
- "version": "3.6.12",
- "resolved": "https://registry.npmjs.org/@types/mongodb/-/mongodb-3.6.12.tgz",
- "integrity": "sha512-49aEzQD5VdHPxyd5dRyQdqEveAg9LanwrH8RQipnMuulwzKmODXIZRp0umtxi1eBUfEusRkoy8AVOMr+kVuFog==",
+ "@types/webidl-conversions": {
+ "version": "7.0.3",
+ "resolved": "https://registry.npmjs.org/@types/webidl-conversions/-/webidl-conversions-7.0.3.tgz",
+ "integrity": "sha512-CiJJvcRtIgzadHCYXw7dqEnMNRjhGZlYK05Mj9OyktqV8uVT8fD2BFOB7S1uwBE3Kj2Z+4UyPmFw/Ixgw/LAlA=="
+ },
+ "@types/whatwg-url": {
+ "version": "11.0.5",
+ "resolved": "https://registry.npmjs.org/@types/whatwg-url/-/whatwg-url-11.0.5.tgz",
+ "integrity": "sha512-coYR071JRaHa+xoEvvYqvnIHaVqaYrLPbsufM9BF63HkwI5Lgmy2QR8Q5K/lYDYo5AK82wOvSOS0UsLTpTG7uQ==",
"requires": {
- "@types/bson": "*",
- "@types/node": "*"
+ "@types/webidl-conversions": "*"
}
},
- "@types/node": {
- "version": "14.14.37",
- "resolved": "https://registry.npmjs.org/@types/node/-/node-14.14.37.tgz",
- "integrity": "sha512-XYmBiy+ohOR4Lh5jE379fV2IU+6Jn4g5qASinhitfyO71b/sCo6MKsMLF5tc7Zf2CE8hViVQyYSobJNke8OvUw=="
- },
"abbrev": {
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
@@ -2128,11 +2180,6 @@
"safe-buffer": "^5.1.1"
}
},
- "bluebird": {
- "version": "3.5.1",
- "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.1.tgz",
- "integrity": "sha512-MKiLiV+I1AA596t9w1sQJ8jkiSr5+ZKi0WKrYGUn6d1Fx+Ij4tIj+m2WMQSGczs5jZVxV339chE8iwk6F64wjA=="
- },
"body-parser": {
"version": "1.19.0",
"resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.19.0.tgz",
@@ -2673,9 +2720,9 @@
}
},
"kareem": {
- "version": "2.3.2",
- "resolved": "https://registry.npmjs.org/kareem/-/kareem-2.3.2.tgz",
- "integrity": "sha512-STHz9P7X2L4Kwn72fA4rGyqyXdmrMSdxqHx9IXon/FXluXieaFA6KJ2upcHAHxQPQ0LeM/OjLrhFxifHewOALQ=="
+ "version": "2.6.3",
+ "resolved": "https://registry.npmjs.org/kareem/-/kareem-2.6.3.tgz",
+ "integrity": "sha512-C3iHfuGUXK2u8/ipq9LfjFfXFxAZMQJJq7vLS45r3D9Y2xQ/m4S8zaR4zMLFWh9AsNPXmcFfUDhTEO8UIC/V6Q=="
},
"lru-cache": {
"version": "6.0.0",
@@ -2708,8 +2755,7 @@
"memory-pager": {
"version": "1.5.0",
"resolved": "https://registry.npmjs.org/memory-pager/-/memory-pager-1.5.0.tgz",
- "integrity": "sha512-ZS4Bp4r/Zoeq6+NLJpP+0Zzm0pR8whtGPf1XExKLJBAczGMnSi3It14OiNCStjQjM6NU1okjQGSxgEZN8eBYKg==",
- "optional": true
+ "integrity": "sha512-ZS4Bp4r/Zoeq6+NLJpP+0Zzm0pR8whtGPf1XExKLJBAczGMnSi3It14OiNCStjQjM6NU1okjQGSxgEZN8eBYKg=="
},
"merge-descriptors": {
"version": "1.0.1",
@@ -2792,44 +2838,74 @@
}
}
},
- "mongoose": {
- "version": "5.13.15",
- "resolved": "https://registry.npmjs.org/mongoose/-/mongoose-5.13.15.tgz",
- "integrity": "sha512-cxp1Gbb8yUWkaEbajdhspSaKzAvsIvOtRlYD87GN/P2QEUhpd6bIvebi36T6M0tIVAMauNaK9SPA055N3PwF8Q==",
+ "mongodb-connection-string-url": {
+ "version": "3.0.2",
+ "resolved": "https://registry.npmjs.org/mongodb-connection-string-url/-/mongodb-connection-string-url-3.0.2.tgz",
+ "integrity": "sha512-rMO7CGo/9BFwyZABcKAWL8UJwH/Kc2x0g72uhDWzG48URRax5TCIcJ7Rc3RZqffZzO/Gwff/jyKwCU9TN8gehA==",
"requires": {
- "@types/bson": "1.x || 4.0.x",
- "@types/mongodb": "^3.5.27",
- "bson": "^1.1.4",
- "kareem": "2.3.2",
- "mongodb": "3.7.3",
- "mongoose-legacy-pluralize": "1.0.2",
- "mpath": "0.8.4",
- "mquery": "3.2.5",
- "ms": "2.1.2",
- "optional-require": "1.0.x",
- "regexp-clone": "1.0.0",
- "safe-buffer": "5.2.1",
- "sift": "13.5.2",
- "sliced": "1.0.1"
+ "@types/whatwg-url": "^11.0.2",
+ "whatwg-url": "^14.1.0 || ^13.0.0"
},
"dependencies": {
- "ms": {
- "version": "2.1.2",
- "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
- "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
+ "tr46": {
+ "version": "5.1.1",
+ "resolved": "https://registry.npmjs.org/tr46/-/tr46-5.1.1.tgz",
+ "integrity": "sha512-hdF5ZgjTqgAntKkklYw0R03MG2x/bSzTtkxmIRw/sTNV8YXsCJ1tfLAX23lhxhHJlEf3CRCOCGGWw3vI3GaSPw==",
+ "requires": {
+ "punycode": "^2.3.1"
+ }
},
- "safe-buffer": {
- "version": "5.2.1",
- "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
- "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="
+ "webidl-conversions": {
+ "version": "7.0.0",
+ "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-7.0.0.tgz",
+ "integrity": "sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g=="
+ },
+ "whatwg-url": {
+ "version": "14.2.0",
+ "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-14.2.0.tgz",
+ "integrity": "sha512-De72GdQZzNTUBBChsXueQUnPKDkg/5A5zp7pFDuQAj5UFoENpiACU0wlCvzpAGnTkj++ihpKwKyYewn/XNUbKw==",
+ "requires": {
+ "tr46": "^5.1.0",
+ "webidl-conversions": "^7.0.0"
+ }
}
}
},
- "mongoose-legacy-pluralize": {
- "version": "1.0.2",
- "resolved": "https://registry.npmjs.org/mongoose-legacy-pluralize/-/mongoose-legacy-pluralize-1.0.2.tgz",
- "integrity": "sha512-Yo/7qQU4/EyIS8YDFSeenIvXxZN+ld7YdV9LqFVQJzTLye8unujAWPZ4NWKfFA+RNjh+wvTWKY9Z3E5XM6ZZiQ==",
- "requires": {}
+ "mongoose": {
+ "version": "8.16.5",
+ "resolved": "https://registry.npmjs.org/mongoose/-/mongoose-8.16.5.tgz",
+ "integrity": "sha512-Ey84Jf1c426FEMj16+j/VqFKupFN2Ey5uAy6TTAN9HlFP4OcunL7j9O7vTuwAipzlZdjctxP0OK9MRJ4Aa/jNg==",
+ "requires": {
+ "bson": "^6.10.4",
+ "kareem": "2.6.3",
+ "mongodb": "~6.17.0",
+ "mpath": "0.9.0",
+ "mquery": "5.0.0",
+ "ms": "2.1.3",
+ "sift": "17.1.3"
+ },
+ "dependencies": {
+ "bson": {
+ "version": "6.10.4",
+ "resolved": "https://registry.npmjs.org/bson/-/bson-6.10.4.tgz",
+ "integrity": "sha512-WIsKqkSC0ABoBJuT1LEX+2HEvNmNKKgnTAyd0fL8qzK4SH2i9NXg+t08YtdZp/V9IZ33cxe3iV4yM0qg8lMQng=="
+ },
+ "mongodb": {
+ "version": "6.17.0",
+ "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-6.17.0.tgz",
+ "integrity": "sha512-neerUzg/8U26cgruLysKEjJvoNSXhyID3RvzvdcpsIi2COYM3FS3o9nlH7fxFtefTb942dX3W9i37oPfCVj4wA==",
+ "requires": {
+ "@mongodb-js/saslprep": "^1.1.9",
+ "bson": "^6.10.4",
+ "mongodb-connection-string-url": "^3.0.0"
+ }
+ },
+ "ms": {
+ "version": "2.1.3",
+ "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+ "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="
+ }
+ }
},
"morgan": {
"version": "1.10.0",
@@ -2851,29 +2927,30 @@
}
},
"mpath": {
- "version": "0.8.4",
- "resolved": "https://registry.npmjs.org/mpath/-/mpath-0.8.4.tgz",
- "integrity": "sha512-DTxNZomBcTWlrMW76jy1wvV37X/cNNxPW1y2Jzd4DZkAaC5ZGsm8bfGfNOthcDuRJujXLqiuS6o3Tpy0JEoh7g=="
+ "version": "0.9.0",
+ "resolved": "https://registry.npmjs.org/mpath/-/mpath-0.9.0.tgz",
+ "integrity": "sha512-ikJRQTk8hw5DEoFVxHG1Gn9T/xcjtdnOKIU1JTmGjZZlg9LST2mBLmcX3/ICIbgJydT2GOc15RnNy5mHmzfSew=="
},
"mquery": {
- "version": "3.2.5",
- "resolved": "https://registry.npmjs.org/mquery/-/mquery-3.2.5.tgz",
- "integrity": "sha512-VjOKHHgU84wij7IUoZzFRU07IAxd5kWJaDmyUzQlbjHjyoeK5TNeeo8ZsFDtTYnSgpW6n/nMNIHvE3u8Lbrf4A==",
+ "version": "5.0.0",
+ "resolved": "https://registry.npmjs.org/mquery/-/mquery-5.0.0.tgz",
+ "integrity": "sha512-iQMncpmEK8R8ncT8HJGsGc9Dsp8xcgYMVSbs5jgnm1lFHTZqMJTUWTDx1LBO8+mK3tPNZWFLBghQEIOULSTHZg==",
"requires": {
- "bluebird": "3.5.1",
- "debug": "3.1.0",
- "regexp-clone": "^1.0.0",
- "safe-buffer": "5.1.2",
- "sliced": "1.0.1"
+ "debug": "4.x"
},
"dependencies": {
"debug": {
- "version": "3.1.0",
- "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
- "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+ "version": "4.4.1",
+ "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.1.tgz",
+ "integrity": "sha512-KcKCqiftBJcZr++7ykoDIEwSa3XWowTfNPo92BYxjXiyYEVrUQh2aLyhxBCwww+heortUFxEJYcRzosstTEBYQ==",
"requires": {
- "ms": "2.0.0"
+ "ms": "^2.1.3"
}
+ },
+ "ms": {
+ "version": "2.1.3",
+ "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+ "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="
}
}
},
@@ -2982,11 +3059,6 @@
"wrappy": "1"
}
},
- "optional-require": {
- "version": "1.0.3",
- "resolved": "https://registry.npmjs.org/optional-require/-/optional-require-1.0.3.tgz",
- "integrity": "sha512-RV2Zp2MY2aeYK5G+B/Sps8lW5NHAzE5QClbFP15j+PWmP+T9PxlJXBOOLoSAdgwFvS4t0aMR4vpedMkbHfh0nA=="
- },
"parseurl": {
"version": "1.3.3",
"resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz",
@@ -3054,6 +3126,11 @@
"resolved": "https://registry.npmjs.org/pstree.remy/-/pstree.remy-1.1.8.tgz",
"integrity": "sha512-77DZwxQmxKnu3aR542U+X8FypNzbfJ+C5XQDk3uWjWxn6151aIMGthWYRXTqT1E5oJvg+ljaa2OJi+VfvCOQ8w=="
},
+ "punycode": {
+ "version": "2.3.1",
+ "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz",
+ "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg=="
+ },
"qs": {
"version": "6.7.0",
"resolved": "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz",
@@ -3102,11 +3179,6 @@
"picomatch": "^2.2.1"
}
},
- "regexp-clone": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/regexp-clone/-/regexp-clone-1.0.0.tgz",
- "integrity": "sha512-TuAasHQNamyyJ2hb97IuBEif4qBHGjPHBS64sZwytpLEqtBQ1gPJTnOaQ6qmpET16cK14kkjbazl6+p0RRv0yw=="
- },
"require-at": {
"version": "1.0.6",
"resolved": "https://registry.npmjs.org/require-at/-/require-at-1.0.6.tgz",
@@ -3193,9 +3265,9 @@
"integrity": "sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw=="
},
"sift": {
- "version": "13.5.2",
- "resolved": "https://registry.npmjs.org/sift/-/sift-13.5.2.tgz",
- "integrity": "sha512-+gxdEOMA2J+AI+fVsCqeNn7Tgx3M9ZN9jdi95939l1IJ8cZsqS8sqpJyOkic2SJk+1+98Uwryt/gL6XDaV+UZA=="
+ "version": "17.1.3",
+ "resolved": "https://registry.npmjs.org/sift/-/sift-17.1.3.tgz",
+ "integrity": "sha512-Rtlj66/b0ICeFzYTuNvX/EF1igRbbnGSvEyT79McoZa/DeGhMyC5pWKOEsZKnpkqtSeovd5FL/bjHWC3CIIvCQ=="
},
"signal-exit": {
"version": "3.0.3",
@@ -3217,16 +3289,10 @@
}
}
},
- "sliced": {
- "version": "1.0.1",
- "resolved": "https://registry.npmjs.org/sliced/-/sliced-1.0.1.tgz",
- "integrity": "sha1-CzpmK10Ewxd7GSa+qCsD+Dei70E="
- },
"sparse-bitfield": {
"version": "3.0.3",
"resolved": "https://registry.npmjs.org/sparse-bitfield/-/sparse-bitfield-3.0.3.tgz",
"integrity": "sha1-/0rm5oZWBWuks+eSqzM004JzyhE=",
- "optional": true,
"requires": {
"memory-pager": "^1.0.2"
}
diff --git a/package.json b/package.json
index 8c294b38a..3f0ec2566 100644
--- a/package.json
+++ b/package.json
@@ -18,7 +18,7 @@
"express-flash": "^0.0.2",
"express-session": "^1.17.1",
"mongodb": "^3.6.5",
- "mongoose": "^5.12.3",
+ "mongoose": "^8.16.5",
"morgan": "^1.10.0",
"nodemon": "^2.0.7",
"passport": "^0.6.0",
diff --git a/public/css/style.css b/public/css/style.css
index fbd6b929e..a47e6d8f0 100644
--- a/public/css/style.css
+++ b/public/css/style.css
@@ -1,10 +1,100 @@
-h1{
- color: red;
+/* Reset default margin/padding */
+* {
+ box-sizing: border-box;
+ margin: 0;
+ padding: 0;
}
-.completed{
- text-decoration: line-through;
- color: gray;
+
+body {
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ min-height: 100vh;
+ font-family: Arial, sans-serif;
+ background-color: #f9f9f9;
+ padding: 2rem;
+ color: #333;
}
-.not{
- text-decoration: underline;
+
+ul {
+ list-style: none;
+}
+
+li.todoItem {
+ display: flex;
+ align-items: center;
+ justify-content: left;
+ background-color: #fff;
+ padding: 0.75rem 1rem;
+ margin-bottom: 0.5rem;
+ border-radius: 6px;
+ box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1);
+}
+
+li.todoItem input[type="checkbox"] {
+ margin-right: 1rem;
+ transform: scale(1.2);
+}
+
+span.completed {
+ text-decoration: line-through;
+ color: #888;
+}
+
+span.not {
+ color: #333;
+ text-decoration: underline;
+}
+
+span.priority {
+ background-color: rgb(251, 251, 162);
+ padding: 0.2rem 0.4rem;
+ border-radius: 4px;
+}
+
+span.del, span.flag {
+ cursor: pointer;
+ margin-left: 0.75rem;
+ font-size: 1.1rem;
+}
+
+
+form {
+ display: flex;
+ margin-top: 1rem;
+ gap: 0.5rem;
+ flex-wrap: wrap;
+ justify-content: center;
+}
+
+form input {
+ padding: 0.5rem 1rem;
+ font-size: 1rem;
+ border-radius: 4px;
+}
+
+form input[type="text"] {
+ width: 250px;
+}
+
+form input[type="submit"] {
+ background-color: #4CAF50;
+ color: white;
+ border: none;
+ cursor: pointer;
+}
+
+form input[type="submit"]:hover {
+ background-color: #45a049;
+}
+
+
+h1 {
+ margin: 1.5rem 0;
+ color: rgb(70, 135, 52);
+}
+
+h2 {
+ margin: 1.5rem 0;
+ font-weight: normal;
}
\ No newline at end of file
diff --git a/public/js/main.js b/public/js/main.js
index b4cfee075..f028ce05d 100644
--- a/public/js/main.js
+++ b/public/js/main.js
@@ -1,17 +1,22 @@
const deleteBtn = document.querySelectorAll('.del')
-const todoItem = document.querySelectorAll('span.not')
-const todoComplete = document.querySelectorAll('span.completed')
+const todoItem = document.querySelectorAll('.check')
+// const todoComplete = document.querySelectorAll('span.completed')
+const todoPriority = document.querySelectorAll('.flag')
Array.from(deleteBtn).forEach((el)=>{
el.addEventListener('click', deleteTodo)
})
Array.from(todoItem).forEach((el)=>{
- el.addEventListener('click', markComplete)
+ el.addEventListener('change', markComplete)
})
-Array.from(todoComplete).forEach((el)=>{
- el.addEventListener('click', markIncomplete)
+// Array.from(todoComplete).forEach((el)=>{
+// el.addEventListener('click', markIncomplete)
+// })
+
+Array.from(todoPriority).forEach((el) => {
+ el.addEventListener('click', markPriority)
})
async function deleteTodo(){
@@ -34,12 +39,14 @@ async function deleteTodo(){
async function markComplete(){
const todoId = this.parentNode.dataset.id
+ const isChecked = this.checked
try{
const response = await fetch('todos/markComplete', {
method: 'put',
headers: {'Content-type': 'application/json'},
body: JSON.stringify({
- 'todoIdFromJSFile': todoId
+ 'todoIdFromJSFile': todoId,
+ 'completed': isChecked
})
})
const data = await response.json()
@@ -50,12 +57,30 @@ async function markComplete(){
}
}
-async function markIncomplete(){
+// async function markIncomplete(){
+// const todoId = this.parentNode.dataset.id
+// try{
+// const response = await fetch('todos/markIncomplete', {
+// method: 'put',
+// headers: {'Content-type': 'application/json'},
+// body: JSON.stringify({
+// 'todoIdFromJSFile': todoId
+// })
+// })
+// const data = await response.json()
+// console.log(data)
+// location.reload()
+// }catch(err){
+// console.log(err)
+// }
+// }
+
+async function markPriority() {
const todoId = this.parentNode.dataset.id
- try{
- const response = await fetch('todos/markIncomplete', {
+ try {
+ const response = await fetch('todos/markPriority', {
method: 'put',
- headers: {'Content-type': 'application/json'},
+ headers: { 'Content-type': 'application/json' },
body: JSON.stringify({
'todoIdFromJSFile': todoId
})
@@ -63,7 +88,7 @@ async function markIncomplete(){
const data = await response.json()
console.log(data)
location.reload()
- }catch(err){
+ } catch (err) {
console.log(err)
}
}
\ No newline at end of file
diff --git a/routes/todos.js b/routes/todos.js
index 03dcf42e4..a07149caa 100644
--- a/routes/todos.js
+++ b/routes/todos.js
@@ -9,8 +9,10 @@ router.post('/createTodo', todosController.createTodo)
router.put('/markComplete', todosController.markComplete)
-router.put('/markIncomplete', todosController.markIncomplete)
+// router.put('/markIncomplete', todosController.markIncomplete)
router.delete('/deleteTodo', todosController.deleteTodo)
+router.put('/markPriority', todosController.markPriority)
+
module.exports = router
\ No newline at end of file
diff --git a/views/todos.ejs b/views/todos.ejs
index d76747a08..fa00c6e73 100644
--- a/views/todos.ejs
+++ b/views/todos.ejs
@@ -10,10 +10,25 @@
Todos
@@ -21,8 +36,8 @@
<%= user.userName %> has <%= left %> things left to do.
Logout