About page main image fixed

.env

@@ -6,7 +6,8 @@ REACT_APP_ANDROID_URL="https://play.google.com/store/apps/details?id=com.mermsem
 REACT_APP_IOS_URL="https://play.google.com/store/apps/details?id=com.mermsemr.myfit"
 
 
-REACT_APP_APPSITE=" https://mermsemr.com"
+REACT_APP_APPSITE="https://dev142.users.myfit.mermsemr.com/login"
+# " https://mermsemr.com"
 #REACT_APP_APPSITE="http://localhost:7012"
 
 # Social Media Links

package-lock.json

@@ -12,6 +12,7 @@
         "@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",
@@ -4998,6 +4999,14 @@
         "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",
@@ -20670,6 +20679,14 @@
       "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",

src/assets/css/style.css

@@ -1181,6 +1181,10 @@ 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 {
@@ -2693,7 +2697,11 @@ header.fix_style.white_header {
 }
 
 .app_solution_section .app_images ul li img {
-  max-width: 100%;
+  max-width: 98%;
+  padding: 1%;
+  border-radius: 15px;
+  box-shadow: 0px 0px 30px #c1dec9;
+  filter: grayscale(40%);
 }
 
 .app_solution_section .app_images li:first-child {
@@ -2768,6 +2776,17 @@ 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---------- */
 
@@ -3601,11 +3620,11 @@ header.fix_style.white_header {
   display: flex;
   flex-direction: column;
   align-content: center;
-  justify-content: center;
+  justify-items: center;
   gap: 10px;
 }
 
-.contact_body {
+/* .contact_body {
   display: flex;
   flex-direction: column;
   align-content: center;
@@ -3614,24 +3633,25 @@ header.fix_style.white_header {
   font-size: 20px;
   font-weight: 800;
   text-align: center;
-}
+} */
 
 /* Animations */
-.animate.pop {
+.animate-image {
   animation-name: animate-pop;
-  animation-timing-function: cubic-bezier(0.26, 0.53, 0.74, 1.48);
-  animation-duration: 0.5s;
+  animation-timing-function: linear;
+  animation-duration: 1s;
+  animation-fill-mode: forwards;
 }
 
 @keyframes animate-pop {
   0% {
     opacity: 0;
-    transform: scale(0.5, 0.5);
+    transform: scale(0.5);
   }
 
   100% {
     opacity: 1;
-    transform: scale(1, 1);
+    transform: scale(1);
   }
 }
 

src/component/AboutUs/Main.js

@@ -6,19 +6,30 @@ 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 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.'
+    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 (
     <>       
@@ -79,12 +90,12 @@ const Main = ({brdcum}) => {
                     <div className="col-lg-6">
                         <div className="app_images" data-aos="fade-in" data-aos-duration="1500">
                         <ul>
-                            <li><img src="assets/images/abt_01.png" alt="" /></li>
+                            <li><img src={About1} alt="health monitor gadget" /></li>
                             <li>
                             <a data-url="#" onClick = {() => setytShow(true)}  className="popup-youtube play-button"
                                 data-toggle="modal"
                                 data-target="#myModal" title="About Video">
-                                <img src="assets/images/abt_02.png" alt="" />
+                                <img src={About2} alt="" />
                                 <div className="waves-block">
                                 <div className="waves wave-1"></div>
                                 <div className="waves wave-2"></div>
@@ -93,7 +104,8 @@ 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="assets/images/abt_03.png" alt="" /></li> */}
+                            <li><img src={About3} alt="" /></li>
                         </ul>
                         </div>
                     </div>
@@ -115,9 +127,7 @@ const Main = ({brdcum}) => {
                         </div> */}
                         <div className="text">
                         <h3>{whyWeAreDiff.title1}</h3>
-                        <p>Lorem Ipsum is simply dummy text of the printing and type
-                            setting indus ideas.
-                        </p>
+                        <p> {whyWeAreDiff.secureDesc}</p>
                         </div>
                     </div>
                     </div>
@@ -128,7 +138,7 @@ const Main = ({brdcum}) => {
                         </div> */}
                         <div className="text">
                         <h3>{whyWeAreDiff.title2}</h3>
-                        <p>Simply dummy text of the printing and typesetting indus lorem Ipsum is dummy.</p>
+                         <p>{whyWeAreDiff.richFeaturesDesc}</p>
                         </div>
                     </div>
                     </div>
@@ -139,9 +149,7 @@ const Main = ({brdcum}) => {
                         </div> */}
                         <div className="text">
                         <h3>{whyWeAreDiff.title3}</h3>
-                        <p>Lorem Ipsum is simply dummy text of the printing and type
-                            setting indus ideas.
-                        </p>
+                         <p>{whyWeAreDiff.easeOfUseDesc}</p>
                         </div>
                     </div>
                     </div>
@@ -152,7 +160,7 @@ const Main = ({brdcum}) => {
                         </div> */}
                         <div className="text">
                         <h3>{whyWeAreDiff.title4}</h3>
-                        <p>Simply dummy text of the printing and typesetting indus lorem Ipsum is dummy.</p>
+                        <p>{whyWeAreDiff.supportDesc}</p>
                         </div>
                     </div>
                     </div>
@@ -165,7 +173,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="assets/images/about_main.png" alt="image"/>
+                            <img src={AboutMainImg} alt="image"/>
                         </div>
                     </div>
                     <div className="col-lg-6">
@@ -173,45 +181,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>
-                            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>
+                            
+                            <p>{innovativeDesc}</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> */}
                             <div className="text">
-                                <p><span className="counter-value" data-count="17">0</span><span>M+</span></p>
-                                <p>Download</p>
+                                <h3>Manage</h3>
+                                <p>health plan</p>
                             </div>
+                            
                             </li>
                             <li>
-                            <div className="icon">
+                            {/* <div className="icon">
                                 <img src="assets/images/followers.png" alt="image" />
-                            </div>
+                            </div> */}
                             <div className="text">
-                                <p><span className="counter-value" data-count="08">0 </span><span>M+</span></p>
-                                <p>Followers</p>
+                                <h3>Health Record</h3>
+                                <p>with you</p>
                             </div>
                             </li>
                             <li>
-                            <div className="icon">
+                            {/* <div className="icon">
                                 <img src="assets/images/reviews.png" alt="image" />
-                            </div>
+                            </div> */}
                             <div className="text">
-                                <p><span className="counter-value" data-count="2300">1500</span><span>+</span></p>
-                                <p>Reviews</p>
+                                <h3>Health</h3>
+                                <p>reminders</p>
                             </div>
                             </li>
                             <li>
-                            <div className="icon">
+                            {/* <div className="icon">
                                 <img src="assets/images/countries.png" alt="image" />
-                            </div>
+                            </div> */}
                             <div className="text">
-                                <p><span className="counter-value" data-count="150">0</span><span>+</span></p>
-                                <p>Countries</p>
+                                <h3>Quick</h3>
+                                <p>Schedule</p>
                             </div>
                             </li>
                         </ul>
@@ -229,8 +237,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 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>
+                        <h2>Have any questions about ?</h2>
+                        <p>{queryDesc}</p>
                     </div>
                     <Link to="/contact" className="btn white_btn">CONTACT US NOW</Link>
                 </div>

src/component/Blog/Blog/Main.js

@@ -1,75 +1,45 @@
-/** @format */
-
 import React, { useEffect, useState } from "react";
 import { Link } from "react-router-dom";
 import BGImg from "../../../assets/images/bread_crumb_bg.png";
 import SiteService from "../../../vendors/service/siteService";
-
 const Main = ({ brdcum, bgimg }) => {
   const [blogData, setBlogData] = useState([]);
+  console.log(blogData);
 
-  let api = new SiteService();
+  const api = new SiteService();
   useEffect(() => {
-    getBlogData();
-  }, []);
+    if(blogData.length===0){getBlogData()};
+  }, [blogData]);
 
   const getBlogData = async () => {
-    /* 
-        The reason for this, is because of the breaking I had when building the blog
-        I decided to save to the local storage for an hour so that it won't need to be going to the server again but I can change this
-    */
-    // Saving it locally to avoid interfering with server
-    if (localStorage.getItem("myFit--blogData") == null) {
-      try {
-        let res = await api.blogData();
+    try {
+      const res = await api.blogData();
 
-        // Set the blog data to local storage
-        localStorage.setItem("myFit--blogData", JSON.stringify(res.data));
-        setBlogData(res.data);
-        // Set a time out for the blog data to be deleted from local storage
-        setTimeout(() => {
-          localStorage.removeItem("myFit--blogData");
-        }, 3600);
-      } catch (error) {
-        console.log("Error from blog data ", error);
-      }
-    } else {
-      try {
-        let data = JSON.parse(localStorage.getItem("myFit--blogData"));
-        setBlogData(data);
-      } catch (error) {
-        console.error("Error parsing JSON data: ", error);
-      }
+      setBlogData(res.data);
+
+      // console.log(res.data);
+
+      
+    } catch (error) {
+      console.log("Error from blog data ", error);
     }
   };
   
-
   return (
     <>
-      <div
-        className="bred_crumb"
-        style={{ backgroundImage: `url(${BGImg})` }}>
+      <div className="bred_crumb" style={{ backgroundImage: `url(${BGImg})` }}>
         <div className="container">
           <span className="banner_shape1">
             {" "}
-            <img
-              src="assets/images/banner-shape1.png"
-              alt="image"
-            />{" "}
+            <img src="assets/images/banner-shape1.png" alt="image" />{" "}
           </span>
           <span className="banner_shape2">
             {" "}
-            <img
-              src="assets/images/banner-shape2.png"
-              alt="image"
-            />{" "}
+            <img src="assets/images/banner-shape2.png" alt="image" />{" "}
           </span>
           <span className="banner_shape3">
             {" "}
-            <img
-              src="assets/images/banner-shape3.png"
-              alt="image"
-            />{" "}
+            <img src="assets/images/banner-shape3.png" alt="image" />{" "}
           </span>
 
           <div className="bred_text">
@@ -82,122 +52,97 @@ const Main = ({ brdcum, bgimg }) => {
                 <span>»</span>
               </li>
               <li>
-                <Link to="/blog">
-                  {blogData.map((item, idx) => {
-                    if (idx === 0) {
-                      return <span>{item.post_title}</span>;
-                    }
-                  })}
-                </Link>
+                <Link to="/blog">Blog</Link>
               </li>
             </ul>
+            {/* <div className="search_bar">
+                    <form action="">
+                        <div className="form-group">
+                            <input type="text" placeholder="Search here" className="form-control"/>
+                            <button className="btn" type="submit"><i className="icofont-search-1"></i></button>
+                        </div>
+                    </form>
+        </div>*/}
           </div>
         </div>
       </div>
 
       <section className="row_am blog_list_main">
-        {blogData.length < 1 && (
-          <div
-            className="loader loader-sm"
-            id="loader-1"></div>
-        )}
-        {blogData.map((data, index) => {
-          if (index == 0) {
+        {blogData.map((data,index) => {
+          if (index === 0){
             return (
-              <div
-                className="container"
-                key={data.id}>
-                <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>{new Date(data.post_date).toDateString()}</span>
-                    </div>
+              <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> */}
+    
+                    <span>{new Date (data.post_date).toDateString()}</span>
                   </div>
-                  <div className="col-lg-6">
-                    <div className="blog_text">
-                      <div className="section_title">
-                        <h2>{data.post_title}</h2>
-                        <div
-                          dangerouslySetInnerHTML={{
-                            __html:
-                              data.post_content.substring(0, 400) + "  . . .",
-                          }}></div>
-                        {/* Change the route name */}
-                        <Link
-                          to={`/blogdetails/${data.id}`}
-                          state={{ data }}>
+                </div>
+                <div className="col-lg-6">
+                  <div className="blog_text">
+                    <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}}>
                           READ MORE
-                        </Link>
-                      </div>
+                        </Link> */}
+                        <Link to={`/blogdetails/${data.id}`} state={{data, allData: blogData}}>
+                      READ MORE
+                    </Link>
                     </div>
                   </div>
                 </div>
               </div>
-            );
-          }
-        })}
-      </section>
+            </div>
 
-      <section
-        className="row_am latest_story blog_list_story"
-        id="blog">
+            )
+          }          
+        })}
+       
+       
+      </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) {
+              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>
-                        {/* Change the route name */}
-                        <Link
-                          to={`/blogdetails/${data.id}`}
-                          state={{ data }}>
-                          READ MORE
-                        </Link>
-                      </div>
-                    </div>
+                  <div key={data.id} className="col-md-4">
+                <div className="story_box">
+                  <div className="story_img">
+                    <img src={data.meta_value} alt="image" />
+                    <span>{new Date (data && data.post_date).toDateString()}</span>
                   </div>
-                );
-              }
-            })}
-          </div>
+                  <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}}>
+                      READ MORE
+                    </Link>
+                  </div>
+                </div>
+              </div>
 
