Skip to content
Merged
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
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
node_modules
.vscode/*
.env
config/.env
2 changes: 0 additions & 2 deletions config/.env

This file was deleted.

5 changes: 3 additions & 2 deletions controllers/todos.js
Original file line number Diff line number Diff line change
Expand Up @@ -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){
Expand Down
4 changes: 4 additions & 0 deletions models/Todo.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,10 @@ const TodoSchema = new mongoose.Schema({
userId: {
type: String,
required: true
},
dueDate: {
type: String,
required: true
}
})

Expand Down
1 change: 0 additions & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion public/js/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -66,4 +66,4 @@ async function markIncomplete(){
}catch(err){
console.log(err)
}
}
}
2 changes: 2 additions & 0 deletions views/todos.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
<% todos.forEach( el => { %>
<li class='todoItem' data-id='<%=el._id%>'>
<span class='<%= el.completed === true ? 'completed' : 'not'%>'><%= el.todo %></span>
<span class="dueDate">Due Date: <%= el.dueDate %></span>
<span class='del'> Delete </span>
</li>
<% }) %>
Expand All @@ -22,6 +23,7 @@

<form action="/todos/createTodo" method='POST'>
<input type="text" placeholder="Enter Todo Item" name='todoItem'>
<input type="date" name="dueDate">
<input type="submit">
</form>

Expand Down