added comments but need to get delete comments working

config/database.js

@@ -1,15 +1,11 @@
 const mongoose = require("mongoose");
+require('dotenv').config()
 
 const connectDB = async () => {
   try {
-    const conn = await mongoose.connect(process.env.DB_STRING, {
-      useNewUrlParser: true,
-      useUnifiedTopology: true,
-      useFindAndModify: false,
-      useCreateIndex: true,
-    });
+    const conn = await mongoose.connect(process.env.DB_STRING)
 
-    console.log(`MongoDB Connected: ${conn.connection.host}`);
+    console.log(`MongoDB Connected`);
   } catch (err) {
     console.error(err);
     process.exit(1);

config/passport.js

@@ -4,11 +4,9 @@ const User = require("../models/User");
 
 module.exports = function (passport) {
   passport.use(
-    new LocalStrategy({ usernameField: "email" }, (email, password, done) => {
-      User.findOne({ email: email.toLowerCase() }, (err, user) => {
-        if (err) {
-          return done(err);
-        }
+    new LocalStrategy({ usernameField: "email" }, async (email, password, done) => {
+      try {
+        const user = await User.findOne({ email: email.toLowerCase() });
         if (!user) {
           return done(null, false, { msg: `Email ${email} not found.` });
         }
@@ -18,24 +16,27 @@ module.exports = function (passport) {
               "Your account was registered using a sign-in provider. To enable password login, sign in using a provider, and then set a password under your user profile.",
           });
         }
-        user.comparePassword(password, (err, isMatch) => {
-          if (err) {
-            return done(err);
-          }
-          if (isMatch) {
-            return done(null, user);
-          }
-          return done(null, false, { msg: "Invalid email or password." });
-        });
-      });
+        const isMatch = await user.comparePassword(password);
+        if (isMatch) {
+          return done(null, user);
+        }
+        return done(null, false, { msg: "Invalid email or password." });
+      } catch (err) {
+        return done(err);
+      }
     })
   );
 
   passport.serializeUser((user, done) => {
     done(null, user.id);
   });
 
-  passport.deserializeUser((id, done) => {
-    User.findById(id, (err, user) => done(err, user));
+  passport.deserializeUser(async (id, done) => {
+    try {
+      const user = await User.findById(id);
+      done(null, user);
+    } catch (err) {
+      done(err);
+    }
   });
 };

controllers/auth.js

@@ -65,7 +65,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 +90,24 @@ exports.postSignup = (req, res, next) => {
     password: req.body.password,
   });
 
-  User.findOne(
-    { $or: [{ email: req.body.email }, { userName: req.body.userName }] },
-    (err, existingUser) => {
+  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);
       }
-      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");
-        });
-      });
-    }
-  );
-};
+      res.redirect("/profile");
+    });
+  } catch (err) {
+    next(err);
+  }
+};

controllers/comments.js

@@ -0,0 +1,40 @@
+const Comment = require("../models/Comment.js");
+
+
+module.exports = {
+  createComment: async (req, res) => {
+    try {
+      if (!req.body.comment || !req.params.id || !req.user.id) {
+        return res.status(400).send({ message: "Missing required fields to create" });
+      }
+
+      await Comment.create({
+        comment: req.body.comment,
+        likes: 0,
+        post: req.params.id,
+        user: req.user.id
+      });
+
+      console.log("Comment has been added!");
+      res.redirect("/post/"+req.params.id);
+    } catch (err) {
+      console.error(err);
+      return res.status(500).send({ message: "Failed to create comment" });
+    }
+  },
+  deleteComment: async (req, res) => {
+      try {
+        if (!req.params.id) {
+          return res.status(400).send({ message: "Missing required fields to delete comment" });
+        }
+
+        await Comment.deleteOne({ _id: req.params.id });
+
+        console.log("Deleted comment");
+        return res.status(200).send({ message: "Comment deleted successfully" });
+      } catch (err) {
+        console.error(err);
+        return res.status(500).send({ message: "Failed to delete comment" });
+      }
+    }
+  }

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 comments = await Comment.find({post: req.params.id}).sort({ createdAt: "desc" }).lean();
+      res.render("post.ejs", { post: post, user: req.user, comment: comments });
     } catch (err) {
       console.log(err);
     }

middleware/multer.js

@@ -4,11 +4,19 @@ const path = require("path");
 module.exports = multer({
   storage: multer.diskStorage({}),
   fileFilter: (req, file, cb) => {
-    let ext = path.extname(file.originalname);
-    if (ext !== ".jpg" && ext !== ".jpeg" && ext !== ".png") {
+    let ext = path.extname(file.originalname).toLowerCase();
+    if (
+      ext !== ".jpg" &&
+      ext !== ".jpeg" &&
+      ext !== ".png" &&
+      ext !== ".gif" &&
+      ext !== ".bmp" &&
+      ext !== ".webp" &&
+      ext !== ".svg"
+    ) {
       cb(new Error("File type is not supported"), false);
       return;
     }
     cb(null, true);
   },
-});
+});

models/Comment.js

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

models/User.js

@@ -30,12 +30,12 @@ UserSchema.pre("save", function save(next) {
 
 // Helper method for validating user's password.
 
-UserSchema.methods.comparePassword = function comparePassword(
-  candidatePassword,
-  cb
-) {
-  bcrypt.compare(candidatePassword, this.password, (err, isMatch) => {
-    cb(err, isMatch);
+UserSchema.methods.comparePassword = function comparePassword(candidatePassword) {
+  return new Promise((resolve, reject) => {
+    bcrypt.compare(candidatePassword, this.password, (err, isMatch) => {
+      if (err) reject(err);
+      else resolve(isMatch);
+    });
   });
 };