Merge pull request #150 from Red-Stream-Y3/main

pull req to production
Red-Stream-Y3 · May 17, 2023 · 1d591a7 · 1d591a7
2 parents 5a9a8c0 + 24f4eba
commit 1d591a7
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 17 deletions.
diff --git a/FrontEnd/src/api/blog.js b/FrontEnd/src/api/blog.js
@@ -195,4 +195,15 @@ export const getLatestBlogPosts = async () => {
     console.log(error);
     return [];
   }
+};
+
+// get authors all blogs
+export const getAuthorAllBlogs = async (authorId) => {
+  try {
+    const response = await axios.get(`/api/blog/author/${authorId}`);
+    return response.data;
+  } catch (error) {
+    console.log(error);
+    return [];
+  }
 };
diff --git a/FrontEnd/src/components/blog/PublicBlogCard.jsx b/FrontEnd/src/components/blog/PublicBlogCard.jsx
@@ -21,20 +21,20 @@ const PublicBlogCrad = ({
   handleBookmark,
   logged,
 }) => {
-  // const [isBookmarked, setIsBookmarked] = useState(false);
-  // const [isLogged, setIsLogged] = useState(false);
+  const [isBookmarked, setIsBookmarked] = useState(false);
+  const [isLogged, setIsLogged] = useState(false);
 
-  // useEffect(() => {
-  //   if (user && user == bookmarked) {
-  //     setIsBookmarked(true);
-  //   }
-  // }, [bookmarked, user]);
+  useEffect(() => {
+    if (user && user == bookmarked) {
+      setIsBookmarked(true);
+    }
+  }, [bookmarked, user]);
 
-  // useEffect(() => {
-  //   if (logged) {
-  //     setIsLogged(true);
-  //   }
-  // });
+  useEffect(() => {
+    if (logged) {
+      setIsLogged(true);
+    }
+  });
 
   //date formatter
   function formatDate(dateString) {
@@ -59,7 +59,7 @@ const PublicBlogCrad = ({
       </div>
 
       <div className="flex justify-end text-white w-full">
-        {/* <div className="flex items-center mx-2">
+        <div className="flex items-center mx-2">
           <div className="">
             {isLogged && (
               <button onClick={handleBookmark}>
@@ -71,7 +71,7 @@ const PublicBlogCrad = ({
               </button>
             )}
           </div>
-        </div> */}
+        </div>
 
         <div className="flex items-center mx-2">
           <div className="text-xl text-blue-600">

diff --git a/FrontEnd/src/pages/blog/MyBlogPosts.jsx b/FrontEnd/src/pages/blog/MyBlogPosts.jsx
@@ -3,7 +3,7 @@
 import React from "react";
 import { useParams, Link } from "react-router-dom";
 import { useState, useEffect } from "react";
-import { getBlogsByAuthor, deleteBlog } from "../../api/blog";
+import { getAuthorAllBlogs, deleteBlog } from "../../api/blog";
 import { BlogContainer, BlogCard } from "../../components";
 import { toast } from "react-toastify";
 
@@ -20,7 +20,7 @@ export default function MyBlogPosts() {
 
   useEffect(() => {
     const fetchBlogsByAuthor = async () => {
-      const blogs = await getBlogsByAuthor(userID);
+      const blogs = await getAuthorAllBlogs(userID);
       setBlogs(blogs);
     };
     fetchBlogsByAuthor();
@@ -29,7 +29,7 @@ export default function MyBlogPosts() {
   //refresh blog object
   const refreshFunc = async () => {
     setLoading(true);
-    let res = await getBlogsByAuthor(userID);
+    let res = await getAuthorAllBlogs(userID);
     setBlogs(res);
     setLoading(false);
   };