About-Us-Fixed

.env

@@ -6,8 +6,7 @@ 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://dev142.users.myfit.mermsemr.com/login"
-# " https://mermsemr.com"
+REACT_APP_APPSITE=" https://mermsemr.com"
 #REACT_APP_APPSITE="http://localhost:7012"
 
 # Social Media Links

package-lock.json

@@ -12,7 +12,6 @@
         "@testing-library/react": "^13.4.0",
         "@testing-library/user-event": "^13.5.0",
         "aos": "^2.3.4",
-        "axios": "^0.24.0",
         "react": "^18.2.0",
         "react-dom": "^18.2.0",
         "react-owl-carousel": "^2.3.3",
@@ -4999,14 +4998,6 @@
         "node": ">=4"
       }
     },
-    "node_modules/axios": {
-      "version": "0.24.0",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-0.24.0.tgz",
-      "integrity": "sha512-Q6cWsys88HoPgAaFAVUb0WpPk0O8iTeisR9IMqy9G8AbO4NlpVknrnQS03zzF9PGAWgO3cgletO3VjV/P7VztA==",
-      "dependencies": {
-        "follow-redirects": "^1.14.4"
-      }
-    },
     "node_modules/axobject-query": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-2.2.0.tgz",
@@ -20679,14 +20670,6 @@
       "resolved": "https://registry.npmjs.org/axe-core/-/axe-core-4.5.2.tgz",
       "integrity": "sha512-u2MVsXfew5HBvjsczCv+xlwdNnB1oQR9HlAcsejZttNjKKSkeDNVwB1vMThIUIFI9GoT57Vtk8iQLwqOfAkboA=="
     },
-    "axios": {
-      "version": "0.24.0",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-0.24.0.tgz",
-      "integrity": "sha512-Q6cWsys88HoPgAaFAVUb0WpPk0O8iTeisR9IMqy9G8AbO4NlpVknrnQS03zzF9PGAWgO3cgletO3VjV/P7VztA==",
-      "requires": {
-        "follow-redirects": "^1.14.4"
-      }
-    },
     "axobject-query": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-2.2.0.tgz",

src/assets/css/style.css

