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
5 changes: 4 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,4 @@
node_modules
config/*.env
node_modules/
pnpm-lock.yaml
.vscode/settings.json
4 changes: 0 additions & 4 deletions .vscode/settings.json

This file was deleted.

1 change: 0 additions & 1 deletion Procfile

This file was deleted.

2 changes: 0 additions & 2 deletions config/.env

This file was deleted.

4 changes: 1 addition & 3 deletions config/database.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,7 @@ const mongoose = require('mongoose')
const connectDB = async () => {
try {
const conn = await mongoose.connect(process.env.DB_STRING, {
useNewUrlParser: true,
useUnifiedTopology: true,
useFindAndModify: false,
dbName:"scuffed",
})

console.log(`MongoDB Connected: ${conn.connection.host}`)
Expand Down
34 changes: 19 additions & 15 deletions controllers/todos.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,41 +8,45 @@ module.exports = {
res.render('todos.ejs', {todos: todoItems, left: itemsLeft})
}catch(err){
console.log(err)
res.status(500).send('Error getting todos');
}
},
createTodo: async (req, res)=>{
try{
await Todo.create({todo: req.body.todoItem, completed: false})
await Todo.create({
todo: req.body.todoItem,
completed: false,
picture: req.body.pictureUrl,
deletePicture: req.body.deleteImageUrl,
})
console.log('Todo has been added!')
res.redirect('/todos')
}catch(err){
console.log(err)
res.status(500).send('Error creating todo');
}
},
markComplete: async (req, res)=>{
toggleComplete: async (req, res)=>{
try{
const todo = await Todo.findById({_id:req.body.todoIdFromJSFile})
await Todo.findOneAndUpdate({_id:req.body.todoIdFromJSFile},{
completed: true
completed: !todo.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)
const todo = await Todo.findById(req.body.todoIdFromJSFile);
if (todo.deletePicture){
fetch(todo.deletePicture, {
method: 'GET',
}).catch(err=>console.error("image delete failed",err)
)
console.log('Image deletion in progress (running in background)');
}
try{
await Todo.findOneAndDelete({_id:req.body.todoIdFromJSFile})
console.log('Deleted Todo')
Expand Down
6 changes: 6 additions & 0 deletions models/Todo.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,12 @@ const TodoSchema = new mongoose.Schema({
completed: {
type: Boolean,
required: true,
},
picture: {
type: String,
},
deletePicture: {
type:String,
}
})

Expand Down
Loading