Added comments

.gitignore

@@ -1,3 +1,4 @@
 node_modules
 .env
-.vscode
+.vscode
+configFile

controllers/auth.js

@@ -47,13 +47,12 @@ exports.postLogin = (req, res, next) => {
 exports.logout = (req, res) => {
   req.logout(() => {
     console.log('User has logged out.')
+    req.session.destroy((err) => {
+      if (err) console.log('Error : Failed to destroy the session during logout.', err)
+      req.user = null
+      res.redirect('/')
+    })
   })
-  req.session.destroy((err) => {
-    if (err)
-      console.log("Error : Failed to destroy the session during logout.", err);
-    req.user = null;
-    res.redirect("/");
-  });
 };
 
 exports.getSignup = (req, res) => {
@@ -65,7 +64,7 @@ exports.getSignup = (req, res) => {
   });
 };
 
-exports.postSignup = (req, res, next) => {
+exports.postSignup = async (req, res, next) => {
   const validationErrors = [];
   if (!validator.isEmail(req.body.email))
     validationErrors.push({ msg: "Please enter a valid email address." });
@@ -90,29 +89,24 @@ exports.postSignup = (req, res, next) => {
     password: req.body.password,
   });
 
-  User.findOne(
-    { $or: [{ email: req.body.email }, { userName: req.body.userName }] },
-    (err, existingUser) => {
-      if (err) {
-        return next(err);
-      }
-      if (existingUser) {
-        req.flash("errors", {
-          msg: "Account with that email address or username already exists.",
-        });
-        return res.redirect("../signup");
-      }
-      user.save((err) => {
-        if (err) {
-          return next(err);
-        }
-        req.logIn(user, (err) => {
-          if (err) {
-            return next(err);
-          }
-          res.redirect("/profile");
-        });
-      });
+  try {
+    const existingUser = await User.findOne({$or: [
+      {email: req.body.email},
+      {userName: req.body.userName}
+    ]})
+
+    if (existingUser) {
+      req.flash('errors', { msg: 'Account with that email address or username already exists.'})
+      return res.redirect('../signup')
+    }
+    await user.save()
+
+    req.logIn(user, (err) => {
+      if (err) return next(err)
+        res.redirect('/profile')
+      })
+    }
+    catch (err) {
+        return next(err)
     }
-  );
 };

controllers/comment.js

@@ -0,0 +1,42 @@
+const Comment = require("../models/Comment");
+
+module.exports = {
+  createComment: async (req, res) => {
+    try {
+      await Comment.create({
+        comment: req.body.comment,
+        likes: 0,
+        user: req.user.id,
+        userName: req.user.userName,
+        post: req.params.id
+      });
+      console.log("Post has been added!");
+      res.redirect(`/post/${req.params.id}`);
+    } catch (err) {
+      console.log(err);
+    }
+  },
+  likeComment: async (req, res) => {
+    try {
+      await Comment.findOneAndUpdate(
+        { _id: req.params.commentid },
+        {
+          $inc: { likes: 1 },
+        }
+      );
+      console.log("Likes +1");
+      res.redirect(`/post/${req.params.postid}`);
+    } catch (err) {
+      console.log(err);
+    }
+  },
+  deleteComment: async (req, res) => {
+    try{
+      await Comment.findOneAndDelete({_id: req.params.commentid})
+      console.log("Deleted Post");
+      res.redirect(`/post/${req.params.postid}`);
+    }catch(err){
+      res.redirect(`/post/${req.params.postid}`);
+    }
+  },
+};

controllers/posts.js

@@ -1,5 +1,6 @@
 const cloudinary = require("../middleware/cloudinary");
 const Post = require("../models/Post");
+const Comment = require("../models/Comment")
 
 module.exports = {
   getProfile: async (req, res) => {
@@ -21,7 +22,8 @@ module.exports = {
   getPost: async (req, res) => {
     try {
       const post = await Post.findById(req.params.id);
-      res.render("post.ejs", { post: post, user: req.user });
+      const comment = await Comment.find({post: req.params.id}).sort({ createdAt: "desc" }).lean();
+      res.render("post.ejs", { post: post, comment: comment, user: req.user });
     } catch (err) {
       console.log(err);
     }
@@ -60,16 +62,13 @@ module.exports = {
     }
   },
   deletePost: async (req, res) => {
-    try {
-      // Find post by id
-      let post = await Post.findById({ _id: req.params.id });
-      // Delete image from cloudinary
+    try{
+      let post = await Post.findById({_id: req.params.id})
       await cloudinary.uploader.destroy(post.cloudinaryId);
-      // Delete post from db
-      await Post.remove({ _id: req.params.id });
+      await Post.findOneAndDelete({_id: req.params.id})
       console.log("Deleted Post");
       res.redirect("/profile");
-    } catch (err) {
+    }catch(err){
       res.redirect("/profile");
     }
   },

middleware/cloudinary.js

@@ -1,6 +1,6 @@
 const cloudinary = require("cloudinary").v2;
 
-require("dotenv").config({ path: "./config/.env" });
+require("dotenv").config({ path: "./configFile/.env" });
 
 cloudinary.config({
   cloud_name: process.env.CLOUD_NAME,

models/Comment.js

@@ -0,0 +1,30 @@
+const mongoose = require("mongoose");
+
+const CommentSchema = new mongoose.Schema({
+  comment: {
+    type: String,
+    required: true,
+  },
+  likes: {
+    type: Number,
+    required: true,
+  },
+  user: {
+    type: mongoose.Schema.Types.ObjectId,
+    ref: "User",
+  },
+  userName: {
+    type: String,
+    required: true,
+  },
+  post: {
+    type: mongoose.Schema.Types.ObjectId,
+    ref: 'Post'
+  },
+  createdAt: {
+    type: Date,
+    default: Date.now,
+  },
+});
+
+module.exports = mongoose.model("Comment", CommentSchema);

models/User.js

@@ -9,24 +9,13 @@ const UserSchema = new mongoose.Schema({
 
 // Password hash middleware.
 
-UserSchema.pre("save", function save(next) {
-  const user = this;
-  if (!user.isModified("password")) {
-    return next();
-  }
-  bcrypt.genSalt(10, (err, salt) => {
-    if (err) {
-      return next(err);
-    }
-    bcrypt.hash(user.password, salt, (err, hash) => {
-      if (err) {
-        return next(err);
-      }
-      user.password = hash;
-      next();
-    });
-  });
-});
+UserSchema.pre('save', async function save(next) {
+    const user = this
+    if (!user.isModified('password')) { return next() }
+    let salt = await bcrypt.genSalt(10)
+    let hash = await bcrypt.hash(user.password, salt)
+    user.password = hash
+})
 
 // Helper method for validating user's password.