Review page fixed to variable

.idea/.gitignore

@@ -0,0 +1,8 @@
+# Default ignored files
+/shelf/
+/workspace.xml
+# Datasource local storage ignored files
+/dataSources/
+/dataSources.local.xml
+# Editor-based HTTP Client requests
+/httpRequests/

.idea/modules.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/www-myfit.iml" filepath="$PROJECT_DIR$/.idea/www-myfit.iml" />
+    </modules>
+  </component>
+</project>

.idea/vcs.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+  </component>
+</project>

.idea/www-myfit.iml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="WEB_MODULE" version="4">
+  <component name="NewModuleRootManager">
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>

docker-compose.yml

@@ -6,7 +6,7 @@ services:
       dockerfile: Dockerfile
     restart: unless-stopped
     ports:
-      - 9057:3000
+      - 7010:3000
     stdin_open: true
     working_dir: /usr/src/app
     volumes:

public/index.html

@@ -7,7 +7,7 @@
 
     <!-- favicons Icons -->
     <link rel="manifest" href="%PUBLIC_URL%/manifest.json">
-    <meta name="description" content="APPER:: App Landing Page" />
+    <meta name="description" content="Cloud-based electronic health record platform for all users. patient health record, family health record">
 
     <!-- fonts -->
     <link rel="stylesheet" href="assets/css/icofont.min.css">

src/assets/css/style.css

