Merge pull request #128 from rishabh7923/v2

Added tagging functionality to posts and implement tag management

server/middlewares/authValidator.js

@@ -1,4 +1,5 @@
 const { body, validationResult } = require('express-validator');
+const Tag = require('../models/Tag');
 
 // Validation middleware for registration
 const validateRegistration = [
@@ -52,11 +53,11 @@ const validatePost = [
     .withMessage('Author name is required')
     .escape(),
 
-  (req, res, next) => {
+  async (req, res, next) => {
     console.log(req.body)
     const errors = validationResult(req);
     if (!errors.isEmpty()) {
-      res.render('admin/add-post', {message: errors });
+      res.render('admin/add-post', { message: errors, tags: await Tag.find() });
     } else next();
   }
 ];

server/models/Post.js

@@ -18,6 +18,12 @@ const PostSchema = new Schema({
     type: String,
     required: true
   },
+  tags: {
+    type: [Schema.Types.ObjectId],
+    ref: 'Tag',
+    required: false,
+    default: []
+  },
   createdAt: {
     type: Date,
     default: Date.now

server/models/Tag.js

@@ -0,0 +1,23 @@
+const mongoose = require('mongoose');
+
+const tagSchema = new mongoose.Schema({
+    name: {
+        type: String,
+        required: true,
+        trim: true
+    },
+    description: {
+        type: String,
+        required: true,
+    },
+    color: {
+        type: String,
+        required: true,
+    },
+    createdAt: {
+        type: Date,
+        default: Date.now
+    }
+});
+
+module.exports = mongoose.model('Tag', tagSchema);

server/routes/admin.js

@@ -1,6 +1,7 @@
 const express = require('express');
 const router = express.Router();
 const Post = require('../models/Post');
+const Tag = require('../models/Tag')
 
 const { validatePost } = require('../middlewares/authValidator');
 const { CloudinaryStorage } = require('multer-storage-cloudinary');
@@ -61,6 +62,26 @@ router.get('/dashboard', authMiddleware, adminMiddleware, async (req, res) => {
   res.render('admin/dashboard', { locals, posts });
 });
 
+router.get('/create-tag', authMiddleware, adminMiddleware, async (req, res) => {
+  const { name, description, color } = req.query;
+  const newTag = new Tag({ name, description, color });
+  await Tag.create(newTag);
+  res.redirect('/tags');
+})
+
+
+router.get('/tags', authMiddleware, adminMiddleware, async (req, res) => {
+  const locals = {
+    title: 'Tags',
+    user: req.cookies.token,
+    description: 'Simple Blog created with NodeJs, Express & MongoDb.',
+  };
+
+  const tags = await Tag.find()
+
+  res.render('admin/tags', { locals, tags });
+})
+
 
 /**
  * GET /add-post
@@ -76,7 +97,9 @@ router.get('/add-post', authMiddleware, adminMiddleware, async (req, res) => {
       description: 'Simple Blog created with NodeJs, Express & MongoDb.',
     };
 
-    res.render('admin/add-post', {locals, layout: adminLayout });
+    const tags = await Tag.find()
+
+    res.render('admin/add-post', { locals, layout: adminLayout, tags });
   } catch (error) {
     console.log(error);
   }
@@ -89,11 +112,13 @@ router.get('/add-post', authMiddleware, adminMiddleware, async (req, res) => {
 router.post('/add-post', upload.single('poster'), authMiddleware, adminMiddleware, validatePost, async (req, res) => {
   try {
     const token = req.cookies.token
+    const tags = await Tag.find({ _id: { $in: req.body.tags.split(',') } });
 
     const newPost = new Post({
       title: req.body.title,
       user: token,
       body: req.body.body,
+      tags: tags.map(x => x._id),
       author: req.body.author,
       poster: req.file ? await cloudinary.uploader.upload(req.file.path).then(r => r.secure_url) : null
     });
@@ -118,8 +143,9 @@ router.get('/edit-post/:id', authMiddleware, adminMiddleware, async (req, res) =
     };
 
     const data = await Post.findOne({ _id: req.params.id });
+    const tags = await Tag.find()
 
-    res.render('admin/edit-post', { locals, data, layout: adminLayout });
+    res.render('admin/edit-post', { locals, data, layout: adminLayout, tags });
   } catch (error) {
     console.log(error);
   }
@@ -130,11 +156,14 @@ router.get('/edit-post/:id', authMiddleware, adminMiddleware, async (req, res) =
  * Admin Update Post Route
  */
 router.put('/edit-post/:id', upload.single('poster'), authMiddleware, adminMiddleware, validatePost, async (req, res) => {
+  const tags = await Tag.find({ _id: { $in: req.body.tags.split(',') } });
+
   try {
     await Post.findByIdAndUpdate(req.params.id, {
       title: req.body.title,
       body: req.body.body,
       author: req.body.author,
+      tags: tags.map(x => x._id),
       ...(req.file ? { poster: await cloudinary.uploader.upload(req.file.path).then(r => r.secure_url) } : {}),
       updatedAt: Date.now(),
     });
@@ -158,5 +187,17 @@ router.delete('/delete-post/:id', authMiddleware, adminMiddleware, async (req, r
   }
 });
 
+/**
+ * DELETE /delete-tag/:id
+ */
+router.delete('/delete-tag/:id', authMiddleware, adminMiddleware, async (req, res) => {
+  try {
+    await Tag.deleteOne({ _id: req.params.id });
+    res.redirect('/tags');
+  } catch (error) {
+    console.log(error);
+  }
+})
+
 
 module.exports = router;

server/routes/main.js

@@ -5,13 +5,16 @@ const router = express.Router();
 
 const Post = require('../models/Post');
 const User = require('../models/User');
+const Tag = require('../models/Tag');
 const ContactMessage = require('../models/contactMessage');
 
 const transporter = require('../config/nodemailerConfig');
 const { validateContact, validateRegistration } = require('../middlewares/authValidator');
 
 const bcrypt = require('bcrypt');
 const jwt = require('jsonwebtoken');
+const { Types: { ObjectId } } = require('mongoose')
+
 const jwtSecret = process.env.JWT_SECRET;
 
 
@@ -45,18 +48,29 @@ router.get('/posts', async (req, res) => {
       }
     }
 
+
+    if (req.query.tags) {
+      const tagIds = req.query.tags.split(',').map(id => new ObjectId(id));
+      query.tags = { $in: tagIds };
+    }
+
+    console.log(query.tags)
+
     const data = await Post.aggregate([
       { $match: query },
       { $sort: { createdAt: -1 } },
       { $skip: (perPage * page) - perPage },
       { $limit: perPage }
     ]).exec()
 
+    const tags = await Tag.find()
+
     const count = await Post.countDocuments(query);
 
     res.render('posts', {
       locals,
       data,
+      tags,
       currentRoute: 'posts',
       search: req.query.search,
       pagination: {
@@ -103,7 +117,7 @@ router.get('/post/:id', async (req, res) => {
   try {
     let slug = req.params.id;
 
-    const data = await Post.findById({ _id: slug });
+    const data = await Post.findById({ _id: slug }).populate('tags');
 
     const locals = {
       title: data.title,