undo

links in variable format
2023-01-19 14:34:55 +01:00 · 2023-01-19 14:23:42 +01:00
40 changed files with 489 additions and 694 deletions
@@ -5,17 +5,15 @@ REACT_APP_YEAR=2023
 REACT_APP_ANDROID_URL="https://play.google.com/store/apps/details?id=com.mermsemr.myfit"
 REACT_APP_IOS_URL="https://play.google.com/store/apps/details?id=com.mermsemr.myfit"

-
-REACT_APP_APPSITE="https://dev142.users.myfit.mermsemr.com/login"
-# " https://mermsemr.com"
-#REACT_APP_APPSITE="http://localhost:7012"
-
-# Social Media Links
 REACT_APP_FACEBOOK="https://www.facebook.com/profile.php?id=100066498622246"
 REACT_APP_TWITTER="https://twitter.com/fluxtra"

+REACT_APP_APPSITE=" https://myfitapp.mermsemr.com"
+#REACT_APP_APPSITE="http://localhost:7012"
+

 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/"
+
@@ -6,7 +6,7 @@ services:
      dockerfile: Dockerfile
    restart: unless-stopped
    ports:
-      - 7010:3000
+      - 9057:3000
    stdin_open: true
    working_dir: /usr/src/app
    volumes:
@@ -12,7 +12,6 @@
        "@testing-library/react": "^13.4.0",
        "@testing-library/user-event": "^13.5.0",
        "aos": "^2.3.4",
-        "axios": "^0.24.0",
        "react": "^18.2.0",
        "react-dom": "^18.2.0",
        "react-owl-carousel": "^2.3.3",
@@ -4999,14 +4998,6 @@
        "node": ">=4"
      }
    },
-    "node_modules/axios": {
-      "version": "0.24.0",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-0.24.0.tgz",
-      "integrity": "sha512-Q6cWsys88HoPgAaFAVUb0WpPk0O8iTeisR9IMqy9G8AbO4NlpVknrnQS03zzF9PGAWgO3cgletO3VjV/P7VztA==",
-      "dependencies": {
-        "follow-redirects": "^1.14.4"
-      }
-    },
    "node_modules/axobject-query": {
      "version": "2.2.0",
      "resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-2.2.0.tgz",
@@ -20679,14 +20670,6 @@
      "resolved": "https://registry.npmjs.org/axe-core/-/axe-core-4.5.2.tgz",
      "integrity": "sha512-u2MVsXfew5HBvjsczCv+xlwdNnB1oQR9HlAcsejZttNjKKSkeDNVwB1vMThIUIFI9GoT57Vtk8iQLwqOfAkboA=="
    },