+                )}
+
+              
+              })}
+          </div>
           <div className="pagination_block">
             <ul>
               <li>
-                <Link
-                  to={process.env.REACT_APP_BLOGSITE}
-                  className="prev">
+                <Link to={process.env.REACT_APP_BLOGSITE}
+                 className="prev">
                   {" "}
                   Visit our blog
                 </Link>

src/component/Blog/BlogSingle/Main.js

@@ -1,201 +1,299 @@
-/** @format */
-
 import React, { useEffect, useState } from "react";
-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 { 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 location = useLocation();
-  let data = location.state?.data;
-  const [blogData, setBlogData] = useState([]);
 
-  let api_call = new 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 () => {
-    /* 
-        The reason for this, is because of the breaking I had when building the blog
-        I decided to save to the local storage for an hour so that it won't need to be going to the server again but I can change this
-    */
-    // Saving it locally to avoid interfering with server
-    if (localStorage.getItem("myFit--blogData") == null) {
-      try {
-        let res = await api_call.blogData();
-
-        // Set the blog data to local storage
-        localStorage.setItem("myFit--blogData", JSON.stringify(res.data));
-        setBlogData(res.data);
-        // Set a time out for the blog data to be deleted from local storage
-        setTimeout(() => {
-          localStorage.removeItem("myFit--blogData");
-        }, 3600);
-      } catch (error) {
-        console.log("Error from blog data ", error);
-      }
-    } else {
-      try {
-        let data = JSON.parse(localStorage.getItem("myFit--blogData"));
-        setBlogData(data);
-      } catch (error) {
-        console.error("Error parsing JSON data: ", error);
-      }
+    try {
+      const res = await api.blogData();
+      setBlogData(res.data);
+      
+    } catch (error) {
+      console.log("Error from blog data ", error);
     }
   };
-
+        
   return (
     <>
-      {brdcum.b1 && (
-        <Bredcrumb
-          no={1}
-          title="Blog details"
-          tag={data && data.post_title}
-          bgimg={BGImg}
-        />
-      )}
+        
+        {brdcum.b1 && 
+        <Bredcrumb 
+        no={1}
+        title="Blog details" 
+        tag="Blog single" 
+        bgimg={BGImg}/>}
 
-      {brdcum.b2 && (
-        <Bredcrumb
-          no={2}
-          title="Blog details"
-          tag={data && data.post_title}
-          bgimg={BGImg1}
-        />
-      )}
+        {brdcum.b2 && 
+        <Bredcrumb 
+        no={2}
+        title="Blog details" 
+        tag="Blog single" 
+        bgimg={BGImg1}/>}
 
-      {brdcum.b5 && (
-        <Bredcrumb
-          no={5}
-          title="Blog details"
-          tag={data && data.post_title}
-          bgimg={BGImg}
-        />
-      )}
+        {brdcum.b5 && 
+        <Bredcrumb 
+        no={5}
+        title="Blog details" 
+        tag="Blog single" 
+        bgimg={BGImg}/>}
 
-      {brdcum.b3 && (
-        <Bredcrumb
-          no={3}
-          title="Blog details"
-          tag={data && data.post_title}
-        />
-      )}
+        {brdcum.b3 && 
+        <Bredcrumb 
+        no={3}
+        title="Blog details" 
+        tag="Blog single" />}
 
-      {brdcum.b4 && (
-        <Bredcrumb
-          no={4}
-          title="Blog details"
-          tag={data && data.post_title}
-          bgimg={BGImg2}
-        />
-      )}
+        {brdcum.b4 && 
+        <Bredcrumb 
+        no={4}
+        title="Blog details" 
+        tag="Blog single" 
+        bgimg={BGImg2}/>}
 
-      <section className="blog_detail_section">
-        <div className="container">
-          <div className="blog_inner_pannel">
-            <span className="blog_date">
-              {new Date(data && data.post_modified).toDateString()}
-            </span>
+        <section className="blog_detail_section">
+            <div className="container">
+                <div className="blog_inner_pannel">
+                    <div className="review">
+                        <span>Review</span>
+                        {/* <span>45 min ago</span> */}
+                        <span>{new Date (data && data.post_modified).toDateString()}</span>
 
-            <div className="section_title">
-              <h2>{data && data.post_title}</h2>
-            </div>
-            <div className="main_img">
-              <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>
+                    <div className="section_title">
+                        <h2>{data && data.post_title}</h2>
+                    </div>
+                    <div className="main_img">
+                        <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="blog_authore">
-              <div className="authore_info">
-                <div className="text">
-                  {/* <h3>{data && data.post_author}</h3> */}
-                  <span>{new Date(data && data.post_date).toDateString()}</span>
+                   
+                    <div className="blog_authore">
+                        <div className="authore_info">
+                            {/* <div className="avtar">
+                                <img src="assets/images/blog_d02.png" alt="image" />
+                            </div> */}
+                            <div className="text">
+                                <h3>{data && data.post_author}</h3>
+                                <span>{new Date (data && data.post_date).toDateString()}</span>
+                            </div>
+                        </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>
+                            </ul>
+                        </div>
+                    </div>
+                    <div className="blog_tags">
+                        <a href={process.env.REACT_APP_BLOGSITE}>Visit Blog Site </a>
+                    </div>
+                </div>
+            </div>
+        </section>
+
+        {/* <section className="row_am comment_section">
+            <div className="container">
+                <div className="section_title">
+                    <h2>3 Comments</h2>
                 </div>
-              </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>
+                        <div className="authore_info">
+                        <div className="avtar">
+                            <img src="assets/images/blog_d01.png" alt="image" />
+                        </div>
+                        <div className="text">
+                            <span>30 min ago</span>
+                            <h4>Dolly Shell</h4>
+                        </div>
+                        </div>
+                        <div className="comment">
+                        <p>Lorem Ipsum is simply dummy text of the printing and typesetting in dustry lorem Ipsum has been the in
+                            dustrys 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. </p>
+                        </div>
+                    </li>
+                    <li className="replay_comment">
+                        <div className="authore_info">
+                        <div className="avtar">
+                            <img src="assets/images/blog_d02.png" alt="image" />
+                        </div>
+                        <div className="text">
+                            <span>15 min ago</span>
+                            <h4>Devil Joe</h4>
+                        </div>
+                        </div>
+                        <div className="comment">
+                        <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 when.</p>
+                        </div>
+                    </li>
+                    <li>
+                        <div className="authore_info">
+                        <div className="avtar">
+                            <img src="assets/images/blog_d03.png" alt="image" />
+                        </div>
+                        <div className="text">
+                            <span>2 days ago</span>
+                            <h4>Sherly Shie</h4>
+                        </div>
+                        </div>
+                        <div className="comment">
+                        <p>Lorem Ipsum is simply dummy text of the printing and typesetting in dustry lorem Ipsum has been the in
+                            dustrys 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. </p>
+                        </div>
+                    </li>
                 </ul>
-              </div>
             </div>
-            <div className="blog_tags">
-              <a href={process.env.REACT_APP_BLOGSITE}>Visit Blog Site </a>
-            </div>
-          </div>
-        </div>
-      </section>
+        </section>
 
-      <section
-        className="row_am latest_story"
-        id="blog">
-        <div className="container">
-          {/* Latest Title */}
-          <div
-            className="section_title"
-            data-aos="fade-in"
-            data-aos-duration="1500"
-            data-aos-delay="100">
-            <h2>
-              Read latest <span>story</span>
-            </h2>
-            <br />
-          </div>
-          {/* Body */}
-          <div className="row">
-            {blogData.slice(-4, -1).map((item, 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={item.meta_value}
-                      alt="image"
-                    />
-                    <span>{new Date(item.post_date).toDateString()}</span>
-                  </div>
-                  <div className="story_text">
-                    <h3>{item.post_title}</h3>
-                    <div
-                      dangerouslySetInnerHTML={{
-                        __html: item.post_content.substring(0, 100) + "  . . .",
-                      }}></div>
-                    <a href={`/blogdetails/${item.id}`}>READ MORE</a>
-                    {/* <Link to={`/blogdetails/${item.id}`}>READ MORE</Link> */}
-                  </div>
+        <section className="row_am comment_form_section">
+            <div className="container">
+                <div className="section_title">
+                    <h2>Leave a <span>comment</span></h2>
+                    <p>Your email address will not be published. Required fields are marked *</p>
                 </div>
-              </div>
-            ))}
-          </div>
-        </div>
-      </section>
-    </>
-  );
-};
+                <form action="">
+                    <div className="row">
+                        <div className="col-md-6">
+                        <div className="form-group">
+                            <input type="text" className="form-control" placeholder="Name *" />
+                        </div>
+                        </div>
+                        <div className="col-md-6">
+                        <div className="form-group">
+                            <input type="email" className="form-control" placeholder="Email *" />
+                        </div>
+                        </div>
+                        <div className="col-md-6">
+                        <div className="form-group">
+                            <input type="text" className="form-control" placeholder="Phone" />
+                        </div>
+                        </div>
+                        <div className="col-md-6">
+                        <div className="form-group">
+                            <input type="text" className="form-control" placeholder="Website  " />
+                        </div>
+                        </div>
+                        <div className="col-md-12">
+                        <div className="form-group">
+                            <textarea className="form-control" placeholder="Comments"></textarea>
+                        </div>
+                        </div>
+                        <div className="col-md-12 text-center">
+                        <button className="btn puprple_btn" type="submit">POST COMMENTS</button>
+                        </div>
+                    </div>
+                </form>
+            </div>
+        </section> */}
 
