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

comments added #751

Open
wants to merge 5 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
17 changes: 17 additions & 0 deletions controllers/comments.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
const Comment = require("../models/Comment")

module.exports = {
createComment: async (req, res) => {
try {
await Comment.create({
comment: req.body.comment,
likes: 0,
post: req.params.id,
});
console.log("Comment has been added!");
res.redirect("/post/"+req.params.id);
} catch (err) {
console.log(err);
}
},
};
4 changes: 3 additions & 1 deletion controllers/posts.js
Original file line number Diff line number Diff line change
@@ -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) => {
Expand All @@ -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, comments: comments });
} catch (err) {
console.log(err);
}
Expand Down
22 changes: 22 additions & 0 deletions models/Comment.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
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",
},
createdAt: {
type: Date,
default: Date.now,
},
});

module.exports = mongoose.model("Comment", CommentSchema);
8 changes: 8 additions & 0 deletions routes/comments.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
const express = require("express");
const router = express.Router();
const commentsController = require("../controllers/comments");

//Comment Routes - simplified for now
router.post("/createComment/:id", commentsController.createComment);

module.exports = router;
2 changes: 2 additions & 0 deletions server.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ const logger = require("morgan");
const connectDB = require("./config/database");
const mainRoutes = require("./routes/main");
const postRoutes = require("./routes/posts");
const commentRoutes = require("./routes/comments");

//Use .env file in config folder
require("dotenv").config({ path: "./config/.env" });
Expand Down Expand Up @@ -56,6 +57,7 @@ app.use(flash());
//Setup Routes For Which The Server Is Listening
app.use("/", mainRoutes);
app.use("/post", postRoutes);
app.use("/comment", commentRoutes);

//Server Running
app.listen(process.env.PORT, () => {
Expand Down
76 changes: 45 additions & 31 deletions views/post.ejs
Original file line number Diff line number Diff line change
@@ -1,37 +1,51 @@
<%- include('partials/header') -%>
<div class="container">
<div class="row justify-content-center mt-5">
<div class="col-6">
<h2><%= post.title %></h2>
<img class="img-fluid" src="<%= post.image%>" />
<div class="row justify-content-between">
<form
class="col-1"
action="/post/likePost/<%= post.id %>?_method=PUT"
method="POST"
>
<button class="btn btn-primary fa fa-heart" type="submit"></button>
</form>
<h3 class="col-3">Likes: <%= post.likes %></h3>
<%if(post.user == user.id){ %>
<form
action="/post/deletePost/<%= post.id %>?_method=DELETE"
method="POST"
class="col-3"
>
<button class="btn btn-primary fa fa-trash" type="submit"></button>
<div class="container">
<div class="row justify-content-center mt-5">
<div class="col-6">
<h2>
<%= post.title %>
</h2>
<img class="img-fluid" src="<%= post.image%>" />
<div class="row justify-content-between">
<form class="col-1" action="/post/likePost/<%= post.id %>?_method=PUT" method="POST">
<button class="btn btn-primary fa fa-heart" type="submit"></button>
</form>
<h3 class="col-3">Likes: <%= post.likes %>
</h3>
<%if(post.user==user.id){ %>
<form action="/post/deletePost/<%= post.id %>?_method=DELETE" method="POST" class="col-3">
<button class="btn btn-primary fa fa-trash" type="submit"></button>
</form>
<%}%>
</div>
</div>
<div class="col-3 mt-5">
<p>
<%= post.caption %>
</p>
</div>
<div class="mt-5">
<h2>Add a comment</h2>
<form action="/comment/createComment/<%=post._id%>" method="POST">
<div class="mb-3">
<label for="comment" class="form-label">Comment</label>
<input type="text" class="form-control" id="comment" name="comment">
</div>
<button type="submit" class="btn btn-primary">Submit</button>
</form>
<%}%>
</div>
</div>
<div class="col-3 mt-5">
<p><%= post.caption %></p>
</div>
<div class="col-6 mt-5">
<a class="btn btn-primary" href="/profile">Return to Profile</a>
<a class="btn btn-primary" href="/feed">Return to Feed</a>
<ul>
<% for(var i=0; i<comments.length; i++) {%>
<li class="col-6 justify-content-between mt-5">
<%= comments[i].comment%>
</li>
<% } %>
</ul>
<div class="col-6 mt-5">
<a class="btn btn-primary" href="/profile">Return to Profile</a>
<a class="btn btn-primary" href="/feed">Return to Feed</a>
</div>
</div>
</div>
</div>

<%- include('partials/footer') -%>
<%- include('partials/footer') -%>