diff --git a/.env b/.env index 1f305c2..6e4162a 100644 --- a/.env +++ b/.env @@ -20,4 +20,3 @@ REACT_APP_AUX_ENDPOINT = "https://devapi.mermsemr.com/en/desktop/api/v2/myfit" REACT_APP_FORM_TIMEOUT = 10000 REACT_APP_MAX_MESSAGE_LENGHT =300 REACT_APP_BLOGSITE="https://blog.mermsemr.com/" - 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.

diff --git a/src/component/Blog/Blog/Main.js b/src/component/Blog/Blog/Main.js index b2e1e87..5efc2a5 100644 --- a/src/component/Blog/Blog/Main.js +++ b/src/component/Blog/Blog/Main.js @@ -9,6 +9,7 @@ import SiteService from "../../../vendors/service/siteService"; const Main = ({ brdcum, bgimg }) => { const [blogData, setBlogData] = useState([]); + console.log(blogData); let api = new SiteService(); useEffect(() => { diff --git a/src/component/Blog/BlogSingle/Main.js b/src/component/Blog/BlogSingle/Main.js index f881a88..1497a4b 100644 --- a/src/component/Blog/BlogSingle/Main.js +++ b/src/component/Blog/BlogSingle/Main.js @@ -21,6 +21,10 @@ const Main = ({ brdcum }) => { }, [blogData]); 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 { 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/component/Pages/Faq/Main.js b/src/component/Pages/Faq/Main.js index c850813..875db9e 100644 --- a/src/component/Pages/Faq/Main.js +++ b/src/component/Pages/Faq/Main.js @@ -1,5 +1,7 @@ import React , { useState , useEffect} from 'react' import { Link } from 'react-router-dom' +import blueapp from "../../../assets/images/appstore_blue.png" +import blue from "../../../assets/images/googleplay_blue.png" import Bredcrumb from '../../Bredcrumb/Main' import BGImg from "../../../assets/images/bread_crumb_bg.png" import BGImg1 from "../../../assets/images/bread_crumb_bg_one.png" @@ -64,7 +66,6 @@ const Main = ({brdcum}) => { tag="Faq" bgimg={BGImg2}/>} - {/*
      diff --git a/src/component/Pages/Review/Main.js b/src/component/Pages/Review/Main.js index a6a6537..575ce2a 100644 --- a/src/component/Pages/Review/Main.js +++ b/src/component/Pages/Review/Main.js @@ -328,16 +328,16 @@ const Main = ({brdcum}) => {

      Let’s download free from apple and play store

      Instant free download from apple and play store. All you need is an iPhone or Android device to enjoy all personalized metrics for personal use. Welcome to myFit App.

      -
      diff --git a/src/routes/index.js b/src/routes/index.js index 8aee054..228d301 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 &&