From 6866d405c978a8309d68158f902128e6a2405c46 Mon Sep 17 00:00:00 2001 From: "VICTOR\\anumu" Date: Fri, 20 Jan 2023 19:39:53 +0100 Subject: [PATCH 1/4] fixed 'Get Started' broken link on nav bar --- .env | 2 +- src/component/Navbar/Main.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.env b/.env index 56afd7f..3e41646 100644 --- a/.env +++ b/.env @@ -6,7 +6,7 @@ REACT_APP_ANDROID_URL="https://play.google.com/store/apps/details?id=com.mermsem REACT_APP_IOS_URL="https://play.google.com/store/apps/details?id=com.mermsemr.myfit" -REACT_APP_APPSITE=" https://myfitapp.mermsemr.com" +REACT_APP_APPSITE=" https://mermsemr.com" #REACT_APP_APPSITE="http://localhost:7012" # Social Media Links diff --git a/src/component/Navbar/Main.js b/src/component/Navbar/Main.js index 55c37ee..18507a3 100644 --- a/src/component/Navbar/Main.js +++ b/src/component/Navbar/Main.js @@ -55,7 +55,7 @@ const Main = ({navbar}) => { Contact
  • - GET STARTED + GET STARTED
    • From bcdcdc7b54eece6cb86adeeb835dc95c29eb8c6e Mon Sep 17 00:00:00 2001 From: "VICTOR\\anumu" Date: Fri, 20 Jan 2023 21:25:13 +0100 Subject: [PATCH 2/4] fixed pricing page broken link --- src/component/Pricing/Main.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/component/Pricing/Main.js b/src/component/Pricing/Main.js index 1986fb8..73dfb0e 100644 --- a/src/component/Pricing/Main.js +++ b/src/component/Pricing/Main.js @@ -7,6 +7,9 @@ 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 blueapp from "../../assets/images/appstore_blue.png"; +import blue from "../../assets/images/googleplay_blue.png"; + const Main = ({brdcum}) => { const[activeFaq, setActiveFaq] = useState({a : true}) From fe311f861071acc26e18d036d40fe5f1725f9115 Mon Sep 17 00:00:00 2001 From: "VICTOR\\anumu" Date: Fri, 20 Jan 2023 21:44:58 +0100 Subject: [PATCH 3/4] Updated pricing_page_broken link --- src/component/Pricing/Main.js | 1 - 1 file changed, 1 deletion(-) diff --git a/src/component/Pricing/Main.js b/src/component/Pricing/Main.js index 73dfb0e..6283b11 100644 --- a/src/component/Pricing/Main.js +++ b/src/component/Pricing/Main.js @@ -6,7 +6,6 @@ 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 blueapp from "../../assets/images/appstore_blue.png"; import blue from "../../assets/images/googleplay_blue.png"; From 5dde6e6e914d2ff7ccefe190cb67a5bd218d8688 Mon Sep 17 00:00:00 2001 From: "DESKTOP-QHP1O2H\\MIKE" Date: Fri, 20 Jan 2023 18:07:01 -0500 Subject: [PATCH 4/4] fixed latest story on homepage --- src/component/Blog/Blog/Main.js | 1 + src/component/Blog/BlogSingle/Main.js | 5 ++- src/component/HomeMain/Story/Main.js | 60 +++++++++++++++++++++++---- 3 files changed, 56 insertions(+), 10 deletions(-) diff --git a/src/component/Blog/Blog/Main.js b/src/component/Blog/Blog/Main.js index 43a4623..ba78687 100644 --- a/src/component/Blog/Blog/Main.js +++ b/src/component/Blog/Blog/Main.js @@ -42,6 +42,7 @@ const Main = ({ brdcum, bgimg }) => { } } }; + return ( <> diff --git a/src/component/Blog/BlogSingle/Main.js b/src/component/Blog/BlogSingle/Main.js index 0d1503f..b2be0a5 100644 --- a/src/component/Blog/BlogSingle/Main.js +++ b/src/component/Blog/BlogSingle/Main.js @@ -16,7 +16,7 @@ const Main = ({ brdcum }) => { let api_call = new SiteService(); useEffect(() => { getBlogData(); - }, [blogData]); + }, []); const getBlogData = async () => { /* @@ -185,7 +185,8 @@ const Main = ({ brdcum }) => { dangerouslySetInnerHTML={{ __html: item.post_content.substring(0, 100) + " . . .", }}> - READ MORE + READ MORE + {/* READ MORE */} diff --git a/src/component/HomeMain/Story/Main.js b/src/component/HomeMain/Story/Main.js index 6767e66..6a1b5bf 100644 --- a/src/component/HomeMain/Story/Main.js +++ b/src/component/HomeMain/Story/Main.js @@ -1,20 +1,64 @@ -import { Link } from 'react-router-dom' -import React from 'react' -import story1 from '../../../assets/images/story01.png' -import story2 from '../../../assets/images/story02.png' -import story3 from '../../../assets/images/story03.png' +import React, { useEffect, useState } from "react"; +import { Link } from 'react-router-dom'; +// import story1 from '../../../assets/images/story01.png'; +// import story2 from '../../../assets/images/story02.png'; +// import story3 from '../../../assets/images/story03.png'; +import SiteService from "../../../vendors/service/siteService"; + const Main = () => { + const [blogData, setBlogData] = useState([]); + + let api = new SiteService(); + useEffect(() => { + getBlogData(); + }, []); + + const getBlogData = async () => { + try { + let res = await api.blogData(); + setBlogData(res.data); + + } catch (error) { + console.log("Error from blog data ", error); + } + }; + return ( <>

    Read latest story

    -

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

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

    {item.post_title}

    +
    + READ MORE +
    +
    +
    + ))} + {/*
    image @@ -53,7 +97,7 @@ const Main = () => { READ MORE
    -
    +
    */}