Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature diary posts #143

Open
wants to merge 10 commits into
base: main
Choose a base branch
from
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
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
node_modules
.vscode/*
.vscode/*
.env
2 changes: 1 addition & 1 deletion config/.env
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
PORT = 2121
DB_STRING = mongodb+srv://demo:demo@cluster0.hcds1.mongodb.net/todos?retryWrites=true&w=majority
DB_STRING = mongodb+srv://zinger:ZyEvLFkPOSp38dI4@cluster0.f3yakar.mongodb.net/ToDoTasks-Demo?retryWrites=true&w=majority
10 changes: 5 additions & 5 deletions controllers/auth.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ const passport = require('passport')
const validator = require('validator')
const User = require('../models/User')

exports.getLogin = (req, res) => {
exports.getLogin = (req, res) => {
if (req.user) {
return res.redirect('/todos')
return res.redirect('/diary')
}
res.render('login', {
title: 'Login'
Expand All @@ -31,7 +31,7 @@ const User = require('../models/User')
req.logIn(user, (err) => {
if (err) { return next(err) }
req.flash('success', { msg: 'Success! You are logged in.' })
res.redirect(req.session.returnTo || '/todos')
res.redirect(req.session.returnTo || '/diary')
})
})(req, res, next)
}
Expand All @@ -49,7 +49,7 @@ const User = require('../models/User')

exports.getSignup = (req, res) => {
if (req.user) {
return res.redirect('/todos')
return res.redirect('/diary')
}
res.render('signup', {
title: 'Create Account'
Expand Down Expand Up @@ -89,7 +89,7 @@ const User = require('../models/User')
if (err) {
return next(err)
}
res.redirect('/todos')
res.redirect('/diary')
})
})
})
Expand Down
42 changes: 42 additions & 0 deletions controllers/diary.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
const Diary = require('../models/Diary')

module.exports = {
getDiary: async (req,res)=>{
console.log(req.user)
try{
const diaryEntries = await Diary.find({userId:req.user.id}) //find the Diary in database with matching from models
const totalEntries = await Diary.countDocuments({userId:req.user.id})
res.render('diary.ejs', {diary: diaryEntries, total: totalEntries, user: req.user})
}catch(err){
console.log(err)
}
},
createDiary: async (req, res)=>{
try{
await Diary.create({diary: req.body.diaryEntry, userId: req.user.id, private: req.body.private})
console.log(req.body)
res.redirect('/diary')
}catch(err){
console.log(err)
}
},
changePrivacy: async (req, res)=>{
try{
await Diary.findOneAndUpdate({_id:req.body.diaryIdFromJSFile},{private: req.body.private})
console.log('Updated Diary')
res.json('Updated Diary')
}catch(err){
console.log(err)
}
},
deleteDiary: async (req, res)=>{
console.log(req.body.diaryIdFromJSFile)
try{
await Diary.findOneAndDelete({_id:req.body.diaryIdFromJSFile})
console.log('Deleted Diary')
res.json('Deleted It')
}catch(err){
console.log(err)
}
}
}
55 changes: 0 additions & 55 deletions controllers/todos.js

This file was deleted.

14 changes: 7 additions & 7 deletions models/Todo.js → models/Diary.js
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
const mongoose = require('mongoose')

const TodoSchema = new mongoose.Schema({
todo: {
const DiarySchema = new mongoose.Schema({
diary: {
type: String,
required: true,
},
completed: {
type: Boolean,
required: true,
},
userId: {
type: String,
required: true
},
private: {
type: Boolean,
required: true
}
})

module.exports = mongoose.model('Todo', TodoSchema)
module.exports = mongoose.model('Diary', DiarySchema)
48 changes: 14 additions & 34 deletions public/js/main.js
Original file line number Diff line number Diff line change
@@ -1,45 +1,23 @@
const deleteBtn = document.querySelectorAll('.del')
const todoItem = document.querySelectorAll('span.not')
const todoComplete = document.querySelectorAll('span.completed')
const changePrivacyBtn = document.querySelectorAll('.changePrivacy')

Array.from(deleteBtn).forEach((el)=>{
el.addEventListener('click', deleteTodo)
el.addEventListener('click', deleteDiary)
})

Array.from(todoItem).forEach((el)=>{
el.addEventListener('click', markComplete)
Array.from(changePrivacyBtn).forEach((el)=>{
el.addEventListener('click', changePrivacy)
})

Array.from(todoComplete).forEach((el)=>{
el.addEventListener('click', markIncomplete)
})

async function deleteTodo(){
const todoId = this.parentNode.dataset.id
async function deleteDiary(){
const diaryId = this.parentNode.dataset.id
try{
const response = await fetch('todos/deleteTodo', {
const response = await fetch('diary/deleteDiary', {
method: 'delete',
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 markComplete(){
const todoId = this.parentNode.dataset.id
try{
const response = await fetch('todos/markComplete', {
method: 'put',
headers: {'Content-type': 'application/json'},
body: JSON.stringify({
'todoIdFromJSFile': todoId
'diaryIdFromJSFile': diaryId
})
})
const data = await response.json()
Expand All @@ -50,14 +28,16 @@ async function markComplete(){
}
}

async function markIncomplete(){
const todoId = this.parentNode.dataset.id
async function changePrivacy(){
const diaryId = this.parentNode.dataset.id
const private = this.parentNode.dataset.private === "true"
try{
const response = await fetch('todos/markIncomplete', {
const response = await fetch('diary/changePrivacy', {
method: 'put',
headers: {'Content-type': 'application/json'},
body: JSON.stringify({
'todoIdFromJSFile': todoId
'diaryIdFromJSFile': diaryId,
'private': !private,
})
})
const data = await response.json()
Expand Down
14 changes: 14 additions & 0 deletions routes/diary.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
const express = require('express')
const router = express.Router()
const diaryController = require('../controllers/diary')
const { ensureAuth } = require('../middleware/auth')

router.get('/', ensureAuth, diaryController.getDiary)

router.post('/createDiary', diaryController.createDiary)

router.put('/changePrivacy', diaryController.changePrivacy)

router.delete('/deleteDiary', diaryController.deleteDiary)

module.exports = router
16 changes: 0 additions & 16 deletions routes/todos.js

This file was deleted.

8 changes: 4 additions & 4 deletions server.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ const flash = require('express-flash')
const logger = require('morgan')
const connectDB = require('./config/database')
const mainRoutes = require('./routes/main')
const todoRoutes = require('./routes/todos')
const diaryRoutes = require('./routes/diary')

require('dotenv').config({path: './config/.env'})

Expand Down Expand Up @@ -39,8 +39,8 @@ app.use(passport.session())
app.use(flash())

app.use('/', mainRoutes)
app.use('/todos', todoRoutes)
app.use('/diary', diaryRoutes)

app.listen(process.env.PORT, ()=>{
console.log('Server is running, you better catch it!')
})
})
46 changes: 46 additions & 0 deletions views/diary.ejs
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>Document</title>
<link rel="stylesheet" href="css/style.css">
</head>
<body>
<h1>Diary</h1>
<ul>
<% diary.forEach( el => { %>
<li class='diaryEntry' data-id='<%=el._id%>' data-private='<%=el.private%>'>
<span><%= el.diary %></span>
<br>
<p>This entry is <%= el.private ? 'Private ' : 'Public ' %></p>
<button class='del'> Delete </button>
<button class='changePrivacy'>Make <%= !el.private ? 'Private ' : 'Public ' %></button>
<br>

<!-- <form action="/diary/updateDiary" method='POST'>
<input type="text" placeholder="Update diary entry" name='diaryEntry'>
<input type="submit" class="update" value="Update">
</form> -->
</li>
<br>
<% }) %>
</ul>

<h2><%= user.userName %> has <%= total %> total diary entries.</h2>

<form action="/diary/createDiary" method='POST'>
<textarea placeholder="Add a new diary Entry" name="diaryEntry"></textarea>
<input type="radio" id="false" name="private" value="false" checked="true">
<label for="public">Public</label>
<input type="radio" id="true" name="private" value="true">
<label for="private">Private</label>
<input type="submit">
</form>

<a href="/logout">Logout</a>

<script src="js/main.js"></script>
</body>
</html>
2 changes: 1 addition & 1 deletion views/index.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<title>Document</title>
</head>
<body>
<h1>Create Your VERY OWN Todolist!</h1>
<h1>Create Your VERY OWN Diary!</h1>
<a href="/login"> Login</a>
<a href="/signup"> Signup</a>
</body>
Expand Down
Loading