From 0a93f6fc8ac932be054feb6684fc4ad611834966 Mon Sep 17 00:00:00 2001 From: "DESKTOP-QHP1O2H\\MIKE" Date: Mon, 23 Jan 2023 13:07:52 -0500 Subject: [PATCH] fixed blog link on home main --- src/component/Blog/Blog/Main.js | 219 ++++++++------------- src/component/Blog/BlogSingle/Main copy.js | 201 ------------------- src/component/Blog/BlogSingle/Main.js | 35 ++-- src/component/HomeMain/Story/Main.js | 16 +- 4 files changed, 110 insertions(+), 361 deletions(-) delete mode 100644 src/component/Blog/BlogSingle/Main copy.js diff --git a/src/component/Blog/Blog/Main.js b/src/component/Blog/Blog/Main.js index ba78687..2a7122e 100644 --- a/src/component/Blog/Blog/Main.js +++ b/src/component/Blog/Blog/Main.js @@ -1,75 +1,45 @@ -/** @format */ - import React, { useEffect, useState } from "react"; import { Link } from "react-router-dom"; import BGImg from "../../../assets/images/bread_crumb_bg.png"; import SiteService from "../../../vendors/service/siteService"; - const Main = ({ brdcum, bgimg }) => { const [blogData, setBlogData] = useState([]); + console.log(blogData); - let api = new SiteService(); + const api = new SiteService(); useEffect(() => { getBlogData(); }, []); const getBlogData = async () => { - /* - The reason for this, is because of the breaking I had when building the blog - I decided to save to the local storage for an hour so that it won't need to be going to the server again but I can change this - */ - // Saving it locally to avoid interfering with server - if (localStorage.getItem("myFit--blogData") == null) { - try { - let res = await api.blogData(); + try { + const res = await api.blogData(); - // Set the blog data to local storage - localStorage.setItem("myFit--blogData", JSON.stringify(res.data)); - setBlogData(res.data); - // Set a time out for the blog data to be deleted from local storage - setTimeout(() => { - localStorage.removeItem("myFit--blogData"); - }, 3600); - } catch (error) { - console.log("Error from blog data ", error); - } - } else { - try { - let data = JSON.parse(localStorage.getItem("myFit--blogData")); - setBlogData(data); - } catch (error) { - console.error("Error parsing JSON data: ", error); - } + setBlogData(res.data); + + // console.log(res.data); + + + } catch (error) { + console.log("Error from blog data ", error); } }; - return ( <> -
+
{" "} - image{" "} + image{" "} {" "} - image{" "} + image{" "} {" "} - image{" "} + image{" "}
@@ -82,122 +52,97 @@ const Main = ({ brdcum, bgimg }) => { ยป
  • - - {blogData.map((item, idx) => { - if (idx === 0) { - return {item.post_title}; - } - })} - + Blog
    • + {/*
    +
    +
    + + +
    +
    +
    */}
    - {blogData.length < 1 && ( -
    - )} - {blogData.map((data, index) => { - if (index == 0) { + {blogData.map((data,index) => { + if (index == 0){ return ( -
    -
    -
    -
    - image - - {new Date(data.post_date).toDateString()} -
    +
    +
    +
    +
    + image + {/* 20 min ago */} + + {new Date (data.post_date).toDateString()}
    -
    -
    -
    -

    {data.post_title}

    -
    - {/* Change the route name */} - +
    +
    +
    +
    +

    {data.post_title}

    +
    + {/* READ MORE - -
    + */} + + READ MORE +
    - ); - } - })} -
    +
    -
    + ) + } + })} + + +
    +
    {blogData.map((data, index) => { - if (index > 0) { + if (index > 0){ return ( -
    -
    -
    - image - - {new Date(data && data.post_date).toDateString()} - -
    -
    -

    {data.post_title}

    -
    - {/* Change the route name */} - - READ MORE - -
    -
    +
    +
    +
    + image + {new Date (data && data.post_date).toDateString()}
    - ); - } - })} -
    +
    +

    {data.post_title}

    +
    + + READ MORE + +
    +
    +
    + )} + + + })} +
    • - + {" "} Visit our blog diff --git a/src/component/Blog/BlogSingle/Main copy.js b/src/component/Blog/BlogSingle/Main copy.js deleted file mode 100644 index b2be0a5..0000000 --- a/src/component/Blog/BlogSingle/Main copy.js +++ /dev/null @@ -1,201 +0,0 @@ -/** @format */ - -import React, { useEffect, useState } from "react"; -import { Link, useLocation } from "react-router-dom"; -import Bredcrumb from "../../Bredcrumb/Main"; -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 SiteService from "../../../vendors/service/siteService"; - -const Main = ({ brdcum }) => { - const location = useLocation(); - let data = location.state?.data; - const [blogData, setBlogData] = useState([]); - - let api_call = new SiteService(); - useEffect(() => { - getBlogData(); - }, []); - - const getBlogData = async () => { - /* - The reason for this, is because of the breaking I had when building the blog - I decided to save to the local storage for an hour so that it won't need to be going to the server again but I can change this - */ - // Saving it locally to avoid interfering with server - if (localStorage.getItem("myFit--blogData") == null) { - try { - let res = await api_call.blogData(); - - // Set the blog data to local storage - localStorage.setItem("myFit--blogData", JSON.stringify(res.data)); - setBlogData(res.data); - // Set a time out for the blog data to be deleted from local storage - setTimeout(() => { - localStorage.removeItem("myFit--blogData"); - }, 3600); - } catch (error) { - console.log("Error from blog data ", error); - } - } else { - try { - let data = JSON.parse(localStorage.getItem("myFit--blogData")); - setBlogData(data); - } catch (error) { - console.error("Error parsing JSON data: ", error); - } - } - }; - - return ( - <> - {brdcum.b1 && ( - - )} - - {brdcum.b2 && ( - - )} - - {brdcum.b5 && ( - - )} - - {brdcum.b3 && ( - - )} - - {brdcum.b4 && ( - - )} - -
      -
      -
      - - {new Date(data && data.post_modified).toDateString()} - - -
      -

      {data && data.post_title}

      -
      -
      - image -
      -
      -

      {data && data.post_name}

      -
      -
      - -
      -
      -
      - {/*

      {data && data.post_author}

      */} - {new Date(data && data.post_date).toDateString()} -
      -
      -
      - -
      -
      - -
      -
      -
      - -
      -
      - {/* Latest Title */} -
      -

      - Read latest story -

      -
      -
      - {/* Body */} -
      - {blogData.slice(-4, -1).map((item, index) => ( -
      -
      -
      - image - {new Date(item.post_date).toDateString()} -
      -
      -

      {item.post_title}

      -
      - READ MORE - {/* READ MORE */} -
      -
      -
      - ))} -
      -
      -
      - - ); -}; - -export default Main; diff --git a/src/component/Blog/BlogSingle/Main.js b/src/component/Blog/BlogSingle/Main.js index cfdebf4..8236ad5 100644 --- a/src/component/Blog/BlogSingle/Main.js +++ b/src/component/Blog/BlogSingle/Main.js @@ -149,25 +149,27 @@ const Main = ({brdcum}) => {
    -
      -

    • Tags:

      • -
    • app,
      • -
    • rating,
      • -
    • development
      • -
    + Visit Blog Site
    -
    + + {/*

    3 Comments

    @@ -260,7 +262,7 @@ const Main = ({brdcum}) => {
    -
    +
    */}
    @@ -283,7 +285,10 @@ const Main = ({brdcum}) => {

    {data.post_title}

    - + {/* + READ MORE + */} + READ MORE
    @@ -291,10 +296,6 @@ const Main = ({brdcum}) => {
    )})} - - - - {/*
    diff --git a/src/component/HomeMain/Story/Main.js b/src/component/HomeMain/Story/Main.js index 6a1b5bf..8c9cfb5 100644 --- a/src/component/HomeMain/Story/Main.js +++ b/src/component/HomeMain/Story/Main.js @@ -32,7 +32,8 @@ const Main = () => {

    Read latest story

    - {blogData.slice(1, 4).map((item, index) => ( + + {blogData.slice(1, 4).map((data, index) => (
    @@ -42,18 +43,21 @@ const Main = () => { data-aos-duration="1500">
    image - {new Date(item.post_date).toDateString()} + {new Date(data.post_date).toDateString()}
    -

    {item.post_title}

    +

    {data.post_title}

    - READ MORE + + READ MORE + + {/* READ MORE */}