From 745cd0142996e7b0466630634581226f757fe111 Mon Sep 17 00:00:00 2001 From: "DESKTOP-QHP1O2H\\MIKE" Date: Thu, 19 Jan 2023 10:43:59 -0500 Subject: [PATCH] modified latest blog on blog-single --- src/component/Blog/Blog/Main.js | 5 +- src/component/Blog/BlogSingle/Main.js | 86 ++++++++++++++++++++------- src/vendors/service/siteService.js | 2 +- 3 files changed, 69 insertions(+), 24 deletions(-) diff --git a/src/component/Blog/Blog/Main.js b/src/component/Blog/Blog/Main.js index 36d7625..ad83a2f 100644 --- a/src/component/Blog/Blog/Main.js +++ b/src/component/Blog/Blog/Main.js @@ -6,6 +6,7 @@ import BGImg2 from "../../../assets/images/bread_crumb_bg_two.png"; import SiteService from "../../../vendors/service/siteService"; const Main = ({ brdcum, bgimg }) => { const [blogData, setBlogData] = useState([]); + console.log(blogData); const api = new SiteService(); useEffect(() => { @@ -18,7 +19,7 @@ const Main = ({ brdcum, bgimg }) => { setBlogData(res.data); - console.log(res.data); + // console.log(res.data); } catch (error) { @@ -124,7 +125,7 @@ const Main = ({ brdcum, bgimg }) => {

{data.post_title}

- + READ MORE
diff --git a/src/component/Blog/BlogSingle/Main.js b/src/component/Blog/BlogSingle/Main.js index 08a0686..b538e19 100644 --- a/src/component/Blog/BlogSingle/Main.js +++ b/src/component/Blog/BlogSingle/Main.js @@ -5,15 +5,46 @@ import BGImg from "../../../assets/images/bread_crumb_bg.png" import BGImg1 from "../../../assets/images/bread_crumb_bg_one.png" import BGImg2 from "../../../assets/images/bread_crumb_bg_two.png" import { useParams } from "react-router-dom"; +import SiteService from "../../../vendors/service/siteService"; + const Main = ({brdcum}) => { - const { id } = useParams(); const location = useLocation(); - const data = location.state?.data; - - console.log("location", location, data); - + const [blogData, setBlogData] = useState([]); + const [newAllData, setNewAllData] = useState([]); + + + useEffect(() => { + getBlogData(); + getLatestBlog(); + }, [location.state?.data]); + + const api = new SiteService(); + const data = location.state?.data; + const allData = location.state?.allData; + + + const getLatestBlog = () =>{ + const arrData = [ ...allData ]; + const itemIndex = arrData.findIndex(x => x.id === data.id) + arrData.splice(itemIndex, 1); + const newAllData = arrData.splice(0, 3); + setNewAllData(newAllData); + + console.log('All data ', arrData, newAllData); +} + + const getBlogData = async () => { + try { + const res = await api.blogData(); + setBlogData(res.data); + + } catch (error) { + console.log("Error from blog data ", error); + } + }; + return ( <> @@ -238,21 +269,34 @@ const Main = ({brdcum}) => {

Lorem Ipsum is simply dummy text of the printing and typese tting
indus orem Ipsum has beenthe standard dummy.

-
-
-
- image - 45 min ago -
-
-

Cool features added!

-

Lorem Ipsum is simply dummy text of the printing and typesetting - industry lorem Ipsum has.

- READ MORE -
-
-
-
+ + {newAllData.map((data) => { + + return ( + +
+
+
+ image + 45 min ago +
+
+

{data.post_title}

+
+ + READ MORE + +
+
+
+ + )})} + + + + + + {/*
image @@ -277,7 +321,7 @@ const Main = ({brdcum}) => { READ MORE
-
+
*/}
diff --git a/src/vendors/service/siteService.js b/src/vendors/service/siteService.js index 70df633..3020e10 100644 --- a/src/vendors/service/siteService.js +++ b/src/vendors/service/siteService.js @@ -6,7 +6,7 @@ class SiteService { console.log("Er are here anyway"); } // Blog Data {Get} - blogData() { + blogData(id) { return this.getAuxEnd("/blogdata", null); }