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

Added comments with usernames #760

Open
wants to merge 1 commit 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
1 change: 1 addition & 0 deletions config/database.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ const mongoose = require("mongoose");
const connectDB = async () => {
try {
const conn = await mongoose.connect(process.env.DB_STRING, {
dbName: 'socials',
useNewUrlParser: true,
useUnifiedTopology: true,
useFindAndModify: false,
Expand Down
19 changes: 19 additions & 0 deletions controllers/comments.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
const Comment = require("../models/Comment");

module.exports = {
createComment: async (req, res) => {
try {
console.log(req.body); // Check what's in req.body
await Comment.create({
comment: req.body.comment,
post: req.params.id,
likes: 0,
user: req.user._id
});
console.log("Comment has been added!");
res.redirect("/post/" + req.params.id);
} catch (err) {
console.log(err);
}
},
};
12 changes: 11 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,16 @@ 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 })
.populate("user")
.sort({ createdAt: "desc" })
.lean();
console.log(comments);
res.render("post.ejs", {
post: post,
user: req.user,
comments: comments,
});
} catch (err) {
console.log(err);
}
Expand Down
29 changes: 29 additions & 0 deletions models/Comment.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
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, // Referencing ObjectId
ref: "Post", // Reference to the "Post" model
required: true,
},
createdAt: {
type: Date,
default: Date.now,
},
user: {
type: mongoose.Schema.Types.ObjectId,
ref: 'User',
required: true
}
});

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

//Post 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
18 changes: 18 additions & 0 deletions views/post.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,24 @@
<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>
<ul>
<% for (var i=0; i<comments.length; i++) { %>
<li class="col-6 justifty-content-between mt-5">

<%= comments[i].user.userName %>: <%= 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>
Expand Down
24 changes: 0 additions & 24 deletions views/todos.ejs

This file was deleted.