file structure changes, building new js code for event handlers

RodBennett · Oct 16, 2022 · 167285d · 167285d
1 parent ac68016
commit 167285d
Show file tree

Hide file tree

Showing 22 changed files with 154 additions and 211 deletions.
diff --git a/controllers/api/comment-routes.js b/controllers/api/comment-routes.js
@@ -8,7 +8,6 @@ const withAuth = require("../../utils/auth");
 router.get("/", async (req, res) => {
   try {
     const dbCommentData = await Comment.findAll({});
-
     res.json(dbCommentData);
   } catch (err) {
     console.log(err);
@@ -17,19 +16,19 @@ router.get("/", async (req, res) => {
 });
 
 // GET route for one single comment
-router.get("/:id", withAuth, async (req, res) => {
-  try {
-    const dbCommentData = await Comment.findByPk({
-      where: {
-        id: req.params.id,
-      },
-    });
-    res.json(dbCommentData);
-  } catch (err) {
-    console.log(err);
-    res.status(500).json(err);
-  }
-});
+// router.get("/:id", withAuth, async (req, res) => {
+//   try {
+//     const dbCommentData = await Comment.findByPk({
+//       where: {
+//         id: req.params.id,
+//       },
+//     });
+//     res.json(dbCommentData);
+//   } catch (err) {
+//     console.log(err);
+//     res.status(500).json(err);
+//   }
+// });
 
 // POST route to create a new comment
 router.post("/", withAuth, async (req, res) => {

diff --git a/controllers/api/post-routes.js b/controllers/api/post-routes.js
@@ -39,7 +39,7 @@ router.get("/:id", withAuth, async (req, res) => {
             comment,
             logged_in: req.session.logged_in,
           });
-   // res.status(200).json(dbPostData);
+   res.status(200).json(dbPostData);
   } catch (err) {
     console.log(err);
     res.status(501).json(err);

diff --git a/controllers/api/user-routes.js b/controllers/api/user-routes.js
@@ -16,12 +16,11 @@ const { User, Post, Comment } = require('../../models');
 // });
 
 // GET route to find one user
-router.get("/:id", async (req, res) => {
+router.get("/login", async (req, res) => {
   try {
-    const userData = await User.findByPk({
-      attributes: { exclude: ["password"] },
+    const userData = await User.findOne({
       where: {
-        id: req.params.id,
+        id: req.body.username,
       },
       include: [
         { model: Post, include: { model: User } }, { model: Post}, { model: Comment }],
@@ -42,11 +41,10 @@ router.post('/', async (req, res) => {
   try {
     const userData = await User.create({
       username: req.body.username,
-      email: req.body.email,
       password: req.body.password,
     });
     req.session.save(() => {
-      req.session.user_id = userData.user_id;
+      req.session.user_id = userData.id;
       req.session.username = userData.username;
       req.session.logged_in = true;
 
@@ -58,7 +56,7 @@ router.post('/', async (req, res) => {
 });
 
 router.get("/signup", (req, res) => {
-  if (req.session.loggedIn) {
+  if (req.session.logged_in) {
     res.redirect("/");
     return;
   }
@@ -68,7 +66,7 @@ router.get("/signup", (req, res) => {
    // after login, this redirects user to homepage
    router.get("/login", (req, res) => {
 
-    if (req.session.loggedIn) {
+    if (req.session.logged_in) {
       res.redirect("/");
       return;
     }
@@ -106,11 +104,11 @@ router.post('/login', async (req, res) => {
         .json({ message: "Please create user account"})
       return;
     }
-    // Once the user successfully logs in, set up the sessions variable 'loggedIn'
+    // Once the user successfully logs in, set up the sessions variable 'logged_in'
     req.session.save(() => {
       req.session.user_id = userData.id;
       req.session.username = userData.username;
-      req.session.loggedIn = true;
+      req.session.logged_in = true;
 
       res
         .status(200)
@@ -126,7 +124,7 @@ router.post('/login', async (req, res) => {
 // Logout
 router.post('/logout', (req, res) => {
   // When the user logs out, destroy the session
-  if (req.session.loggedIn) {
+  if (req.session.logged_in) {
     req.session.destroy(() => {
       res.status(204).end();
     });

diff --git a/controllers/homeRoutes.js b/controllers/homeRoutes.js
@@ -13,17 +13,46 @@ router.get("/", async (req, res) => {
 
     res.render("homepage", {
       posts,
-      loggedIn: req.session.loggedIn,
+      logged_in: req.session.logged_in,
     });
   } catch (err) {
     console.log(err);
     res.status(500).json(err);
   }
 });
 
+// GET one post by id
+// router.get(":id", withAuth, async (req, res) => {
+//   try {
+//     const dbPostData = await Post.findOne({
+//       where: {
+//         id: req.params.id,
+//       },
+//       include: [
+//         { model: User}, { model: Comment, include: {model: User } }],
+//     });
+//     if (!dbPostData) {
+//       res.status(404).json({ message: "No post found with this id" });
+//       return;
+//     }
+
+//     const post = dbPostData.get({ plain: true });
+//     const comment = post.comment;
+//     res.render('readpost', {
+//             post,
+//             comment,
+//             logged_in: req.session.logged_in,
+//           });
+//     res.status(200).json(dbPostData);
+//   } catch (err) {
+//     console.log(err);
+//     res.status(501).json(err);
+//   }
+// });
+
 // GET route to redierct user to homepage after signing up
 router.get("/signup", (req, res) => {
-  if (req.session.loggedIn) {
+  if (req.session.logged_in) {
     res.redirect("/");
     return;
   }
@@ -32,38 +61,12 @@ router.get("/signup", (req, res) => {
 
 // GET route for loggin in and redirecting to homepage if logged-in
 router.get("/login", (req, res) => {
-  if (req.session.loggedIn) {
+  if (req.session.logged_in) {
     res.redirect("/");
     return;
   }
   res.render("login");
 });
 
-// This route allows user to get all data after login and to search posts with comments
-// router.get('/posts/:id', withAuth, async (req, res) => {
-//   try {
-//     const postData = await Post.findByPk(req.params.id, {
-//       include:
-//        [{ model: User }, { model: Comment, include: { model: User } }],
-//     });
-
-//     if (!postData) {
-//       res.status(400).json({ message: "No post found with this id" });
-//       return;
-//     }
-
-//     const post = postData.get({ plain: true });
-//     const comment = post.comment;
-
-//     res.render('readpost', {
-//       post,
-//       comment,
-//       logged_in: req.session.logged_in,
-//       user_id
-//     });
-//   } catch (err) {
-//     res.status(502).json(err);
-//   }
-// });
 
 module.exports = router;
diff --git a/public/css/js/createComment.js b/public/css/js/createComment.js
diff --git a/public/css/js/createPost.js b/public/css/js/createPost.js
diff --git a/public/css/js/login.js b/public/css/js/login.js
diff --git a/public/css/js/logout.js b/public/css/js/logout.js
diff --git a/public/css/js/signup.js b/public/css/js/signup.js
diff --git a/public/css/style.css b/public/css/style.css
@@ -75,6 +75,11 @@ main {
     margin: 10px 50px;
 }
 
+#username-input{
+    width: 40%;
+    height: 5vh;
+}
+
 #username-signup {
     width: 40%;
     height: 5vh;

diff --git a/public/js/comment.js b/public/js/comment.js
@@ -0,0 +1,26 @@
+const commentFormHandler = async function(event) {
+    event.preventDefault();
+
+    const postId = document.querySelector('input[name="post-id"]').value;
+    const body = document.querySelector('textarea[name="comment-body"]').value;
+
+    if (body) {
+      await fetch('/api/comment', {
+        method: 'POST',
+        body: JSON.stringify({
+          postId,
+          body
+        }),
+        headers: {
+          'Content-Type': 'application/json'
+        }
+      });
+
+      document.location.reload();
+    }
+  };
+
+  document
+    .querySelector('#new-comment-form')
+    .addEventListener('submit', commentFormHandler);
+
diff --git a/public/js/edit.js b/public/js/edit.js
@@ -0,0 +1 @@
+//const postID = document.querySelector('input[name="post-id")
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		//const postID = document.querySelector('input[name="post-id")