Merge pull request #4 from shrushti2000/profile

Profile ,Bookmark
shrushti2000 · Jun 12, 2022 · 367129f · 367129f
2 parents 3deb298 + 657508c
commit 367129f
Show file tree

Hide file tree

Showing 23 changed files with 769 additions and 209 deletions.
diff --git a/src/App.js b/src/App.js
@@ -1,26 +1,33 @@
-import { useEffect } from "react";
+import { Profiler, useEffect } from "react";
 import { useDispatch, useSelector } from "react-redux";
 import { BrowserRouter, Route, Routes } from "react-router-dom";
 import "./App.css";
 import { Header } from "./components";
+import { getAllBokmarkedPosts, getAllPosts, getUserPost } from "./features/postSlice";
 import { getAllUser } from "./features/userSlice";
 import logo from "./logo.png";
-import { FeedPage } from "./pages";
+import { FeedPage, UserProfile } from "./pages";
+import { BookmarkPage } from "./pages/BookmarkPage/BookmarkPage";
 import { Landingpage } from "./pages/Landingpage/Landingpage";
 import { Signin } from "./pages/Signin/Signin";
 import { Signup } from "./pages/Signup/Signup";
+import { SuggestedUserProfile } from "./pages/SuggestedUserProfile/SuggestedUserProfile";
 function App() {
   const { token } = useSelector((state) => state.authentication);
   const dispatch=useDispatch()
   const {allUsers}=useSelector(state=>state.user)
-
+  const {allPosts}=useSelector(state=>state.post)
+  const {user}=useSelector(state=>state.authentication)
   useEffect(()=>{
     if(token){
       dispatch(getAllUser())
+      dispatch(getAllPosts())
+      dispatch(getAllBokmarkedPosts())
+     dispatch(getUserPost(user.username))
     }
 
 
-  },[token,allUsers])
+  },[token])
   return (
     <>
       <BrowserRouter>
@@ -29,6 +36,9 @@ function App() {
           <Route path="/signin" element={<Signin />} />
           <Route path="/signup" element={<Signup />} />
           <Route path="/feedpage" element={<FeedPage />} />
+          <Route path="/profile" element={<UserProfile/>}/>
+          <Route path="/bookmark" element={<BookmarkPage/>}/>
+          <Route path="/user-profile/:username" element={<SuggestedUserProfile/>}/>
         </Routes>
       </BrowserRouter>
     </>

diff --git a/src/Services/bookmarkService.js b/src/Services/bookmarkService.js
@@ -0,0 +1,30 @@
+import axios from "axios";
+
+export const getAllBookmarkService = (token) =>
+  axios.get("/api/users/bookmark", {
+    headers: {
+      authorization: token,
+    },
+  });
+
+export const addBookmarkService = (postId, token) =>
+  axios.post(
+    `/api/users/bookmark/${postId}`,
+    {},
+    {
+      headers: {
+        authorization: token,
+      },
+    }
+  );
+
+export const removeBookmarkService = (postId, token) =>
+  axios.post(
+    `/api/users/remove-bookmark/${postId}`,
+    {},
+    {
+      headers: {
+        authorization: token,
+      },
+    }
+  );
diff --git a/src/Services/commentService.js b/src/Services/commentService.js
@@ -1,6 +1,6 @@
 import axios from "axios";
 
-export const addCommentService = (postId, commentData, token) => {
+export const addCommentService = (postId, commentData, token) => 
   axios.post(
     `/api/comments/add/${postId}`,
     {
@@ -12,9 +12,9 @@ export const addCommentService = (postId, commentData, token) => {
       },
     }
   );
-};
 
-export const editCommentService = (postId, commentId, commentData, token) => {
+
+export const editCommentService = (postId, commentId, commentData, token) => 
   axios.post(
     `/api/comments/edit/${postId}/${commentId}`,
     {
@@ -26,7 +26,7 @@ export const editCommentService = (postId, commentId, commentData, token) => {
       },
     }
   );
-};
+
 
 export const deleteCommentService = (postId, commentId, token) =>
   axios.post(

diff --git a/src/Services/postService.js b/src/Services/postService.js
@@ -2,12 +2,12 @@ import axios from "axios"
 
 export const getAllPostService=()=>axios.get("/api/posts");
 export const getUserPostService=(username)=>axios.get(`/api/posts/user/${username}`)
-export const addPostService=(postData,token)=>{
+export const addPostService=(postData,token)=>
     axios.post("/api/posts",{postData},{headers:{
         authorization:token
     }})
-}
-export const editPostService=(postData,token)=>{
+
+export const editPostService=(postData,token)=>
     axios.post(`/api/posts/edit/${postData._id}`,{
         postData
     },{
@@ -16,28 +16,27 @@ export const editPostService=(postData,token)=>{
         }
     })
 
-}
 
-export const deleteUserPostService=(postId,token)=>{
+
+export const deleteUserPostService=(postId,token)=>
     axios.delete(`/api/posts/${postId}`,{
         headers:{
             authorization:token
         }
     })
-}
 
-export const likePostService=(postId,token)=>{
+
+export const likePostService=(postId,token)=>
     axios.post(`/api/posts/like/${postId}`,{},{
         headers:{
             authorization:token
         }
     })
-}
 
-export const dislikePostService=(postId,token)=>{
+
+export const dislikePostService=(postId,token)=>
     axios.post(`/api/posts/dislike/${postId}`,{},{
         headers:{
             authorization:token
         }
     })
-}
diff --git a/src/Services/userService.js b/src/Services/userService.js
@@ -2,25 +2,26 @@ import axios from "axios"
 
 export const getAllUserService=()=>axios.get("/api/users") 
 
-export const updateUserService=(token,userData)=>{
-return axios.post("/api/users/edit",{userData},{
+export const updateUserService=(token,userData)=>
+ axios.post("/api/users/edit",{userData},{
     headers:{
         authorization:token
     }
 })
-}
 
-export const followUserService=(token,userId)=>{
-    return axios.post(`/api/users/follow/${userId}`,{},{
+
+export const followUserService=(token,userId)=>
+     axios.post(`/api/users/follow/${userId}`,{},{
         headers:{
             authorization:token
         }
     })
-}
-export const unfollowUserService=(token,userId)=>{
-    return axios.post(`/api/users/unfollow/${userId}`,{},{
+
+
+
+export const unfollowUserService=(token,userId)=>
+     axios.post(`/api/users/unfollow/${userId}`,{},{
         headers:{
             authorization:token
         }
     })
-}
diff --git a/src/backend/controllers/PostController.js b/src/backend/controllers/PostController.js
@@ -71,9 +71,7 @@ export const createPostHandler = function (schema, request) {
         404,
         {},
         {
-          errors: [
-            "The username you entered is not Registered. Not Found error",
-          ],
+          errors: ["The username you entered is not Registered. Not Found error"],
         }
       );
     }
@@ -86,6 +84,8 @@ export const createPostHandler = function (schema, request) {
         likedBy: [],
         dislikedBy: [],
       },
+      comments: [],
+      bookmark: [],
       username: user.username,
       createdAt: formatDate(),
       updatedAt: formatDate(),
@@ -116,9 +116,7 @@ export const editPostHandler = function (schema, request) {
         404,
         {},
         {
-          errors: [
-            "The username you entered is not Registered. Not Found error",
-          ],
+          errors: ["The username you entered is not Registered. Not Found error"],
         }
       );
     }
@@ -161,24 +159,16 @@ export const likePostHandler = function (schema, request) {
         404,
         {},
         {
-          errors: [
-            "The username you entered is not Registered. Not Found error",
-          ],
+          errors: ["The username you entered is not Registered. Not Found error"],
         }
       );
     }
     const postId = request.params.postId;
     const post = schema.posts.findBy({ _id: postId }).attrs;
     if (post.likes.likedBy.some((currUser) => currUser._id === user._id)) {
-      return new Response(
-        400,
-        {},
-        { errors: ["Cannot like a post that is already liked. "] }
-      );
+      return new Response(400, {}, { errors: ["Cannot like a post that is already liked. "] });
     }
-    post.likes.dislikedBy = post.likes.dislikedBy.filter(
-      (currUser) => currUser._id !== user._id
-    );
+    post.likes.dislikedBy = post.likes.dislikedBy.filter((currUser) => currUser._id !== user._id);
     post.likes.likeCount += 1;
     post.likes.likedBy.push(user);
     this.db.posts.update({ _id: postId }, { ...post, updatedAt: formatDate() });
@@ -207,20 +197,14 @@ export const dislikePostHandler = function (schema, request) {
         404,
         {},
         {
-          errors: [
-            "The username you entered is not Registered. Not Found error",
-          ],
+          errors: ["The username you entered is not Registered. Not Found error"],
         }
       );
     }
     const postId = request.params.postId;
     let post = schema.posts.findBy({ _id: postId }).attrs;
     if (post.likes.likeCount === 0) {
-      return new Response(
-        400,
-        {},
-        { errors: ["Cannot decrement like less than 0."] }
-      );
+      return new Response(400, {}, { errors: ["Cannot decrement like less than 0."] });
     }
     if (post.likes.dislikedBy.some((currUser) => currUser._id === user._id)) {
       return new Response(
@@ -230,9 +214,7 @@ export const dislikePostHandler = function (schema, request) {
       );
     }
     post.likes.likeCount -= 1;
-    const updatedLikedBy = post.likes.likedBy.filter(
-      (currUser) => currUser._id !== user._id
-    );
+    const updatedLikedBy = post.likes.likedBy.filter((currUser) => currUser._id !== user._id);
     post.likes.dislikedBy.push(user);
     post = { ...post, likes: { ...post.likes, likedBy: updatedLikedBy } };
     this.db.posts.update({ _id: postId }, { ...post, updatedAt: formatDate() });
@@ -260,9 +242,7 @@ export const deletePostHandler = function (schema, request) {
         404,
         {},
         {
-          errors: [
-            "The username you entered is not Registered. Not Found error",
-          ],
+          errors: ["The username you entered is not Registered. Not Found error"],
         }
       );
     }
@@ -273,9 +253,7 @@ export const deletePostHandler = function (schema, request) {
         400,
         {},
         {
-          errors: [
-            "Cannot delete a Post doesn't belong to the logged in User.",
-          ],
+          errors: ["Cannot delete a Post doesn't belong to the logged in User."],
         }
       );
     }
@@ -290,4 +268,4 @@ export const deletePostHandler = function (schema, request) {
       }
     );
   }
-};
+};
diff --git a/src/backend/controllers/UserController.js b/src/backend/controllers/UserController.js
@@ -105,7 +105,7 @@ export const getBookmarkPostsHandler = function (schema, request) {
  * send POST Request at /api/users/bookmark/:postId/
  * */
 
-export const bookmarkPostHandler = function (schema, request) {
+ export const bookmarkPostHandler = function (schema, request) {
   const { postId } = request.params;
   const post = schema.posts.findBy({ _id: postId }).attrs;
   const user = requiresAuth.call(this, request);
@@ -122,7 +122,7 @@ export const bookmarkPostHandler = function (schema, request) {
       );
     }
     const isBookmarked = user.bookmarks.some(
-      (currPost) => currPost._id === postId
+      (currPostId) => currPostId === postId
     );
     if (isBookmarked) {
       return new Response(
@@ -131,7 +131,7 @@ export const bookmarkPostHandler = function (schema, request) {
         { errors: ["This Post is already bookmarked"] }
       );
     }
-    user.bookmarks.push(post);
+    user.bookmarks.push(postId);
     this.db.users.update(
       { _id: user._id },
       { ...user, updatedAt: formatDate() }
@@ -148,12 +148,13 @@ export const bookmarkPostHandler = function (schema, request) {
   }
 };
 
+
 /**
  * This handler handles adding a post to user's bookmarks in the db.
  * send POST Request at /api/users/remove-bookmark/:postId/
  * */
 
-export const removePostFromBookmarkHandler = function (schema, request) {
+ export const removePostFromBookmarkHandler = function (schema, request) {
   const { postId } = request.params;
   let user = requiresAuth.call(this, request);
   try {
@@ -169,13 +170,13 @@ export const removePostFromBookmarkHandler = function (schema, request) {
       );
     }
     const isBookmarked = user.bookmarks.some(
-      (currPost) => currPost._id === postId
+      (currPostId) => currPostId === postId
     );
     if (!isBookmarked) {
       return new Response(400, {}, { errors: ["Post not bookmarked yet"] });
     }
     const filteredBookmarks = user.bookmarks.filter(
-      (currPost) => currPost._id !== postId
+      (currPostId) => currPostId !== postId
     );
     user = { ...user, bookmarks: filteredBookmarks };
     this.db.users.update(
@@ -194,6 +195,7 @@ export const removePostFromBookmarkHandler = function (schema, request) {
   }
 };
 
+
 /**
  * This handler handles follow action.
  * send POST Request at /api/users/follow/:followUserId/
@@ -318,4 +320,4 @@ export const unfollowUserHandler = function (schema, request) {
       }
     );
   }
-};
+};