From 745cd0142996e7b0466630634581226f757fe111 Mon Sep 17 00:00:00 2001 From: "DESKTOP-QHP1O2H\\MIKE" Date: Thu, 19 Jan 2023 10:43:59 -0500 Subject: [PATCH 1/5] 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); } From 24732b6c05b4b709e49fdcd27abba8f43b06a807 Mon Sep 17 00:00:00 2001 From: "VICTOR\\anumu" Date: Thu, 19 Jan 2023 18:43:04 +0100 Subject: [PATCH 2/5] assigned text to variable in about us page and used the variables in place of text --- src/component/AboutUs/Main.js | 48 ++++++++++++++++++++--------------- 1 file changed, 27 insertions(+), 21 deletions(-) diff --git a/src/component/AboutUs/Main.js b/src/component/AboutUs/Main.js index 74796bb..9e014f7 100644 --- a/src/component/AboutUs/Main.js +++ b/src/component/AboutUs/Main.js @@ -9,6 +9,17 @@ import BGImg2 from "../../assets/images/bread_crumb_bg_two.png" const Main = ({brdcum}) => { const [ytShow , setytShow] = useState (false) + // About us text variables + let innovativeDesc = 'The team at myFit by Flxuxtra LLC works with you to achieve your health objectives without getting in your way. Do your health your way to get the best result for you and your family. We are you, always ready and always engaged with the users to help get the best out of our solution.' + 'We work with you to achieve your health and fitness goals by providing solutions that fit your goals.' + let whyWeAreDiff = { + desc:'We work with you to achieve your health and fitness goals by providing solutions that fit your goals.', + title1: 'Secure', + title2: 'Rich Features', + title3: 'Ease of Use', + title4: 'Support' + } + return ( <> {brdcum.b1 && @@ -56,17 +67,13 @@ const Main = ({brdcum}) => { life easy to grow.

- Lorem Ipsum is simply dummy text of the printing and type - setting industry lorem Ipsum has been the industrys standard dummy text ever since the when an unknown - printer took a galley of type and scrambled it to make a type specimen book. It has survived not only - five centuries, but also the leap into electronic typesetting, remaining to make a type speci - men book. It has survived essentially unchanged. + {innovativeDesc}

-

+ {/*

Standard dummy text ever since the when an unknown printer took a galley of type and scrambled it to make a type specien book. It has survived not only five centuries, but also the leap into electronic typesetting. -

+

*/}
@@ -98,17 +105,16 @@ const Main = ({brdcum}) => {

Why we are different from others!

-

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

+

{whyWeAreDiff.desc}

-
+ {/*
image -
+
*/}
-

Secure code

+

{whyWeAreDiff.title1}

Lorem Ipsum is simply dummy text of the printing and type setting indus ideas.

@@ -117,22 +123,22 @@ const Main = ({brdcum}) => {
-
+ {/*
image -
+
*/}
-

Fully functional

+

{whyWeAreDiff.title2}

Simply dummy text of the printing and typesetting indus lorem Ipsum is dummy.

-
+ {/*
image -
+
*/}
-

Best communication

+

{whyWeAreDiff.title3}

Lorem Ipsum is simply dummy text of the printing and type setting indus ideas.

@@ -141,11 +147,11 @@ const Main = ({brdcum}) => {
-
+ {/*
image -
+
*/}
-

24-7 Support

+

{whyWeAreDiff.title4}

Simply dummy text of the printing and typesetting indus lorem Ipsum is dummy.

From bb7b54f8a4a63fb5aa6af061b85b9302f43fff62 Mon Sep 17 00:00:00 2001 From: ChineseChikki Date: Fri, 20 Jan 2023 12:39:14 +0100 Subject: [PATCH 3/5] Fixed broken footer link of how it work --- src/component/Footer/Main.js | 18 +++++++++--------- src/component/Navbar/Main.js | 12 ++++++------ src/routes/index.js | 4 ++++ 3 files changed, 19 insertions(+), 15 deletions(-) diff --git a/src/component/Footer/Main.js b/src/component/Footer/Main.js index e0ed1f0..c833b5c 100644 --- a/src/component/Footer/Main.js +++ b/src/component/Footer/Main.js @@ -94,13 +94,13 @@ const Main = ({ footer }) => {
-

Help & Suport

+

Help & Support

  • FAQs
  • - How it works + How it works
  • Terms & conditions @@ -231,13 +231,13 @@ const Main = ({ footer }) => {
-

Help & Suport

+

Help & Support

  • FAQs
  • - How it works + How it works
  • Terms & conditions @@ -367,7 +367,7 @@ const Main = ({ footer }) => { Support
  • - How it works + How it works
  • Terms & conditions @@ -483,7 +483,7 @@ const Main = ({ footer }) => {
    -

    Help & Suport

    +

    Help & Support

    • FAQs @@ -492,7 +492,7 @@ const Main = ({ footer }) => { Support
    • - How it works + How it works
    • Terms & conditions @@ -615,7 +615,7 @@ const Main = ({ footer }) => {
    -

    Help & Suport

    +

    Help & Support

    • FAQs @@ -624,7 +624,7 @@ const Main = ({ footer }) => { Support
    • - How it works + How it works
    • Terms & conditions diff --git a/src/component/Navbar/Main.js b/src/component/Navbar/Main.js index a8e8fc1..55c37ee 100644 --- a/src/component/Navbar/Main.js +++ b/src/component/Navbar/Main.js @@ -134,7 +134,7 @@ const Main = ({navbar}) => { Features
    • - How it works + How it works
    • Blog @@ -286,7 +286,7 @@ const Main = ({navbar}) => {
        -
      • Home Defoult
        • +
      • Home Default
      @@ -359,7 +359,7 @@ const Main = ({navbar}) => {
        -
      • Home Defoult
        • +
      • Home Default
      @@ -404,7 +404,7 @@ const Main = ({navbar}) => {
        -
      • Home Defoult
        • +
      • Home Default
      @@ -477,7 +477,7 @@ const Main = ({navbar}) => {
        -
      • Home Defoult
        • +
      • Home Default
      @@ -533,7 +533,7 @@ const Main = ({navbar}) => {
        -
      • Home Defoult
        • +
      • Home Default
      diff --git a/src/routes/index.js b/src/routes/index.js index af34beb..d9326da 100644 --- a/src/routes/index.js +++ b/src/routes/index.js @@ -3,6 +3,7 @@ import { Route, Routes, useLocation } from "react-router-dom"; import Navbar from "../component/Navbar/Main"; import Footer from "../component/Footer/Main"; import Home from "../component/Home/Main"; +import Work from "../component/HomeMain/Work/Main" import AboutUs from "../component/AboutUs/Main"; import Review from "../component/Pages/Review/Main"; import Contact from "../component/Contact/Main"; @@ -13,6 +14,7 @@ import Pricing from "../component/Pricing/Main"; import Blog from "../component/Blog/Blog/Main"; import BlogSingle from "../component/Blog/BlogSingle/Main"; + import Terms from "../component/Terms/Main"; import Privacy from "../component/Privacy/Main"; @@ -87,6 +89,8 @@ const Routing = () => { } /> } /> } /> + } /> + {footerpage &&