diff --git a/.gitignore b/.gitignore index 22bbbe69c..ea04d7c5a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,3 @@ node_modules .vscode/* -.env \ No newline at end of file +config/.env \ No newline at end of file diff --git a/config/.env b/config/.env deleted file mode 100644 index dbe126e0a..000000000 --- a/config/.env +++ /dev/null @@ -1,2 +0,0 @@ -PORT = 2121 -DB_STRING = mongodb+srv://demo:demo@cluster0.hcds1.mongodb.net/todos?retryWrites=true&w=majority \ No newline at end of file diff --git a/controllers/todos.js b/controllers/todos.js index b10950f93..021ca4bc5 100644 --- a/controllers/todos.js +++ b/controllers/todos.js @@ -6,14 +6,15 @@ module.exports = { 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}) + const dueDate = await Todo.find({userId:req.user.dueDate}) + res.render('todos.ejs', {todos: todoItems, left: itemsLeft, user: req.user, dueDate: dueDate}) }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, dueDate: req.body.dueDate}) console.log('Todo has been added!') res.redirect('/todos') }catch(err){ diff --git a/models/Todo.js b/models/Todo.js index 8698f6900..6a1705f15 100644 --- a/models/Todo.js +++ b/models/Todo.js @@ -12,6 +12,10 @@ const TodoSchema = new mongoose.Schema({ userId: { type: String, required: true + }, + dueDate: { + type: String, + required: true } }) diff --git a/package-lock.json b/package-lock.json index f5d8debf0..092ffd806 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5,7 +5,6 @@ "requires": true, "packages": { "": { - "name": "todo-mvc-auth-local", "version": "1.0.0", "license": "MIT", "dependencies": { diff --git a/public/js/main.js b/public/js/main.js index b4cfee075..fec84bc89 100644 --- a/public/js/main.js +++ b/public/js/main.js @@ -66,4 +66,4 @@ async function markIncomplete(){ }catch(err){ console.log(err) } -} \ No newline at end of file +} diff --git a/views/todos.ejs b/views/todos.ejs index d76747a08..0e283fcd2 100644 --- a/views/todos.ejs +++ b/views/todos.ejs @@ -13,6 +13,7 @@ <% todos.forEach( el => { %>
  • '><%= el.todo %> + Due Date: <%= el.dueDate %> Delete
  • <% }) %> @@ -22,6 +23,7 @@
    +