-    "axios": {
-      "version": "0.24.0",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-0.24.0.tgz",
-      "integrity": "sha512-Q6cWsys88HoPgAaFAVUb0WpPk0O8iTeisR9IMqy9G8AbO4NlpVknrnQS03zzF9PGAWgO3cgletO3VjV/P7VztA==",
-      "requires": {
-        "follow-redirects": "^1.14.4"
-      }
-    },
    "axobject-query": {
      "version": "2.2.0",
      "resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-2.2.0.tgz",
@@ -1181,10 +1181,6 @@ header.fixed .navbar {
 .how_it_works .step_block ul li .step_img img {
  max-width: 100%;
 }
-.how_it_works .step_block ul li .step_img img.create-account-logo {
-  border-radius: 15px;
-  box-shadow: 0px 0px 10px #c7c6c6;
-}

 /* how it works heading h4 */
 .how_it_works .step_block ul li .step_text h4 {
@@ -2697,11 +2693,7 @@ header.fix_style.white_header {
 }

 .app_solution_section .app_images ul li img {
-  max-width: 98%;
-  padding: 1%;
-  border-radius: 15px;
-  box-shadow: 0px 0px 30px #c1dec9;
-  filter: grayscale(40%);
+  max-width: 100%;
 }

 .app_solution_section .app_images li:first-child {
@@ -2776,17 +2768,6 @@ header.fix_style.white_header {
 .about_page_sectino img {
  max-width: 100%;
 }
-.about_page_sectino .abt_img img {
-  animation: scale;
-  animation-duration: 1s;
-  animation-timing-function: linear;
-  animation-iteration-count: infinite;
-}
-@keyframes scale {
-  0%{transform: scale(1);}
-  50%{transform: scale(1.01);}
-  100%{transform: scale(1);}
-}

 /* -----------experts_team_sectio---------- */

@@ -3027,17 +3008,11 @@ header.fix_style.white_header {
  margin-bottom: 15px;
 }

-.blog_detail_section .blog_inner_pannel span.blog_date {
+.blog_detail_section .blog_inner_pannel .review span {
  line-height: 1;
-  color: var(--purple);
-  display: flex;
-  font-weight: 700;
-  text-align: center;
-  justify-content: center;
-  align-items: center;
 }

-/* .blog_detail_section .blog_inner_pannel .review span:first-child {
+.blog_detail_section .blog_inner_pannel .review span:first-child {
  color: var(--purple);
  display: inline-block;
  font-weight: 700;
@@ -3049,7 +3024,7 @@ header.fix_style.white_header {
  margin-left: 15px;
  padding-left: 15px;
  border-left: 1px solid var(--dark-purple);
-} */
+}

 .blog_detail_section .blog_inner_pannel .section_title {
  margin-bottom: 40px;
@@ -3068,29 +3043,29 @@ header.fix_style.white_header {
 }

 .blog_detail_section .blog_inner_pannel .info h3 {
-  font-weight: 700;
-  color: var(--dark-purple);
-  margin-top: 30px;
-  font-size: 25px;
-  margin-bottom: 15px;
+    font-weight: 700;
+    color: var(--dark-purple);
+    margin-top: 30px;
+    font-size: 25px;
+    margin-bottom: 15px;
 }

 /* To highlight the link in the terms section */
-.blog_detail_section .blog_inner_pannel .info p span a {
-  color: var(--dark-purple);
-  text-decoration: underline;
+.blog_detail_section .blog_inner_pannel .info p span a{
+    color: var(--dark-purple);
+    text-decoration: underline;
 }

 /* To reduce the fonts for sub-headers */
 .blog_detail_section .blog_inner_pannel .info h4 {
-  font-weight: 700;
-  color: var(--dark-purple);
-  margin-top: 30px;
-  font-size: 20px;
-  margin-bottom: 15px;
-}
+    font-weight: 700;
+    color: var(--dark-purple);
+    margin-top: 30px;
+    font-size: 20px;
+    margin-bottom: 15px;
+  }

-/* To align the text for proper readability */
+  /* To align the text for proper readability */
 .blog_detail_section .blog_inner_pannel .info p {
  text-align: justify;
 }
@@ -3551,80 +3526,48 @@ header.fix_style.white_header {
 }

 /* Textarea scrollbar */
-.contact_page_section
-  .contact_inner
-  .contact_form
-  form
-  .form-group
-  textarea::-webkit-scrollbar {
+.contact_page_section .contact_inner .contact_form form .form-group textarea::-webkit-scrollbar {
  width: 12px;
  cursor: pointer;
 }

-.contact_page_section
-  .contact_inner
-  .contact_form
-  form
-  .form-group
-  textarea::-webkit-scrollbar-track {
-  -webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.3);
+.contact_page_section .contact_inner .contact_form form .form-group textarea::-webkit-scrollbar-track {
+  -webkit-box-shadow: inset 0 0 6px rgba(0,0,0,0.3); 
  border-radius: 10px;
  background-color: var(--light-bg);
 }

-.contact_page_section
-  .contact_inner
-  .contact_form
-  form
-  .form-group
-  textarea::-webkit-scrollbar-thumb {
+.contact_page_section .contact_inner .contact_form form .form-group textarea::-webkit-scrollbar-thumb {
  border-radius: 10px;
-  -webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.5);
+  -webkit-box-shadow: inset 0 0 6px rgba(0,0,0,0.5); 
  background-color: var(--body-text-purple);
 }

-.contact_page_section
-  .contact_inner
-  .contact_form
-  form
-  .form-group
-  .contact_btn {
+.contact_page_section .contact_inner .contact_form form .form-group .contact_btn{
  display: flex !important;
  align-items: center;
  justify-content: center;
 }

-.contact_page_section
-  .contact_inner
-  .contact_form
-  form
-  .form-group
-  .contact_btn
-  p {
+.contact_page_section .contact_inner .contact_form form .form-group .contact_btn p{
  margin: 0 !important;
 }

-.contact_page_section
-  .contact_inner
-  .contact_form
-  form
-  .form-group
-  .contact_btn
-  > span {
+.contact_page_section .contact_inner .contact_form form .form-group .contact_btn > span{
  width: 24px;
  height: 24px;
 }

-#contact_body {
+#contact_body{
  min-height: 48rem;
  display: flex;
  flex-direction: column;
  align-content: center;
-  justify-items: center;
+  justify-content: center;
  gap: 10px;
 }

-/* .contact_body {
+.contact_body{
  display: flex;
  flex-direction: column;
  align-content: center;
@@ -3633,67 +3576,50 @@ header.fix_style.white_header {
  font-size: 20px;
  font-weight: 800;
  text-align: center;
-} */
+}

 /* Animations */
-.animate-image {
+.animate.pop {
  animation-name: animate-pop;
-  animation-timing-function: linear;
-  animation-duration: 1s;
-  animation-fill-mode: forwards;
+  animation-timing-function: cubic-bezier(0.26, 0.53, 0.74, 1.48);
+  animation-duration: 0.5s;
 }

@keyframes animate-pop {
  0% {
    opacity: 0;
-    transform: scale(0.5);
+    transform: scale(0.5, 0.5);
  }

  100% {
    opacity: 1;
-    transform: scale(1);
+    transform: scale(1, 1);
  }
 }

 /* For the err msg */
-#errText {
+#errText{
  text-align: center;
  color: tomato;
  font-weight: 600;
 }

-.contact_page_section .contact_inner .contact_form form .form-group span {
+.contact_page_section .contact_inner .contact_form form .form-group span{
  font-size: 12px;
  color: tomato;
  padding: 3px;
  display: none;
 }

-.contact_page_section
-  .contact_inner
-  .contact_form
-  form
-  .form-group
-  input:valid[focused="true"] {
+.contact_page_section .contact_inner .contact_form form .form-group input:valid[focused="true"]{
  border: 1px solid var(--dark-purple);
 }

-.contact_page_section
-  .contact_inner
-  .contact_form
-  form
-  .form-group
-  input:invalid[focused="true"] {
+.contact_page_section .contact_inner .contact_form form .form-group input:invalid[focused="true"]{
  border: 1px solid tomato;
 }

-.contact_page_section
-  .contact_inner
-  .contact_form
-  form
-  .form-group
-  input:invalid[focused="true"]
-  ~ span {
+.contact_page_section .contact_inner .contact_form form .form-group input:invalid[focused="true"] ~ span{
  display: block;
 }

@@ -4763,20 +4689,19 @@ header.fix_style.white_header {

 /* Loader */

-.loader {
+.loader{
  border-radius: 100%;
  position: relative;
 }

-.loader-sm {
+.loader-sm{
  width: 24px;
  height: 24px;
 }

 /* LOADER 1 */

-#loader-1:before,
-#loader-1:after {
+#loader-1:before, #loader-1:after{
  content: "";
  position: absolute;
  width: 100%;
@@ -4786,24 +4711,24 @@ header.fix_style.white_header {
  border-top-color: var(--body-text-purple);
 }

-#loader-1:before {
+#loader-1:before{
  z-index: 100;
  animation: spin 1.5s infinite;
 }

-#loader-1:after {
+#loader-1:after{
  border: 3.5px solid #ccc;
 }

-@keyframes spin {
-  0% {
+@keyframes spin{
+  0%{
    -webkit-transform: rotate(0deg);
    -ms-transform: rotate(0deg);
    -o-transform: rotate(0deg);
    transform: rotate(0deg);
  }

-  100% {
+  100%{
    -webkit-transform: rotate(360deg);
    -ms-transform: rotate(360deg);
    -o-transform: rotate(360deg);
@@ -6,31 +6,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 About1 from '../../assets/images/about_one.png'
-import About2 from '../../assets/images/about_two.png'
-import About3 from '../../assets/images/about_three.png'
-
-import AboutMainImg from '../../assets/images/about_main_image.png'
-
 const Main = ({brdcum}) => {
    const [ytShow , setytShow] = useState (false)

-    // About us text variables
-    let innovativeDesc = 'The team at myFit by Fluxtra 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.',
-        secureDesc:"MyFit is built to keep your data secure and protect your privacy. Your data is encrypted and you are always in control of your information.",
-        richFeaturesDesc: " Self-service & Scheduling, Tracking of health and fitness, Performance metrics. A more active, healthier interaction and improved quality of life.",
-        easeOfUseDesc:" MyFit keeps you connected to your health, a healthy partner for a healthy life. Measure and keep track of your health & awareness in one place.",
-        supportDesc:" myFit alerts you of irregular rhythms. You can connect with your health facilitator.",
-        title1: 'Secure',
-        title2: 'Rich Features',
-        title3: 'Ease of Use',
-        title4: 'Support'
-    }
-    let queryDesc = 'If you have any questions, please get in touch with us, we will revert back quickly.'
-    
  return (
    <>       
       {brdcum.b1 && 
@@ -78,24 +56,28 @@ const Main = ({brdcum}) => {
                            life easy to grow.</h2>
                        </div>
                        <p data-aos="fade-up" data-aos-duration="1500">
-                            {innovativeDesc}
+                            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.
                        </p>
-                        {/* <p data-aos="fade-up" data-aos-duration="1500">
+                        <p data-aos="fade-up" data-aos-duration="1500">
                            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.
-                        </p> */}
+                        </p>
                        </div>
                    </div>
                    <div className="col-lg-6">
                        <div className="app_images" data-aos="fade-in" data-aos-duration="1500">
                        <ul>
-                            <li><img src={About1} alt="health monitor gadget" /></li>
+                            <li><img src="assets/images/abt_01.png" alt="" /></li>
                            <li>
                            <a data-url="#" onClick = {() => setytShow(true)}  className="popup-youtube play-button"
                                data-toggle="modal"
                                data-target="#myModal" title="About Video">
-                                <img src={About2} alt="" />
+                                <img src="assets/images/abt_02.png" alt="" />
                                <div className="waves-block">
                                <div className="waves wave-1"></div>
                                <div className="waves wave-2"></div>
@@ -104,8 +86,7 @@ const Main = ({brdcum}) => {
                                <span className="play_icon"><img src="assets/images/play_black.png" alt="image"/></span>
                            </a>
                            </li>
-                            {/* <li><img src="assets/images/abt_03.png" alt="" /></li> */}
-                            <li><img src={About3} alt="" /></li>
+                            <li><img src="assets/images/abt_03.png" alt="" /></li>
                        </ul>
                        </div>
                    </div>
@@ -117,50 +98,55 @@ const Main = ({brdcum}) => {
                <div className="container">
                <div className="section_title" data-aos="fade-up" data-aos-duration="1500" data-aos-delay="100">
                    <h2><span>Why we are different</span> from others!</h2>
-                    <p>{whyWeAreDiff.desc}</p>
+                    <p>Lorem Ipsum is simply dummy text of the printing and typese tting <br/> indus orem Ipsum has beenthe standard
+                    dummy.</p>
                </div>
                <div className="row">
                    <div className="col-md-6 col-lg-3">
                    <div className="why_box" data-aos="fade-up" data-aos-duration="1500" data-aos-delay="100">
-                        {/* <div className="icon">
+                        <div className="icon">
                        <img src="assets/images/secure.png" alt="image"/>
-                        </div> */}
+                        </div>
                        <div className="text">
-                        <h3>{whyWeAreDiff.title1}</h3>
-                        <p> {whyWeAreDiff.secureDesc}</p>
+                        <h3>Secure code</h3>
+                        <p>Lorem Ipsum is simply dummy text of the printing and type
+                            setting indus ideas.
+                        </p>
                        </div>
                    </div>
                    </div>
                    <div className="col-md-6 col-lg-3">
                    <div className="why_box" data-aos="fade-up" data-aos-duration="1500" data-aos-delay="200">
-                        {/* <div className="icon">
+                        <div className="icon">
                        <img src="assets/images/abt_functional.png" alt="image"/>
-                        </div> */}
+                        </div>
                        <div className="text">
-                        <h3>{whyWeAreDiff.title2}</h3>
-                         <p>{whyWeAreDiff.richFeaturesDesc}</p>
+                        <h3>Fully functional</h3>
+                        <p>Simply dummy text of the printing and typesetting indus lorem Ipsum is dummy.</p>
                        </div>
                    </div>
                    </div>
                    <div className="col-md-6 col-lg-3">
                    <div className="why_box" data-aos="fade-up" data-aos-duration="1500" data-aos-delay="300">
-                        {/* <div className="icon">
+                        <div className="icon">
                        <img src="assets/images/communication.png" alt="image"/>
-                        </div> */}
+                        </div>
                        <div className="text">
-                        <h3>{whyWeAreDiff.title3}</h3>
-                         <p>{whyWeAreDiff.easeOfUseDesc}</p>
+                        <h3>Best communication</h3>
+                        <p>Lorem Ipsum is simply dummy text of the printing and type
+                            setting indus ideas.
+                        </p>
                        </div>
                    </div>
                    </div>
                    <div className="col-md-6 col-lg-3">
                    <div className="why_box" data-aos="fade-up" data-aos-duration="1500" data-aos-delay="400">
-                        {/* <div className="icon">
+                        <div className="icon">
                        <img src="assets/images/abt_support.png" alt="image"/>
-                        </div> */}
+                        </div>
                        <div className="text">
-                        <h3>{whyWeAreDiff.title4}</h3>
-                        <p>{whyWeAreDiff.supportDesc}</p>
+                        <h3>24-7 Support</h3>
+                        <p>Simply dummy text of the printing and typesetting indus lorem Ipsum is dummy.</p>
                        </div>
                    </div>
                    </div>
@@ -173,7 +159,7 @@ const Main = ({brdcum}) => {
                <div className="row">
                    <div className="col-lg-6">
                        <div className="abt_img" data-aos="fade-in" data-aos-duration="1500">
-                            <img src={AboutMainImg} alt="image"/>
+                            <img src="assets/images/about_main.png" alt="image"/>
                        </div>
                    </div>
                    <div className="col-lg-6">
@@ -181,45 +167,45 @@ const Main = ({brdcum}) => {
                        <div className="section_title" data-aos="fade-up" data-aos-duration="1500" data-aos-delay="100">
                            <h2> <span>We focus on quality,</span> never
                            focus on quantity</h2>
-                            
-                            <p>{innovativeDesc}</p>
+                            <p>
+                            Lorem Ipsum is simply dummy text of the printing and typesetting industry lorem Ipsum has been the industrys standard dummy text ever since the when an unknown printer took a galley of type and.
+                            </p>
                        </div>
                        <ul className="app_statstic" id="counter" data-aos="fade-in" data-aos-duration="1500">
                            <li>
-                            {/* <div className="icon">
+                            <div className="icon">
                                <img src="assets/images/download.png" alt="image" />
-                            </div> */}
-                            <div className="text">
-                                <h3>Manage</h3>
-                                <p>health plan</p>
                            </div>
-                            
+                            <div className="text">
+                                <p><span className="counter-value" data-count="17">0</span><span>M+</span></p>
+                                <p>Download</p>
+                            </div>
                            </li>
                            <li>
-                            {/* <div className="icon">
+                            <div className="icon">
                                <img src="assets/images/followers.png" alt="image" />
-                            </div> */}
+                            </div>
                            <div className="text">
-                                <h3>Health Record</h3>
-                                <p>with you</p>
+                                <p><span className="counter-value" data-count="08">0 </span><span>M+</span></p>
+                                <p>Followers</p>
                            </div>
                            </li>
                            <li>
-                            {/* <div className="icon">
+                            <div className="icon">
                                <img src="assets/images/reviews.png" alt="image" />
-                            </div> */}
+                            </div>
                            <div className="text">
-                                <h3>Health</h3>
-                                <p>reminders</p>
+                                <p><span className="counter-value" data-count="2300">1500</span><span>+</span></p>
+                                <p>Reviews</p>
                            </div>
                            </li>
                            <li>
-                            {/* <div className="icon">
+                            <div className="icon">
                                <img src="assets/images/countries.png" alt="image" />
-                            </div> */}
+                            </div>
                            <div className="text">
-                                <h3>Quick</h3>
-                                <p>Schedule</p>
+                                <p><span className="counter-value" data-count="150">0</span><span>+</span></p>
+                                <p>Countries</p>
                            </div>
                            </li>
                        </ul>
@@ -237,8 +223,8 @@ const Main = ({brdcum}) => {
                    <span className="banner_shape3"> <img src="assets/images/banner-shape3.png" alt="image" /> </span>
                
                    <div className="section_title">
-                        <h2>Have any questions about ?</h2>
-                        <p>{queryDesc}</p>
+                        <h2>Have any query about ?</h2>
+                        <p>Lorem Ipsum is simply dummy text of the printing and typese tting <br/> indus orem Ipsum has beenthe standard dummy.</p>
                    </div>
                    <Link to="/contact" className="btn white_btn">CONTACT US NOW</Link>
                </div>
@@ -1,15 +1,16 @@
 import React, { useEffect, useState } from "react";
 import { Link } from "react-router-dom";
 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, bgimg }) => {
  const [blogData, setBlogData] = useState([]);
-  console.log(blogData);

  const api = new SiteService();
  useEffect(() => {
-    if(blogData.length===0){getBlogData()};
-  }, [blogData]);
+    getBlogData();
+  }, []);

  const getBlogData = async () => {
    try {
@@ -17,7 +18,7 @@ const Main = ({ brdcum, bgimg }) => {

      setBlogData(res.data);

-      // console.log(res.data);
+      console.log(res.data);

      
    } catch (error) {
@@ -69,14 +70,14 @@ const Main = ({ brdcum, bgimg }) => {

      <section className="row_am blog_list_main">
        {blogData.map((data,index) => {
-          if (index === 0){
+          if (index == 0){
            return (
              <div className="container">
              <div className="row">
                <div
                  className="col-lg-6"
-                  // data-aos="fade-in"
-                  // data-aos-duration="1500"
+                  data-aos="fade-in"
+                  data-aos-duration="1500"
                >
                  <div className="blog_img">
                    <img 
@@ -93,12 +94,9 @@ const Main = ({ brdcum, bgimg }) => {
                    <div className="section_title">
                      <h2>{data.post_title}</h2>
                      <div dangerouslySetInnerHTML={{__html: data.post_content.substring(0,400)+'  . . .'}}></div>
-                      {/* <Link to={`/blog-single/${data.id}`} state={{data}}>
+                      <Link to={`/blog-single/${data.id}`} state={{data}}>
                          READ MORE
-                        </Link> */}
-                        <Link to={`/blogdetails/${data.id}`} state={{data, allData: blogData}}>
-                      READ MORE
-                    </Link>
+                        </Link>
                    </div>
                  </div>
                </div>
@@ -118,7 +116,7 @@ const Main = ({ brdcum, bgimg }) => {
              if (index > 0){
                return (
                  <div key={data.id} className="col-md-4">
-                <div className="story_box">
+                <div className="story_box" data-aos="fade-up" data-aos-duration="1500">
                  <div className="story_img">
                    <img src={data.meta_value} alt="image" />
                    <span>{new Date (data && data.post_date).toDateString()}</span>
@@ -126,7 +124,7 @@ const Main = ({ brdcum, bgimg }) => {
                  <div className="story_text">
                    <h3>{data.post_title}</h3>
                    <div dangerouslySetInnerHTML={{__html: data && data.post_content.substring(0,100)+'  . . .'}}></div>
-                    <Link to={`/blogdetails/${data.id}`} state={{data, allData: blogData}}>
+                    <Link to={`/blog-single/${data.id}`} state={{data}}>
                      READ MORE
                    </Link>
                  </div>
@@ -141,8 +139,7 @@ const Main = ({ brdcum, bgimg }) => {
          <div className="pagination_block">
            <ul>
              <li>
-                <Link to={process.env.REACT_APP_BLOGSITE}
-                 className="prev">
+                <Link to="#" className="prev">
                  {" "}
                  Visit our blog
                </Link>
@@ -5,46 +5,15 @@ 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 [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);
-    }
-  };
-        
+    const data = location.state?.data;
+    
+    console.log("location", location, data);
+    
  return (
    <>
        
@@ -101,8 +70,42 @@ const Main = ({brdcum}) => {
                        <h3>{data && data.post_name}</h3>
                        <div dangerouslySetInnerHTML={{__html: data && data.post_content}}></div>
                    </div>
-
-                   
+                    {/* <div className="info">
+                        <p>Lorem Ipsum is simply dummy text of the printing and typesetting in dustry lorem Ipsum has been the industrys standard dummy text ev er since the 1500s, 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 Lorem Ipsum is simply dummy text of the printing and typesettingindustry lorem Ipsum has been the industrys standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived.</p>
+                        <p>Printing and typesetting in dustry lorem Ipsum has been the industrys standard dummy text ev er since the 1500s, when an unnown 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 Lorem Ipsum is simply dummy text of the printing and typesettingindustry lorem Ipsum has been the industrys centuries, but also the leap into electronic.</p>
+                        <h3>Why we are best</h3>
+                        <p>Lorem Ipsum is simply dummy text of the printing and typesetting in dustry lorem Ipsum has been the industrys standard dummy text ev er since the 1500s, 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.</p>
+                        <ul>
+                            <li><p> <span className="icon"><i className="icofont-check-circled"></i></span> Lorem Ipsum is simply dummy text of the printing and typesetting in </p></li>
+                            <li><p> <span className="icon"><i className="icofont-check-circled"></i></span> Dustry lorem Ipsum has been the industrys standard dummy text ev er since the when</p></li>
+                            <li><p> <span className="icon"><i className="icofont-check-circled"></i></span> Unknown printer took a galley of type and scrambled it to make.</p></li>
+                            <li><p> <span className="icon"><i className="icofont-check-circled"></i></span> Type specimen book. It has survived not only five centuries, but also the leap into electronic.</p></li>
+                            <li><p> <span className="icon"><i className="icofont-check-circled"></i></span> Lorem Ipsum is simply dummy text of the printing.</p></li>
+                            <li><p> <span className="icon"><i className="icofont-check-circled"></i></span> Dustry lorem Ipsum has been the industrys standard dummy text ev er since.</p></li>
+                            <li><p> <span className="icon"><i className="icofont-check-circled"></i></span> Unknown printer took a galley of type and scrambled it to make.</p></li>
+                            <li><p> <span className="icon"><i className="icofont-check-circled"></i></span> Type specimen book. It has survived not only.</p></li>
+                        </ul>
+                    </div> 
+                    <div className="two_img">
+                        <div className="row">
+                            <div className="col-md-6">
+                            <img src="assets/images/blog_sub_01.png" alt="image" />
+                            </div>
+                            <div className="col-md-6">
+                            <img src="assets/images/blog_sub_02.png" alt="image" />
+                            </div>
+                        </div>
+                    </div>
+                    <div className="info">
+                        <h3>Why we are best</h3>
+                        <p>Lorem Ipsum is simply dummy text of the printing and typesetting in dustry lorem Ipsum has been the industrys standard dummy text ev er since the 1500s, 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 Lorem Ipsum is simply dummy text of the printing and typesettingindustry lorem Ipsum has been the industrys standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived.</p>
+                    </div>
+                    <div className="quote_block">
+                        <span className="q_icon"><img src="assets/images/quote_icon.png" alt="image" /></span>
+                        <h2>Lorem Ipsum is simply dummy text of the printing and typesetting in dustry lorem Ipsum has been the industrys standard dummy.</h2>
+                        <p><span className="name">Mr. John Doe,</span> Apper Inc</p>
+                    </div> */}
+                    {/* <p>Lorem Ipsum is simply dummy text of the printing and typesetting in dustry lorem Ipsum has been the industrys standard dummy text ev er since the 1500s, 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 industry.</p> */}
                    <div className="blog_authore">
                        <div className="authore_info">
                            {/* <div className="avtar">
@@ -115,27 +118,25 @@ const Main = ({brdcum}) => {
                        </div>
                        <div className="social_media">
                            <ul>
-                                <li>
-                                <a href={process.env.REACT_APP_FACEBOOK}>
-                                    <i className="icofont-facebook"></i>
-                                </a>
-                                </li>
-                                <li>
-                                <a href={process.env.REACT_APP_TWITTER}>
-                                    <i className="icofont-twitter"></i>
-                                </a>
-                                </li>
+                                <li><Link to="#"><i className="icofont-facebook"></i></Link></li>
+                                <li><Link to="#"><i className="icofont-twitter"></i></Link></li>
+                                <li><Link to="#"><i className="icofont-instagram"></i></Link></li>
+                                <li><Link to="#"><i className="icofont-pinterest"></i></Link></li>
                            </ul>
                        </div>
                    </div>
                    <div className="blog_tags">
-                        <a href={process.env.REACT_APP_BLOGSITE}>Visit Blog Site </a>
+                        <ul>
+                        <li className="tags"><p>Tags:</p></li>
+                        <li><span>app,</span></li>
+                        <li><span>rating,</span></li>
+                        <li><span>development</span></li>
+                        </ul>
                    </div>
                </div>
            </div>
        </section>
-
-        {/* <section className="row_am comment_section">
+        <section className="row_am comment_section">
            <div className="container">
                <div className="section_title">
                    <h2>3 Comments</h2>
@@ -228,7 +229,7 @@ const Main = ({brdcum}) => {
                    </div>
                </form>
            </div>
-        </section> */}
+        </section>

        <section className="row_am latest_story" id="blog">
            <div className="container">
@@ -237,33 +238,21 @@ const Main = ({brdcum}) => {
                    <p>Lorem Ipsum is simply dummy text of the printing and typese tting <br/> indus orem Ipsum has beenthe standard dummy.</p>
                </div>
                <div className="row">
-
-                 {newAllData.map((data) => {
-                    
-                    return (
-
-                     <div className="col-md-4">
-                     <div className="story_box" data-aos="fade-up" data-aos-duration="1500">
-                         <div className="story_img">
-                        <img src={data.meta_value} alt="image" />
-                         <span>45 min ago</span>
-                         </div>
-                         <div className="story_text">
-                            <h3>{data.post_title}</h3>
-                             <div dangerouslySetInnerHTML={{__html: data.post_content.substring(0,300)+'  . . .'}}></div>
-                            {/* <Link to={`/blog-single/${data.id}`} state={{data}}>
-                                 READ MORE
-                            </Link> */}
-                            <Link to={`/blogdetails/${data.id}`} state={{data, allData: blogData}}>
-                                 READ MORE
-                            </Link>
-                         </div>
-                     </div>
-                 </div>
-
-                 )})}
-
-                    {/* <div className="col-md-4">
+                    <div className="col-md-4">
+                        <div className="story_box" data-aos="fade-up" data-aos-duration="1500">
+                            <div className="story_img">
+                            <img src="assets/images/story01.png" alt="image" />
+                            <span>45 min ago</span>
+                            </div>
+                            <div className="story_text">
+                                <h3>Cool features added!</h3>
+                                <p>Lorem Ipsum is simply dummy text of the printing and typesetting 
+                                industry lorem Ipsum has.</p>
+                                <Link to="#">READ MORE</Link>
+                            </div>
+                        </div>
+                    </div>
+                    <div className="col-md-4">
                        <div className="story_box" data-aos="fade-up" data-aos-duration="1500">
                            <div className="story_img">
                            <img src="assets/images/story02.png" alt="image" />
@@ -288,7 +277,7 @@ const Main = ({brdcum}) => {
                                <Link to="#">READ MORE</Link>
                            </div>
                        </div>
-                    </div> */}
+                    </div>
                </div>
            </div>
        </section>
@@ -19,7 +19,7 @@ const Main = ({title,tag,bgimg,paragraph,no}) => {
                        <ul>
                            <li><Link to="/">Home</Link></li>
                            <li><span>»</span></li>
-                            <li><Link to="#">{tag}</Link></li>
+                            <li><Link to="/about">{tag}</Link></li>
                        </ul>
                    </div>
                </div>
@@ -39,7 +39,7 @@ const Main = ({title,tag,bgimg,paragraph,no}) => {
                        <ul>
                            <li><Link to="/">Home</Link></li>
                            <li><span>»</span></li>
-                            <li><Link to="#">{tag}</Link></li>
+                            <li><Link to="/about">{tag}</Link></li>
                        </ul>
                    </div>
                </div>
@@ -58,7 +58,7 @@ const Main = ({title,tag,bgimg,paragraph,no}) => {
                        <ul>
                            <li><Link to="/">Home</Link></li>
                            <li><span>»</span></li>
-                            <li><Link to="#">{tag}</Link></li>
+                            <li><Link to="/about">{tag}</Link></li>
                        </ul>
                    </div>
                </div>
@@ -77,7 +77,7 @@ const Main = ({title,tag,bgimg,paragraph,no}) => {
                        <ul>
                            <li><Link to="/">Home</Link></li>
                            <li><span>»</span></li>
-                            <li><Link to="#">{tag}</Link></li>
+                            <li><Link to="/about">{tag}</Link></li>
                        </ul>
                    </div>
                </div>
@@ -96,7 +96,7 @@ const Main = ({title,tag,bgimg,paragraph,no}) => {
                        <ul>
                            <li><Link to="/">Home</Link></li>
                            <li><span>»</span></li>
-                            <li><Link to="#">{tag}</Link></li>
+                            <li><Link to="/about">{tag}</Link></li>
                        </ul>
                    </div>
                </div>
@@ -6,7 +6,7 @@ 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 SuccessImg from "../../assets/images/confirmed-letter.jpg"
+import SuccessImg from "../../assets/images/experts_01.png"

 import SiteService from "../../vendors/service/siteService";

@@ -51,11 +51,10 @@ const FormInput = (props) => {

 const Main = ({ brdcum }) => {
  let response = document.getElementById("contact_loader");
+  let contact_body = document.getElementById("contact_body");
  let errText = document.getElementById("errText");
  let navigate = useNavigate();

-  let [showSuccessfulImage, setShowSuccessfulImage] = useState(false) // Handles when sucess image is shown
-
  // Form Validation
  const [values, setValues] = useState({
    name: "",
@@ -65,9 +64,7 @@ const Main = ({ brdcum }) => {
    country: "",
  }); //initial state values
  const [countries, setCountries] = useState([]); // initial state for country dropdown
-
  const [myData, setMyData] = useState(null);
-
  // Gave a generic name for multiple calls
  const API_CALL = new SiteService(); // instantiating the class
  // API CALL
@@ -81,6 +78,7 @@ const Main = ({ brdcum }) => {
  const onChange = (e) => {
    setValues((prev) => ({ ...prev, [e.target.name]: e.target.value }));
  };
+  console.log(values);

  // Submitting form
  const handleSubmit = async (e) => {
@@ -95,30 +93,36 @@ const Main = ({ brdcum }) => {
        setMyData(contact);

        // Checking for errors
-        if (contact?.data?.status < 1 || contact?.data?.message_id == ""){
-          errText.textContent = "unable to send your message, please try again";
-          response.innerHTML = `<p> SEND MESSAGE </p>`;
-        }else {
+        if (contact?.data?.status < 1 || contact?.data?.message_id == "")
+          return (errText.textContent =
+            "unable to send your message, please try able");
+        else {
          response.innerHTML = `<p> SEND MESSAGE </p>`;

-          setShowSuccessfulImage(true) // sets show success image to true
-
+          contact_body.innerHTML = `<div class='contact_body animate pop'>
+      <div><img src=${SuccessImg} /></div>
+      <p>We have received your message and will follow up promptly.</p>
+      </div>`;
          setTimeout(() => {
            navigate("/");
          }, 10000);
+
+          setValues((prev) => ({ ...prev, [e.target.name]: "" }));
        }
      })
-      .catch(() => {
-        errText.textContent = "unable to send your message, please try again";
-        response.innerHTML = `<p> SEND MESSAGE </p>`;
+      .catch((error) => {
+        console.log(error);
      });
  };

  //CALLS THE API AFTER COMPONENT LOADS
  useEffect(() => {
-    allCountry().then((data) => setCountries(Object.entries(data.data))).catch((err)=>console.log(err.message));
+    allCountry().then((data) => setCountries(Object.values(data.data)));
  }, []);

+  useEffect(() => {
+    console.log(myData);
+  }, [myData]);

  return (
    <>
@@ -176,114 +180,110 @@ const Main = ({ brdcum }) => {
        id="contact">
        <div className="container">
          <div className="contact_inner">
-            <div className="contact_form" id="contact_body">
-              {showSuccessfulImage ? (
-                <>
-                  <div><img className="img-fluid animate-image" src={SuccessImg} alt='success image' /></div>
-                  <p>We have received your message and will follow up promptly.</p>
-                </>
-              ) : (
-                <>
-                <div className="section_title">
-                  <h2>
-                    <span>Leave a</span> message
-                  </h2>
-                  <p>Fill up form below, our team will get back soon</p>
+            <div
+              className="contact_form"
+              id="contact_body">
+              <div className="section_title">
+                <h2>
+                  <span>Leave a</span> message
+                </h2>
+                <p>Fill up form below, our team will get back soon</p>
+              </div>
+
+              {/* Contact Form */}
+              <form onSubmit={handleSubmit}>
+                <FormInput
+                  name="name"
+                  type="text"
+                  placeholder="Name"
+                  errorMessage="Please enter your name"
+                  required={true}
+                  maxLenght={35}
+                  value={values.name}
+                  onChange={onChange}
+                  pattern="^[A-Za-z]{1,35}$"
+                />
+
+                <FormInput
+                  name="email"
+                  type="email"
+                  placeholder="Email"
+                  errorMessage="It should be a valid email address!"
+                  required={true}
+                  maxLenght={35}
+                  value={values.email}
+                  onChange={onChange}
+                />
+
+                <div className="form-group">
+                  <select
+                    className="form-control"
+                    name="country"
+                    value={values.country}
+                    onChange={onChange}
+                    required>
+                    <option
+                      value={""}
+                      onCha>
+                      Country
+                    </option>
+                    {countries.length > 0 &&
+                      countries.map((country, index) => (
+                        <option
+                          key={index}
+                          value={country}>
+                          {country}
+                        </option>
+                      ))}
+                  </select>
                </div>

-                {/* Contact Form */}
-                <form onSubmit={handleSubmit}>
-                  <FormInput
-                    name="name"
-                    type="text"
-                    placeholder="Name"
-                    errorMessage="Please enter your first and last name. (e.g: Mark John)"
-                    required={true}
-                    maxLenght={35}
-                    value={values.name}
+                <FormInput
+                  name="phone"
+                  type="number"
+                  placeholder="Phone"
+                  errorMessage="It should be a valid phone number!"
+                  maxLenght={15}
+                  value={values.phone}
+                  onChange={onChange}
+                  pattern="^[0-9]{15}$"
+                />
+
+                <div className="form-group">
+                  <textarea
+                    name="msg"
+                    className="form-control"
+                    placeholder="Your message"
+                    value={values.msg}
+                    errorMessage='words have exceeded 350 characters!'
                    onChange={onChange}
-                    pattern="^\w+( \w+)$"
+                    maxLength={300}
+                    pattern="^[A-Za-z0-9]{5, 300}$"
                  />
-
-                  <FormInput
-                    name="email"
-                    type="email"
-                    placeholder="Email"
-                    errorMessage="It should be a valid email address!"
-                    required={true}
-                    maxLenght={35}
-                    value={values.email}
+                </div>
+                <div className="form-group term_check">
+                  <input
+                    type="checkbox"
+                    id="term"
                    onChange={onChange}
+                    required
                  />
-
-                  <div className="form-group">
-                    <select
-                      className="form-control"
-                      name="country"
-                      value={values.country}
-                      onChange={onChange}
-                      required>
-                      <option value={""}>
-                        Country
-                      </option>
-                      {countries.length > 0 &&
-                        countries.map((country, index) => (
-                          <option
-                            key={index}
-                            value={country[0]}>
-                            {country[1]}
-                          </option>
-                        ))}
-                    </select>
-                  </div>
-
-                  <FormInput
-                    name="phone"
-                    type="number"
-                    placeholder="Phone"
-                    errorMessage="It should be a valid phone number!"
-                    maxLenght={15}
-                    value={values.phone}
-                    onChange={onChange}
-                    pattern="^[0-9]{15}$"
-                  />
-
-                  <div className="form-group">
-                    <textarea
-                      name="message"
-                      className="form-control"
-                      placeholder="Your message"
-                      value={values.message}
-                      onChange={onChange}
-                      maxLength={300}
-                      pattern="^[A-Za-z0-9]{5, 300}$"
-                    />
-                  </div>
-                  <div className="form-group term_check">
-                    <input
-                      type="checkbox"
-                      id="term"
-                      onChange={onChange}
-                      required
-                    />
-                    <label htmlFor="term">
-                      I agree to the terms and conditions
-                    </label>
-                  </div>
-                  <div className="form-group mb-0">
-                    <button
-                      type="submit"
-                      className="btn puprple_btn contact_btn"
-                      aria-label="submit form"
-                      id="contact_loader">
-                      <p> SEND MESSAGE </p>
-                    </button>
-                  </div>
-                </form>
-                {/* Error Tag */}
-                <p id="errText"></p>
-                </>
-              )}
+                  <label htmlFor="term">
+                    I agree to the terms and conditions
+                  </label>
+                </div>
+                <div className="form-group mb-0">
+                  <button
+                    type="submit"
+                    className="btn puprple_btn contact_btn"
+                    aria-label="submit form"
+                    id="contact_loader">
+                    <p> SEND MESSAGE </p>
+                  </button>
+                </div>
+              </form>
+              {/* Error Tag */}
+              <p id="errText" />
            </div>

            {/* Contact Info */}
@@ -355,9 +355,7 @@ const Main = ({ brdcum }) => {
        </div>
      </section>
      <section className="row_am map_section">
-        <div className="container">
-
-        </div>
+        <div className="container" />
      </section>
    </>
  );
@@ -1,5 +1,4 @@
 import { Link } from "react-router-dom";
-import { HashLink } from 'react-router-hash-link';
 import React from "react";
 import line from "../../assets/images/anim_line.png";
 import blueapp from "../../assets/images/appstore_blue.png";
@@ -62,14 +61,14 @@ const Main = ({ footer }) => {
                    </ul>
                    <ul className="social_media">
                      <li>
-                        <a href={process.env.REACT_APP_FACEBOOK}>
+                        <Link to="#">
                          <i className="icofont-facebook"></i>
-                        </a>
+                        </Link>
                      </li>
                      <li>
-                        <a href ={process.env.REACT_APP_TWITTER}>
+                        <Link to="#">
                          <i className="icofont-twitter"></i>
-                        </a>
+                        </Link>
                      </li>
                    </ul>
                  </div>
@@ -79,9 +78,7 @@ const Main = ({ footer }) => {
                    <h3>Useful Links</h3>
                    <ul>
                      <li>
-                        {/* <Link to="/">Home</Link> */}
-                        <HashLink to="/#">Home</HashLink>
-
+                        <Link to="/">Home</Link>
                      </li>
                      <li>
                        <Link to="/about">About us</Link>
@@ -97,13 +94,13 @@ const Main = ({ footer }) => {
                </div>
                <div className="col-lg-3 col-md-6 col-12">
                  <div className="links">
-                    <h3>Help & Support</h3>
+                    <h3>Help & Suport</h3>
                    <ul>
                      <li>
                        <Link to="/faq">FAQs</Link>
                      </li>
                      <li>
-                        <HashLink to="/#how_it_work">How it works</HashLink>
+                        <Link to="/#how_it_work">How it works</Link>
                      </li>
                      <li>
                        <Link to="/terms">Terms & conditions</Link>
@@ -119,12 +116,12 @@ const Main = ({ footer }) => {
                    <h3>Let’s Try Out</h3>
                    <ul className="app_btn">
                      <li>
-                        <a href={process.env.REACT_APP_ANDROID_URL}>
+                        <a href="https://play.google.com/store/apps/details?id=com.mermsemr.myfit">
                          <img src={blueapp} alt="image" />
                        </a>
                      </li>
                      <li>
-                        <a href={process.env.REACT_APP_IOS_URL}>
+                        <a href="https://play.google.com/store/apps/details?id=com.mermsemr.myfit">
                          <img src={blue} alt="image" />
                        </a>
                      </li>
@@ -200,15 +197,15 @@ const Main = ({ footer }) => {
                      </li>
                    </ul>
                    <ul className="social_media">
-                     <li>
-                          <a href={process.env.REACT_APP_FACEBOOK}>
-                            <i className="icofont-facebook"></i>
-                          </a>
+                      <li>
+                        <Link to="#">
+                          <i className="icofont-facebook"></i>
+                        </Link>
                      </li>
                      <li>
-                          <a href ={process.env.REACT_APP_TWITTER}>
-                            <i className="icofont-twitter"></i>
-                          </a>
+                        <Link to="#">
+                          <i className="icofont-twitter"></i>
+                        </Link>
                      </li>
                    </ul>
                  </div>
@@ -234,13 +231,13 @@ const Main = ({ footer }) => {
                </div>
                <div className="col-lg-3 col-md-6 col-12">
                  <div className="links">
-                    <h3>Help & Support</h3>
+                    <h3>Help & Suport</h3>
                    <ul>
                      <li>
                        <Link to="/faq">FAQs</Link>
                      </li>
                      <li>
-                        <HashLink to="/#how_it_work">How it works</HashLink>
+                        <Link to="/#how_it_work">How it works</Link>
                      </li>
                      <li>
                        <Link to="/terms">Terms & conditions</Link>
@@ -256,13 +253,19 @@ const Main = ({ footer }) => {
                    <h3>Let’s Try Out</h3>
                    <ul className="app_btn">
                      <li>
-                        <a href={process.env.REACT_APP_ANDROID_URL}>
-                          <img src={blueapp} alt="image" />
+                        <a href="https://play.google.com/store/apps/details?id=com.mermsemr.myfit">
+                          <img
+                            src="assets/images/appstore_blue.png"
+                            alt="image"
+                          />
                        </a>
                      </li>
                      <li>
-                        <a href={process.env.REACT_APP_IOS_URL}>
-                          <img src={blue} alt="image" />
+                        <a href="https://play.google.com/store/apps/details?id=com.mermsemr.myfit">
+                          <img
+                            src="assets/images/googleplay_blue.png"
+                            alt="image"
+                          />
                        </a>
                      </li>
                    </ul>
@@ -324,14 +327,14 @@ const Main = ({ footer }) => {
                    </ul>
                    <ul className="social_media">
                      <li>
-                        <a href={process.env.REACT_APP_FACEBOOK}>
+                        <Link to="#">
                          <i className="icofont-facebook"></i>
-                        </a>
+                        </Link>
                      </li>
                      <li>
-                        <a href ={process.env.REACT_APP_TWITTER}>
+                        <Link to="#">
                          <i className="icofont-twitter"></i>
-                        </a>
+                        </Link>
                      </li>
                    </ul>
                  </div>
@@ -370,7 +373,7 @@ const Main = ({ footer }) => {
                        <Link to="#">Support</Link>
                      </li>
                      <li>
-                         <HashLink to="/#how_it_work">How it works</HashLink>
+                        <Link to="/work">How it works</Link>
                      </li>
                      <li>
                        <Link to="/terms">Terms & conditions</Link>
@@ -386,14 +389,20 @@ const Main = ({ footer }) => {
                  <div className="try_out">
                    <h3>Let’s Try Out</h3>
                    <ul className="app_btn">
-                     <li>
-                        <a href={process.env.REACT_APP_ANDROID_URL}>
-                          <img src={blueapp} alt="image" />
+                      <li>
+                        <a href="https://play.google.com/store/apps/details?id=com.mermsemr.myfit">
+                          <img
+                            src="assets/images/appstore_blue.png"
+                            alt="image"
+                          />
                        </a>
                      </li>
                      <li>
-                        <a href={process.env.REACT_APP_IOS_URL}>
-                          <img src={blue} alt="image" />
+                        <a href to="https://play.google.com/store/apps/details?id=com.mermsemr.myfit">
+                          <img
+                            src="assets/images/googleplay_blue.png"
+                            alt="image"
+                          />
                        </a>
                      </li>
                    </ul>
@@ -449,14 +458,14 @@ const Main = ({ footer }) => {
                    </ul>
                    <ul className="social_media">
                      <li>
-                        <a href={process.env.REACT_APP_FACEBOOK}>
+                        <Link to="#">
                          <i className="icofont-facebook"></i>
-                        </a>
+                        </Link>
                      </li>
                      <li>
-                        <a href ={process.env.REACT_APP_TWITTER}>
+                        <Link to="#">
                          <i className="icofont-twitter"></i>
-                        </a>
+                        </Link>
                      </li>
                    </ul>
                  </div>
@@ -486,7 +495,7 @@ const Main = ({ footer }) => {

                <div className="col-lg-3 col-md-6 col-12">
                  <div className="links">
-                    <h3>Help & Support</h3>
+                    <h3>Help & Suport</h3>
                    <ul>
                      <li>
                        <Link to="/faq">FAQs</Link>
@@ -495,7 +504,7 @@ const Main = ({ footer }) => {
                        <Link to="#">Support</Link>
                      </li>
                      <li>
-                          <HashLink to="/#how_it_work">How it works</HashLink>
+                        <Link to="/work">How it works</Link>
                      </li>
                      <li>
                        <Link to="/terms">Terms & conditions</Link>
@@ -512,13 +521,19 @@ const Main = ({ footer }) => {
                    <h3>Let’s Try Out</h3>
                    <ul className="app_btn">
                      <li>
-                        <a href={process.env.REACT_APP_ANDROID_URL}>
-                          <img src={blueapp} alt="image" />
+                        <a href="https://play.google.com/store/apps/details?id=com.mermsemr.myfit">
+                          <img
+                            src="assets/images/appstore_blue.png"
+                            alt="image"
+                          />
                        </a>
                      </li>
                      <li>
-                        <a href={process.env.REACT_APP_IOS_URL}>
-                          <img src={blue} alt="image" />
+                        <a href="https://play.google.com/store/apps/details?id=com.mermsemr.myfit">
+                          <img
+                            src="assets/images/googleplay_blue.png"
+                            alt="image"
+                          />
                        </a>
                      </li>
                    </ul>
@@ -582,14 +597,14 @@ const Main = ({ footer }) => {
                    </ul>
                    <ul className="social_media">
                      <li>
-                        <a href={process.env.REACT_APP_FACEBOOK}>
+                        <Link to="#">
                          <i className="icofont-facebook"></i>
-                        </a>
+                        </Link>
                      </li>
                      <li>
-                        <a href ={process.env.REACT_APP_TWITTER}>
+                        <Link to="#">
                          <i className="icofont-twitter"></i>
-                        </a>
+                        </Link>
                      </li>
                    </ul>
                  </div>
@@ -618,7 +633,7 @@ const Main = ({ footer }) => {
                </div>
                <div className="col-lg-3 col-md-6 col-12">
                  <div className="links">
-                    <h3>Help & Support</h3>
+                    <h3>Help & Suport</h3>
                    <ul>
                      <li>
                        <Link to="/faq">FAQs</Link>
@@ -627,7 +642,7 @@ const Main = ({ footer }) => {
                        <Link to="#">Support</Link>
                      </li>
                      <li>
-                         <HashLink to="/#how_it_work">How it works</HashLink>
+                        <Link to="/work">How it works</Link>
                      </li>
                      <li>
                        <Link to="/terms">Terms & conditions</Link>
@@ -642,14 +657,20 @@ const Main = ({ footer }) => {
                  <div className="try_out">
                    <h3>Let’s Try Out</h3>
                    <ul className="app_btn">
-                     <li>
-                        <a href={process.env.REACT_APP_ANDROID_URL}>
-                          <img src={blueapp} alt="image" />
+                      <li>
+                        <a href="https://play.google.com/store/apps/details?id=com.mermsemr.myfit">
+                          <img
+                            src="assets/images/appstore_blue.png"
+                            alt="image"
+                          />
                        </a>
                      </li>
                      <li>
-                        <a href={process.env.REACT_APP_IOS_URL}>
-                          <img src={blue} alt="image" />
+                        <a href="https://play.google.com/store/apps/details?id=com.mermsemr.myfit">
+                          <img
+                            src="assets/images/googleplay_blue.png"
+                            alt="image"
+                          />
                        </a>
                      </li>
                    </ul>
@@ -103,22 +103,6 @@ const Main = ({ setfooter, setnavbar, setbrdcum }) => {
                </p>
              </div>
              <ul className="app_btn">
-                  <li>
-                      <a href={process.env.REACT_APP_ANDROID_URL}>
-                        <img src={blueapp} alt="image" />
-                        <img className="white_img" src={whiteapp} alt="image" />
-                      </a>
-                  </li>
-                  <li>
-                      <a href={process.env.REACT_APP_IOS_URL}>
-                        <img src={blue} alt="image" />
-                        <img className="white_img" src={white} alt="image" />
-                      </a>
-                  </li>
-              </ul>
-
-
-              {/* <ul className="app_btn">
                <li>
                  <Link to="https://play.google.com/store/apps/details?id=com.mermsemr.myfit">
                    <img className="blue_img" src={blueapp} alt="image" />
@@ -131,9 +115,7 @@ const Main = ({ setfooter, setnavbar, setbrdcum }) => {
                    <img className="white_img" src={white} alt="image" />
                  </Link>
                </li>
-              </ul> */}
-
-
+              </ul>
            </div>
            <div
              className="col-lg-6 col-md-12"
@@ -47,18 +47,19 @@ const Main = () => {
                            <div className="free_text">
                                <div className="section_title">
                                    <h2>Let’s download free from apple and play store</h2>
-                                    <p>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.</p>
+                                    <p>Instant free download from apple and play store orem Ipsum is simply dummy text of the printing.
+                                    and typese tting indus orem Ipsum has beenthe standard</p>
                                </div>
                                <ul className="app_btn">
                                <li>
-                                    <a href={process.env.REACT_APP_ANDROID_URL}>
+                                    <Link to="https://play.google.com/store/apps/details?id=com.mermsemr.myfit">
                                    <img src={blueapp} alt="image" />
-                                    </a>
+                                    </Link>
                                </li>
                                <li>
-                                    <a href={process.env.REACT_APP_IOS_URL}>
+                                    <Link to="https://play.google.com/store/apps/details?id=com.mermsemr.myfit">
                                    <img src={blue} alt="image" />
-                                    </a>
+                                    </Link>
                                </li>
                                </ul>
                            </div>
@@ -33,10 +33,9 @@ const Main = () => {
        <section className="row_am interface_section">
            <div className="container-fluid">
                <div className="section_title" data-aos="fade-up" data-aos-duration="1500" data-aos-delay="300">
-                    <h2>Beautiful <span>interface</span></h2>
+                    <h2>Beautifull <span>interface</span></h2>
                    <p>
-                    myFit appends a fun yet simple process to keep you consistently<br/> motivated,engaged and moving again without any shrewdness.
-
+                    Lorem Ipsum is simply dummy text of the printing and typese tting <br/> indus orem Ipsum has beenthe standard dummy.
                    </p>
                </div>
                <div className="screen_slider" >
@@ -8,13 +8,11 @@ import img3 from '../../../assets/images/premium.png'
 import SiteService from '../../../vendors/service/siteService'

 const Main = ({gredient , video}) => {
-
+    
    const[tog, setTog] = useState()

    const [prices, setPrices] = useState([]); // initial state for FAQs before API call

-    const [pricing_text_02, setPricingtext02] = useState('');
-
    let priceServices = new SiteService(); // instantiating the class

    const getAllPriceData = () => {
@@ -22,9 +20,7 @@ const Main = ({gredient , video}) => {
    };

    useEffect(() => {
-        getAllPriceData().then((data) => {
-            setPricingtext02(data.data.pricing_text_02);
-            setPrices(data.data.pricing) });
+        getAllPriceData().then((data) => setPrices(data.data));
        AOS.init();
        AOS.refresh();
    }, []);
@@ -35,13 +31,9 @@ const Main = ({gredient , video}) => {
            <section className="row_am pricing_section gredient-pricing" id="pricing">
                <div className="container">
                    <div className="section_title" data-aos="fade-up" data-aos-duration="1500" data-aos-delay="300">
-                    <h2>Flexible & Simple <span>pricing</span></h2>
-                    <p className="gredient-p">
-                    {/*    <>*/}
-                    {/*    {pricing_text_02}*/}
-                    {/*</>*/}
-                         Choose your myFit Pricing Plan <br/> myFit has a free Standard for Basics , $5 per month for Premium <br />
-                        and $7.99 per month for Gold-tier</p>
+                    <h2>Best & simple <span>pricing</span></h2>
+                    <p className="gredient-p">Lorem Ipsum is simply dummy text of the printing and typese tting <br/> indus orem Ipsum has beenthe
+                        standard dummy.</p>
                    </div>
                    <div className="toggle_block" data-aos="fade-up" data-aos-duration="1500">
                        <span className={`month ${tog ? 'active' : ''}`}>Monthly</span>
@@ -148,9 +140,9 @@ const Main = ({gredient , video}) => {
            <section className="row_am pricing_section" id="pricing">
                <div className="container">
                    <div className="section_title" data-aos="fade-up" data-aos-duration="1500" data-aos-delay="300">
-                    <h2>Flexible & Simple <span>pricing</span></h2>
-                    <p>Choose your myFit Pricing Plan <br/> myFit has a free Standard for Basics , $5 per month for Premium <br />
-                        and $7.99 per month for Gold-tier.</p>
+                    <h2>Best & simple <span>pricing</span></h2>
+                    <p>Lorem Ipsum is simply dummy text of the printing and typese tting <br/> indus orem Ipsum has beenthe
+                        standard dummy.</p>
                    </div>
                    <div className="toggle_block" data-aos="fade-up" data-aos-duration="1500">
                        <span className={`month ${tog ? 'active' : ''}`}>Monthly</span>
@@ -1,68 +1,20 @@
-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";
-
+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'

 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 (
    <>
        <section className="row_am latest_story" id="blog">
            <div className="container">
                <div className="section_title" data-aos="fade-in" data-aos-duration="1500" data-aos-delay="100">
                    <h2>Read latest <span>story</span></h2>
+                    <p>Lorem Ipsum is simply dummy text of the printing and typese tting <br/> indus orem Ipsum has beenthe standard dummy.</p>
                </div>
                <div className="row">
-                  
-                {blogData.slice(1, 4).map((data, index) => (
-              <div
-                className="col-md-4"
-                key={index}>
-                <div
-                  className="story_box"
-                  data-aos="fade-up"
-                  data-aos-duration="1500">
-                  <div className="story_img">
-                    <img
-                      src={data.meta_value}
-                      alt="image"
-                    />
-                    <span>{new Date(data.post_date).toDateString()}</span>
-                  </div>
-                  <div className="story_text">
-                    <h3>{data.post_title}</h3>
-                    <div
-                      dangerouslySetInnerHTML={{
-                        __html: data.post_content.substring(0, 100) + "  . . .",
-                      }}></div>
-                      <Link to={`/blogdetails/${data.id}`} state={{data, allData: blogData}}>
-                                 READ MORE
-                            </Link>
-                    {/* <Link to={`/blogdetails/${item.id}`}>READ MORE</Link> */}
-                  </div>
-                </div>
-              </div>
-            ))}
-                    {/* <div className="col-md-4">
+                    <div className="col-md-4">
                        <div className="story_box" data-aos="fade-up" data-aos-duration="1500">
                            <div className="story_img">
                            <img src={story1} alt="image" />
@@ -101,7 +53,7 @@ const Main = () => {
                                <Link to="/blog-single">READ MORE</Link>
                            </div>
                        </div>
-                    </div> */}
+                    </div>
                </div>
            </div>
        </section> 
@@ -1,15 +1,14 @@
 import React , {useState} from 'react'
 import { Link } from 'react-router-dom'
-import img from '../../../assets/images/appdownload.png'
-// import img1 from '../../../assets/images/create_account2.png'
-import img2 from '../../../assets/images/download_app1.png'
+import img from '../../../assets/images/download_app1.png'
+import img1 from '../../../assets/images/create_account2.png'
+import img2 from '../../../assets/images/enjoy_app01.png'
 import line from '../../../assets/images/anim_line.png'
 import banner from '../../../assets/images/banner-shape1.png'
 import banner1 from '../../../assets/images/banner-shape2.png'
 import banner2 from '../../../assets/images/banner-shape3.png'
 import video from '../../../assets/images/play_icon.png'
 import ytvideo from '../../../assets/images/yt_thumb.png'
-import createAccount from '../../../assets/images/create_account.png'

 const Main = ({dark}) => {
    const [ytShow , setytShow] = useState (false)
@@ -29,8 +28,8 @@ const Main = ({dark}) => {
                                <div className="step_text" data-aos="fade-right" data-aos-duration="1500">
                                <h4>Download app</h4>
                                <div className="app_icon">
-                                    <a href={process.env.REACT_APP_ANDROID_URL}><i className="icofont-brand-android-robot"></i></a>
-                                    <a href={process.env.REACT_APP_IOS_URL}><i className="icofont-brand-apple"></i></a>
+                                    <Link to={process.env.REACT_APP_ANDROID_URL}><i className="icofont-brand-android-robot"></i></Link>
+                                    <Link to={process.env.REACT_APP_IOS_URL}><i className="icofont-brand-apple"></i></Link>
                                </div>
                                <p>Download App either for Mac or Android</p>
                                </div>
@@ -51,7 +50,7 @@ const Main = ({dark}) => {
                                <h3>02</h3>
                                </div>
                                <div className="step_img" data-aos="fade-right" data-aos-duration="1500">
-                                <img className="create-account-logo" src={createAccount} alt="create account logo"/>
+                                <img src={img1} alt="image" />
                                </div>
                            </li>
                            <li>
@@ -55,7 +55,7 @@ const Main = ({navbar}) => {
                                <Link to="/contact" className="nav-link" >Contact</Link>
                            </li>
                            <li className="nav-item">
-                                <a href={process.env.REACT_APP_APPSITE} className="nav-link dark_btn">GET STARTED</a>
+                                <Link to={process.env.REACT_APP_APPSITE} className="nav-link dark_btn">GET STARTED</Link>
                            </li>
                        </ul>
                    </div>
@@ -143,8 +143,7 @@ const Main = ({navbar}) => {
                                <Link to="/contact" className="nav-link" >Contact</Link>
                            </li>
                            <li className="nav-item">
-                                 <a href={process.env.REACT_APP_APPSITE} className="nav-link dark_btn">GET STARTED</a>
-                                {/* <Link to="/" className="nav-link dark_btn">GET STARTED</Link> */}
+                                <Link to="/" className="nav-link dark_btn">GET STARTED</Link>
                            </li>

                        </div >
@@ -212,8 +211,7 @@ const Main = ({navbar}) => {
                                    <Link to="/contact" className="nav-link" >Contact</Link>
                                </li>
                                <li className="nav-item">
-                                    <a href={process.env.REACT_APP_APPSITE} className="nav-link dark_btn">GET STARTED</a>
-                                    {/* <Link to="/contact" className="nav-link dark_btn">GET STARTED</Link> */}
+                                    <Link to="/contact" className="nav-link dark_btn">GET STARTED</Link>
                                </li>
                            </ul>
                        </div>
@@ -277,8 +275,7 @@ const Main = ({navbar}) => {
                                <Link to="/contact" className="nav-link" >Contact</Link>
                            </li>
                            <li className="nav-item">
-                                <a href={process.env.REACT_APP_APPSITE} className="nav-link dark_btn">GET STARTED</a>
-                                {/* <Link to="/contact" className="nav-link dark_btn">GET STARTED</Link> */}
+                                <Link to="/contact" className="nav-link dark_btn">GET STARTED</Link>
                            </li>
                        </ul>
                    </div>
@@ -289,7 +286,7 @@ const Main = ({navbar}) => {
                                <span className="drp_btn" ><i className="icofont-rounded-down"></i></span>
                                <div className="sub_menu" style={{ display: show ? "block" : "none" }}>
                                <ul>
-                                    <li><Link to="/">Home Default</Link></li>
+                                    <li><Link to="/">Home Defoult</Link></li>
                                  
                                </ul>
                                </div>
@@ -333,8 +330,7 @@ const Main = ({navbar}) => {
                                <Link to="/contact" className="nav-link" >Contact</Link>
                            </li>
                            <li className="nav-item">
-                                <a href={process.env.REACT_APP_APPSITE} className="nav-link dark_btn">GET STARTED</a>
-                                {/* <Link to="/contact" className="nav-link dark_btn">GET STARTED</Link> */}
+                                <Link to="/contact" className="nav-link dark_btn">GET STARTED</Link>
                            </li>
                        </ul>
                    </div>
@@ -363,7 +359,7 @@ const Main = ({navbar}) => {
                                <span className="drp_btn" ><i className="icofont-rounded-down"></i></span>
                                <div className="sub_menu">
                                <ul>
-                                    <li><Link to="/">Home Default</Link></li>
+                                    <li><Link to="/">Home Defoult</Link></li>
                                  
                                  
                                </ul>
@@ -397,8 +393,7 @@ const Main = ({navbar}) => {
                                <Link smooth to="#contact" className="nav-link" >Contact</Link>
                            </li>
                            <li className="nav-item">
-                                <a href={process.env.REACT_APP_APPSITE} className="nav-link dark_btn">GET STARTED</a>
-                                {/* <Link to="/contact" className="nav-link dark_btn">GET STARTED</Link> */}
+                                <Link to="/contact" className="nav-link dark_btn">GET STARTED</Link>
                            </li>
                        </ul>
                    </div>
@@ -409,7 +404,7 @@ const Main = ({navbar}) => {
                                <span className="drp_btn" ><i className="icofont-rounded-down"></i></span>
                                <div className="sub_menu" style={{ display: show ? "block" : "none" }}>
                                <ul>
-                                    <li><Link to="/">Home Default</Link></li>
+                                    <li><Link to="/">Home Defoult</Link></li>
                                  
                                  
                                </ul>
@@ -454,8 +449,7 @@ const Main = ({navbar}) => {
                                <Link to="/contact" className="nav-link" >Contact</Link>
                            </li>
                            <li className="nav-item">
-                                <a href={process.env.REACT_APP_APPSITE} className="nav-link dark_btn">GET STARTED</a>
-                                {/* <Link to="/contact" className="nav-link dark_btn">GET STARTED</Link> */}
+                                <Link to="/contact" className="nav-link dark_btn">GET STARTED</Link>
                            </li>
                        </ul>
                    </div>
@@ -483,7 +477,7 @@ const Main = ({navbar}) => {
                                <span className="drp_btn" ><i className="icofont-rounded-down"></i></span>
                                <div className="sub_menu">
                                <ul>
-                                    <li><Link to="/">Home Default</Link></li>
+                                    <li><Link to="/">Home Defoult</Link></li>
                                  
                                  
                                </ul>
@@ -528,8 +522,7 @@ const Main = ({navbar}) => {
                                <Link to="/contact" className="nav-link" >Contact</Link>
                            </li>
                            <li className="nav-item">
-                                <a href={process.env.REACT_APP_APPSITE} className="nav-link dark_btn">GET STARTED</a>
-                                {/* <Link to="/contact" className="nav-link dark_btn">GET STARTED</Link> */}
+                                <Link to="/contact" className="nav-link dark_btn">GET STARTED</Link>
                            </li>
                        </ul>
                    </div>
@@ -540,7 +533,7 @@ const Main = ({navbar}) => {
                                <span className="drp_btn" ><i className="icofont-rounded-down"></i></span>
                                <div className="sub_menu" style={{ display: show ? "block" : "none" }}>
                                <ul>
-                                    <li><Link to="/">Home Default</Link></li>
+                                    <li><Link to="/">Home Defoult</Link></li>
                                   
                                   
                                </ul>
@@ -585,8 +578,7 @@ const Main = ({navbar}) => {
                                <Link to="/contact" className="nav-link" >Contact</Link>
                            </li>
                            <li className="nav-item">
-                                <a href={process.env.REACT_APP_APPSITE} className="nav-link dark_btn">GET STARTED</a>
-                                {/* <Link to="/contact" className="nav-link dark_btn">GET STARTED</Link> */}
+                                <Link to="/contact" className="nav-link dark_btn">GET STARTED</Link>
                            </li>
                        </ul>
                    </div>
@@ -1,14 +1,10 @@
 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"
 import BGImg2 from "../../../assets/images/bread_crumb_bg_two.png"
 import Faq from '../../HomeMain/Faq/Main'
-import screen from '../../../assets/images/download-screen01.png'
-import screen1 from '../../../assets/images/download-screen02.png'

 import SiteService from '../../../vendors/service/siteService'

@@ -33,7 +29,7 @@ const Main = ({brdcum}) => {
        <Bredcrumb 
            no={1}
            title="Have questions? look here" 
-            paragraph="Learn more about myFit  through answers to frequently asked questions."
+            paragraph="Lorem Ipsum is simply dummy text of the printing and typesetting"
            tag="Faq" 
            bgimg={BGImg}/>}

@@ -41,7 +37,7 @@ const Main = ({brdcum}) => {
        <Bredcrumb 
            no={2}
            title="Have questions? look here" 
-            paragraph="Learn more about myFit  through answers to frequently asked questions."
+            paragraph="Lorem Ipsum is simply dummy text of the printing and typesetting"
            tag="Faq" 
            bgimg={BGImg1}/>}

@@ -49,7 +45,7 @@ const Main = ({brdcum}) => {
        <Bredcrumb 
        no={5}
        title="Have questions? look here" 
-        paragraph="Learn more about myFit  through answers to frequently asked questions."
+        paragraph="Lorem Ipsum is simply dummy text of the printing and typesetting"
        tag="Faq" 
        bgimg={BGImg}/>}

@@ -57,17 +53,18 @@ const Main = ({brdcum}) => {
        <Bredcrumb 
            no={3}
            title="Have questions? look here" 
-            paragraph="Learn more about myFit  through answers to frequently asked questions."
+            paragraph="Lorem Ipsum is simply dummy text of the printing and typesetting"
            tag="Faq" />}

        {brdcum.b4 && 
        <Bredcrumb 
            no={4}
            title="Have questions? look here" 
-            paragraph="Learn more about myFit  through answers to frequently asked questions."
+            paragraph="Lorem Ipsum is simply dummy text of the printing and typesetting"
            tag="Faq" 
            bgimg={BGImg2}/>}

+
        {/* <section className="row_am faq_section">
            <div className="container">
                <div className="faq_panel">
@@ -226,31 +223,27 @@ const Main = ({brdcum}) => {
                            <div className="free_text">
                                <div className="section_title">
                                    <h2>Let’s download free from apple and play store</h2>
-                                    <p>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.</p>
+                                    <p>Instant free download from apple and play store orem Ipsum is simply dummy text of the printing.
+                                    and typese tting indus orem Ipsum has beenthe standard</p>
                                </div>
                                <ul className="app_btn">
-                                    <li>
-                                        <a href={process.env.REACT_APP_ANDROID_URL}>
-                                        <img src={blueapp} alt="image" />
-                                        </a>
-                                    </li>
-                                    <li>
-                                        <a href={process.env.REACT_APP_IOS_URL}>
-                                        <img src={blue} alt="image" />
-                                        </a>
-                                    </li>
-
+                                <li>
+                                    <Link to="#">
+                                    <img src="assets/images/appstore_blue.png" alt="image" />
+                                    </Link>
+                                </li>
+                                <li>
+                                    <Link to="#">
+                                    <img src="assets/images/googleplay_blue.png" alt="image" />
+                                    </Link>
+                                </li>
                                </ul>
                            </div>
                        </div>
                        <div className="col-md-6">
-                            {/* <div className="free_img">
+                            <div className="free_img">
                                <img src="assets/images/download-screen01.png" alt="image" />
                                <img className="mobile_mockup" src="assets/images/download-screen02.png" alt="image" />
-                            </div> */}
-                            <div className="free_img">
-                                <img src={screen} alt="image" />
-                                <img className="mobile_mockup" src={screen1} alt="image" />
                            </div>
                        </div>
                    </div>
@@ -4,8 +4,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 screen from '../../../assets/images/download-screen01.png'
-import screen1 from '../../../assets/images/download-screen02.png'

 const Main = ({brdcum}) => {

@@ -328,30 +326,27 @@ const Main = ({brdcum}) => {
                            <div className="free_text">
                                <div className="section_title">
                                    <h2>Let’s download free from apple and play store</h2>
-                                   <p>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.</p>
+                                    <p>Instant free download from apple and play store orem Ipsum is simply dummy text of the printing.
+                                    and typese tting indus orem Ipsum has beenthe standard</p>
                                </div>
-                                 <ul className="app_btn">
+                                <ul className="app_btn">
                                <li>
-                                    <a href={process.env.REACT_APP_ANDROID_URL}>
-                                    <img src={blueapp} alt="image" />
-                                    </a>
+                                    <Link to="#">
+                                    <img src="assets/images/appstore_blue.png" alt="image" />
+                                    </Link>
                                </li>
                                <li>
-                                    <a href={process.env.REACT_APP_IOS_URL}>
-                                    <img src={blue} alt="image" />
-                                    </a>
+                                    <Link to="#">
+                                    <img src="assets/images/googleplay_blue.png" alt="image" />
+                                    </Link>
                                </li>
                                </ul>
                            </div>
                        </div>
                        <div className="col-md-6">
-                            {/* <div className="free_img">
+                            <div className="free_img">
                                <img src="assets/images/download-screen01.png" alt="image" />
                                <img className="mobile_mockup" src="assets/images/download-screen02.png" alt="image" />
-                            </div> */}
-                            <div className="free_img">
-                                <img src={screen} alt="image" />
-                                <img className="mobile_mockup" src={screen1} alt="image" />
                            </div>
                        </div>
                    </div>
@@ -6,11 +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";
-import screen from '../../assets/images/download-screen01.png'
-import screen1 from '../../assets/images/download-screen02.png'
-


 const Main = ({brdcum}) => {
@@ -22,7 +17,7 @@ const Main = ({brdcum}) => {
        <Bredcrumb 
        no={1}
        title="Our Pricing & Plans" 
-        paragraph="Flexible & Convienent Pricing Options"
+        paragraph="Lorem Ipsum is simply dummy text of the printing and typesetting"
        tag="Our Pricing & Plans" 
        bgimg={BGImg}/>}

@@ -30,7 +25,7 @@ const Main = ({brdcum}) => {
        <Bredcrumb 
        no={2}
        title="Our Pricing & Plans" 
-        paragraph="Flexible & Convienent Pricing Options"
+        paragraph="Lorem Ipsum is simply dummy text of the printing and typesetting"
        tag="Our Pricing & Plans" 
        bgimg={BGImg1}/>}

@@ -38,7 +33,7 @@ const Main = ({brdcum}) => {
        <Bredcrumb 
        no={5}
        title="Our Pricing & Plans" 
-        paragraph="Flexible & Convienent Pricing Options"
+        paragraph="Lorem Ipsum is simply dummy text of the printing and typesetting"
        tag="Our Pricing & Plans" 
        bgimg={BGImg}/>}

@@ -47,14 +42,14 @@ const Main = ({brdcum}) => {
        <Bredcrumb 
        no={3}
        title="Our Pricing & Plans" 
-        paragraph="Flexible & Convienent Pricing Options"
+        paragraph="Lorem Ipsum is simply dummy text of the printing and typesetting"
        tag="Our Pricing & Plans" />}

        {brdcum.b4 && 
        <Bredcrumb 
        no={4}
        title="Our Pricing & Plans" 
-        paragraph="Flexible & Convienent Pricing Options"
+        paragraph="Lorem Ipsum is simply dummy text of the printing and typesetting"
        tag="Our Pricing & Plans" 
        bgimg={BGImg2}/>}

@@ -214,27 +209,27 @@ const Main = ({brdcum}) => {
                            <div className="free_text">
                                <div className="section_title">
                                    <h2>Let’s download free from apple and play store</h2>
-                                   <p>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.</p>
+                                    <p>Instant free download from apple and play store orem Ipsum is simply dummy text of the printing.
+                                    and typese tting indus orem Ipsum has beenthe standard</p>
                                </div>
                                <ul className="app_btn">
-                                     <li>
-                                        <a href={process.env.REACT_APP_ANDROID_URL}>
-                                        <img src={blueapp} alt="image" />
-                                        </a>
-                                    </li>
-                                    <li>
-                                        <a href={process.env.REACT_APP_IOS_URL}>
-                                        <img src={blue} alt="image" />
-                                        </a>
-                                    </li>
-
+                                <li>
+                                    <Link to="#">
+                                    <img src="assets/images/appstore_blue.png" alt="image" />
+                                    </Link>
+                                </li>
+                                <li>
+                                    <Link to="#">
+                                    <img src="assets/images/googleplay_blue.png" alt="image" />
+                                    </Link>
+                                </li>
                                </ul>
                            </div>
                        </div>
                        <div className="col-md-6">
-                        <div className="free_img">
-                                <img src={screen} alt="image" />
-                                <img className="mobile_mockup" src={screen1} alt="image" />
+                            <div className="free_img">
+                                <img src="assets/images/download-screen01.png" alt="image" />
+                                <img className="mobile_mockup" src="assets/images/download-screen02.png" alt="image" />
                            </div>
                        </div>
                    </div>
@@ -13,7 +13,6 @@ 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";

@@ -85,10 +84,9 @@ const Routing = () => {
        <Route path="/sign-up" element={<SignUp />} />
        <Route path="/pricing" element={<Pricing brdcum={brdcum} />} />
        <Route path="/blog" element={<Blog brdcum={brdcum} />} />
-        <Route path="/blogdetails/:id" element={<BlogSingle brdcum={brdcum} />} />
+        <Route path="/blog-single/:id" element={<BlogSingle brdcum={brdcum} />} />
        <Route path="/terms" element={<Terms brdcum={brdcum} />} />
        <Route path="/privacy" element={<Privacy brdcum={brdcum} />} />
-
      </Routes>
      {footerpage && <Footer footer={footer} />}
    </>
@@ -6,7 +6,7 @@ class SiteService {
    console.log("Er are here anyway");
  }
  // Blog Data {Get}
-  blogData(id) {
+  blogData() {
    return this.getAuxEnd("/blogdata", null);
  }

@@ -16,8 +16,8 @@ class SiteService {
  }

  // Contact Data{POST}
-  contactData(value) {
-    return this.postAuxEnd("/contact", value)
+  contactData() {
+    return this.postAuxEnd("/contact", null)
  }

  faqData() {
Author	SHA1	Message	Date
ChineseChikki	20bffa1409	undo	2023-01-19 14:34:55 +01:00
ChineseChikki	e28f521632	links in variable format	2023-01-19 14:23:42 +01:00