About us page updated

.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

src/component/AboutUs/Main.js

@@ -19,6 +19,13 @@ const Main = ({brdcum}) => {
         title3: 'Ease of Use',
         title4: 'Support'
     }
+
+    let 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."
+    let richFeaturesDesc = " Self-service & Scheduling, Tracking of health and fitness, Performance metrics. A more active, healthier interaction and improved quality of life."
+    let easeOfUseDesc = " MyFit keeps you connected to your health, a healthy partner for a healthy life. Measure and keep track of all you desire with your health, meaningful health awareness in one place."
+    let supportDesc = " myFit alerts you of irregular rhythms. You can connect with your health facilitator."
+
+    let queryDesc = 'If you have an query, please get in touch with us, we will revert back quickly.'
     
   return (
     <>       
@@ -115,9 +122,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> {secureDesc}</p>
                         </div>
                     </div>
                     </div>
@@ -128,7 +133,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>{richFeaturesDesc}</p>
                         </div>
                     </div>
                     </div>
@@ -139,9 +144,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>{easeOfUseDesc}</p>
                         </div>
                     </div>
                     </div>
@@ -152,7 +155,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>{supportDesc}</p>
                         </div>
                     </div>
                     </div>
@@ -173,45 +176,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>
@@ -230,7 +233,7 @@ const Main = ({brdcum}) => {
                 
                     <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>
+                        <p>{queryDesc}</p>
                     </div>
                     <Link to="/contact" className="btn white_btn">CONTACT US NOW</Link>
                 </div>

src/component/Contact/Main.js

@@ -64,7 +64,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,10 +94,10 @@ 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 again");
-        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'>
@@ -105,24 +107,19 @@ const Main = ({ brdcum }) => {
           setTimeout(() => {
             navigate("/");
           }, 10000);
-
-          setValues((prev) => ({ ...prev, [e.target.name]: "" }));
         }
       })
-      .catch((error) => {
-        errText.textContent = "unable to send your message, please try again"
-        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.keys(data.data))).catch((err)=>console.log(err.message));
+    allCountry().then((data) => setCountries(Object.entries(data.data))).catch((err)=>console.log(err.message));
   }, []);
 
-  // useEffect(() => {
-  //   myData
-  // }, [myData]);
 
   return (
     <>
@@ -201,7 +198,7 @@ const Main = ({ brdcum }) => {
                   maxLenght={35}
                   value={values.name}
                   onChange={onChange}
-                  pattern="^$|^[a-zA-Z]+( [a-zA-Z]+)?$+( [a-zA-Z]+)?$"
+                  pattern="^\w+( \w+)$"
                 />
 
                 <FormInput
@@ -222,17 +219,15 @@ const Main = ({ brdcum }) => {
                     value={values.country}
                     onChange={onChange}
                     required>
-                    <option
-                      value={""}
-                      onCha>
+                    <option value={""}>
                       Country
                     </option>
                     {countries.length > 0 &&
                       countries.map((country, index) => (
                         <option
                           key={index}
-                          value={country}>
-                          {country}
+                          value={country[0]}>
+                          {country[1]}
                         </option>
                       ))}
                   </select>
@@ -255,7 +250,6 @@ const Main = ({ brdcum }) => {
                     className="form-control"
                     placeholder="Your message"
                     value={values.message}
-                    errorMessage='words have exceeded 350 characters!'
                     onChange={onChange}
                     maxLength={300}
                     pattern="^[A-Za-z0-9]{5, 300}$"
@@ -283,7 +277,7 @@ const Main = ({ brdcum }) => {
                 </div>
               </form>
               {/* Error Tag */}
-              <p id="errText" />
+              <p id="errText"></p>
             </div>
 
             {/* Contact Info */}
@@ -355,7 +349,9 @@ const Main = ({ brdcum }) => {
         </div>
       </section>
       <section className="row_am map_section">
-        <div className="container" />
+        <div className="container">
+
+        </div>
       </section>
     </>
   );

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'
 
@@ -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>