@@ -1119,7 +1119,7 @@ header.fixed .navbar {
 .how_it_works .how_it_inner {
   background-color: var(--bg-white);
   padding: 70px 0;
-  padding-bottom: 250px;
+  padding-bottom: 10px;
   border-radius: 30px;
   box-shadow: 0px 4px 30px #ede9fe;
 }

src/component/AboutUs/Main.js

@@ -9,6 +9,17 @@ import BGImg2 from "../../assets/images/bread_crumb_bg_two.png"
 const Main = ({brdcum}) => {
     const [ytShow , setytShow] = useState (false)
 
+    // About us text variables
+    let innovativeDesc = 'The team at myFit by Flxuxtra LLC works with you to achieve your health objectives without getting in your way. Do your health your way to get the best result for you and your family. We are you, always ready and always engaged with the users to help get the best out of our solution.'
+    'We work with you to achieve your health and fitness goals by providing solutions that fit your goals.'
+    let whyWeAreDiff = {
+        desc:'We work with you to achieve your health and fitness goals by providing solutions that fit your goals.',
+        title1: 'Secure',
+        title2: 'Rich Features',
+        title3: 'Ease of Use',
+        title4: 'Support'
+    }
+    
   return (
     <>       
        {brdcum.b1 && 
@@ -56,17 +67,13 @@ const Main = ({brdcum}) => {
                             life easy to grow.</h2>
                         </div>
                         <p data-aos="fade-up" data-aos-duration="1500">
-                            Lorem Ipsum is simply dummy text of the printing and type
+                            {innovativeDesc}
-                            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">
@@ -98,17 +105,16 @@ 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>Lorem Ipsum is simply dummy text of the printing and typese tting <br/> indus orem Ipsum has beenthe standard
+                    <p>{whyWeAreDiff.desc}</p>
-                    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>Secure code</h3>
+                        <h3>{whyWeAreDiff.title1}</h3>
                         <p>Lorem Ipsum is simply dummy text of the printing and type
                             setting indus ideas.
                         </p>
@@ -117,22 +123,22 @@ const Main = ({brdcum}) => {
                     </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>Fully functional</h3>
+                        <h3>{whyWeAreDiff.title2}</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>Best communication</h3>
+                        <h3>{whyWeAreDiff.title3}</h3>
                         <p>Lorem Ipsum is simply dummy text of the printing and type
                             setting indus ideas.
                         </p>
@@ -141,11 +147,11 @@ const Main = ({brdcum}) => {
                     </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>24-7 Support</h3>
+                        <h3>{whyWeAreDiff.title4}</h3>
                         <p>Simply dummy text of the printing and typesetting indus lorem Ipsum is dummy.</p>
                         </div>
                     </div>

src/component/Blog/Blog/Main.js

@@ -1,27 +1,63 @@
-import React from 'react'
+import React, { useEffect, useState } from "react";
-import { Link } from 'react-router-dom'
+import { Link } from "react-router-dom";
-import BGImg from "../../../assets/images/bread_crumb_bg.png"
+import BGImg from "../../../assets/images/bread_crumb_bg.png";
-import BGImg1 from "../../../assets/images/bread_crumb_bg_one.png"
+import BGImg1 from "../../../assets/images/bread_crumb_bg_one.png";
-import BGImg2 from "../../../assets/images/bread_crumb_bg_two.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(() => {
+    getBlogData();
+  }, []);
+
+  const getBlogData = async () => {
+    try {
+      const res = await api.blogData();
+
+      setBlogData(res.data);
+
+      // console.log(res.data);
+
+      
+    } catch (error) {
+      console.log("Error from blog data ", error);
+    }
+  };
   
-const Main = ({brdcum,bgimg}) => {
   return (
     <>
+      <div className="bred_crumb" style={{ backgroundImage: `url(${BGImg})` }}>
+        <div className="container">
+          <span className="banner_shape1">
+            {" "}
+            <img src="assets/images/banner-shape1.png" alt="image" />{" "}
+          </span>
+          <span className="banner_shape2">
+            {" "}
+            <img src="assets/images/banner-shape2.png" alt="image" />{" "}
+          </span>
+          <span className="banner_shape3">
+            {" "}
+            <img src="assets/images/banner-shape3.png" alt="image" />{" "}
+          </span>
 
-        <div className="bred_crumb" style={{ backgroundImage : `url(${BGImg})`}}>
+          <div className="bred_text">
-            <div className="container">
+            <h1>Latest Blog Post</h1>
-                <span className="banner_shape1"> <img src="assets/images/banner-shape1.png" alt="image" /> </span>
+            <ul>
-                <span className="banner_shape2"> <img src="assets/images/banner-shape2.png" alt="image" /> </span>
+              <li>
-                <span className="banner_shape3"> <img src="assets/images/banner-shape3.png" alt="image" /> </span>
+                <Link to="/">Home</Link>
-
+              </li>
-                <div className="bred_text">
+              <li>
-                <h1>Latest Blog Post</h1>
+                <span>»</span>
-                <ul>
+              </li>
-                    <li><Link to="/">Home</Link></li>
+              <li>
-                    <li><span>»</span></li>
+                <Link to="/blog">Blog</Link>
-                    <li><Link to="/blog">Blog</Link></li>
+              </li>
-                </ul>
+            </ul>
-               {/* <div className="search_bar">
+            {/* <div className="search_bar">
                     <form action="">
                         <div className="form-group">
                             <input type="text" placeholder="Search here" className="form-control"/>
@@ -29,126 +65,92 @@ const Main = ({brdcum,bgimg}) => {
                         </div>
                     </form>
         </div>*/}
-                </div>
+          </div>
-            </div>
         </div>
+      </div>
 
+      <section className="row_am blog_list_main">
+        {blogData.map((data,index) => {
+          if (index == 0){
+            return (
+              <div className="container">
+              <div className="row">
+                <div
+                  className="col-lg-6"
+                  data-aos="fade-in"
+                  data-aos-duration="1500"
+                >
+                  <div className="blog_img">
+                    <img 
+                      src={data.meta_value}
+                      alt="image"
+                    />
+                    {/* <span>20 min ago</span> */}
     
-        <section className="row_am blog_list_main">
+                    <span>{new Date (data.post_date).toDateString()}</span>
-            <div className="container">
+                  </div>
-                <div className="row">
-                <div className="col-lg-6" data-aos="fade-in" data-aos-duration="1500">
-                    <div className="blog_img">
-                        <img src="https://picsum.photos/seed/picsum/505/378" alt="image"/>
-                        <span>20 min ago</span>
-                    </div>
                 </div>
                 <div className="col-lg-6">
-                    <div className="blog_text">
+                  <div className="blog_text">
-                        <div className="section_title">
+                    <div className="section_title">
-                        <h2>Top rated app of the year!</h2>
+                      <h2>{data.post_title}</h2>
-                        <p>myFit has powerful connectivity, fitness, health, and safety features
+                      <div dangerouslySetInnerHTML={{__html: data.post_content.substring(0,400)+'  . . .'}}></div>
-                            Also makes provision Fitness tracking,Workout tracking,Heart rate monitoringscrambled 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 typesetting.</p>
+                      <Link to={`/blog-single/${data.id}`} state={{data}}>
-                            <Link to="/blog-single">READ MORE</Link>
+                          READ MORE
-                        </div>
+                        </Link>
                     </div>
+                  </div>
                 </div>
-                </div>
+              </div>
             </div>
-        </section>
-        <section className="row_am latest_story blog_list_story" id="blog">
-            <div className="container">
-                <div className="row">
-                    <div className="col-md-4">
-                        <div className="story_box" data-aos="fade-up" data-aos-duration="1500">
-                            <div className="story_img">
-                            <img src="https://picsum.photos/seed/picsum/505/378" 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="/blog-single">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="https://picsum.photos/seed/picsum/505/378" alt="image" />
-                            <span>45 min ago</span>
-                            </div>
-                            <div className="story_text">
-                                <h3>Top rated app! Yupp.</h3>
-                                <p>Simply dummy text of the printing and typesetting industry lorem Ipsum has Lorem Ipsum is.</p>
-                                <Link to="/blog-single">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="https://picsum.photos/seed/picsum/505/378" alt="image"/>
-                            <span>45 min ago</span>
-                            </div>
-                            <div className="story_text">
-                                <h3>Creative ideas on app.</h3>
-                                <p>Printing and typesetting industry lorem Ipsum has Lorem simply dummy text of the.</p>
-                                <Link to="/blog-single">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="https://picsum.photos/seed/picsum/505/378" alt="image"/>
-                            <span>45 min ago</span>
-                            </div>
-                            <div className="story_text">
-                                <h3>Excellence UI design</h3>
-                                <p>Lorem Ipsum is simply dummy text of the printing and typesetting 
-                                industry lorem Ipsum has.</p>
-                                <Link to="/blog-single">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="https://picsum.photos/seed/picsum/505/378" alt="image"/>
-                            <span>45 min ago</span>
-                            </div>
-                            <div className="story_text">
-                                <h3>Quick and easy Search</h3>
-                                <p>Simply dummy text of the printing and typesetting industry lorem Ipsum has Lorem Ipsum is.</p>
-                                <Link to="/blog-single">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="https://picsum.photos/seed/picsum/505/378" alt="image"/>
-                            <span>45 min ago</span>
-                            </div>
-                            <div className="story_text">
-                                <h3>Chat function eded</h3>
-                                <p>Printing and typesetting industry lorem Ipsum has Lorem simply dummy text of the.</p>
-                                <Link to="/blog-single">READ MORE</Link>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-                <div className="pagination_block">
-                    <ul>
-                        <li><Link to="#" className="prev"> Visit our blog</Link></li>
-                    </ul>
-                </div>
-            </div>
-        </section>
-    </>
-  )
-}
 
-export default Main
+            )
+          }          
+        })}
+       
+       
+      </section>
+      <section className="row_am latest_story blog_list_story" id="blog">
+        <div className="container">
+          <div className="row">
+            {blogData.map((data, index) => {
+              if (index > 0){
+                return (
+                  <div key={data.id} 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>{new Date (data && data.post_date).toDateString()}</span>
+                  </div>
+                  <div className="story_text">
+                    <h3>{data.post_title}</h3>
+                    <div dangerouslySetInnerHTML={{__html: data && data.post_content.substring(0,100)+'  . . .'}}></div>
+                    <Link to={`/blog-single/${data.id}`} state={{data, allData: blogData}}>
+                      READ MORE
+                    </Link>
+                  </div>
+                </div>
+              </div>
+
+                )}
+
+              
+              })}
+          </div>
+          <div className="pagination_block">
+            <ul>
+              <li>
+                <Link to="#" className="prev">
+                  {" "}
+                  Visit our blog
+                </Link>
+              </li>
+            </ul>
+          </div>
+        </div>
+      </section>
+    </>
+  );
+};
+
+export default Main;

src/component/Blog/BlogSingle/Main.js

@@ -1,11 +1,49 @@
-import React from 'react'
+import React, { useEffect, useState } from "react";
-import { Link } from 'react-router-dom'
+import { Link, useLocation } from 'react-router-dom'
 import Bredcrumb from '../../Bredcrumb/Main'
 import BGImg from "../../../assets/images/bread_crumb_bg.png"
 import BGImg1 from "../../../assets/images/bread_crumb_bg_one.png"
 import BGImg2 from "../../../assets/images/bread_crumb_bg_two.png"
+import { 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);
+    }
+  };
         
   return (
     <>
@@ -49,15 +87,21 @@ const Main = ({brdcum}) => {
                 <div className="blog_inner_pannel">
                     <div className="review">
                         <span>Review</span>
-                        <span>45 min ago</span>
+                        {/* <span>45 min ago</span> */}
+                        <span>{new Date (data && data.post_modified).toDateString()}</span>
+
                     </div>
                     <div className="section_title">
-                        <h2>Top rated app of the year!</h2>
+                        <h2>{data && data.post_title}</h2>
                     </div>
                     <div className="main_img">
-                        <img src="assets/images/blog_detail_main.png" alt="image" />
+                        <img src={data && data.meta_value} alt="image" />
                     </div>
                     <div className="info">
+                        <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>
@@ -86,21 +130,21 @@ const Main = ({brdcum}) => {
                     <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>
-                        <div className="quote_block">
+                    <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>
+                    </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>
+                    {/* <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">
+                            {/* <div className="avtar">
                                 <img src="assets/images/blog_d02.png" alt="image" />
-                            </div>
+                            </div> */}
                             <div className="text">
-                                <h3>By: John Dow</h3>
+                                <h3>{data && data.post_author}</h3>
-                                <span>July 25, 2022</span>
+                                <span>{new Date (data && data.post_date).toDateString()}</span>
                             </div>
                         </div>
                         <div className="social_media">
@@ -225,21 +269,34 @@ 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">
-                    <div className="col-md-4">
+
-                        <div className="story_box" data-aos="fade-up" data-aos-duration="1500">
+                 {newAllData.map((data) => {
-                            <div className="story_img">
+                    
-                            <img src="assets/images/story01.png" alt="image" />
+                    return (
-                            <span>45 min ago</span>
+
-                            </div>
+                     <div className="col-md-4">
-                            <div className="story_text">
+                     <div className="story_box" data-aos="fade-up" data-aos-duration="1500">
-                                <h3>Cool features added!</h3>
+                         <div className="story_img">
-                                <p>Lorem Ipsum is simply dummy text of the printing and typesetting 
+                        <img src={data.meta_value} alt="image" />
-                                industry lorem Ipsum has.</p>
+                         <span>45 min ago</span>
-                                <Link to="#">READ MORE</Link>
+                         </div>
-                            </div>
+                         <div className="story_text">
-                        </div>
+                            <h3>{data.post_title}</h3>
-                    </div>
+                             <div dangerouslySetInnerHTML={{__html: data.post_content.substring(0,300)+'  . . .'}}></div>
-                    <div className="col-md-4">
+                            <Link to={`/blog-single/${data.id}`} state={{data}}>
+                                 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" />
@@ -264,7 +321,7 @@ const Main = ({brdcum}) => {
                                 <Link to="#">READ MORE</Link>
                             </div>
                         </div>
-                    </div>
+                    </div> */}
                 </div>
             </div>
         </section>

src/component/Footer/Main.js

@@ -61,14 +61,14 @@ const Main = ({ footer }) => {
                     </ul>
                     <ul className="social_media">
                       <li>
-                        <Link to="#">
+                        <a href={process.env.REACT_APP_FACEBOOK}>
                           <i className="icofont-facebook"></i>
-                        </Link>
+                        </a>
                       </li>
                       <li>
-                        <Link to="#">
+                        <a href ={process.env.REACT_APP_TWITTER}>
                           <i className="icofont-twitter"></i>
-                        </Link>
+                        </a>
                       </li>
                     </ul>
                   </div>
@@ -94,13 +94,13 @@ const Main = ({ footer }) => {
                 </div>
                 <div className="col-lg-3 col-md-6 col-12">
                   <div className="links">
-                    <h3>Help & Suport</h3>
+                    <h3>Help & Support</h3>
                     <ul>
                       <li>
                         <Link to="/faq">FAQs</Link>
                       </li>
                       <li>
-                        <Link to="/#how_it_work">How it works</Link>
+                        <Link to="/how_it_work">How it works</Link>
                       </li>
                       <li>
                         <Link to="/terms">Terms & conditions</Link>
@@ -116,14 +116,14 @@ const Main = ({ footer }) => {
                     <h3>Let’s Try Out</h3>
                     <ul className="app_btn">
                       <li>
-                        <Link to="https://play.google.com/store/apps/details?id=com.mermsemr.myfit">
+                        <a href={process.env.REACT_APP_ANDROID_URL}>
                           <img src={blueapp} alt="image" />
-                        </Link>
+                        </a>
                       </li>
                       <li>
-                        <Link to="https://play.google.com/store/apps/details?id=com.mermsemr.myfit">
+                        <a href={process.env.REACT_APP_IOS_URL}>
                           <img src={blue} alt="image" />
-                        </Link>
+                        </a>
                       </li>
                     </ul>
                   </div>
@@ -197,15 +197,15 @@ const Main = ({ footer }) => {
                       </li>
                     </ul>
                     <ul className="social_media">
-                      <li>
+                     <li>
-                        <Link to="#">
+                          <a href={process.env.REACT_APP_FACEBOOK}>
-                          <i className="icofont-facebook"></i>
+                            <i className="icofont-facebook"></i>
-                        </Link>
+                          </a>
                       </li>
                       <li>
-                        <Link to="#">
+                          <a href ={process.env.REACT_APP_TWITTER}>
-                          <i className="icofont-twitter"></i>
+                            <i className="icofont-twitter"></i>
-                        </Link>
+                          </a>
                       </li>
                     </ul>
                   </div>
@@ -231,13 +231,13 @@ const Main = ({ footer }) => {
                 </div>
                 <div className="col-lg-3 col-md-6 col-12">
                   <div className="links">
-                    <h3>Help & Suport</h3>
+                    <h3>Help & Support</h3>
                     <ul>
                       <li>
                         <Link to="/faq">FAQs</Link>
                       </li>
                       <li>
-                        <Link to="/#how_it_work">How it works</Link>
+                       <Link to="/how_it_work">How it works</Link>
                       </li>
                       <li>
                         <Link to="/terms">Terms & conditions</Link>
@@ -253,20 +253,14 @@ const Main = ({ footer }) => {
                     <h3>Let’s Try Out</h3>
                     <ul className="app_btn">
                       <li>
-                        <Link to="https://play.google.com/store/apps/details?id=com.mermsemr.myfit">
+                        <a href={process.env.REACT_APP_ANDROID_URL}>
-                          <img
+                          <img src={blueapp} alt="image" />
-                            src="assets/images/appstore_blue.png"
+                        </a>
-                            alt="image"
-                          />
-                        </Link>
                       </li>
                       <li>
-                        <Link to="https://play.google.com/store/apps/details?id=com.mermsemr.myfit">
+                        <a href={process.env.REACT_APP_IOS_URL}>
-                          <img
+                          <img src={blue} alt="image" />
-                            src="assets/images/googleplay_blue.png"
+                        </a>
-                            alt="image"
-                          />
-                        </Link>
                       </li>
                     </ul>
                   </div>
@@ -327,14 +321,14 @@ const Main = ({ footer }) => {
                     </ul>
                     <ul className="social_media">
                       <li>
-                        <Link to="#">
+                        <a href={process.env.REACT_APP_FACEBOOK}>
                           <i className="icofont-facebook"></i>
-                        </Link>
+                        </a>
                       </li>
                       <li>
-                        <Link to="#">
+                        <a href ={process.env.REACT_APP_TWITTER}>
                           <i className="icofont-twitter"></i>
-                        </Link>
+                        </a>
                       </li>
                     </ul>
                   </div>
@@ -373,7 +367,7 @@ const Main = ({ footer }) => {
                         <Link to="#">Support</Link>
                       </li>
                       <li>
-                        <Link to="/work">How it works</Link>
+                        <Link to="/how_it_work">How it works</Link>
                       </li>
                       <li>
                         <Link to="/terms">Terms & conditions</Link>
@@ -389,21 +383,15 @@ const Main = ({ footer }) => {
                   <div className="try_out">
                     <h3>Let’s Try Out</h3>
                     <ul className="app_btn">
-                      <li>
+                     <li>
-                        <Link to="https://play.google.com/store/apps/details?id=com.mermsemr.myfit">
+                        <a href={process.env.REACT_APP_ANDROID_URL}>
-                          <img
+                          <img src={blueapp} alt="image" />
-                            src="assets/images/appstore_blue.png"
+                        </a>
-                            alt="image"
-                          />
-                        </Link>
                       </li>
                       <li>
-                        <Link to="https://play.google.com/store/apps/details?id=com.mermsemr.myfit">
+                        <a href={process.env.REACT_APP_IOS_URL}>
-                          <img
+                          <img src={blue} alt="image" />
-                            src="assets/images/googleplay_blue.png"
+                        </a>
-                            alt="image"
-                          />
-                        </Link>
                       </li>
                     </ul>
                   </div>
@@ -458,14 +446,14 @@ const Main = ({ footer }) => {
                     </ul>
                     <ul className="social_media">
                       <li>
-                        <Link to="#">
+                        <a href={process.env.REACT_APP_FACEBOOK}>
                           <i className="icofont-facebook"></i>
-                        </Link>
+                        </a>
                       </li>
                       <li>
-                        <Link to="#">
+                        <a href ={process.env.REACT_APP_TWITTER}>
                           <i className="icofont-twitter"></i>
-                        </Link>
+                        </a>
                       </li>
                     </ul>
                   </div>
@@ -495,7 +483,7 @@ const Main = ({ footer }) => {
 
                 <div className="col-lg-3 col-md-6 col-12">
                   <div className="links">
-                    <h3>Help & Suport</h3>
+                    <h3>Help & Support</h3>
                     <ul>
                       <li>
                         <Link to="/faq">FAQs</Link>
@@ -504,7 +492,7 @@ const Main = ({ footer }) => {
                         <Link to="#">Support</Link>
                       </li>
                       <li>
-                        <Link to="/work">How it works</Link>
+                        <Link to="/how_it_work">How it works</Link>
                       </li>
                       <li>
                         <Link to="/terms">Terms & conditions</Link>
@@ -521,20 +509,14 @@ const Main = ({ footer }) => {
                     <h3>Let’s Try Out</h3>
                     <ul className="app_btn">
                       <li>
-                        <Link to="https://play.google.com/store/apps/details?id=com.mermsemr.myfit">
+                        <a href={process.env.REACT_APP_ANDROID_URL}>
-                          <img
+                          <img src={blueapp} alt="image" />
-                            src="assets/images/appstore_blue.png"
+                        </a>
-                            alt="image"
-                          />
-                        </Link>
                       </li>
                       <li>
-                        <Link to="https://play.google.com/store/apps/details?id=com.mermsemr.myfit">
+                        <a href={process.env.REACT_APP_IOS_URL}>
-                          <img
+                          <img src={blue} alt="image" />
-                            src="assets/images/googleplay_blue.png"
+                        </a>
-                            alt="image"
-                          />
-                        </Link>
                       </li>
                     </ul>
                   </div>
@@ -597,14 +579,14 @@ const Main = ({ footer }) => {
                     </ul>
                     <ul className="social_media">
                       <li>
-                        <Link to="#">
+                        <a href={process.env.REACT_APP_FACEBOOK}>
                           <i className="icofont-facebook"></i>
-                        </Link>
+                        </a>
                       </li>
                       <li>
-                        <Link to="#">
+                        <a href ={process.env.REACT_APP_TWITTER}>
                           <i className="icofont-twitter"></i>
-                        </Link>
+                        </a>
                       </li>
                     </ul>
                   </div>
@@ -633,7 +615,7 @@ const Main = ({ footer }) => {
                 </div>
                 <div className="col-lg-3 col-md-6 col-12">
                   <div className="links">
-                    <h3>Help & Suport</h3>
+                    <h3>Help & Support</h3>
                     <ul>
                       <li>
                         <Link to="/faq">FAQs</Link>
@@ -642,7 +624,7 @@ const Main = ({ footer }) => {
                         <Link to="#">Support</Link>
                       </li>
                       <li>
-                        <Link to="/work">How it works</Link>
+                        <Link to="/how_it_work">How it works</Link>
                       </li>
                       <li>
                         <Link to="/terms">Terms & conditions</Link>
@@ -657,21 +639,15 @@ const Main = ({ footer }) => {
                   <div className="try_out">
                     <h3>Let’s Try Out</h3>
                     <ul className="app_btn">
-                      <li>
+                     <li>
-                        <Link to="https://play.google.com/store/apps/details?id=com.mermsemr.myfit">
+                        <a href={process.env.REACT_APP_ANDROID_URL}>
-                          <img
+                          <img src={blueapp} alt="image" />
-                            src="assets/images/appstore_blue.png"
+                        </a>
-                            alt="image"
-                          />
-                        </Link>
                       </li>
                       <li>
-                        <Link to="https://play.google.com/store/apps/details?id=com.mermsemr.myfit">
+                        <a href={process.env.REACT_APP_IOS_URL}>
-                          <img
+                          <img src={blue} alt="image" />
-                            src="assets/images/googleplay_blue.png"
+                        </a>
-                            alt="image"
-                          />
-                        </Link>
                       </li>
                     </ul>
                   </div>

src/component/HomeMain/Download/Main.js

@@ -47,19 +47,18 @@ 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 orem Ipsum is simply dummy text of the printing.
+                                    <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>
-                                    and typese tting indus orem Ipsum has beenthe standard</p>
                                 </div>
                                 <ul className="app_btn">
                                 <li>
-                                    <Link to="https://play.google.com/store/apps/details?id=com.mermsemr.myfit">
+                                    <a href={process.env.REACT_APP_ANDROID_URL}>
                                     <img src={blueapp} alt="image" />
-                                    </Link>
+                                    </a>
                                 </li>
                                 <li>
-                                    <Link to="https://play.google.com/store/apps/details?id=com.mermsemr.myfit">
+                                    <a href={process.env.REACT_APP_IOS_URL}>
                                     <img src={blue} alt="image" />
-                                    </Link>
+                                    </a>
                                 </li>
                                 </ul>
                             </div>

src/component/HomeMain/Faq/Main.js

@@ -24,8 +24,7 @@ const Main = ({gredient}) => {
             <div className="container">
                 <div className="section_title" data-aos="fade-up" data-aos-duration="1500" data-aos-delay="300">
                     <h2><span>FAQ</span> - Frequently Asked Questions</h2>
-                    <p>Lorem Ipsum is simply dummy text of the printing and typese tting <br/> indus orem Ipsum has beenthe
+                    <p>Organizing all types of wellness activity you desire.<br/>Proven step to increase pleasure and commitment.</p>
-                        standard dummy.</p>
                 </div>
                 <div className="faq_panel">
                     <div className="accordion" id="accordionExample">

src/component/HomeMain/Interface/Main.js

@@ -33,9 +33,10 @@ 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>Beautifull <span>interface</span></h2>
+                    <h2>Beautiful <span>interface</span></h2>
                     <p>
-                    Lorem Ipsum is simply dummy text of the printing and typese tting <br/> indus orem Ipsum has beenthe standard dummy.
+                    myFit appends a fun yet simple process to keep you consistently<br/> motivated,engaged and moving again without any shrewdness.
+
                     </p>
                 </div>
                 <div className="screen_slider" >

src/component/HomeMain/Pricing/Main.js

@@ -41,7 +41,7 @@ const Main = ({gredient , video}) => {
                             <span className={`tog_btn ${tog && "month_active"}`} onClick = {() => setTog(tog === true ? false : true)}></span>
                         </div>
                         <span className="years">Yearly</span>
-                        <span className="offer">50% off</span>
+                        {/* <span className="offer">50% off</span> */}
                     </div>
 
                     <div className={`pricing_pannel monthly_plan ${tog ? '' : 'active'}`}>
@@ -49,10 +49,9 @@ const Main = ({gredient , video}) => {
 
                         {prices.length > 0 &&
                                 prices.map((price, index) => {
-                                    if (index % 2 == 0) {
                                         return (
                                             <div key={index} className="col-md-4">
-                                                <div className="pricing_block">
+                                                <div className={`pricing_block ${index % 2 == 0? '' : 'highlited_block'}`}>
                                                     <div className="icon">
                                                     { video ? <img src="assets/images/standard-one.png" alt="image" /> : <img src={price.icon} alt="image" /> }
                                                     </div>
@@ -62,32 +61,12 @@ const Main = ({gredient , video}) => {
                                                     </div>
                                                     <span className="price">{price.price}</span>
                                                     <ul className="benifits">
-                                                        {price.features.map((feature, index)=> <p key={index}>{feature}</p>)}
+                                                        {price.features.map((feature, index)=> <li key={index}><p>{feature}</p></li>)}
                                                     </ul>
                                                     <Link to="/" className="btn white_btn">Start Now</Link>
                                                 </div>
                                             </div>
                                         );
-                                    } else {
-                                        return (
-                                            <div key={index} className="col-md-4">
-                                                <div className="pricing_block highlited_block">
-                                                    <div className="icon">
-                                                    { video ? <img src="assets/images/standard-one.png" alt="image" /> : <img src={price.icon} alt="image" /> }
-                                                    </div>
-                                                    <div className="pkg_name">
-                                                    <h3>{price.title}</h3>
-                                                    <span>{price.text}</span>
-                                                    </div>
-                                                    <span className="price">{price.price}</span>
-                                                    <ul className="benifits">
-                                                        {price.features.map((feature, index)=> <p key={index}>{feature}</p>)}
-                                                    </ul>
-                                                    <Link to="/" className="btn white_btn">Start Now</Link>
-                                                </div>
-                                            </div>
-                                        );
-                                    }
                                 })
                             }
 
@@ -130,10 +109,9 @@ const Main = ({gredient , video}) => {
 
                         {prices.length > 0 &&
                                 prices.map((price, index) => {
-                                    if (index % 2 == 0) {
                                         return (
                                             <div key={index} className="col-md-4">
-                                                <div className="pricing_block">
+                                                <div className={`pricing_block ${index % 2 == 0? '' : 'highlited_block'}`}>
                                                     <div className="icon">
                                                     { video ? <img src="assets/images/standard-one.png" alt="image" /> : <img src={price.icon} alt="image" /> }
                                                     </div>
@@ -141,34 +119,14 @@ const Main = ({gredient , video}) => {
                                                     <h3>{price.title}</h3>
                                                     <span>{price.text}</span>
                                                     </div>
-                                                    <span className="price">{price.price}</span>
+                                                    <span className="price">{price.price_anual}</span>
                                                     <ul className="benifits">
-                                                        {price.features.map((feature, index)=> <p key={index}>{feature}</p>)}
+                                                        {price.features.map((feature, index)=> <li key={index}><p>{feature}</p></li>)}
                                                     </ul>
                                                     <Link to="/" className="btn white_btn">Start Now</Link>
                                                 </div>
                                             </div>
                                         );
-                                    } else {
-                                        return (
-                                            <div key={index} className="col-md-4">
-                                                <div className="pricing_block highlited_block">
-                                                    <div className="icon">
-                                                    { video ? <img src="assets/images/standard-one.png" alt="image" /> : <img src={price.icon} alt="image" /> }
-                                                    </div>
-                                                    <div className="pkg_name">
-                                                    <h3>{price.title}</h3>
-                                                    <span>{price.text}</span>
-                                                    </div>
-                                                    <span className="price">{price.price}</span>
-                                                    <ul className="benifits">
-                                                        {price.features.map((feature, index)=> <p key={index}>{feature}</p>)}
-                                                    </ul>
-                                                    <Link to="/" className="btn white_btn">Start Now</Link>
-                                                </div>
-                                            </div>
-                                        );
-                                    }
                                 })
                             }
 
@@ -192,7 +150,7 @@ const Main = ({gredient , video}) => {
                             <span className={`tog_btn ${tog && "month_active"}`} onClick = {() => setTog(tog === true ? false : true)}></span>
                         </div>
                         <span className="years">Yearly</span>
-                        <span className="offer">50% off</span>
+                        {/* <span className="offer">50% off</span> */}
                     </div>
 
                     <div className={`pricing_pannel monthly_plan ${tog ? '' : 'active'}`}>
@@ -200,10 +158,9 @@ const Main = ({gredient , video}) => {
 
                             {prices.length > 0 &&
                                 prices.map((price, index) => {
-                                    if (index % 2 == 0) {
                                         return (
                                             <div key={index} className="col-md-4">
-                                                <div className="pricing_block">
+                                                <div className={`pricing_block ${index % 2 == 0? '' : 'highlited_block'}`}>
                                                     <div className="icon">
                                                     { video ? <img src="assets/images/standard-one.png" alt="image" /> : <img src={price.icon} alt="image" /> }
                                                     </div>
@@ -213,33 +170,13 @@ const Main = ({gredient , video}) => {
                                                     </div>
                                                     <span className="price">{price.price}</span>
                                                     <ul className="benifits">
-                                                        {price.features.map((feature, index)=> <p key={index}>{feature}</p>)}
+                                                        {price.features.map((feature, index)=> <li key={index}><p>{feature}</p></li>)}
                                                     </ul>
                                                     <Link to="/" className="btn white_btn">Start Now</Link>
                                                 </div>
                                             </div>
                                         );
-                                    } else {
+                                   })
-                                        return (
-                                            <div key={index} className="col-md-4">
-                                                <div className="pricing_block highlited_block">
-                                                    <div className="icon">
-                                                    { video ? <img src="assets/images/standard-one.png" alt="image" /> : <img src={price.icon} alt="image" /> }
-                                                    </div>
-                                                    <div className="pkg_name">
-                                                    <h3>{price.title}</h3>
-                                                    <span>{price.text}</span>
-                                                    </div>
-                                                    <span className="price">{price.price}</span>
-                                                    <ul className="benifits">
-                                                        {price.features.map((feature, index)=> <p key={index}>{feature}</p>)}
-                                                    </ul>
-                                                    <Link to="/" className="btn white_btn">Start Now</Link>
-                                                </div>
-                                            </div>
-                                        );
-                                    }
-                                })
                             }
 
                         </div>
@@ -250,10 +187,9 @@ const Main = ({gredient , video}) => {
 
                         {prices.length > 0 &&
                                 prices.map((price, index) => {
-                                    if (index % 2 == 0) {
                                         return (
                                             <div key={index} className="col-md-4">
-                                                <div className="pricing_block">
+                                                <div className={`pricing_block ${index % 2 == 0? '' : 'highlited_block'}`}>
                                                     <div className="icon">
                                                     { video ? <img src="assets/images/standard-one.png" alt="image" /> : <img src={price.icon} alt="image" /> }
                                                     </div>
@@ -261,34 +197,14 @@ const Main = ({gredient , video}) => {
                                                     <h3>{price.title}</h3>
                                                     <span>{price.text}</span>
                                                     </div>
-                                                    <span className="price">{price.price}</span>
+                                                    <span className="price">{price.price_anual}</span>
                                                     <ul className="benifits">
-                                                        {price.features.map((feature, index)=> <p key={index}>{feature}</p>)}
+                                                        {price.features.map((feature, index)=> <li key={index}><p>{feature}</p></li>)}
                                                     </ul>
                                                     <Link to="/" className="btn white_btn">Start Now</Link>
                                                 </div>
                                             </div>
                                         );
-                                    } else {
-                                        return (
-                                            <div key={index} className="col-md-4">
-                                                <div className="pricing_block highlited_block">
-                                                    <div className="icon">
-                                                    { video ? <img src="assets/images/standard-one.png" alt="image" /> : <img src={price.icon} alt="image" /> }
-                                                    </div>
-                                                    <div className="pkg_name">
-                                                    <h3>{price.title}</h3>
-                                                    <span>{price.text}</span>
-                                                    </div>
-                                                    <span className="price">{price.price}</span>
-                                                    <ul className="benifits">
-                                                        {price.features.map((feature, index)=> <p key={index}>{feature}</p>)}
-                                                    </ul>
-                                                    <Link to="/" className="btn white_btn">Start Now</Link>
-                                                </div>
-                                            </div>
-                                        );
-                                    }
                                 })
                             }
 

src/component/HomeMain/Work/Main.js

@@ -1,8 +1,8 @@
 import React , {useState} from 'react'
 import { Link } from 'react-router-dom'
-import img from '../../../assets/images/download_app.jpg'
+import img from '../../../assets/images/download_app1.png'
-import img1 from '../../../assets/images/create_account.jpg'
+import img1 from '../../../assets/images/create_account2.png'
-import img2 from '../../../assets/images/enjoy_app.jpg'
+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'
@@ -43,7 +43,7 @@ const Main = ({dark}) => {
                             <li>
                                 <div className="step_text" data-aos="fade-left" data-aos-duration="1500">
                                 <h4>Create account</h4>
-                                <span>14 days free trial</span>
+                                <span>Free Account</span>
                                 <p>Sign up free for App account. One account for all devices.</p>
                                 </div>
                                 <div className="step_number"> 

src/component/Navbar/Main.js

@@ -134,7 +134,7 @@ const Main = ({navbar}) => {
                                 <Link smooth to="/#features" className="nav-link">Features</Link>
                             </li>
                             <li className="nav-item">
-                                <Link smooth to="/#how_it_work" className="nav-link">How it works</Link>
+                                <Link smooth to="#how_it_work" className="nav-link">How it works</Link>
                             </li>
                             <li className="nav-item" >
                                 <Link to="/blog" className="nav-link">Blog</Link>
@@ -286,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 Defoult</Link></li>
+                                    <li><Link to="/">Home Default</Link></li>
                                   
                                 </ul>
                                 </div>
@@ -359,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 Defoult</Link></li>
+                                    <li><Link to="/">Home Default</Link></li>
                                   
                                   
                                 </ul>
@@ -404,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 Defoult</Link></li>
+                                    <li><Link to="/">Home Default</Link></li>
                                   
                                   
                                 </ul>
@@ -477,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 Defoult</Link></li>
+                                    <li><Link to="/">Home Default</Link></li>
                                   
                                   
                                 </ul>
@@ -533,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 Defoult</Link></li>
+                                    <li><Link to="/">Home Default</Link></li>
                                    
                                    
                                 </ul>

src/component/Pages/Faq/Main.js

@@ -4,24 +4,25 @@ 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 SiteService from '../../../vendors/service/siteService'
 
 const Main = ({brdcum}) => {
 
-    const[activeFaq, setActiveFaq] = useState({btn0 : false})
+    // const[activeFaq, setActiveFaq] = useState({btn0 : false})
 
-    const [faqs, setFaqs] = useState([]); // initial state for FAQs before API call
+    // const [faqs, setFaqs] = useState([]); // initial state for FAQs before API call
 
-    let faqServices = new SiteService(); // instantiating the class
+    // let faqServices = new SiteService(); // instantiating the class
 
-    const allFaqData = () => {
+    // const allFaqData = () => {
-        return faqServices.faqData();
+    //     return faqServices.faqData();
-    };
+    // };
 
-    useEffect(() => {
+    // useEffect(() => {
-        allFaqData().then((data) => setFaqs(data.data));
+    //     allFaqData().then((data) => setFaqs(data.data));
-    }, []);
+    // }, []);
   return (
     <>
         {brdcum.b1 && 
@@ -64,12 +65,12 @@ const Main = ({brdcum}) => {
             bgimg={BGImg2}/>}
 
 
-        <section className="row_am faq_section">
+        {/* <section className="row_am faq_section">
             <div className="container">
                 <div className="faq_panel">
                     <div className="accordion" id="accordionExample">
 
-                        {/* <div className="card" data-aos="fade-up" >
+                        <div className="card" data-aos="fade-up" >
                             <div className="card-header" id="headingOne">
                                 <h2 className="mb-0">
                                 <button type="button" className={`btn btn-link ${activeFaq.a && "active"}`} onClick= {() => setActiveFaq(activeFaq.a ? {a : false} : {a : true})} data-toggle="collapse" data-target="#collapseOne">
@@ -84,9 +85,9 @@ const Main = ({brdcum}) => {
                                     leap into electronic typesetting, remaining essentially unchanged.</p>
                                 </div>
                             </div>
-                        </div> */}
+                        </div>
 
-                        {/* <div className="card" data-aos="fade-up" >
+                        <div className="card" data-aos="fade-up" >
                             <div className="card-header" id="headingTwo">
                                 <h2 className="mb-0">
                                 <button type="button" className={`btn btn-link collapsed ${activeFaq.b && "active"}`} onClick= {() => setActiveFaq(activeFaq.b ? {b : false} : {b : true})} data-toggle="collapse"
@@ -101,9 +102,9 @@ const Main = ({brdcum}) => {
                                     leap into electronic typesetting, remaining essentially unchanged.</p>
                                 </div>
                             </div>
-                        </div> */}
+                        </div>
 
-                        {/* <div className="card" data-aos="fade-up" >
+                        <div className="card" data-aos="fade-up" >
                             <div className="card-header" id="headingThree">
                                 <h2 className="mb-0">
                                 <button type="button" className={`btn btn-link collapsed ${activeFaq.c && "active"}`} onClick= {() => setActiveFaq(activeFaq.c ? {c : false} : {c : true})} data-toggle="collapse"
@@ -119,9 +120,9 @@ const Main = ({brdcum}) => {
                                     leap into electronic typesetting, remaining essentially unchanged.</p>
                                 </div>
                             </div>
-                        </div> */}
+                        </div>
 
-                        {/* <div className="card" data-aos="fade-up" >
+                        <div className="card" data-aos="fade-up" >
                             <div className="card-header" id="headingFour">
                                 <h2 className="mb-0">
                                 <button type="button" className={`btn btn-link collapsed ${activeFaq.d && "active"}`} onClick= {() => setActiveFaq(activeFaq.d ? {d : false} : {d : true})} data-toggle="collapse"
@@ -138,9 +139,9 @@ const Main = ({brdcum}) => {
                                     leap into electronic typesetting, remaining essentially unchanged.</p>
                                 </div>
                             </div>
-                        </div> */}
+                        </div>
 
-                        {/* <div className="card" data-aos="fade-up" >
+                        <div className="card" data-aos="fade-up" >
                             <div className="card-header" id="headingFive">
                                 <h2 className="mb-0">
                                 <button type="button" className={`btn btn-link collapsed ${activeFaq.e && "active"}`} onClick= {() => setActiveFaq(activeFaq.e ? {e : false} : {e : true})} data-toggle="collapse"
@@ -157,9 +158,9 @@ const Main = ({brdcum}) => {
                                     leap into electronic typesetting, remaining essentially unchanged.</p>
                                 </div>
                             </div>
-                        </div> */}
+                        </div>
 
-                        {/* <div className="card" data-aos="fade-up" >
+                        <div className="card" data-aos="fade-up" >
                             <div className="card-header" id="headingSix">
                                 <h2 className="mb-0">
                                 <button type="button" className={`btn btn-link collapsed ${activeFaq.f && "active"}`} onClick= {() => setActiveFaq(activeFaq.f ? {f : false} : {f : true})} data-toggle="collapse"
@@ -176,9 +177,9 @@ const Main = ({brdcum}) => {
                                     leap into electronic typesetting, remaining essentially unchanged.</p>
                                 </div>
                             </div>
-                        </div> */}
+                        </div>
 
-                        {/* <div className="card" data-aos="fade-up" >
+                        <div className="card" data-aos="fade-up" >
                             <div className="card-header" id="headingSeven">
                                 <h2 className="mb-0">
                                 <button type="button" className={`btn btn-link collapsed ${activeFaq.g && "active"}`} onClick= {() => setActiveFaq(activeFaq.g ? {g : false} : {g : true})} data-toggle="collapse"
@@ -195,37 +196,14 @@ const Main = ({brdcum}) => {
                                     leap into electronic typesetting, remaining essentially unchanged.</p>
                                 </div>
                             </div>
-                        </div> */}
-
-                    {/* displays loading ... while the page fetches the FAQs */}
-                    {faqs.length < 1 && <h3>Loading...</h3>}
-
-                    {faqs.length > 0 && faqs.map((faq, index) => {
-                        let id = `heading${index}`; //headingSeven
-                        let target = `collapse${index}`; //#collapseSeven
-
-                        return(
-                        <div key={index} className="card" data-aos="fade-up" >
-                            <div className="card-header" id={id}>
-                                <h2 className="mb-0">
-                                <button type="button" className={`btn btn-link collapsed ${activeFaq.b && "active"}`} data-toggle="collapse"
-                                    data-target={`#${target}`}>{activeFaq.b ? <i className="icon_faq icofont-minus"></i>  : <i className="icon_faq icofont-plus"></i>}{faq.title}
-                                </button>
-                                </h2>
-                            </div>
-
-                            <div id={target} className="collapse" aria-labelledby={id} data-parent="#accordionExample">
-                                <div className="card-body">
-                                    <p>{faq.text}</p>
-                                </div>
-                            </div>
                         </div>
-                        )
-                    })}
                     </div>
                 </div>
             </div>
-        </section>
+        </section> */}
+
+        <Faq />
+
         <section className="row_am free_app_section review_freeapp" id="getstarted">
             <div className="container">
                 <div className="free_app_inner aos-init" data-aos="fade-in" data-aos-duration="1500" data-aos-delay="100"> 
@@ -245,20 +223,20 @@ 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 orem Ipsum is simply dummy text of the printing.
+                                    <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>
-                                    and typese tting indus orem Ipsum has beenthe standard</p>
                                 </div>
                                 <ul className="app_btn">
-                                <li>
+                                    <li>
-                                    <Link to="#">
+                                        <a href={process.env.REACT_APP_ANDROID_URL}>
-                                    <img src="assets/images/appstore_blue.png" alt="image" />
+                                        <img src={blueapp} alt="image" />
-                                    </Link>
+                                        </a>
-                                </li>
+                                    </li>
-                                <li>
+                                    <li>
-                                    <Link to="#">
+                                        <a href={process.env.REACT_APP_IOS_URL}>
-                                    <img src="assets/images/googleplay_blue.png" alt="image" />
+                                        <img src={blue} alt="image" />
-                                    </Link>
+                                        </a>
-                                </li>
+                                    </li>
+
                                 </ul>
                             </div>
                         </div>

src/component/Pages/Review/Main.js

@@ -326,19 +326,18 @@ 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 orem Ipsum is simply dummy text of the printing.
+                                   <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>
-                                    and typese tting indus orem Ipsum has beenthe standard</p>
                                 </div>
-                                <ul className="app_btn">
+                                 <ul className="app_btn">
                                 <li>
-                                    <Link to="#">
+                                    <a href={process.env.REACT_APP_ANDROID_URL}>
-                                    <img src="assets/images/appstore_blue.png" alt="image" />
+                                    <img src={blueapp} alt="image" />
-                                    </Link>
+                                    </a>
                                 </li>
                                 <li>
-                                    <Link to="#">
+                                    <a href={process.env.REACT_APP_IOS_URL}>
-                                    <img src="assets/images/googleplay_blue.png" alt="image" />
+                                    <img src={blue} alt="image" />
-                                    </Link>
+                                    </a>
                                 </li>
                                 </ul>
                             </div>

src/component/Pricing/Main.js

@@ -1,6 +1,7 @@
 import { Link } from 'react-router-dom'
 import React , {useState ,useEffect} from 'react'
 import Pricing from '../HomeMain/Pricing/Main'
+import Faq from '../HomeMain/Faq/Main'
 import Bredcrumb from '../Bredcrumb/Main'
 import BGImg from "../../assets/images/bread_crumb_bg.png"
 import BGImg1 from "../../assets/images/bread_crumb_bg_one.png"
@@ -53,7 +54,8 @@ const Main = ({brdcum}) => {
         bgimg={BGImg2}/>}
 
         <Pricing/>
-        <section className="row_am faq_section">
+        <Faq />
+        {/* <section className="row_am faq_section">
             <div className="container">
                 <div className="faq_panel">
                     <div className="accordion" id="accordionExample">
@@ -187,7 +189,7 @@ const Main = ({brdcum}) => {
             </div>
             </div>
         </div>
-        </section>
+        </section> */}
         <section className="row_am free_app_section review_freeapp" id="getstarted">
             <div className="container">
                 <div className="free_app_inner aos-init" data-aos="fade-in" data-aos-duration="1500" data-aos-delay="100"> 
@@ -207,20 +209,20 @@ 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 orem Ipsum is simply dummy text of the printing.
+                                   <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>
-                                    and typese tting indus orem Ipsum has beenthe standard</p>
                                 </div>
                                 <ul className="app_btn">
-                                <li>
+                                     <li>
-                                    <Link to="#">
+                                        <a href={process.env.REACT_APP_ANDROID_URL}>
-                                    <img src="assets/images/appstore_blue.png" alt="image" />
+                                        <img src={blueapp} alt="image" />
-                                    </Link>
+                                        </a>
-                                </li>
+                                    </li>
-                                <li>
+                                    <li>
-                                    <Link to="#">
+                                        <a href={process.env.REACT_APP_IOS_URL}>
-                                    <img src="assets/images/googleplay_blue.png" alt="image" />
+                                        <img src={blue} alt="image" />
-                                    </Link>
+                                        </a>
-                                </li>
+                                    </li>
+
                                 </ul>
                             </div>
                         </div>

src/routes/index.js

@@ -3,6 +3,7 @@ import { Route, Routes, useLocation } from "react-router-dom";
 import Navbar from "../component/Navbar/Main";
 import Footer from "../component/Footer/Main";
 import Home from "../component/Home/Main";
+import Work from "../component/HomeMain/Work/Main"
 import AboutUs from "../component/AboutUs/Main";
 import Review from "../component/Pages/Review/Main";
 import Contact from "../component/Contact/Main";
@@ -13,6 +14,7 @@ import Pricing from "../component/Pricing/Main";
 import Blog from "../component/Blog/Blog/Main";
 import BlogSingle from "../component/Blog/BlogSingle/Main";
 
+
 import Terms from "../component/Terms/Main";
 import Privacy from "../component/Privacy/Main";
 
@@ -84,9 +86,11 @@ const Routing = () => {
         <Route path="/sign-up" element={<SignUp />} />
         <Route path="/pricing" element={<Pricing brdcum={brdcum} />} />
         <Route path="/blog" element={<Blog brdcum={brdcum} />} />
-        <Route path="/blog-single" 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} />} />
+        <Route path="/how_it_work" element={<Work brdcum={brdcum} />} />
+
       </Routes>
       {footerpage && <Footer footer={footer} />}
     </>

src/vendors/service/siteService.js

@@ -6,8 +6,8 @@ class SiteService {
     console.log("Er are here anyway");
   }
   // Blog Data {Get}
-  blogData() {
+  blogData(id) {
-    return this.getAuxEnd("blogdata", null);
+    return this.getAuxEnd("/blogdata", null);
   }
 
   // Country Data {GET}