Loading...
} + //height={400} + endMessage={ ++ Yay! You have seen it all +
+ } + > + {!this.state.loaded && + this.state.blogs.map((value, index) => ( +
+
+ 50
+ ? value.description.substring(0, 50) + "..."
+ : value.description
+ }
+ avatar={value.author?.avatar}
+ author={value.author.name}
+ date={dateFormat(value.updatedAt, "mmmm dS, yyyy")}
+ readTime={
+ value.readTime ? value.readTime + " min" : "2 min"
+ }
+ authorUrl={"/profile/" + value.author._id}
+ poster={value.image}
+ />
+
+
+ ))}
+ 
+ 
+
+ -
+ {this.state.blogs.map((blog) => {
+ return (
+
-
+
-
-
+
+
);
diff --git a/client/src/Containers/BlogById/BlogContent.js b/client/src/Containers/BlogById/BlogContent.js
index 83d10d9..767b60f 100644
--- a/client/src/Containers/BlogById/BlogContent.js
+++ b/client/src/Containers/BlogById/BlogContent.js
@@ -1,23 +1,28 @@
import React from "react";
-import { Paper } from "@mui/material";
+import { Grid, Paper } from "@mui/material";
import { parser } from "./parser";
+import UserCard from "../../Components/UserCard";
export function BlogContent(props) {
return (
-
+ elevation={0}
+ align="center"
+ sx={{ mb: "1vw" }}
+ >
+
{props.title}
- {props.isAuth && props.userId === props.author && (
-
By {props.authorName} ⚫ {props.lastUpdated}{" "}
-
);
}
diff --git a/client/src/Containers/Home/Home.js b/client/src/Containers/Home/Home.js
index 5839897..250b1f4 100644
--- a/client/src/Containers/Home/Home.js
+++ b/client/src/Containers/Home/Home.js
@@ -1,28 +1,39 @@
import React from 'react';
-import CategoryBar from '../../Components/CategoryBar';
-import HomeCarousel from '../../Components/HomeCarousel/HomeCarousel';
import BlogsList from '../../Components/BlogsList/BlogsList';
-import Categories from '../../Categories';
-import EditorsPickBlock from '../../Components/EditorsPick/EditorsPickBlock/EditorsPickBlock';
+import { Box, Grid } from '@mui/material';
+import Tags from '../../Components/Tags';
+
+const tags = [
+ { name: "Ok bro", link: "/bro" },
+ { name: "Ok", link: "/bro" },
+ { name: "Ok bro2", link: "/bro" },
+ { name: "Ok bro3", link: "/bro" },
+ { name: "Ok bro4", link: "/bro" },
+ { name: "Ok", link: "/bro" },
+ { name: "Ok bro2", link: "/bro" },
+ { name: "Ok bro3", link: "/bro" },
+ { name: "Ok bro4", link: "/bro" },
+ { name: "Ok bro2", link: "/bro" },
+ { name: "Ok bro3", link: "/bro" },
+ { name: "Ok bro4", link: "/bro" },
+ { name: "Ok", link: "/bro" },
+ { name: "Ok bro2", link: "/bro" },
+ { name: "Ok bro3", link: "/bro" },
+ { name: "Ok bro4", link: "/bro" },
+]
const Home = props => {
- const data = [1,2];
return (
- {props.author &&
+
-
- {Categories.map((value,index)=>{
- if(index % 2 === 0){
- return
+
+
+
+
+
-
-
)
};
export default Home;
diff --git a/client/src/Requests/ImageUpload.js b/client/src/Requests/ImageUpload.js
index 3bbb3c0..a3d128c 100644
--- a/client/src/Requests/ImageUpload.js
+++ b/client/src/Requests/ImageUpload.js
@@ -6,6 +6,8 @@ const ImageUpload = (file) => {
reject("File type is not supported!");
}
+ //compress image
+
//get url to upload image from s3
fetch("/api/blogs/image/new/" + file.name)
.then(res => res.json())
diff --git a/client/src/themes/dark.js b/client/src/themes/dark.js
index 527e817..40b2d1b 100644
--- a/client/src/themes/dark.js
+++ b/client/src/themes/dark.js
@@ -1,14 +1,15 @@
-import {createTheme } from '@mui/material/styles';
+import { createTheme } from '@mui/material/styles';
const darkTheme = createTheme({
palette: {
- mode: 'dark',
+ mode: 'dark',
+ navBack: "rgba(28, 25, 27, 0.8)"
},
typography: {
fontFamily: [
- 'Serif'
+ 'sans-serif'
].join(','),
- }
+ }
});
export default darkTheme;
\ No newline at end of file
diff --git a/client/src/themes/light.js b/client/src/themes/light.js
index 5ea1767..5414c4b 100644
--- a/client/src/themes/light.js
+++ b/client/src/themes/light.js
@@ -1,14 +1,15 @@
-import {createTheme } from '@mui/material/styles';
+import { createTheme } from '@mui/material/styles';
const lightTheme = createTheme({
palette: {
- mode: 'light',
+ mode: 'light',
+ navBack: "rgba(250,250,250,.9)"
},
typography: {
fontFamily: [
- 'Serif'
+ 'Serif'
].join(','),
- }
+ }
});
export default lightTheme;
\ No newline at end of file
diff --git a/controllers/appControllers/getHome.js b/controllers/appControllers/getHome.js
new file mode 100644
index 0000000..82a4fff
--- /dev/null
+++ b/controllers/appControllers/getHome.js
@@ -0,0 +1,14 @@
+const { Blog } = require("../../models/blog");
+const { Comments } = require("../../models/comments");
+const { User } = require("../../models/user");
+const { Stats } = require("../../models/stats");
+
+
+module.exports = async (req, res) => {
+ //1. top 10 of ok-blogger
+ //2. latest 10 of ok-blogger
+ // list of to 10 categories
+ // Should we implement infinite scrolling : Yes
+
+
+}
\ No newline at end of file
diff --git a/controllers/appControllers/getPost.js b/controllers/appControllers/getPost.js
new file mode 100644
index 0000000..4b23702
--- /dev/null
+++ b/controllers/appControllers/getPost.js
@@ -0,0 +1,99 @@
+const { Blog } = require("../../models/blog");
+
+// async function transform() {
+// await Blog.find().then(async blogs => {
+// for (let blog of blogs) {
+// if (blog._id.toString() !== "6159fde88150df0056cf2df6") {
+// let stat = new Stats({
+// blogId: blog._id
+// })
+// await stat.save(async (err, cmt) => {
+// blog.stats = cmt._id;
+// await blog.save().then(blog => {
+// console.log("added to ", blog._id);
+// })
+// })
+// }
+// else {
+// console.log("Hello ", blog._id);
+// }
+// }
+// }).catch(err => {
+// console.log(err);
+// })
+// }
+
+// how to populate multiple ref objects in mongodb?
+async function getBlogDetails(blogId, result) {
+ await Blog
+ .findById(blogId)
+ .populate({
+ path: "author",
+ select: "name email description github twitter website avatar blogs",
+ populate: {
+ path: "blogs",
+ select: "title description image readTime tags stats",
+ options: {
+ limit: 3,
+ sort: { createdAt: -1 },
+ },
+ populate: {
+ path: "stats",
+ select: "approvals reads views likes"
+ }
+ }
+ })
+ .populate({
+ path: "stats",
+ select: "approvals reads views likes"
+ })
+ .then(data => {
+ let dataNew = JSON.parse(JSON.stringify(data));
+ let { author, ...blogData } = dataNew;
+ let { blogs, ...AuthorData } = author;
+
+ result.fromAuthor = blogs;
+ result.author = AuthorData;
+ result.blog = blogData;
+ }).catch(err => {
+ console.log(JSON.stringify(err, Object.getOwnPropertyNames(err), 4));
+ result.blog = null;
+ throw err;
+ // TODO : log error here
+ });
+}
+
+module.exports = async (req, res) => {
+ /*
+ #swagger.tags = ['App']
+ #swagger.summary = 'Get Post By Id'
+ #swagger.description = 'Endpoint get a blog and its related components by blogId. It provides Blog details, its author details, recommandation, related posts'
+
+ #swagger.security = [{
+ "apiKeyAuth": []
+ }]
+ */
+
+ // Blog, Author, Releted posts, More from Author, Top from ok-blogger
+
+ const result = {};
+
+ const listPromise = [];
+ // Get blog and author details
+ listPromise.push(getBlogDetails(req.params.id, result));
+
+ // Get top from ok-blogger
+
+ await Promise.all(listPromise).then(data => {
+ return res.status(200).json({
+ success: true,
+ message: "Request completed",
+ data: result,
+ });
+ }).catch(err => {
+ return res.status(503).json({
+ success: false,
+ message: "blog not found!",
+ });
+ })
+};
diff --git a/controllers/blogControllers/getBlogs.js b/controllers/blogControllers/getBlogs.js
index 082f9e3..27df214 100644
--- a/controllers/blogControllers/getBlogs.js
+++ b/controllers/blogControllers/getBlogs.js
@@ -4,36 +4,36 @@ module.exports = async (req, res) => {
/*
#swagger.tags = ['Blog']
#swagger.summary = 'Get All blogs'
- #swagger.description = 'Endpoint to get all blogs based on query parameters'
+ #swagger.description = 'Endpoint to get all blogs based on query parameters'
#swagger.parameters['tag'] = {
- in: 'query',
- description: 'blog tag',
- schema: {
+ in: 'query',
+ description: 'blog tag',
+ schema: {
$tag:'science-and-space'
- }
- }
+ }
+ }
#swagger.parameters['max count'] = {
- in: 'query',
- description: 'Maximum number of elements that need to be returned',
- schema: {
+ in: 'query',
+ description: 'Maximum number of elements that need to be returned',
+ schema: {
$maxcount:3
- }
- }
+ }
+ }
#swagger.parameters['sort'] = {
- in: 'query',
- description: 'Sort or Not sorted',
- schema: {
+ in: 'query',
+ description: 'Sort or Not sorted',
+ schema: {
$sort:true
- }
- }
+ }
+ }
#swagger.security = [{
- "apiKeyAuth": []
- }]
+ "apiKeyAuth": []
+ }]
*/
var blogs = [];
@@ -44,12 +44,17 @@ module.exports = async (req, res) => {
}
if (req.query.sort) {
- filters.sort = { updatedAt: "asc" };
+ filters.sort = { updatedAt: -1 };
}
if (req.query.tag) {
query.tags = { $in: req.query.tag };
}
+
+ if (req.query.lastDate) {
+ query.updatedAt = { $lt: new Date(req.query.lastDate) }
+ }
+
await Blog.find(
query,
"author readTime title description image tags updatedAt",
diff --git a/controllers/commentControllers/commentRoutes.js b/controllers/commentControllers/commentRoutes.js
deleted file mode 100644
index 1fdd0dd..0000000
--- a/controllers/commentControllers/commentRoutes.js
+++ /dev/null
@@ -1,12 +0,0 @@
-const express = require("express");
-const router = express.Router();
-const auth = require("../../middleware/auth");
-const addComment = require("./addComment");
-const updateComment = require("./updateComment");
-const getComments = require("./getComments");
-
-router.get("/:commentBoxId", getComments);
-router.post("/:commentBoxId/new", auth, addComment);
-router.put("/:commentBoxId/:commentId", auth, updateComment);
-
-module.exports = router;
diff --git a/controllers/userControllers/userRoutes.js b/controllers/userControllers/userRoutes.js
deleted file mode 100644
index f5f4ed3..0000000
--- a/controllers/userControllers/userRoutes.js
+++ /dev/null
@@ -1,20 +0,0 @@
-var router = require("express").Router();
-const auth = require("../../middleware/auth");
-const login = require("./login");
-const getMyProfile = require("./getMyProfile");
-const getPublicProfile = require("./getPublicProfile");
-const logout = require("./logout");
-const register = require("./register");
-const updateProfile = require("./updateProfile");
-
-//session
-router.post("/session", login);
-router.delete("/session", logout);
-
-//for users
-router.post("/new", register);
-router.get("/my", auth, getMyProfile);
-router.get("/:id", getPublicProfile);
-router.put("/:id", auth, updateProfile);
-
-module.exports = router;
diff --git a/endpoints.js b/endpoints.js
deleted file mode 100644
index 625cfa1..0000000
--- a/endpoints.js
+++ /dev/null
@@ -1,12 +0,0 @@
-const express = require("express");
-const userRoutes = require("./controllers/userControllers/userRoutes");
-const blogRoutes = require("./controllers/blogControllers/blogRoutes");
-const commentRoutes = require("./controllers/commentControllers/commentRoutes");
-
-const router = express.Router();
-
-router.use("/api/users/", userRoutes);
-router.use("/api/blogs/", blogRoutes);
-router.use("/api/comments/", commentRoutes);
-
-module.exports = router;
diff --git a/index.js b/index.js
index 8ff374b..d0c3b7a 100644
--- a/index.js
+++ b/index.js
@@ -7,7 +7,7 @@ const expressSession = require("express-session");
const morgan = require("morgan");
const path = require("path");
-const endpoints = require("./endpoints");
+const endpoints = require("./routes/endpoints");
const swaggerUi = require("swagger-ui-express");
const swaggerFile = require("./swagger_output.json");
@@ -67,10 +67,10 @@ var options = {
app.use(endpoints);
app.use("/doc", swaggerUi.serve, swaggerUi.setup(swaggerFile, options));
-app.use(express.static(path.join(__dirname, "client/build")));
-app.get("*", (req, res) => {
- res.sendFile(path.join(__dirname + "/client/build/index.html"));
-});
+// app.use(express.static(path.join(__dirname, "client/build")));
+// app.get("*", (req, res) => {
+// res.sendFile(path.join(__dirname + "/client/build/index.html"));
+// });
// Start Server
app.listen(PORT, () => {
diff --git a/middleware/isAuth.js b/middleware/isAuth.js
new file mode 100644
index 0000000..0c057dc
--- /dev/null
+++ b/middleware/isAuth.js
@@ -0,0 +1,13 @@
+const { User } = require('../models/user');
+require("dotenv").config();
+
+module.exports = (req, res, next) => {
+ //parse the token
+ // let token = req.headers.cookies.replace("authToken=","").replace("%22","").replace("%22","");
+
+ User.findById(req.session.userId, (err, user) => {
+ if (err) throw err;
+ req.user = user;
+ next();
+ });
+}
\ No newline at end of file
diff --git a/middleware/isAuther.js b/middleware/isAuther.js
deleted file mode 100644
index e69de29..0000000
diff --git a/models/blog.js b/models/blog.js
index 769982c..790ffa7 100644
--- a/models/blog.js
+++ b/models/blog.js
@@ -36,6 +36,10 @@ const blogSchema = mongoose.Schema(
type: mongoose.Schema.Types.ObjectId,
ref: "Comments",
},
+ stats: {
+ type: mongoose.Schema.Types.ObjectId,
+ ref: "Stats",
+ },
tags: [
{
type: String,
diff --git a/models/stats.js b/models/stats.js
new file mode 100644
index 0000000..f0485c9
--- /dev/null
+++ b/models/stats.js
@@ -0,0 +1,37 @@
+const mongoose = require("mongoose");
+
+require("dotenv").config();
+
+const statsSchema = mongoose.Schema(
+ {
+ blogId: {
+ type: mongoose.Schema.Types.ObjectId,
+ ref: "Blog",
+ required: [true, "Stats should be associated with blogId"],
+ },
+ likedBy: [{ type: mongoose.Schema.Types.ObjectId, ref: "User" }],
+ verfiedBy: [{ type: mongoose.Schema.Types.ObjectId, ref: "User" }],
+ approvals: {
+ type: Number,
+ default: 0,
+ },
+ reads: {
+ type: Number,
+ default: 0,
+ },
+ views: {
+ type: Number,
+ default: 0,
+ },
+ likes: {
+ type: Number,
+ default: 0,
+ }
+ },
+ {
+ timestamps: true,
+ }
+);
+
+const Stats = mongoose.model("Stats", statsSchema);
+module.exports = { Stats };
diff --git a/package.json b/package.json
index 196aa4a..2c7f340 100644
--- a/package.json
+++ b/package.json
@@ -22,6 +22,7 @@
},
"homepage": "https://github.com/Rajpra786/Blog-App#readme",
"dependencies": {
+ "@types/cookie": "^0.4.0",
"aws-sdk": "^2.983.0",
"bcrypt": "^5.0.1",
"body-parser": "^1.19.0",
@@ -30,15 +31,12 @@
"dotenv": "^10.0.0",
"express": "^4.17.1",
"express-session": "^1.17.2",
- "mongoose": "^5.11.13",
+ "mongoose": "^5.13.15",
"morgan": "^1.10.0",
"multer": "^1.4.3",
"multer-s3": "^2.9.1",
- "swagger-ui-express": "^4.1.6",
- "@types/cookie": "^0.4.0",
- "swagger-autogen": "^2.11.2"
- },
- "devDependencies": {
-
+ "nodemon": "^2.0.20",
+ "swagger-autogen": "^2.11.2",
+ "swagger-ui-express": "^4.1.6"
}
}
diff --git a/routes/appRoutes.js b/routes/appRoutes.js
new file mode 100644
index 0000000..cc8f29c
--- /dev/null
+++ b/routes/appRoutes.js
@@ -0,0 +1,9 @@
+var router = require("express").Router();
+const isAuth = require("../middleware/isAuth");
+const getPost = require("../controllers/appControllers/getPost");
+
+// Get /api/app/:id Get all for a given blog id
+
+router.get("/:id", isAuth, getPost);
+
+module.exports = router;
diff --git a/controllers/blogControllers/blogRoutes.js b/routes/blogRoutes.js
similarity index 51%
rename from controllers/blogControllers/blogRoutes.js
rename to routes/blogRoutes.js
index 252b5f4..4a867f0 100644
--- a/controllers/blogControllers/blogRoutes.js
+++ b/routes/blogRoutes.js
@@ -1,10 +1,10 @@
var router = require("express").Router();
-const auth = require("../../middleware/auth");
-const createBlog = require("./createBlog");
-const getBlogById = require("./getBlogById");
-const getBlogs = require("./getBlogs");
-const updateBlog = require("./updateBlog");
-const getUploadUrl = require("./getUploadUrl");
+const auth = require("../middleware/auth");
+const createBlog = require("../controllers/blogControllers/createBlog");
+const getBlogById = require("../controllers/blogControllers/getBlogById");
+const getBlogs = require("../controllers/blogControllers/getBlogs");
+const updateBlog = require("../controllers/blogControllers/updateBlog");
+const getUploadUrl = require("../controllers/blogControllers/getUploadUrl");
// POST /api/blogs/new (Auth) Create a new blog
// PUT /api/blogs/:id (Auth) Update a blog
diff --git a/routes/commentRoutes.js b/routes/commentRoutes.js
new file mode 100644
index 0000000..62bb482
--- /dev/null
+++ b/routes/commentRoutes.js
@@ -0,0 +1,12 @@
+const express = require("express");
+const router = express.Router();
+const auth = require("../middleware/auth");
+const addComment = require("../controllers/commentControllers/addComment");
+const updateComment = require("../controllers/commentControllers/updateComment");
+const getComments = require("../controllers/commentControllers/getComments");
+
+router.get("/:commentBoxId", getComments);
+router.post("/:commentBoxId/new", auth, addComment);
+router.put("/:commentBoxId/:commentId", auth, updateComment);
+
+module.exports = router;
diff --git a/routes/endpoints.js b/routes/endpoints.js
new file mode 100644
index 0000000..4c3f033
--- /dev/null
+++ b/routes/endpoints.js
@@ -0,0 +1,13 @@
+const express = require("express");
+const userRoutes = require("./userRoutes");
+const blogRoutes = require("./blogRoutes");
+const commentRoutes = require("./commentRoutes");
+const appRoutes = require("./appRoutes");
+
+const router = express.Router();
+
+router.use("/api/users/", userRoutes);
+router.use("/api/blogs/", blogRoutes);
+router.use("/api/comments/", commentRoutes);
+router.use("/api/app/", appRoutes)
+module.exports = router;
diff --git a/routes/userRoutes.js b/routes/userRoutes.js
new file mode 100644
index 0000000..c3e3632
--- /dev/null
+++ b/routes/userRoutes.js
@@ -0,0 +1,20 @@
+var router = require("express").Router();
+const auth = require("../middleware/auth");
+const login = require("../controllers/userControllers/login");
+const getMyProfile = require("../controllers/userControllers/getMyProfile");
+const getPublicProfile = require("../controllers/userControllers/getPublicProfile");
+const logout = require("../controllers/userControllers/logout");
+const register = require("../controllers/userControllers/register");
+const updateProfile = require("../controllers/userControllers/updateProfile");
+
+//session
+router.post("/session", login);
+router.delete("/session", logout);
+
+//for users
+router.post("/new", register);
+router.get("/my", auth, getMyProfile);
+router.get("/:id", getPublicProfile);
+router.put("/:id", auth, updateProfile);
+
+module.exports = router;
diff --git a/swagger.js b/swagger.js
index f96d306..10aa1cc 100644
--- a/swagger.js
+++ b/swagger.js
@@ -56,7 +56,7 @@ const doc = {
};
const outputFile = "./swagger_output.json";
-const endpointsFiles = ["./endpoints.js"];
+const endpointsFiles = ["./routes/endpoints.js"];
swaggerAutogen(outputFile, endpointsFiles, doc);
// swaggerAutogen(outputFile, endpointsFiles, doc).then(() => {
diff --git a/swagger_output.json b/swagger_output.json
index 8c80d13..bcbd3bf 100644
--- a/swagger_output.json
+++ b/swagger_output.json
@@ -2,14 +2,13 @@
"swagger": "2.0",
"info": {
"version": "1.0.0",
- "title": "Blog API",
+ "title": "Blogger-Bhaiya backend API",
"description": "This is the documentation for backend server API."
},
- "host": "localhost:8081",
+ "host": "blogger-bhaiya.herokuapp.com",
"basePath": "/",
- "tags": [],
"schemes": [
- "http"
+ "https"
],
"securityDefinitions": {
"apiKeyAuth": {
@@ -44,11 +43,11 @@
"properties": {
"email": {
"type": "string",
- "example": "hello@gmail.com"
+ "example": "hello2@gmail.com"
},
"password": {
"type": "string",
- "example": "12345678"
+ "example": "87654321"
}
},
"required": [
@@ -298,6 +297,11 @@
"name": "maxcount",
"in": "query",
"type": "string"
+ },
+ {
+ "name": "lastDate",
+ "in": "query",
+ "type": "string"
}
],
"responses": {
@@ -578,6 +582,36 @@
}
]
}
+ },
+ "/api/app/{id}": {
+ "get": {
+ "tags": [
+ "App"
+ ],
+ "summary": "Get Post By Id",
+ "description": "Endpoint get a blog and its related components by blogId. It provides Blog details, its author details, recommandation, related posts",
+ "parameters": [
+ {
+ "name": "id",
+ "in": "path",
+ "required": true,
+ "type": "string"
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "OK"
+ },
+ "503": {
+ "description": "Service Unavailable"
+ }
+ },
+ "security": [
+ {
+ "apiKeyAuth": []
+ }
+ ]
+ }
}
},
"definitions": {