@@ -1181,10 +1181,6 @@ header.fixed .navbar {
 .how_it_works .step_block ul li .step_img img {
   max-width: 100%;
 }
-.how_it_works .step_block ul li .step_img img.create-account-logo {
-  border-radius: 15px;
-  box-shadow: 0px 0px 10px #c7c6c6;
-}
 
 /* how it works heading h4 */
 .how_it_works .step_block ul li .step_text h4 {
@@ -2697,11 +2693,7 @@ header.fix_style.white_header {
 }
 
 .app_solution_section .app_images ul li img {
-  max-width: 98%;
-  padding: 1%;
-  border-radius: 15px;
-  box-shadow: 0px 0px 30px #c1dec9;
-  filter: grayscale(40%);
+  max-width: 100%;
 }
 
 .app_solution_section .app_images li:first-child {
@@ -2776,17 +2768,6 @@ header.fix_style.white_header {
 .about_page_sectino img {
   max-width: 100%;
 }
-.about_page_sectino .abt_img img {
-  animation: scale;
-  animation-duration: 1s;
-  animation-timing-function: linear;
-  animation-iteration-count: infinite;
-}
-@keyframes scale {
-  0%{transform: scale(1);}
-  50%{transform: scale(1.01);}
-  100%{transform: scale(1);}
-}
 
 /* -----------experts_team_sectio---------- */
 
@@ -3620,11 +3601,11 @@ header.fix_style.white_header {
   display: flex;
   flex-direction: column;
   align-content: center;
-  justify-items: center;
+  justify-content: center;
   gap: 10px;
 }
 
-/* .contact_body {
+.contact_body {
   display: flex;
   flex-direction: column;
   align-content: center;
@@ -3633,25 +3614,24 @@ header.fix_style.white_header {
   font-size: 20px;
   font-weight: 800;
   text-align: center;
-} */
+}
 
 /* Animations */
-.animate-image {
+.animate.pop {
   animation-name: animate-pop;
-  animation-timing-function: linear;
-  animation-duration: 1s;
-  animation-fill-mode: forwards;
+  animation-timing-function: cubic-bezier(0.26, 0.53, 0.74, 1.48);
+  animation-duration: 0.5s;
 }
 
 @keyframes animate-pop {
   0% {
     opacity: 0;
-    transform: scale(0.5);
+    transform: scale(0.5, 0.5);
   }
 
   100% {
     opacity: 1;
-    transform: scale(1);
+    transform: scale(1, 1);
   }
 }
 

src/component/AboutUs/Main.js

@@ -6,30 +6,22 @@ import BGImg from "../../assets/images/bread_crumb_bg.png"
 import BGImg1 from "../../assets/images/bread_crumb_bg_one.png"
 import BGImg2 from "../../assets/images/bread_crumb_bg_two.png"
 
-import About1 from '../../assets/images/about_one.png'
-import About2 from '../../assets/images/about_two.png'
-import About3 from '../../assets/images/about_three.png'
-
-import AboutMainImg from '../../assets/images/about_main_image.png'
-
 const Main = ({brdcum}) => {
     const [ytShow , setytShow] = useState (false)
 
     // About us text variables
-    let innovativeDesc = 'The team at myFit by Fluxtra LLC works with you to achieve your health objectives without getting in your way. Do your health your way to get the best result for you and your family. We are you, always ready and always engaged with the users to help get the best out of our solution.'
+    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.',
-        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.'
+
+    let secure = "Secure";
+    let richFeatures = "Rich Features";
+    let easeOfUse = "Ease of Use";
+    let support = "Support";
+
+    let queryDesc = 'If you have an query, please get in touch with us, we will revert back quickly.'
     
   return (
     <>       
@@ -90,12 +82,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={About1} alt="health monitor gadget" /></li>
+                            <li><img src="assets/images/abt_01.png" alt="" /></li>
                             <li>
                             <a data-url="#" onClick = {() => setytShow(true)}  className="popup-youtube play-button"
                                 data-toggle="modal"
                                 data-target="#myModal" title="About Video">
-                                <img src={About2} alt="" />
+                                <img src="assets/images/abt_02.png" alt="" />
                                 <div className="waves-block">
                                 <div className="waves wave-1"></div>
                                 <div className="waves wave-2"></div>
@@ -104,8 +96,7 @@ const Main = ({brdcum}) => {
                                 <span className="play_icon"><img src="assets/images/play_black.png" alt="image"/></span>
                             </a>
                             </li>
-                            {/* <li><img src="assets/images/abt_03.png" alt="" /></li> */}
-                            <li><img src={About3} alt="" /></li>
+                            <li><img src="assets/images/abt_03.png" alt="" /></li>
                         </ul>
                         </div>
                     </div>
@@ -126,41 +117,38 @@ const Main = ({brdcum}) => {
                         <img src="assets/images/secure.png" alt="image"/>
                         </div> */}
                         <div className="text">
-                        <h3>{whyWeAreDiff.title1}</h3>
-                        <p> {whyWeAreDiff.secureDesc}</p>
+                        <h3>{secure}</h3>
+                        <p>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.</p>
                         </div>
                     </div>
                     </div>
                     <div className="col-md-6 col-lg-3">
-                    <div className="why_box" data-aos="fade-up" data-aos-duration="1500" data-aos-delay="200">
-                        {/* <div className="icon">
-                        <img src="assets/images/abt_functional.png" alt="image"/>
-                        </div> */}
-                        <div className="text">
-                        <h3>{whyWeAreDiff.title2}</h3>
-                         <p>{whyWeAreDiff.richFeaturesDesc}</p>
+                        <div className="why_box" data-aos="fade-up" data-aos-duration="1500" data-aos-delay="200">
+                            <div className="text">
+                                <h3>{richFeatures}</h3>
+                                <p>Self-service.</p>
+                                <p>Tracking of health and fitness.</p>
+                                <p>Scheduling.</p>
+                                <p>Performance metrics.</p>
+                                <p>A more active, healthier interaction and improved quality of life.</p>
+                            </div>
                         </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">
-                        <img src="assets/images/communication.png" alt="image"/>
-                        </div> */}
                         <div className="text">
-                        <h3>{whyWeAreDiff.title3}</h3>
-                         <p>{whyWeAreDiff.easeOfUseDesc}</p>
+                            <h3>{easeOfUse}</h3>
+                            <p>MyFit keeps you connected to health, a healthy partner for a healthy life.</p>
+                            <p>Measure and keep track of all you desire with your health, meaningful health awareness in one place, never miss an appointment, scheduling<br/> with daily plans. An advanced metrics in a glance.</p>
+                         
                         </div>
                     </div>
                     </div>
                     <div className="col-md-6 col-lg-3">
                     <div className="why_box" data-aos="fade-up" data-aos-duration="1500" data-aos-delay="400">
-                        {/* <div className="icon">
-                        <img src="assets/images/abt_support.png" alt="image"/>
-                        </div> */}
                         <div className="text">
-                        <h3>{whyWeAreDiff.title4}</h3>
-                        <p>{whyWeAreDiff.supportDesc}</p>
+                        <h3>{support}</h3>
+                        <p>myFit can alert you of irregular rhythms. You can connect with your health facilitator.</p>
                         </div>
                     </div>
                     </div>
@@ -173,22 +161,17 @@ const Main = ({brdcum}) => {
                 <div className="row">
                     <div className="col-lg-6">
                         <div className="abt_img" data-aos="fade-in" data-aos-duration="1500">
-                            <img src={AboutMainImg} alt="image"/>
+                            <img src="assets/images/about_main.png" alt="image"/>
                         </div>
                     </div>
                     <div className="col-lg-6">
                         <div className="about_text">
                         <div className="section_title" data-aos="fade-up" data-aos-duration="1500" data-aos-delay="100">
-                            <h2> <span>We focus on quality,</span> never
-                            focus on quantity</h2>
-                            
-                            <p>{innovativeDesc}</p>
+                            <h2> <span>We focus on quality,</span> never focus on quantity</h2>
+                             <p>{innovativeDesc}</p>
                         </div>
                         <ul className="app_statstic" id="counter" data-aos="fade-in" data-aos-duration="1500">
                             <li>
-                            {/* <div className="icon">
-                                <img src="assets/images/download.png" alt="image" />
-                            </div> */}
                             <div className="text">
                                 <h3>Manage</h3>
                                 <p>health plan</p>
@@ -196,27 +179,20 @@ const Main = ({brdcum}) => {
                             
                             </li>
                             <li>
-                            {/* <div className="icon">
-                                <img src="assets/images/followers.png" alt="image" />
-                            </div> */}
                             <div className="text">
                                 <h3>Health Record</h3>
                                 <p>with you</p>
                             </div>
                             </li>
                             <li>
-                            {/* <div className="icon">
-                                <img src="assets/images/reviews.png" alt="image" />
-                            </div> */}
+                          
                             <div className="text">
                                 <h3>Health</h3>
                                 <p>reminders</p>
                             </div>
                             </li>
                             <li>
-                            {/* <div className="icon">
-                                <img src="assets/images/countries.png" alt="image" />
-                            </div> */}
+                          
                             <div className="text">
                                 <h3>Quick</h3>
                                 <p>Schedule</p>
@@ -237,7 +213,7 @@ const Main = ({brdcum}) => {
                     <span className="banner_shape3"> <img src="assets/images/banner-shape3.png" alt="image" /> </span>
                 
                     <div className="section_title">
-                        <h2>Have any questions about ?</h2>
+                        <h2>Have any query about ?</h2>
                         <p>{queryDesc}</p>
                     </div>
                     <Link to="/contact" className="btn white_btn">CONTACT US NOW</Link>

src/component/Blog/Blog/Main.js

@@ -8,8 +8,8 @@ const Main = ({ brdcum, bgimg }) => {
 
   const api = new SiteService();
   useEffect(() => {
-    if(blogData.length===0){getBlogData()};
-  }, [blogData]);
+    getBlogData();
+  }, []);
 
   const getBlogData = async () => {
     try {
@@ -69,14 +69,14 @@ const Main = ({ brdcum, bgimg }) => {
 
       <section className="row_am blog_list_main">
         {blogData.map((data,index) => {
-          if (index === 0){
+          if (index == 0){
             return (
               <div className="container">
               <div className="row">
                 <div
                   className="col-lg-6"
-                  // data-aos="fade-in"
-                  // data-aos-duration="1500"
+                  data-aos="fade-in"
+                  data-aos-duration="1500"
                 >
                   <div className="blog_img">
                     <img 
@@ -118,7 +118,7 @@ const Main = ({ brdcum, bgimg }) => {
               if (index > 0){
                 return (
                   <div key={data.id} className="col-md-4">
-                <div className="story_box">
+                <div className="story_box" data-aos="fade-up" data-aos-duration="1500">
                   <div className="story_img">
                     <img src={data.meta_value} alt="image" />
                     <span>{new Date (data && data.post_date).toDateString()}</span>

src/component/Blog/BlogSingle/Main.js

@@ -101,8 +101,42 @@ const Main = ({brdcum}) => {
                         <h3>{data && data.post_name}</h3>
                         <div dangerouslySetInnerHTML={{__html: data && data.post_content}}></div>
                     </div>
-
-                   
+                    {/* <div className="info">
+                        <p>Lorem Ipsum is simply dummy text of the printing and typesetting in dustry lorem Ipsum has been the industrys standard dummy text ev er since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries, but also the leap into electronic Lorem Ipsum is simply dummy text of the printing and typesettingindustry lorem Ipsum has been the industrys standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived.</p>
+                        <p>Printing and typesetting in dustry lorem Ipsum has been the industrys standard dummy text ev er since the 1500s, when an unnown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries, but also the leap into electronic Lorem Ipsum is simply dummy text of the printing and typesettingindustry lorem Ipsum has been the industrys centuries, but also the leap into electronic.</p>
+                        <h3>Why we are best</h3>
+                        <p>Lorem Ipsum is simply dummy text of the printing and typesetting in dustry lorem Ipsum has been the industrys standard dummy text ev er since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries, but also the leap into electronic.</p>
+                        <ul>
+                            <li><p> <span className="icon"><i className="icofont-check-circled"></i></span> Lorem Ipsum is simply dummy text of the printing and typesetting in </p></li>
+                            <li><p> <span className="icon"><i className="icofont-check-circled"></i></span> Dustry lorem Ipsum has been the industrys standard dummy text ev er since the when</p></li>
+                            <li><p> <span className="icon"><i className="icofont-check-circled"></i></span> Unknown printer took a galley of type and scrambled it to make.</p></li>
+                            <li><p> <span className="icon"><i className="icofont-check-circled"></i></span> Type specimen book. It has survived not only five centuries, but also the leap into electronic.</p></li>
+                            <li><p> <span className="icon"><i className="icofont-check-circled"></i></span> Lorem Ipsum is simply dummy text of the printing.</p></li>
+                            <li><p> <span className="icon"><i className="icofont-check-circled"></i></span> Dustry lorem Ipsum has been the industrys standard dummy text ev er since.</p></li>
+                            <li><p> <span className="icon"><i className="icofont-check-circled"></i></span> Unknown printer took a galley of type and scrambled it to make.</p></li>
+                            <li><p> <span className="icon"><i className="icofont-check-circled"></i></span> Type specimen book. It has survived not only.</p></li>
+                        </ul>
+                    </div> 
+                    <div className="two_img">
+                        <div className="row">
+                            <div className="col-md-6">
+                            <img src="assets/images/blog_sub_01.png" alt="image" />
+                            </div>
+                            <div className="col-md-6">
+                            <img src="assets/images/blog_sub_02.png" alt="image" />
+                            </div>
+                        </div>
+                    </div>
+                    <div className="info">
+                        <h3>Why we are best</h3>
+                        <p>Lorem Ipsum is simply dummy text of the printing and typesetting in dustry lorem Ipsum has been the industrys standard dummy text ev er since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries, but also the leap into electronic Lorem Ipsum is simply dummy text of the printing and typesettingindustry lorem Ipsum has been the industrys standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived.</p>
+                    </div>
+                    <div className="quote_block">
+                        <span className="q_icon"><img src="assets/images/quote_icon.png" alt="image" /></span>
+                        <h2>Lorem Ipsum is simply dummy text of the printing and typesetting in dustry lorem Ipsum has been the industrys standard dummy.</h2>
+                        <p><span className="name">Mr. John Doe,</span> Apper Inc</p>
+                    </div> */}
+                    {/* <p>Lorem Ipsum is simply dummy text of the printing and typesetting in dustry lorem Ipsum has been the industrys standard dummy text ev er since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries, but also the leap into electronic industry.</p> */}
                     <div className="blog_authore">
                         <div className="authore_info">
                             {/* <div className="avtar">

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="#">{tag}</Link></li>
+                            <li><Link to="/about">{tag}</Link></li>
                         </ul>
                     </div>
                 </div>
@@ -39,7 +39,7 @@ const Main = ({title,tag,bgimg,paragraph,no}) => {
                         <ul>
                             <li><Link to="/">Home</Link></li>
                             <li><span>»</span></li>
-                            <li><Link to="#">{tag}</Link></li>
+                            <li><Link to="/about">{tag}</Link></li>
                         </ul>
                     </div>
                 </div>
@@ -58,7 +58,7 @@ const Main = ({title,tag,bgimg,paragraph,no}) => {
                         <ul>
                             <li><Link to="/">Home</Link></li>
                             <li><span>»</span></li>
-                            <li><Link to="#">{tag}</Link></li>
+                            <li><Link to="/about">{tag}</Link></li>
                         </ul>
                     </div>
                 </div>
@@ -77,7 +77,7 @@ const Main = ({title,tag,bgimg,paragraph,no}) => {
                         <ul>
                             <li><Link to="/">Home</Link></li>
                             <li><span>»</span></li>
-                            <li><Link to="#">{tag}</Link></li>
+                            <li><Link to="/about">{tag}</Link></li>
                         </ul>
                     </div>
                 </div>
@@ -96,7 +96,7 @@ const Main = ({title,tag,bgimg,paragraph,no}) => {
                         <ul>
                             <li><Link to="/">Home</Link></li>
                             <li><span>»</span></li>
-                            <li><Link to="#">{tag}</Link></li>
+                            <li><Link to="/about">{tag}</Link></li>
                         </ul>
                     </div>
                 </div>

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/confirmed-letter.jpg"
+import SuccessImg from "../../assets/images/experts_01.png"
 
 import SiteService from "../../vendors/service/siteService";
 
@@ -51,11 +51,10 @@ const FormInput = (props) => {
 
 const Main = ({ brdcum }) => {
   let response = document.getElementById("contact_loader");
+  let contact_body = document.getElementById("contact_body");
   let errText = document.getElementById("errText");
   let navigate = useNavigate();
 
-  let [showSuccessfulImage, setShowSuccessfulImage] = useState(false) // Handles when sucess image is shown
-
   // Form Validation
   const [values, setValues] = useState({
     name: "",
@@ -101,8 +100,10 @@ const Main = ({ brdcum }) => {
         }else {
           response.innerHTML = `<p> SEND MESSAGE </p>`;
 
-          setShowSuccessfulImage(true) // sets show success image to true
-
+          contact_body.innerHTML = `<div class='contact_body animate pop'>
+      <div><img src=${SuccessImg} /></div>
+      <p>We have received your message and will follow up promptly.</p>
+      </div>`;
           setTimeout(() => {
             navigate("/");
           }, 10000);
@@ -176,114 +177,107 @@ const Main = ({ brdcum }) => {
         id="contact">
         <div className="container">
           <div className="contact_inner">
-            <div className="contact_form" id="contact_body">
-              {showSuccessfulImage ? (
-                <>
-                  <div><img className="img-fluid animate-image" src={SuccessImg} alt='success image' /></div>
-                  <p>We have received your message and will follow up promptly.</p>
-                </>
-              ) : (
-                <>
-                <div className="section_title">
-                  <h2>
-                    <span>Leave a</span> message
-                  </h2>
-                  <p>Fill up form below, our team will get back soon</p>
+            <div
+              className="contact_form"
+              id="contact_body">
+              <div className="section_title">
+                <h2>
+                  <span>Leave a</span> message
+                </h2>
+                <p>Fill up form below, our team will get back soon</p>
+              </div>
+
+              {/* Contact Form */}
+              <form onSubmit={handleSubmit}>
+                <FormInput
+                  name="name"
+                  type="text"
+                  placeholder="Name"
+                  errorMessage="Please enter your first and last name. (e.g: Mark John)"
+                  required={true}
+                  maxLenght={35}
+                  value={values.name}
+                  onChange={onChange}
+                  pattern="^$|^[a-zA-Z]+( [a-zA-Z]+)?$+( [a-zA-Z]+)?$"
+                />
+
+                <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={""}>
+                      Country
+                    </option>
+                    {countries.length > 0 &&
+                      countries.map((country, index) => (
+                        <option
+                          key={index}
+                          value={country[0]}>
+                          {country[1]}
+                        </option>
+                      ))}
+                  </select>
                 </div>
 
-                {/* Contact Form */}
-                <form onSubmit={handleSubmit}>
-                  <FormInput
-                    name="name"
-                    type="text"
-                    placeholder="Name"
-                    errorMessage="Please enter your first and last name. (e.g: Mark John)"
-                    required={true}
-                    maxLenght={35}
-                    value={values.name}
+                <FormInput
+                  name="phone"
+                  type="number"
+                  placeholder="Phone"
+                  errorMessage="It should be a valid phone number!"
+                  maxLenght={15}
+                  value={values.phone}
+                  onChange={onChange}
+                  pattern="^[0-9]{15}$"
+                />
+
+                <div className="form-group">
+                  <textarea
+                    name="message"
+                    className="form-control"
+                    placeholder="Your message"
+                    value={values.message}
                     onChange={onChange}
-                    pattern="^\w+( \w+)$"
+                    maxLength={300}
+                    pattern="^[A-Za-z0-9]{5, 300}$"
                   />
-
-                  <FormInput
-                    name="email"
-                    type="email"
-                    placeholder="Email"
-                    errorMessage="It should be a valid email address!"
-                    required={true}
-                    maxLenght={35}
-                    value={values.email}
+                </div>
+                <div className="form-group term_check">
+                  <input
+                    type="checkbox"
+                    id="term"
                     onChange={onChange}
+                    required
                   />
-
-                  <div className="form-group">
-                    <select
-                      className="form-control"
-                      name="country"
-                      value={values.country}
-                      onChange={onChange}
-                      required>
-                      <option value={""}>
-                        Country
-                      </option>
-                      {countries.length > 0 &&
-                        countries.map((country, index) => (
-                          <option
-                            key={index}
-                            value={country[0]}>
-                            {country[1]}
-                          </option>
-                        ))}
-                    </select>
-                  </div>
-
-                  <FormInput
-                    name="phone"
-                    type="number"
-                    placeholder="Phone"
-                    errorMessage="It should be a valid phone number!"
-                    maxLenght={15}
-                    value={values.phone}
-                    onChange={onChange}
-                    pattern="^[0-9]{15}$"
-                  />
-
-                  <div className="form-group">
-                    <textarea
-                      name="message"
-                      className="form-control"
-                      placeholder="Your message"
-                      value={values.message}
-                      onChange={onChange}
-                      maxLength={300}
-                      pattern="^[A-Za-z0-9]{5, 300}$"
-                    />
-                  </div>
-                  <div className="form-group term_check">
-                    <input
-                      type="checkbox"
-                      id="term"
-                      onChange={onChange}
-                      required
-                    />
-                    <label htmlFor="term">
-                      I agree to the terms and conditions
-                    </label>
-                  </div>
-                  <div className="form-group mb-0">
-                    <button
-                      type="submit"
-                      className="btn puprple_btn contact_btn"
-                      aria-label="submit form"
-                      id="contact_loader">
-                      <p> SEND MESSAGE </p>
-                    </button>
-                  </div>
-                </form>
-                {/* Error Tag */}
-                <p id="errText"></p>
-                </>
-              )}
+                  <label htmlFor="term">
+                    I agree to the terms and conditions
+                  </label>
+                </div>
+                <div className="form-group mb-0">
+                  <button
+                    type="submit"
+                    className="btn puprple_btn contact_btn"
+                    aria-label="submit form"
+                    id="contact_loader">
+                    <p> SEND MESSAGE </p>
+                  </button>
+                </div>
+              </form>
+              {/* Error Tag */}
+              <p id="errText"></p>
             </div>
 
             {/* Contact Info */}

src/component/Footer/Main.js

@@ -79,9 +79,7 @@ const Main = ({ footer }) => {
                     <h3>Useful Links</h3>
                     <ul>
                       <li>
-                        {/* <Link to="/">Home</Link> */}
-                        <HashLink to="/#">Home</HashLink>
-
+                        <Link to="/">Home</Link>
                       </li>
                       <li>
                         <Link to="/about">About us</Link>

src/component/HomeMain/Pricing/Main.js

@@ -8,13 +8,11 @@ import img3 from '../../../assets/images/premium.png'
 import SiteService from '../../../vendors/service/siteService'
 
 const Main = ({gredient , video}) => {
-
+    
     const[tog, setTog] = useState()
 
     const [prices, setPrices] = useState([]); // initial state for FAQs before API call
 
-    const [pricing_text_02, setPricingtext02] = useState('');
-
     let priceServices = new SiteService(); // instantiating the class
 
     const getAllPriceData = () => {
@@ -22,9 +20,7 @@ const Main = ({gredient , video}) => {
     };
 
     useEffect(() => {
-        getAllPriceData().then((data) => {
-            setPricingtext02(data.data.pricing_text_02);
-            setPrices(data.data.pricing) });
+        getAllPriceData().then((data) => setPrices(data.data));
         AOS.init();
         AOS.refresh();
     }, []);
@@ -35,13 +31,9 @@ const Main = ({gredient , video}) => {
             <section className="row_am pricing_section gredient-pricing" id="pricing">
                 <div className="container">
                     <div className="section_title" data-aos="fade-up" data-aos-duration="1500" data-aos-delay="300">
-                    <h2>Flexible & Simple <span>pricing</span></h2>
-                    <p className="gredient-p">
-                    {/*    <>*/}
-                    {/*    {pricing_text_02}*/}
-                    {/*</>*/}
-                         Choose your myFit Pricing Plan <br/> myFit has a free Standard for Basics , $5 per month for Premium <br />
-                        and $7.99 per month for Gold-tier</p>
+                    <h2>Best & simple <span>pricing</span></h2>
+                    <p className="gredient-p">Lorem Ipsum is simply dummy text of the printing and typese tting <br/> indus orem Ipsum has beenthe
+                        standard dummy.</p>
                     </div>
                     <div className="toggle_block" data-aos="fade-up" data-aos-duration="1500">
                         <span className={`month ${tog ? 'active' : ''}`}>Monthly</span>
@@ -148,9 +140,9 @@ const Main = ({gredient , video}) => {
             <section className="row_am pricing_section" id="pricing">
                 <div className="container">
                     <div className="section_title" data-aos="fade-up" data-aos-duration="1500" data-aos-delay="300">
-                    <h2>Flexible & Simple <span>pricing</span></h2>
-                    <p>Choose your myFit Pricing Plan <br/> myFit has a free Standard for Basics , $5 per month for Premium <br />
-                        and $7.99 per month for Gold-tier.</p>
+                    <h2>Best & simple <span>pricing</span></h2>
+                    <p>Lorem Ipsum is simply dummy text of the printing and typese tting <br/> indus orem Ipsum has beenthe
+                        standard dummy.</p>
                     </div>
                     <div className="toggle_block" data-aos="fade-up" data-aos-duration="1500">
                         <span className={`month ${tog ? 'active' : ''}`}>Monthly</span>

src/component/HomeMain/Work/Main.js

@@ -1,15 +1,14 @@
 import React , {useState} from 'react'
 import { Link } from 'react-router-dom'
-import img from '../../../assets/images/appdownload.png'
-// import img1 from '../../../assets/images/create_account2.png'
-import img2 from '../../../assets/images/download_app1.png'
+import img from '../../../assets/images/download_app1.png'
+import img1 from '../../../assets/images/create_account2.png'
+import img2 from '../../../assets/images/enjoy_app01.png'
 import line from '../../../assets/images/anim_line.png'
 import banner from '../../../assets/images/banner-shape1.png'
 import banner1 from '../../../assets/images/banner-shape2.png'
 import banner2 from '../../../assets/images/banner-shape3.png'
 import video from '../../../assets/images/play_icon.png'
 import ytvideo from '../../../assets/images/yt_thumb.png'
-import createAccount from '../../../assets/images/create_account.png'
 
 const Main = ({dark}) => {
     const [ytShow , setytShow] = useState (false)
@@ -29,8 +28,8 @@ const Main = ({dark}) => {
                                 <div className="step_text" data-aos="fade-right" data-aos-duration="1500">
                                 <h4>Download app</h4>
                                 <div className="app_icon">
-                                    <a href={process.env.REACT_APP_ANDROID_URL}><i className="icofont-brand-android-robot"></i></a>
-                                    <a href={process.env.REACT_APP_IOS_URL}><i className="icofont-brand-apple"></i></a>
+                                    <Link to={process.env.REACT_APP_ANDROID_URL}><i className="icofont-brand-android-robot"></i></Link>
+                                    <Link to={process.env.REACT_APP_IOS_URL}><i className="icofont-brand-apple"></i></Link>
                                 </div>
                                 <p>Download App either for Mac or Android</p>
                                 </div>
@@ -51,7 +50,7 @@ const Main = ({dark}) => {
                                 <h3>02</h3>
                                 </div>
                                 <div className="step_img" data-aos="fade-right" data-aos-duration="1500">
-                                <img className="create-account-logo" src={createAccount} alt="create account logo"/>
+                                <img src={img1} alt="image" />
                                 </div>
                             </li>
                             <li>

src/component/Navbar/Main.js

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

src/component/Pages/Faq/Main.js

@@ -7,8 +7,6 @@ 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'
 
@@ -244,13 +242,9 @@ 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,8 +4,6 @@ import Bredcrumb from '../../Bredcrumb/Main'
 import BGImg from "../../../assets/images/bread_crumb_bg.png"
 import BGImg1 from "../../../assets/images/bread_crumb_bg_one.png"
 import BGImg2 from "../../../assets/images/bread_crumb_bg_two.png"
-import screen from '../../../assets/images/download-screen01.png'
-import screen1 from '../../../assets/images/download-screen02.png'
 
 const Main = ({brdcum}) => {
 
@@ -345,13 +343,9 @@ 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,9 +8,6 @@ import BGImg1 from "../../assets/images/bread_crumb_bg_one.png"
 import BGImg2 from "../../assets/images/bread_crumb_bg_two.png"
 import blueapp from "../../assets/images/appstore_blue.png";
 import blue from "../../assets/images/googleplay_blue.png";
-import screen from '../../assets/images/download-screen01.png'
-import screen1 from '../../assets/images/download-screen02.png'
-
 
 
 const Main = ({brdcum}) => {
@@ -22,7 +19,7 @@ const Main = ({brdcum}) => {
         <Bredcrumb 
         no={1}
         title="Our Pricing & Plans" 
-        paragraph="Flexible & Convienent Pricing Options"
+        paragraph="Lorem Ipsum is simply dummy text of the printing and typesetting"
         tag="Our Pricing & Plans" 
         bgimg={BGImg}/>}
 
@@ -30,7 +27,7 @@ const Main = ({brdcum}) => {
         <Bredcrumb 
         no={2}
         title="Our Pricing & Plans" 
-        paragraph="Flexible & Convienent Pricing Options"
+        paragraph="Lorem Ipsum is simply dummy text of the printing and typesetting"
         tag="Our Pricing & Plans" 
         bgimg={BGImg1}/>}
 
@@ -38,7 +35,7 @@ const Main = ({brdcum}) => {
         <Bredcrumb 
         no={5}
         title="Our Pricing & Plans" 
-        paragraph="Flexible & Convienent Pricing Options"
+        paragraph="Lorem Ipsum is simply dummy text of the printing and typesetting"
         tag="Our Pricing & Plans" 
         bgimg={BGImg}/>}
 
@@ -47,14 +44,14 @@ const Main = ({brdcum}) => {
         <Bredcrumb 
         no={3}
         title="Our Pricing & Plans" 
-        paragraph="Flexible & Convienent Pricing Options"
+        paragraph="Lorem Ipsum is simply dummy text of the printing and typesetting"
         tag="Our Pricing & Plans" />}
 
         {brdcum.b4 && 
         <Bredcrumb 
         no={4}
         title="Our Pricing & Plans" 
-        paragraph="Flexible & Convienent Pricing Options"
+        paragraph="Lorem Ipsum is simply dummy text of the printing and typesetting"
         tag="Our Pricing & Plans" 
         bgimg={BGImg2}/>}
 
@@ -232,9 +229,9 @@ const Main = ({brdcum}) => {
                             </div>
                         </div>
                         <div className="col-md-6">
-                        <div className="free_img">
-                                <img src={screen} alt="image" />
-                                <img className="mobile_mockup" src={screen1} alt="image" />
+                            <div className="free_img">
+                                <img src="assets/images/download-screen01.png" alt="image" />
+                                <img className="mobile_mockup" src="assets/images/download-screen02.png" alt="image" />
                             </div>
                         </div>
                     </div>