Merge branch 'feturedmore_details' of https://gitlab.chiefsoft.net/MyFit/www-myfit into feturedmore_details

# Conflicts:
#	src/component/HomeMain/Features/Main.js

.env

@@ -9,5 +9,3 @@ REACT_APP_FACEBOOK="https://www.facebook.com/profile.php?id=100066498622246"
 REACT_APP_TWITTER="https://twitter.com/fluxtra"
 
 REACT_APP_APPSITE="https://myfitapp.mermsemr.com"
-
-REACT_APP_AUX_ENDPOINT = "https://devapi.mermsemr.com/en/desktop/api/v2/myfit"

src/component/Contact/Main.js

@@ -1,25 +1,11 @@
-import React, { useEffect, useState } from "react";
+import React, { useEffect } from "react";
 import { Link } 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 SiteService from "../../vendors/service/siteService";
-
 const Main = ({ brdcum }) => {
-  let [countries, setCountries] = useState([]) // initial state for country dropdown
-  let countryClass = new SiteService() // instantiating the class
-  
-  const allCountry = () => {
-    return countryClass.countryData();
-  }
-
-  //CALLS THE API AFTER COMPONENT LOADS
-  useEffect(()=>{
-    allCountry().then((data)=> setCountries(Object.values(data.data)))
-  },[])
-
   return (
     <>
       {brdcum.b1 && (
@@ -100,7 +86,6 @@ const Main = ({ brdcum }) => {
                 <div className="form-group">
                   <select className="form-control">
                     <option value="">Country</option>
-                    {countries.length > 0 && countries.map((country, index) => <option key={index} value={country}>{country}</option>)}
                   </select>
                 </div>
                 <div className="form-group">

src/component/HomeMain/Features/Main.js

@@ -24,10 +24,10 @@ const Main = ({ video }) => {
                 <span>Features</span> that makes app different!
               </h2>
               <p>
-                myFit has powerful connectivity, fitness, health, and
-                safety features <br />
-                Also makes provision Fitness tracking,Workout tracking,Heart
-                rate monitoring
+                Fitness Integration with your health plan in your pocket
+                bolsters
+                <br /> healthier life by tracking and experiencing life-changing
+                results
               </p>
             </div>
             <div className="feature_detail">
@@ -120,7 +120,7 @@ const Main = ({ video }) => {
               data-aos-delay="100"
             >
               <h2>
-                <span>Features</span> that makes app different!
+                <span>Features</span> that makes app different!{" "}
               </h2>
               <p>
                 Fitness Integration with your health plan in your pocket

src/component/Terms/Main.js

@@ -28,8 +28,8 @@ const Main = ({ brdcum }) => {
                 collection, use, purpose, and sharing of personally identifiable
                 information ("PII") related to the use of Merms's myFit website{" "}
                 <span>
-                  <a href={process.env.REACT_APP_APPSITE}>
-                    {process.env.REACT_APP_APPSITE}
+                  <a href="https://myfit.mermsemr.com/">
+                    https://myfit.mermsemr.com
                   </a>
                 </span>
                 , MERMS providing of services to our users ("Partners"), or from
@@ -53,8 +53,8 @@ const Main = ({ brdcum }) => {
                 govern. Provides its services (described below) to you through
                 its website located at{" "}
                 <span>
-                  <a href={process.env.REACT_APP_APPSITE}>
-                    {process.env.REACT_APP_APPSITE}
+                  <a href="https://myfit.mermsemr.com/">
+                    https://myfit.mermsemr.com
                   </a>
                 </span>{" "}
                 (the "Site") and through its mobile applications and related
@@ -1363,8 +1363,8 @@ const Main = ({ brdcum }) => {
                 use, purpose, and sharing of personally identifiable information
                 ("PII") related to the use of Merms's myFit website{" "}
                 <span>
-                  <a href={process.env.REACT_APP_APPSITE}>
-                    {process.env.REACT_APP_APPSITE}
+                  <a href="https://myfit.mermsemr.com/">
+                    https://myfit.mermsemr.com
                   </a>
                 </span>
                 , MERMS providing of services to our users ("Partners"), or from

src/vendors/service/siteService.js

@@ -1,70 +0,0 @@
-import React from "react";
-import Axios from "axios";
-
-class SiteService {
-  constructor() {
-    console.log("Er are here anyway");
-  }
-  blogData() {
-    return this.getAuxEnd("blogdata", null);
-  }
-
-  countryData() {
-    return this.getAuxEnd("/country", null);
-  }
-
-  faqData() {}
-  
-  //----------------------------------------  -----
-  //----------------------------------------  -----
-  // Unified call below 
-  //----------------------------------------  -----
-  //----------------------------------------  -----
-  getAuxEnd(uri, reqData) {
-    const endPoint = process.env.REACT_APP_AUX_ENDPOINT + uri;
-    return Axios.get(endPoint)
-      .then((response) => {
-        // console.log(response);
-        // res = response;
-        // console.log("~~~~~~~ Toks2 GET ~~~~~~~~");
-        return response;
-      })
-      .catch((error) => {
-        if (error.response) {
-          //response status is an error code
-          console.log(error.response.status);
-        } else if (error.request) {
-          //response not received though the request was sent
-          console.log(error.request);
-        } else {
-          //an error occurred when setting up the request
-          console.log(error.message);
-        }
-      });
-  }
-
-  postAuxEnd(uri, reqData) {
-    const endPoint = process.env.REACT_APP_AUX_ENDPOINT + uri;
-    Axios.post(endPoint)
-      .then((response) => {
-        console.log(response);
-        // res = response;
-        console.log("~~~~~~~ Toks2 POST ~~~~~~~~");
-        return response;
-      })
-      .catch((error) => {
-        if (error.response) {
-          //response status is an error code
-          console.log(error.response.status);
-        } else if (error.request) {
-          //response not received though the request was sent
-          console.log(error.request);
-        } else {
-          //an error occurred when setting up the request
-          console.log(error.message);
-        }
-      });
-  }
-}
-
-export default SiteService;