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

src/component/AboutUs/Main.js

@@ -10,19 +10,17 @@ 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 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 (
@@ -119,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>
@@ -172,16 +167,11 @@ const Main = ({brdcum}) => {
                     <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>
@@ -189,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>

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

@@ -198,7 +198,7 @@ const Main = ({ brdcum }) => {
                   maxLenght={35}
                   value={values.name}
                   onChange={onChange}
-                  pattern="^\w+( \w+)$"
+                  pattern="^$|^[a-zA-Z]+( [a-zA-Z]+)?$+( [a-zA-Z]+)?$"
                 />
 
                 <FormInput

src/component/HomeMain/Work/Main.js

@@ -1,8 +1,8 @@
 import React , {useState} from 'react'
 import { Link } from 'react-router-dom'
-import img from '../../../assets/images/appdownload.png'
+import img from '../../../assets/images/download_app1.png'
 import img1 from '../../../assets/images/create_account2.png'
-import img2 from '../../../assets/images/download_app1.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'
@@ -28,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>

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}) => {
@@ -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>