-export default Main;
+        <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">
+
+                 {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="story_box" data-aos="fade-up" data-aos-duration="1500">
+                            <div className="story_img">
+                            <img src="assets/images/story02.png" 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="#">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/story03.png" 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="#">READ MORE</Link>
+                            </div>
+                        </div>
+                    </div> */}
+                </div>
+            </div>
+        </section>
+    </>
+  )
+}
+
+export default Main

src/component/Bredcrumb/Main.js

@@ -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="/about">{tag}</Link></li>
+                            <li><Link to="#">{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="/about">{tag}</Link></li>
+                            <li><Link to="#">{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="/about">{tag}</Link></li>
+                            <li><Link to="#">{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="/about">{tag}</Link></li>
+                            <li><Link to="#">{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="/about">{tag}</Link></li>
+                            <li><Link to="#">{tag}</Link></li>
                         </ul>
                     </div>
                 </div>

src/component/Contact/Main.js

@@ -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/experts_01.png"
+import SuccessImg from "../../assets/images/confirmed-letter.jpg"
 
 import SiteService from "../../vendors/service/siteService";
 
@@ -51,10 +51,11 @@ 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: "",
@@ -64,7 +65,9 @@ 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
@@ -92,36 +95,30 @@ const Main = ({ brdcum }) => {
         setMyData(contact);
 
         // Checking for errors
-        if (contact?.data?.status < 1 || contact?.data?.message_id == "")
-          return (errText.textContent =
-            "unable to send your message, please try able");
-        else {
+        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 {
           response.innerHTML = `<p> SEND MESSAGE </p>`;
 
-          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>`;
+          setShowSuccessfulImage(true) // sets show success image to true
+
           setTimeout(() => {
             navigate("/");
           }, 10000);
-
-          setValues((prev) => ({ ...prev, [e.target.name]: "" }));
         }
       })
-      .catch((error) => {
-        console.log(error);
+      .catch(() => {
+        errText.textContent = "unable to send your message, please try again";
+        response.innerHTML = `<p> SEND MESSAGE </p>`;
       });
   };
 
   //CALLS THE API AFTER COMPONENT LOADS
   useEffect(() => {
-    allCountry().then((data) => setCountries(Object.values(data.data)));
+    allCountry().then((data) => setCountries(Object.entries(data.data))).catch((err)=>console.log(err.message));
   }, []);
 
-  useEffect(() => {
-    myData
-  }, [myData]);
 
   return (
     <>
@@ -179,110 +176,114 @@ const Main = ({ brdcum }) => {
         id="contact">
         <div className="container">
           <div className="contact_inner">
-            <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 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>
 
-                <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!'
+                {/* 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}
                     onChange={onChange}
-                    maxLength={300}
-                    pattern="^[A-Za-z0-9]{5, 300}$"
+                    pattern="^\w+( \w+)$"
                   />
-                </div>
-                <div className="form-group term_check">
-                  <input
-                    type="checkbox"
-                    id="term"
+
+                  <FormInput
+                    name="email"
+                    type="email"
+                    placeholder="Email"
+                    errorMessage="It should be a valid email address!"
+                    required={true}
+                    maxLenght={35}
+                    value={values.email}
                     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" />
+
+                  <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>
+                </>
+              )}
             </div>
 
             {/* Contact Info */}
@@ -354,7 +355,9 @@ const Main = ({ brdcum }) => {
         </div>
       </section>
       <section className="row_am map_section">
-        <div className="container" />
+        <div className="container">
+
+        </div>
       </section>
     </>
   );

src/component/Footer/Main.js

@@ -1,4 +1,5 @@
 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";
@@ -78,7 +79,9 @@ const Main = ({ footer }) => {
                     <h3>Useful Links</h3>
                     <ul>
                       <li>
-                        <Link to="/">Home</Link>
+                        {/* <Link to="/">Home</Link> */}
+                        <HashLink to="/#">Home</HashLink>
+
                       </li>
                       <li>
                         <Link to="/about">About us</Link>
@@ -100,7 +103,7 @@ const Main = ({ footer }) => {
                         <Link to="/faq">FAQs</Link>
                       </li>
                       <li>
-                        <Link to="/how_it_work">How it works</Link>
+                        <HashLink to="/#how_it_work">How it works</HashLink>
                       </li>
                       <li>
                         <Link to="/terms">Terms & conditions</Link>
@@ -237,7 +240,7 @@ const Main = ({ footer }) => {
                         <Link to="/faq">FAQs</Link>
                       </li>
                       <li>
-                       <Link to="/how_it_work">How it works</Link>
+                        <HashLink to="/#how_it_work">How it works</HashLink>
                       </li>
                       <li>
                         <Link to="/terms">Terms & conditions</Link>
@@ -367,7 +370,7 @@ const Main = ({ footer }) => {
                         <Link to="#">Support</Link>
                       </li>
                       <li>
-                        <Link to="/how_it_work">How it works</Link>
+                         <HashLink to="/#how_it_work">How it works</HashLink>
                       </li>
                       <li>
                         <Link to="/terms">Terms & conditions</Link>
@@ -492,7 +495,7 @@ const Main = ({ footer }) => {
                         <Link to="#">Support</Link>
                       </li>
                       <li>
-                        <Link to="/how_it_work">How it works</Link>
+                          <HashLink to="/#how_it_work">How it works</HashLink>
                       </li>
                       <li>
                         <Link to="/terms">Terms & conditions</Link>
@@ -624,7 +627,7 @@ const Main = ({ footer }) => {
                         <Link to="#">Support</Link>
                       </li>
                       <li>
-                        <Link to="/how_it_work">How it works</Link>
+                         <HashLink to="/#how_it_work">How it works</HashLink>
                       </li>
                       <li>
                         <Link to="/terms">Terms & conditions</Link>

src/component/HomeMain/Pricing/Main.js

@@ -8,11 +8,13 @@ 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 = () => {
@@ -20,7 +22,9 @@ const Main = ({gredient , video}) => {
     };
 
     useEffect(() => {
-        getAllPriceData().then((data) => setPrices(data.data));
+        getAllPriceData().then((data) => {
+            setPricingtext02(data.data.pricing_text_02);
+            setPrices(data.data.pricing) });
         AOS.init();
         AOS.refresh();
     }, []);
@@ -31,9 +35,13 @@ 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>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>
+                    <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>
                     </div>
                     <div className="toggle_block" data-aos="fade-up" data-aos-duration="1500">
                         <span className={`month ${tog ? 'active' : ''}`}>Monthly</span>
@@ -140,9 +148,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>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>
+                    <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>
                     </div>
                     <div className="toggle_block" data-aos="fade-up" data-aos-duration="1500">
                         <span className={`month ${tog ? 'active' : ''}`}>Monthly</span>

src/component/HomeMain/Story/Main.js

@@ -32,7 +32,8 @@ const Main = () => {
                     <h2>Read latest <span>story</span></h2>
                 </div>
                 <div className="row">
-                {blogData.slice(1, 4).map((item, index) => (
+                  
+                {blogData.slice(1, 4).map((data, index) => (
               <div
                 className="col-md-4"
                 key={index}>
@@ -42,18 +43,21 @@ const Main = () => {
                   data-aos-duration="1500">
                   <div className="story_img">
                     <img
-                      src={item.meta_value}
+                      src={data.meta_value}
                       alt="image"
                     />
-                    <span>{new Date(item.post_date).toDateString()}</span>
+                    <span>{new Date(data.post_date).toDateString()}</span>
                   </div>
                   <div className="story_text">
-                    <h3>{item.post_title}</h3>
+                    <h3>{data.post_title}</h3>
                     <div
                       dangerouslySetInnerHTML={{
-                        __html: item.post_content.substring(0, 100) + "  . . .",
+                        __html: data.post_content.substring(0, 100) + "  . . .",
                       }}></div>
-                    <Link to={`/blogdetails/${item.id}`}>READ MORE</Link>
+                      <Link to={`/blogdetails/${data.id}`} state={{data, allData: blogData}}>
+                                 READ MORE
+                            </Link>
+                    {/* <Link to={`/blogdetails/${item.id}`}>READ MORE</Link> */}
                   </div>
                 </div>
               </div>

src/component/HomeMain/Work/Main.js

@@ -1,14 +1,15 @@
 import React , {useState} from 'react'
 import { Link } from 'react-router-dom'
-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 img from '../../../assets/images/appdownload.png'
+// import img1 from '../../../assets/images/create_account2.png'
+import img2 from '../../../assets/images/download_app1.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)
@@ -28,8 +29,8 @@ const Main = ({dark}) => {
                                 <div className="step_text" data-aos="fade-right" data-aos-duration="1500">
                                 <h4>Download app</h4>
                                 <div className="app_icon">
-                                    <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>
+                                    <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>
                                 </div>
                                 <p>Download App either for Mac or Android</p>
                                 </div>
@@ -50,7 +51,7 @@ const Main = ({dark}) => {
                                 <h3>02</h3>
                                 </div>
                                 <div className="step_img" data-aos="fade-right" data-aos-duration="1500">
-                                <img src={img1} alt="image" />
+                                <img className="create-account-logo" src={createAccount} alt="create account logo"/>
                                 </div>
                             </li>
                             <li>

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>
@@ -143,7 +143,8 @@ const Main = ({navbar}) => {
                                 <Link to="/contact" className="nav-link" >Contact</Link>
                             </li>
                             <li className="nav-item">
-                                <Link to="/" className="nav-link dark_btn">GET STARTED</Link>
+                                 <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> */}
                             </li>
 
                         </div >
@@ -211,7 +212,8 @@ const Main = ({navbar}) => {
                                     <Link to="/contact" className="nav-link" >Contact</Link>
                                 </li>
                                 <li className="nav-item">
-                                    <Link to="/contact" className="nav-link dark_btn">GET STARTED</Link>
+                                    <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> */}
                                 </li>
                             </ul>
                         </div>
@@ -275,7 +277,8 @@ const Main = ({navbar}) => {
                                 <Link to="/contact" className="nav-link" >Contact</Link>
                             </li>
                             <li className="nav-item">
-                                <Link to="/contact" className="nav-link dark_btn">GET STARTED</Link>
+                                <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> */}
                             </li>
                         </ul>
                     </div>
@@ -330,7 +333,8 @@ const Main = ({navbar}) => {
                                 <Link to="/contact" className="nav-link" >Contact</Link>
                             </li>
                             <li className="nav-item">
-                                <Link to="/contact" className="nav-link dark_btn">GET STARTED</Link>
+                                <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> */}
                             </li>
                         </ul>
                     </div>
@@ -393,7 +397,8 @@ const Main = ({navbar}) => {
                                 <Link smooth to="#contact" className="nav-link" >Contact</Link>
                             </li>
                             <li className="nav-item">
-                                <Link to="/contact" className="nav-link dark_btn">GET STARTED</Link>
+                                <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> */}
                             </li>
                         </ul>
                     </div>
@@ -449,7 +454,8 @@ const Main = ({navbar}) => {
                                 <Link to="/contact" className="nav-link" >Contact</Link>
                             </li>
                             <li className="nav-item">
-                                <Link to="/contact" className="nav-link dark_btn">GET STARTED</Link>
+                                <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> */}
                             </li>
                         </ul>
                     </div>
@@ -522,7 +528,8 @@ const Main = ({navbar}) => {
                                 <Link to="/contact" className="nav-link" >Contact</Link>
                             </li>
                             <li className="nav-item">
-                                <Link to="/contact" className="nav-link dark_btn">GET STARTED</Link>
+                                <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> */}
                             </li>
                         </ul>
                     </div>
@@ -578,7 +585,8 @@ const Main = ({navbar}) => {
                                 <Link to="/contact" className="nav-link" >Contact</Link>
                             </li>
                             <li className="nav-item">
-                                <Link to="/contact" className="nav-link dark_btn">GET STARTED</Link>
+                                <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> */}
                             </li>
                         </ul>
                     </div>

src/component/Pages/Faq/Main.js

@@ -7,6 +7,8 @@ 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'
 
@@ -31,7 +33,7 @@ const Main = ({brdcum}) => {
         <Bredcrumb 
             no={1}
             title="Have questions? look here" 
-            paragraph="Lorem Ipsum is simply dummy text of the printing and typesetting"
+            paragraph="Learn more about myFit  through answers to frequently asked questions."
             tag="Faq" 
             bgimg={BGImg}/>}
 
@@ -39,7 +41,7 @@ const Main = ({brdcum}) => {
         <Bredcrumb 
             no={2}
             title="Have questions? look here" 
-            paragraph="Lorem Ipsum is simply dummy text of the printing and typesetting"
+            paragraph="Learn more about myFit  through answers to frequently asked questions."
             tag="Faq" 
             bgimg={BGImg1}/>}
 
@@ -47,7 +49,7 @@ const Main = ({brdcum}) => {
         <Bredcrumb 
         no={5}
         title="Have questions? look here" 
-        paragraph="Lorem Ipsum is simply dummy text of the printing and typesetting"
+        paragraph="Learn more about myFit  through answers to frequently asked questions."
         tag="Faq" 
         bgimg={BGImg}/>}
 
@@ -55,14 +57,14 @@ const Main = ({brdcum}) => {
         <Bredcrumb 
             no={3}
             title="Have questions? look here" 
-            paragraph="Lorem Ipsum is simply dummy text of the printing and typesetting"
+            paragraph="Learn more about myFit  through answers to frequently asked questions."
             tag="Faq" />}
 
         {brdcum.b4 && 
         <Bredcrumb 
             no={4}
             title="Have questions? look here" 
-            paragraph="Lorem Ipsum is simply dummy text of the printing and typesetting"
+            paragraph="Learn more about myFit  through answers to frequently asked questions."
             tag="Faq" 
             bgimg={BGImg2}/>}
 
@@ -242,9 +244,13 @@ const Main = ({brdcum}) => {
                             </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>

src/component/Pages/Review/Main.js

@@ -4,6 +4,8 @@ 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}) => {
 
@@ -343,9 +345,13 @@ const Main = ({brdcum}) => {
                             </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>

src/component/Pricing/Main.js

@@ -8,6 +8,9 @@ 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}) => {
@@ -19,7 +22,7 @@ const Main = ({brdcum}) => {
         <Bredcrumb 
         no={1}
         title="Our Pricing & Plans" 
-        paragraph="Lorem Ipsum is simply dummy text of the printing and typesetting"
+        paragraph="Flexible & Convienent Pricing Options"
         tag="Our Pricing & Plans" 
         bgimg={BGImg}/>}
 
@@ -27,7 +30,7 @@ const Main = ({brdcum}) => {
         <Bredcrumb 
         no={2}
         title="Our Pricing & Plans" 
-        paragraph="Lorem Ipsum is simply dummy text of the printing and typesetting"
+        paragraph="Flexible & Convienent Pricing Options"
         tag="Our Pricing & Plans" 
         bgimg={BGImg1}/>}
 
@@ -35,7 +38,7 @@ const Main = ({brdcum}) => {
         <Bredcrumb 
         no={5}
         title="Our Pricing & Plans" 
-        paragraph="Lorem Ipsum is simply dummy text of the printing and typesetting"
+        paragraph="Flexible & Convienent Pricing Options"
         tag="Our Pricing & Plans" 
         bgimg={BGImg}/>}
 
@@ -44,14 +47,14 @@ const Main = ({brdcum}) => {
         <Bredcrumb 
         no={3}
         title="Our Pricing & Plans" 
-        paragraph="Lorem Ipsum is simply dummy text of the printing and typesetting"
+        paragraph="Flexible & Convienent Pricing Options"
         tag="Our Pricing & Plans" />}
 
         {brdcum.b4 && 
         <Bredcrumb 
         no={4}
         title="Our Pricing & Plans" 
-        paragraph="Lorem Ipsum is simply dummy text of the printing and typesetting"
+        paragraph="Flexible & Convienent Pricing Options"
         tag="Our Pricing & Plans" 
         bgimg={BGImg2}/>}
 
@@ -229,9 +232,9 @@ const Main = ({brdcum}) => {
                             </div>
                         </div>
                         <div className="col-md-6">
-                            <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 className="free_img">
+                                <img src={screen} alt="image" />
+                                <img className="mobile_mockup" src={screen1} alt="image" />
                             </div>
                         </div>
                     </div>

src/routes/index.js

@@ -3,7 +3,6 @@ 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";
@@ -89,7 +88,6 @@ const Routing = () => {
         <Route path="/blogdetails/: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

@@ -16,8 +16,8 @@ class SiteService {
   }
 
   // Contact Data{POST}
-  contactData() {
-    return this.postAuxEnd("/contact", null)
+  contactData(value) {
+    return this.postAuxEnd("/contact", value)
   }
 
   faqData() {