blog data

.env

@@ -1,19 +1,21 @@
 REACT_APP_US_ADDRESS="USA: 32 Oatgrass Dr, Grayson GA 30017"
 REACT_APP_US_PHONE="(415) 251 7583"
-REACT_APP_SUPPORT_EMAIL="support@mermsemr.com"
+REACT_APP_SUPPORT_EMAIL="support@myfit.ai"
-REACT_APP_YEAR=2023
+REACT_APP_YEAR=2025
 REACT_APP_ANDROID_URL="https://play.google.com/store/apps/details?id=com.mermsemr.myfit"
 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="http://localhost:7012"
+
+# Social Media Links
 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_APPSITE="http://localhost:7012"
 
-
+REACT_APP_AUX_ENDPOINT="https://devapi.mermsemr.com/en/desktop/api/v2/myfit"
-REACT_APP_AUX_ENDPOINT = "https://devapi.mermsemr.com/en/desktop/api/v2/myfit"
+REACT_APP_FORM_TIMEOUT=10000
-REACT_APP_FORM_TIMEOUT = 10000
+REACT_APP_MAX_MESSAGE_LENGHT=300
-REACT_APP_MAX_MESSAGE_LENGHT =300
 REACT_APP_BLOGSITE="https://blog.mermsemr.com/"
-

.env.development

@@ -0,0 +1,21 @@
+REACT_APP_US_ADDRESS="USA: 32 Oatgrass Dr, Grayson GA 30017"
+REACT_APP_US_PHONE="(415) 251 7583"
+REACT_APP_SUPPORT_EMAIL="support@myfit.ai"
+REACT_APP_YEAR=2025
+REACT_APP_ANDROID_URL="https://play.google.com/store/apps/details?id=com.mermsemr.myfit"
+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="http://localhost:7012"
+
+# Social Media Links
+REACT_APP_FACEBOOK="https://www.facebook.com/profile.php?id=100066498622246"
+REACT_APP_TWITTER="https://twitter.com/fluxtra"
+
+
+REACT_APP_AUX_ENDPOINT="https://devapi.mermsemr.com/en/desktop/api/v2/myfit"
+REACT_APP_FORM_TIMEOUT=10000
+REACT_APP_MAX_MESSAGE_LENGHT=300
+REACT_APP_BLOGSITE="https://blog.mermsemr.com/"

.env.production

@@ -0,0 +1,21 @@
+REACT_APP_US_ADDRESS="USA: 32 Oatgrass Dr, Grayson GA 30017"
+REACT_APP_US_PHONE="(415) 251 7583"
+REACT_APP_SUPPORT_EMAIL="support@myfit.ai"
+REACT_APP_YEAR=2025
+REACT_APP_ANDROID_URL="https://play.google.com/store/apps/details?id=com.mermsemr.myfit"
+REACT_APP_IOS_URL="https://play.google.com/store/apps/details?id=com.mermsemr.myfit"
+
+
+REACT_APP_APPSITE="https://users.myfit.ai/login"
+# " https://mermsemr.com"
+#REACT_APP_APPSITE="http://localhost:7012"
+
+# Social Media Links
+REACT_APP_FACEBOOK="https://www.facebook.com/profile.php?id=100066498622246"
+REACT_APP_TWITTER="https://twitter.com/fluxtra"
+
+
+REACT_APP_AUX_ENDPOINT="https://devapi.mermsemr.com/en/desktop/api/v2/myfit"
+REACT_APP_FORM_TIMEOUT=10000
+REACT_APP_MAX_MESSAGE_LENGHT=300
+REACT_APP_BLOGSITE="https://blog.mermsemr.com/"

.gitignore

@@ -1 +1,2 @@
 node_modules/*
+build/*

.idea/.gitignore

@@ -0,0 +1,8 @@
+# Default ignored files
+/shelf/
+/workspace.xml
+# Datasource local storage ignored files
+/dataSources/
+/dataSources.local.xml
+# Editor-based HTTP Client requests
+/httpRequests/

.idea/modules.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/www-myfit.iml" filepath="$PROJECT_DIR$/.idea/www-myfit.iml" />
+    </modules>
+  </component>
+</project>

.idea/vcs.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+  </component>
+</project>

.idea/www-myfit.iml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="WEB_MODULE" version="4">
+  <component name="NewModuleRootManager">
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>

Dockerfile

@@ -1,6 +1,9 @@
 # pull the base image
 FROM node:alpine
 
+# Build args
+ARG NODE_ENV
+
 # set the working direction
 #WORKDIR /app
 WORKDIR /usr/src/app
@@ -8,16 +11,26 @@ WORKDIR /usr/src/app
 # add `/app/node_modules/.bin` to $PATH
 # ENV PATH /app/node_modules/.bin:$PATH
 ENV PATH /usr/src/app/node_modules/.bin:$PATH
+ENV NODE_ENV=$NODE_ENV
+
+# install nginx
+RUN apk update
+RUN apk add nginx
 
 # install app dependencies
 COPY package.json ./
 
 COPY package-lock.json ./
 
+COPY nginx.conf ./
+
+COPY run.sh ./
+
 RUN npm install
 
 # add app
 COPY . ./
 
 # start app
-CMD ["npm", "start"]
+CMD /bin/sh ./run.sh
+

docker-compose.yml

@@ -1,12 +1,15 @@
 version: '3'
 services:
   myfit-www:
+    image: registry.chiefsoft.net/www-myfit:latest
     build:
       context: .
       dockerfile: Dockerfile
+      args:
+        - NODE_ENV=production
     restart: unless-stopped
     ports:
-      - 9057:3000
+      - 7010:3000
     stdin_open: true
     working_dir: /usr/src/app
     volumes:
@@ -19,6 +22,7 @@ services:
       - apigateway.wrenchboard.app.lotus.fluxtra.net:172.31.4.19
     environment:
       - CHOKIDAR_USEPOLLING=true
+      - NODE_ENV=${NODE_ENV:-production}
 volumes:
   src:
   public:

nginx.conf

@@ -0,0 +1,29 @@
+worker_processes 1;
+
+events {
+  worker_connections 1024;
+}
+
+http {
+  access_log /var/log/nginx/access.log;
+  error_log  /var/log/nginx/error.log;
+
+  server {
+    gzip on;
+    listen 3000;
+    server_name localhost;
+    root /usr/src/app/build;
+
+    include /etc/nginx/mime.types;
+
+    location /nginx_status {
+      stub_status on;
+      access_log off;
+    }
+
+    location / {
+      try_files $uri $uri/ /index.html;
+    }
+  }
+}
+

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",

package.json

@@ -18,8 +18,8 @@
     "axios": "^0.24.0"
   },
   "scripts": {
-    "start": "react-scripts start -e .env",
+    "start": "react-scripts start -e .env.development",
-    "build": "react-scripts build -e .env",
+    "build": "react-scripts build -e .env.production",
     "test": "react-scripts test",
     "eject": "react-scripts eject"
   },

public/assets/css/style.css

@@ -1733,7 +1733,7 @@ iframe#youtubevideo {
     padding: 20px 100px;
     padding-bottom: 50px;
     position: relative;
-    z-index: 999999;
+    /* z-index: 999999; */
 }
 
 /* download app dark background */

public/index.html

@@ -7,7 +7,7 @@
 
     <!-- favicons Icons -->
     <link rel="manifest" href="%PUBLIC_URL%/manifest.json">
-    <meta name="description" content="APPER:: App Landing Page" />
+    <meta name="description" content="Cloud-based electronic health record platform for all users. patient health record, family health record">
 
     <!-- fonts -->
     <link rel="stylesheet" href="assets/css/icofont.min.css">

run.sh

@@ -0,0 +1,15 @@
+#!/usr/bin/env sh
+set -e
+set -x
+
+export NODE_ENV="${NODE_ENV:-development}"
+
+if [ $NODE_ENV == "development" ]; then
+  # this runs webpack-dev-server with hot reloading
+  npm start
+else
+  # build the app and serve it via nginx
+  npm run build
+  nginx -g 'daemon off;' -c /usr/src/app/nginx.conf
+  nginx -c /usr/src/app/nginx.conf
+fi

src/assets/css/style.css

@@ -1119,7 +1119,7 @@ header.fixed .navbar {
 .how_it_works .how_it_inner {
   background-color: var(--bg-white);
   padding: 70px 0;
-  padding-bottom: 250px;
+  padding-bottom: 10px;
   border-radius: 30px;
   box-shadow: 0px 4px 30px #ede9fe;
 }
@@ -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 {
@@ -1754,7 +1758,7 @@ iframe#youtubevideo {
   padding: 20px 100px;
   padding-bottom: 50px;
   position: relative;
-  z-index: 999999;
+  /* z-index: 999999; */
 }
 
 /* download app dark background */
@@ -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---------- */
 
@@ -3008,11 +3027,17 @@ header.fix_style.white_header {
   margin-bottom: 15px;
 }
 
-.blog_detail_section .blog_inner_pannel .review span {
+.blog_detail_section .blog_inner_pannel span.blog_date {
   line-height: 1;
+  color: var(--purple);
+  display: flex;
+  font-weight: 700;
+  text-align: center;
+  justify-content: center;
+  align-items: center;
 }
 
-.blog_detail_section .blog_inner_pannel .review span:first-child {
+/* .blog_detail_section .blog_inner_pannel .review span:first-child {
   color: var(--purple);
   display: inline-block;
   font-weight: 700;
@@ -3024,7 +3049,7 @@ header.fix_style.white_header {
   margin-left: 15px;
   padding-left: 15px;
   border-left: 1px solid var(--dark-purple);
-}
+} */
 
 .blog_detail_section .blog_inner_pannel .section_title {
   margin-bottom: 40px;
@@ -3043,29 +3068,29 @@ header.fix_style.white_header {
 }
 
 .blog_detail_section .blog_inner_pannel .info h3 {
-    font-weight: 700;
+  font-weight: 700;
-    color: var(--dark-purple);
+  color: var(--dark-purple);
-    margin-top: 30px;
+  margin-top: 30px;
-    font-size: 25px;
+  font-size: 25px;
-    margin-bottom: 15px;
+  margin-bottom: 15px;
 }
 
 /* To highlight the link in the terms section */
-.blog_detail_section .blog_inner_pannel .info p span a{
+.blog_detail_section .blog_inner_pannel .info p span a {
-    color: var(--dark-purple);
+  color: var(--dark-purple);
-    text-decoration: underline;
+  text-decoration: underline;
 }
 
 /* To reduce the fonts for sub-headers */
 .blog_detail_section .blog_inner_pannel .info h4 {
-    font-weight: 700;
+  font-weight: 700;
-    color: var(--dark-purple);
+  color: var(--dark-purple);
-    margin-top: 30px;
+  margin-top: 30px;
-    font-size: 20px;
+  font-size: 20px;
-    margin-bottom: 15px;
+  margin-bottom: 15px;
-  }
+}
 
-  /* To align the text for proper readability */
+/* To align the text for proper readability */
 .blog_detail_section .blog_inner_pannel .info p {
   text-align: justify;
 }
@@ -3526,48 +3551,80 @@ header.fix_style.white_header {
 }
 
 /* Textarea scrollbar */
-.contact_page_section .contact_inner .contact_form form .form-group textarea::-webkit-scrollbar {
+.contact_page_section
+  .contact_inner
+  .contact_form
+  form
+  .form-group
+  textarea::-webkit-scrollbar {
   width: 12px;
   cursor: pointer;
 }
 
-.contact_page_section .contact_inner .contact_form form .form-group textarea::-webkit-scrollbar-track {
+.contact_page_section
-  -webkit-box-shadow: inset 0 0 6px rgba(0,0,0,0.3); 
+  .contact_inner
+  .contact_form
+  form
+  .form-group
+  textarea::-webkit-scrollbar-track {
+  -webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.3);
   border-radius: 10px;
   background-color: var(--light-bg);
 }
 
-.contact_page_section .contact_inner .contact_form form .form-group textarea::-webkit-scrollbar-thumb {
+.contact_page_section
+  .contact_inner
+  .contact_form
+  form
+  .form-group
+  textarea::-webkit-scrollbar-thumb {
   border-radius: 10px;
-  -webkit-box-shadow: inset 0 0 6px rgba(0,0,0,0.5); 
+  -webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.5);
   background-color: var(--body-text-purple);
 }
 
-.contact_page_section .contact_inner .contact_form form .form-group .contact_btn{
+.contact_page_section
+  .contact_inner
+  .contact_form
+  form
+  .form-group
+  .contact_btn {
   display: flex !important;
   align-items: center;
   justify-content: center;
 }
 
-.contact_page_section .contact_inner .contact_form form .form-group .contact_btn p{
+.contact_page_section
+  .contact_inner
+  .contact_form
+  form
+  .form-group
+  .contact_btn
+  p {
   margin: 0 !important;
 }
 
-.contact_page_section .contact_inner .contact_form form .form-group .contact_btn > span{
+.contact_page_section
+  .contact_inner
+  .contact_form
+  form
+  .form-group
+  .contact_btn
+  > span {
   width: 24px;
   height: 24px;
 }
 
-#contact_body{
+#contact_body {
   min-height: 48rem;
   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;
@@ -3576,50 +3633,67 @@ 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-timing-function: linear;
-  animation-duration: 0.5s;
+  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);
   }
 }
 
 /* For the err msg */
-#errText{
+#errText {
   text-align: center;
   color: tomato;
   font-weight: 600;
 }
 
-.contact_page_section .contact_inner .contact_form form .form-group span{
+.contact_page_section .contact_inner .contact_form form .form-group span {
   font-size: 12px;
   color: tomato;
   padding: 3px;
   display: none;
 }
 
-.contact_page_section .contact_inner .contact_form form .form-group input:valid[focused="true"]{
+.contact_page_section
+  .contact_inner
+  .contact_form
+  form
+  .form-group
+  input:valid[focused="true"] {
   border: 1px solid var(--dark-purple);
 }
 
-.contact_page_section .contact_inner .contact_form form .form-group input:invalid[focused="true"]{
+.contact_page_section
+  .contact_inner
+  .contact_form
+  form
+  .form-group
+  input:invalid[focused="true"] {
   border: 1px solid tomato;
 }
 
-.contact_page_section .contact_inner .contact_form form .form-group input:invalid[focused="true"] ~ span{
+.contact_page_section
+  .contact_inner
+  .contact_form
+  form
+  .form-group
+  input:invalid[focused="true"]
+  ~ span {
   display: block;
 }
 
@@ -4689,19 +4763,20 @@ header.fix_style.white_header {
 
 /* Loader */
 
-.loader{
+.loader {
   border-radius: 100%;
   position: relative;
 }
 
-.loader-sm{
+.loader-sm {
   width: 24px;
   height: 24px;
 }
 
 /* LOADER 1 */
 
-#loader-1:before, #loader-1:after{
+#loader-1:before,
+#loader-1:after {
   content: "";
   position: absolute;
   width: 100%;
@@ -4711,24 +4786,24 @@ header.fix_style.white_header {
   border-top-color: var(--body-text-purple);
 }
 
-#loader-1:before{
+#loader-1:before {
   z-index: 100;
   animation: spin 1.5s infinite;
 }
 
-#loader-1:after{
+#loader-1:after {
   border: 3.5px solid #ccc;
 }
 
-@keyframes spin{
+@keyframes spin {
-  0%{
+  0% {
     -webkit-transform: rotate(0deg);
     -ms-transform: rotate(0deg);
     -o-transform: rotate(0deg);
     transform: rotate(0deg);
   }
 
-  100%{
+  100% {
     -webkit-transform: rotate(360deg);
     -ms-transform: rotate(360deg);
     -o-transform: rotate(360deg);

src/component/AboutUs/Main.js

@@ -6,9 +6,32 @@ 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. 
+    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 (
     <>       
        {brdcum.b1 && 
@@ -56,28 +79,24 @@ const Main = ({brdcum}) => {
                             life easy to grow.</h2>
                         </div>
                         <p data-aos="fade-up" data-aos-duration="1500">
-                            Lorem Ipsum is simply dummy text of the printing and type
+                            {innovativeDesc}
-                            setting industry lorem Ipsum has been the industrys standard dummy text ever since the 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 typesetting, remaining to make a type speci
-                            men book. It has survived essentially unchanged.
                         </p>
-                        <p data-aos="fade-up" data-aos-duration="1500">
+                        {/* <p data-aos="fade-up" data-aos-duration="1500">
                             Standard dummy text ever since the when an unknown printer took a galley of type and scrambled it to
                             make a type specien book. It has survived not only five centuries, but also the leap into electronic
                             typesetting.
-                        </p>
+                        </p> */}
                         </div>
                     </div>
                     <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>
@@ -86,7 +105,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>
@@ -98,55 +118,50 @@ const Main = ({brdcum}) => {
                 <div className="container">
                 <div className="section_title" data-aos="fade-up" data-aos-duration="1500" data-aos-delay="100">
                     <h2><span>Why we are different</span> from others!</h2>
-                    <p>Lorem Ipsum is simply dummy text of the printing and typese tting <br/> indus orem Ipsum has beenthe standard
+                    <p>{whyWeAreDiff.desc}</p>
-                    dummy.</p>
                 </div>
                 <div className="row">
                     <div className="col-md-6 col-lg-3">
                     <div className="why_box" data-aos="fade-up" data-aos-duration="1500" data-aos-delay="100">
-                        <div className="icon">
+                        {/* <div className="icon">
                         <img src="assets/images/secure.png" alt="image"/>
-                        </div>
+                        </div> */}
                         <div className="text">
-                        <h3>Secure code</h3>
+                        <h3>{whyWeAreDiff.title1}</h3>
-                        <p>Lorem Ipsum is simply dummy text of the printing and type
+                        <p> {whyWeAreDiff.secureDesc}</p>
-                            setting indus ideas.
-                        </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">
+                        {/* <div className="icon">
                         <img src="assets/images/abt_functional.png" alt="image"/>
-                        </div>
+                        </div> */}
                         <div className="text">
-                        <h3>Fully functional</h3>
+                        <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>
                     <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">
+                        {/* <div className="icon">
                         <img src="assets/images/communication.png" alt="image"/>
-                        </div>
+                        </div> */}
                         <div className="text">
-                        <h3>Best communication</h3>
+                        <h3>{whyWeAreDiff.title3}</h3>
-                        <p>Lorem Ipsum is simply dummy text of the printing and type
+                         <p>{whyWeAreDiff.easeOfUseDesc}</p>
-                            setting indus ideas.
-                        </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">
+                        {/* <div className="icon">
                         <img src="assets/images/abt_support.png" alt="image"/>
-                        </div>
+                        </div> */}
                         <div className="text">
-                        <h3>24-7 Support</h3>
+                        <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>
@@ -159,7 +174,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">
@@ -167,45 +182,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>{innovativeDesc}</p>
-                            </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>
+                                <h3>Manage</h3>
-                                <p>Download</p>
+                                <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>
+                                <h3>Health Record</h3>
-                                <p>Followers</p>
+                                <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>
+                                <h3>Health</h3>
-                                <p>Reviews</p>
+                                <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>
+                                <h3>Quick</h3>
-                                <p>Countries</p>
+                                <p>Schedule</p>
                             </div>
                             </li>
                         </ul>
@@ -223,8 +238,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>
+                        <h2>Have any questions 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/Blog/Blog/Main.js

@@ -1,27 +1,61 @@
-import React from 'react'
+import React, { useEffect, useState } from "react";
-import { Link } from 'react-router-dom'
+import { Link } from "react-router-dom";
-import BGImg from "../../../assets/images/bread_crumb_bg.png"
+import BGImg from "../../../assets/images/bread_crumb_bg.png";
-import BGImg1 from "../../../assets/images/bread_crumb_bg_one.png"
+import SiteService from "../../../vendors/service/siteService";
-import BGImg2 from "../../../assets/images/bread_crumb_bg_two.png"
+const Main = ({ brdcum, bgimg }) => {
+  const [blogData, setBlogData] = useState([]);
+  console.log(blogData);
+
+  const api = new SiteService();
+  useEffect(() => {
+    if(blogData.length===0){getBlogData()};
+  }, [blogData]);
+
+  const getBlogData = async () => {
+    try {
+      const res = await api.blogData();
+
+      setBlogData(res.data);
+
+      // console.log(res.data);
+
+      
+    } catch (error) {
+      console.log("Error from blog data ", error);
+    }
+  };
   
-const Main = ({brdcum,bgimg}) => {
   return (
     <>
+      <div className="bred_crumb" style={{ backgroundImage: `url(${BGImg})` }}>
+        <div className="container">
+          <span className="banner_shape1">
+            {" "}
+            <img src="assets/images/banner-shape1.png" alt="image" />{" "}
+          </span>
+          <span className="banner_shape2">
+            {" "}
+            <img src="assets/images/banner-shape2.png" alt="image" />{" "}
+          </span>
+          <span className="banner_shape3">
+            {" "}
+            <img src="assets/images/banner-shape3.png" alt="image" />{" "}
+          </span>
 
-        <div className="bred_crumb" style={{ backgroundImage : `url(${BGImg})`}}>
+          <div className="bred_text">
-            <div className="container">
+            <h1>Latest Blog Post</h1>
-                <span className="banner_shape1"> <img src="assets/images/banner-shape1.png" alt="image" /> </span>
+            <ul>
-                <span className="banner_shape2"> <img src="assets/images/banner-shape2.png" alt="image" /> </span>
+              <li>
-                <span className="banner_shape3"> <img src="assets/images/banner-shape3.png" alt="image" /> </span>
+                <Link to="/">Home</Link>
-
+              </li>
-                <div className="bred_text">
+              <li>
-                <h1>Latest Blog Post</h1>
+                <span>»</span>
-                <ul>
+              </li>
-                    <li><Link to="/">Home</Link></li>
+              <li>
-                    <li><span>»</span></li>
+                <Link to="/blog">Blog</Link>
-                    <li><Link to="/blog">Blog</Link></li>
+              </li>
-                </ul>
+            </ul>
-               {/* <div className="search_bar">
+            {/* <div className="search_bar">
                     <form action="">
                         <div className="form-group">
                             <input type="text" placeholder="Search here" className="form-control"/>
@@ -29,126 +63,96 @@ const Main = ({brdcum,bgimg}) => {
                         </div>
                     </form>
         </div>*/}
-                </div>
+          </div>
-            </div>
         </div>
+      </div>
 
+      <section className="row_am blog_list_main">
+        {blogData.map((data,index) => {
+          if (index === 0){
+            return (
+              <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> */}
     
-        <section className="row_am blog_list_main">
+                    <span>{new Date (data.post_date).toDateString()}</span>
-            <div className="container">
+                  </div>
-                <div className="row">
-                <div className="col-lg-6" data-aos="fade-in" data-aos-duration="1500">
-                    <div className="blog_img">
-                        <img src="https://picsum.photos/seed/picsum/505/378" alt="image"/>
-                        <span>20 min ago</span>
-                    </div>
                 </div>
                 <div className="col-lg-6">
-                    <div className="blog_text">
+                  <div className="blog_text">
-                        <div className="section_title">
+                    <div className="section_title">
-                        <h2>Top rated app of the year!</h2>
+                      <h2>{data.post_title}</h2>
-                        <p>myFit has powerful connectivity, fitness, health, and safety features
+                      <div dangerouslySetInnerHTML={{__html: data.post_content.substring(0,400)+'  . . .'}}></div>
-                            Also makes provision Fitness tracking,Workout tracking,Heart rate monitoringscrambled 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 typesetting.</p>
+                      {/* <Link to={`/blog-single/${data.id}`} state={{data}}>
-                            <Link to="/blog-single">READ MORE</Link>
+                          READ MORE
-                        </div>
+                        </Link> */}
+                        <Link to={`/blogdetails/${data.id}`} state={{data, allData: blogData}}>
+                      READ MORE
+                    </Link>
                     </div>
+                  </div>
                 </div>
-                </div>
+              </div>
             </div>
-        </section>
-        <section className="row_am latest_story blog_list_story" id="blog">
-            <div className="container">
-                <div className="row">
-                    <div className="col-md-4">
-                        <div className="story_box" data-aos="fade-up" data-aos-duration="1500">
-                            <div className="story_img">
-                            <img src="https://picsum.photos/seed/picsum/505/378" alt="image" />
-                            <span>45 min ago</span>
-                            </div>
-                            <div className="story_text">
-                                <h3>Cool features added!</h3>
-                                <p>Lorem Ipsum is simply dummy text of the printing and typesetting 
-                                industry lorem Ipsum has.</p>
-                                <Link to="/blog-single">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="https://picsum.photos/seed/picsum/505/378" 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="/blog-single">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="https://picsum.photos/seed/picsum/505/378" 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="/blog-single">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="https://picsum.photos/seed/picsum/505/378" alt="image"/>
-                            <span>45 min ago</span>
-                            </div>
-                            <div className="story_text">
-                                <h3>Excellence UI design</h3>
-                                <p>Lorem Ipsum is simply dummy text of the printing and typesetting 
-                                industry lorem Ipsum has.</p>
-                                <Link to="/blog-single">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="https://picsum.photos/seed/picsum/505/378" alt="image"/>
-                            <span>45 min ago</span>
-                            </div>
-                            <div className="story_text">
-                                <h3>Quick and easy Search</h3>
-                                <p>Simply dummy text of the printing and typesetting industry lorem Ipsum has Lorem Ipsum is.</p>
-                                <Link to="/blog-single">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="https://picsum.photos/seed/picsum/505/378" alt="image"/>
-                            <span>45 min ago</span>
-                            </div>
-                            <div className="story_text">
-                                <h3>Chat function eded</h3>
-                                <p>Printing and typesetting industry lorem Ipsum has Lorem simply dummy text of the.</p>
-                                <Link to="/blog-single">READ MORE</Link>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-                <div className="pagination_block">
-                    <ul>
-                        <li><Link to="#" className="prev"> Visit our blog</Link></li>
-                    </ul>
-                </div>
-            </div>
-        </section>
-    </>
-  )
-}
 
-export default Main
+            )
+          }          
+        })}
+       
+       
+      </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){
+                return (
+                  <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 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">
+                  {" "}
+                  Visit our blog
+                </Link>
+              </li>
+            </ul>
+          </div>
+        </div>
+      </section>
+    </>
+  );
+};
+
+export default Main;

src/component/Blog/BlogSingle/Main.js

@@ -1,11 +1,49 @@
-import React from 'react'
+import React, { useEffect, useState } from "react";
-import { Link } from 'react-router-dom'
+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 { 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 () => {
+    try {
+      const res = await api.blogData();
+      setBlogData(res.data);
+      
+    } catch (error) {
+      console.log("Error from blog data ", error);
+    }
+  };
         
   return (
     <>
@@ -49,81 +87,55 @@ const Main = ({brdcum}) => {
                 <div className="blog_inner_pannel">
                     <div className="review">
                         <span>Review</span>
-                        <span>45 min ago</span>
+                        {/* <span>45 min ago</span> */}
+                        <span>{new Date (data && data.post_modified).toDateString()}</span>
+
                     </div>
                     <div className="section_title">
-                        <h2>Top rated app of the year!</h2>
+                        <h2>{data && data.post_title}</h2>
                     </div>
                     <div className="main_img">
-                        <img src="assets/images/blog_detail_main.png" alt="image" />
+                        <img src={data && data.meta_value} alt="image" />
                     </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>
+                        <h3>{data && data.post_name}</h3>
-                        <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>
+                        <div dangerouslySetInnerHTML={{__html: data && data.post_content}}></div>
-                        <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">
+                            {/* <div className="avtar">
                                 <img src="assets/images/blog_d02.png" alt="image" />
-                            </div>
+                            </div> */}
                             <div className="text">
-                                <h3>By: John Dow</h3>
+                                <h3>{data && data.post_author}</h3>
-                                <span>July 25, 2022</span>
+                                <span>{new Date (data && data.post_date).toDateString()}</span>
                             </div>
                         </div>
                         <div className="social_media">
                             <ul>
-                                <li><Link to="#"><i className="icofont-facebook"></i></Link></li>
+                                <li>
-                                <li><Link to="#"><i className="icofont-twitter"></i></Link></li>
+                                <a href={process.env.REACT_APP_FACEBOOK}>
-                                <li><Link to="#"><i className="icofont-instagram"></i></Link></li>
+                                    <i className="icofont-facebook"></i>
-                                <li><Link to="#"><i className="icofont-pinterest"></i></Link></li>
+                                </a>
+                                </li>
+                                <li>
+                                <a href={process.env.REACT_APP_TWITTER}>
+                                    <i className="icofont-twitter"></i>
+                                </a>
+                                </li>
                             </ul>
                         </div>
                     </div>
                     <div className="blog_tags">
-                        <ul>
+                        <a href={process.env.REACT_APP_BLOGSITE}>Visit Blog Site </a>
-                        <li className="tags"><p>Tags:</p></li>
-                        <li><span>app,</span></li>
-                        <li><span>rating,</span></li>
-                        <li><span>development</span></li>
-                        </ul>
                     </div>
                 </div>
             </div>
         </section>
-        <section className="row_am comment_section">
+
+        {/* <section className="row_am comment_section">
             <div className="container">
                 <div className="section_title">
                     <h2>3 Comments</h2>
@@ -216,7 +228,7 @@ const Main = ({brdcum}) => {
                     </div>
                 </form>
             </div>
-        </section>
+        </section> */}
 
         <section className="row_am latest_story" id="blog">
             <div className="container">
@@ -225,21 +237,33 @@ const Main = ({brdcum}) => {
                     <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">
-                    <div className="col-md-4">
+
-                        <div className="story_box" data-aos="fade-up" data-aos-duration="1500">
+                 {newAllData.map((data) => {
-                            <div className="story_img">
+                    
-                            <img src="assets/images/story01.png" alt="image" />
+                    return (
-                            <span>45 min ago</span>
+
-                            </div>
+                     <div className="col-md-4">
-                            <div className="story_text">
+                     <div className="story_box" data-aos="fade-up" data-aos-duration="1500">
-                                <h3>Cool features added!</h3>
+                         <div className="story_img">
-                                <p>Lorem Ipsum is simply dummy text of the printing and typesetting 
+                        <img src={data.meta_value} alt="image" />
-                                industry lorem Ipsum has.</p>
+                         <span>45 min ago</span>
-                                <Link to="#">READ MORE</Link>
+                         </div>
-                            </div>
+                         <div className="story_text">
-                        </div>
+                            <h3>{data.post_title}</h3>
-                    </div>
+                             <div dangerouslySetInnerHTML={{__html: data.post_content.substring(0,300)+'  . . .'}}></div>
-                    <div className="col-md-4">
+                            {/* <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" />
@@ -264,7 +288,7 @@ const Main = ({brdcum}) => {
                                 <Link to="#">READ MORE</Link>
                             </div>
                         </div>
-                    </div>
+                    </div> */}
                 </div>
             </div>
         </section>

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
@@ -78,7 +81,6 @@ const Main = ({ brdcum }) => {
   const onChange = (e) => {
     setValues((prev) => ({ ...prev, [e.target.name]: e.target.value }));
   };
-  console.log(values);
 
   // Submitting form
   const handleSubmit = async (e) => {
@@ -93,36 +95,30 @@ const Main = ({ brdcum }) => {
         setMyData(contact);
 
         // Checking for errors
-        if (contact?.data?.status < 1 || contact?.data?.message_id == "")
+        if (contact?.data?.status < 1 || contact?.data?.message_id == ""){
-          return (errText.textContent =
+          errText.textContent = "unable to send your message, please try again";
-            "unable to send your message, please try able");
+          response.innerHTML = `<p> SEND MESSAGE </p>`;
-        else {
+        }else {
           response.innerHTML = `<p> SEND MESSAGE </p>`;
 
-          contact_body.innerHTML = `<div class='contact_body animate pop'>
+          setShowSuccessfulImage(true) // sets show success image to true
-      <div><img src=${SuccessImg} /></div>
+
-      <p>We have received your message and will follow up promptly.</p>
-      </div>`;
           setTimeout(() => {
             navigate("/");
           }, 10000);
-
-          setValues((prev) => ({ ...prev, [e.target.name]: "" }));
         }
       })
-      .catch((error) => {
+      .catch(() => {
-        console.log(error);
+        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(() => {
-    console.log(myData);
-  }, [myData]);
 
   return (
     <>
@@ -180,110 +176,114 @@ const Main = ({ brdcum }) => {
         id="contact">
         <div className="container">
           <div className="contact_inner">
-            <div
+            <div className="contact_form" id="contact_body">
-              className="contact_form"
+              {showSuccessfulImage ? (
-              id="contact_body">
+                <>
-              <div className="section_title">
+                  <div><img className="img-fluid animate-image" src={SuccessImg} alt='success image' /></div>
-                <h2>
+                  <p>We have received your message and will follow up promptly.</p>
-                  <span>Leave a</span> message
+                </>
-                </h2>
+              ) : (
-                <p>Fill up form below, our team will get back soon</p>
+                <>
-              </div>
+                <div className="section_title">
-
+                  <h2>
-              {/* Contact Form */}
+                    <span>Leave a</span> message
-              <form onSubmit={handleSubmit}>
+                  </h2>
-                <FormInput
+                  <p>Fill up form below, our team will get back soon</p>
-                  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>
 
-                <FormInput
+                {/* Contact Form */}
-                  name="phone"
+                <form onSubmit={handleSubmit}>
-                  type="number"
+                  <FormInput
-                  placeholder="Phone"
+                    name="name"
-                  errorMessage="It should be a valid phone number!"
+                    type="text"
-                  maxLenght={15}
+                    placeholder="Name"
-                  value={values.phone}
+                    errorMessage="Please enter your first and last name. (e.g: Mark John)"
-                  onChange={onChange}
+                    required={true}
-                  pattern="^[0-9]{15}$"
+                    maxLenght={35}
-                />
+                    value={values.name}
-
-                <div className="form-group">
-                  <textarea
-                    name="msg"
-                    className="form-control"
-                    placeholder="Your message"
-                    value={values.msg}
-                    errorMessage='words have exceeded 350 characters!'
                     onChange={onChange}
-                    maxLength={300}
+                    pattern="^\w+( \w+)$"
-                    pattern="^[A-Za-z0-9]{5, 300}$"
                   />
-                </div>
+
-                <div className="form-group term_check">
+                  <FormInput
-                  <input
+                    name="email"
-                    type="checkbox"
+                    type="email"
-                    id="term"
+                    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
+                  <div className="form-group">
-                  </label>
+                    <select
-                </div>
+                      className="form-control"
-                <div className="form-group mb-0">
+                      name="country"
-                  <button
+                      value={values.country}
-                    type="submit"
+                      onChange={onChange}
-                    className="btn puprple_btn contact_btn"
+                      required>
-                    aria-label="submit form"
+                      <option value={""}>
-                    id="contact_loader">
+                        Country
-                    <p> SEND MESSAGE </p>
+                      </option>
-                  </button>
+                      {countries.length > 0 &&
-                </div>
+                        countries.map((country, index) => (
-              </form>
+                          <option
-              {/* Error Tag */}
+                            key={index}
-              <p id="errText" />
+                            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 */}
@@ -355,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";
@@ -13,33 +14,11 @@ const Main = ({ footer }) => {
         <footer>
           <div className="top_footer" id="contact">
             <div className="anim_line dark_bg">
-              <span>
+              {[...Array(9)].map((_, index) => (
-                <img src={line} alt="anim_line" />
+                <span key={index}>
-              </span>
+                  <img src={line} alt="anim_line" />
-              <span>
+                </span>
-                <img src={line} alt="anim_line" />
+              ))}
-              </span>
-              <span>
-                <img src={line} alt="anim_line" />
-              </span>
-              <span>
-                <img src={line} alt="anim_line" />
-              </span>
-              <span>
-                <img src={line} alt="anim_line" />
-              </span>
-              <span>
-                <img src={line} alt="anim_line" />
-              </span>
-              <span>
-                <img src={line} alt="anim_line" />
-              </span>
-              <span>
-                <img src={line} alt="anim_line" />
-              </span>
-              <span>
-                <img src={line} alt="anim_line" />
-              </span>
             </div>
             <div className="container">
               <div className="row">
@@ -51,24 +30,32 @@ const Main = ({ footer }) => {
                     </div>
                     <ul>
                       <li>
-                        <Link to="#">
+                        {/* <Link to="#">
                           {process.env.REACT_APP_SUPPORT_EMAIL}
-                        </Link>
+                        </Link> */}
+                        <a
+                          href={`mailto: ${process.env.REACT_APP_SUPPORT_EMAIL}`}
+                        >
+                          {process.env.REACT_APP_SUPPORT_EMAIL}
+                        </a>
                       </li>
                       <li>
-                        <Link to="#">{process.env.REACT_APP_US_PHONE}</Link>
+                        {/* <Link to="#">{process.env.REACT_APP_US_PHONE}</Link> */}
+                        <a href={`tel: ${process.env.REACT_APP_US_PHONE}`}>
+                          {process.env.REACT_APP_US_PHONE}
+                        </a>
                       </li>
                     </ul>
                     <ul className="social_media">
                       <li>
-                        <Link to="#">
+                        <a href={process.env.REACT_APP_FACEBOOK}>
                           <i className="icofont-facebook"></i>
-                        </Link>
+                        </a>
                       </li>
                       <li>
-                        <Link to="#">
+                        <a href={process.env.REACT_APP_TWITTER}>
                           <i className="icofont-twitter"></i>
-                        </Link>
+                        </a>
                       </li>
                     </ul>
                   </div>
@@ -78,13 +65,14 @@ 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>
                       </li>
                       <li>
-                        <Link to="/blog">Blog</Link>
+                        <Link to="https://blog.myfit.ai/">Blog</Link>
                       </li>
                       <li>
                         <Link to="/contact">Contact us</Link>
@@ -94,13 +82,13 @@ const Main = ({ footer }) => {
                 </div>
                 <div className="col-lg-3 col-md-6 col-12">
                   <div className="links">
-                    <h3>Help & Suport</h3>
+                    <h3>Help & Support</h3>
                     <ul>
                       <li>
                         <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>
@@ -116,14 +104,14 @@ const Main = ({ footer }) => {
                     <h3>Let’s Try Out</h3>
                     <ul className="app_btn">
                       <li>
-                        <Link to="https://play.google.com/store/apps/details?id=com.mermsemr.myfit">
+                        <a href={process.env.REACT_APP_ANDROID_URL}>
                           <img src={blueapp} alt="image" />
-                        </Link>
+                        </a>
                       </li>
                       <li>
-                        <Link to="https://play.google.com/store/apps/details?id=com.mermsemr.myfit">
+                        <a href={process.env.REACT_APP_IOS_URL}>
                           <img src={blue} alt="image" />
-                        </Link>
+                        </a>
                       </li>
                     </ul>
                   </div>
@@ -188,24 +176,32 @@ const Main = ({ footer }) => {
                     </div>
                     <ul>
                       <li>
-                        <Link to="#">
+                        {/* <Link to="#">
                           {process.env.REACT_APP_SUPPORT_EMAIL}
-                        </Link>
+                        </Link> */}
+                        <a
+                          href={`mailto: ${process.env.REACT_APP_SUPPORT_EMAIL}`}
+                        >
+                          {process.env.REACT_APP_SUPPORT_EMAIL}
+                        </a>
                       </li>
                       <li>
-                        <Link to="#">{process.env.REACT_APP_US_PHONE}</Link>
+                        {/* <Link to="#">{process.env.REACT_APP_US_PHONE}</Link> */}
+                        <a href={`tel: ${process.env.REACT_APP_US_PHONE}`}>
+                          {process.env.REACT_APP_US_PHONE}
+                        </a>
                       </li>
                     </ul>
                     <ul className="social_media">
                       <li>
-                        <Link to="#">
+                        <a href={process.env.REACT_APP_FACEBOOK}>
                           <i className="icofont-facebook"></i>
-                        </Link>
+                        </a>
                       </li>
                       <li>
-                        <Link to="#">
+                        <a href={process.env.REACT_APP_TWITTER}>
                           <i className="icofont-twitter"></i>
-                        </Link>
+                        </a>
                       </li>
                     </ul>
                   </div>
@@ -231,13 +227,13 @@ const Main = ({ footer }) => {
                 </div>
                 <div className="col-lg-3 col-md-6 col-12">
                   <div className="links">
-                    <h3>Help & Suport</h3>
+                    <h3>Help & Support</h3>
                     <ul>
                       <li>
                         <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>
@@ -253,20 +249,14 @@ const Main = ({ footer }) => {
                     <h3>Let’s Try Out</h3>
                     <ul className="app_btn">
                       <li>
-                        <Link to="https://play.google.com/store/apps/details?id=com.mermsemr.myfit">
+                        <a href={process.env.REACT_APP_ANDROID_URL}>
-                          <img
+                          <img src={blueapp} alt="image" />
-                            src="assets/images/appstore_blue.png"
+                        </a>
-                            alt="image"
-                          />
-                        </Link>
                       </li>
                       <li>
-                        <Link to="https://play.google.com/store/apps/details?id=com.mermsemr.myfit">
+                        <a href={process.env.REACT_APP_IOS_URL}>
-                          <img
+                          <img src={blue} alt="image" />
-                            src="assets/images/googleplay_blue.png"
+                        </a>
-                            alt="image"
-                          />
-                        </Link>
                       </li>
                     </ul>
                   </div>
@@ -317,24 +307,32 @@ const Main = ({ footer }) => {
                     </div>
                     <ul>
                       <li>
-                        <Link to="#">
+                        {/* <Link to="#">
                           {process.env.REACT_APP_SUPPORT_EMAIL}
-                        </Link>
+                        </Link> */}
+                        <a
+                          href={`mailto: ${process.env.REACT_APP_SUPPORT_EMAIL}`}
+                        >
+                          {process.env.REACT_APP_SUPPORT_EMAIL}
+                        </a>
                       </li>
                       <li>
-                        <Link to="#">{process.env.REACT_APP_US_PHONE}</Link>
+                        {/* <Link to="#">{process.env.REACT_APP_US_PHONE}</Link> */}
+                        <a href={`tel: ${process.env.REACT_APP_US_PHONE}`}>
+                          {process.env.REACT_APP_US_PHONE}
+                        </a>
                       </li>
                     </ul>
                     <ul className="social_media">
                       <li>
-                        <Link to="#">
+                        <a href={process.env.REACT_APP_FACEBOOK}>
                           <i className="icofont-facebook"></i>
-                        </Link>
+                        </a>
                       </li>
                       <li>
-                        <Link to="#">
+                        <a href={process.env.REACT_APP_TWITTER}>
                           <i className="icofont-twitter"></i>
-                        </Link>
+                        </a>
                       </li>
                     </ul>
                   </div>
@@ -373,7 +371,7 @@ const Main = ({ footer }) => {
                         <Link to="#">Support</Link>
                       </li>
                       <li>
-                        <Link to="/work">How it works</Link>
+                        <HashLink to="/#how_it_work">How it works</HashLink>
                       </li>
                       <li>
                         <Link to="/terms">Terms & conditions</Link>
@@ -390,20 +388,14 @@ const Main = ({ footer }) => {
                     <h3>Let’s Try Out</h3>
                     <ul className="app_btn">
                       <li>
-                        <Link to="https://play.google.com/store/apps/details?id=com.mermsemr.myfit">
+                        <a href={process.env.REACT_APP_ANDROID_URL}>
-                          <img
+                          <img src={blueapp} alt="image" />
-                            src="assets/images/appstore_blue.png"
+                        </a>
-                            alt="image"
-                          />
-                        </Link>
                       </li>
                       <li>
-                        <Link to="https://play.google.com/store/apps/details?id=com.mermsemr.myfit">
+                        <a href={process.env.REACT_APP_IOS_URL}>
-                          <img
+                          <img src={blue} alt="image" />
-                            src="assets/images/googleplay_blue.png"
+                        </a>
-                            alt="image"
-                          />
-                        </Link>
                       </li>
                     </ul>
                   </div>
@@ -448,24 +440,32 @@ const Main = ({ footer }) => {
                     </div>
                     <ul>
                       <li>
-                        <Link to="#">
+                        {/* <Link to="#">
                           {process.env.REACT_APP_SUPPORT_EMAIL}
-                        </Link>
+                        </Link> */}
+                        <a
+                          href={`mailto: ${process.env.REACT_APP_SUPPORT_EMAIL}`}
+                        >
+                          {process.env.REACT_APP_SUPPORT_EMAIL}
+                        </a>
                       </li>
                       <li>
-                        <Link to="#">{process.env.REACT_APP_US_PHONE}</Link>
+                        {/* <Link to="#">{process.env.REACT_APP_US_PHONE}</Link> */}
+                        <a href={`tel: ${process.env.REACT_APP_US_PHONE}`}>
+                          {process.env.REACT_APP_US_PHONE}
+                        </a>
                       </li>
                     </ul>
                     <ul className="social_media">
                       <li>
-                        <Link to="#">
+                        <a href={process.env.REACT_APP_FACEBOOK}>
                           <i className="icofont-facebook"></i>
-                        </Link>
+                        </a>
                       </li>
                       <li>
-                        <Link to="#">
+                        <a href={process.env.REACT_APP_TWITTER}>
                           <i className="icofont-twitter"></i>
-                        </Link>
+                        </a>
                       </li>
                     </ul>
                   </div>
@@ -495,7 +495,7 @@ const Main = ({ footer }) => {
 
                 <div className="col-lg-3 col-md-6 col-12">
                   <div className="links">
-                    <h3>Help & Suport</h3>
+                    <h3>Help & Support</h3>
                     <ul>
                       <li>
                         <Link to="/faq">FAQs</Link>
@@ -504,7 +504,7 @@ const Main = ({ footer }) => {
                         <Link to="#">Support</Link>
                       </li>
                       <li>
-                        <Link to="/work">How it works</Link>
+                        <HashLink to="/#how_it_work">How it works</HashLink>
                       </li>
                       <li>
                         <Link to="/terms">Terms & conditions</Link>
@@ -521,20 +521,14 @@ const Main = ({ footer }) => {
                     <h3>Let’s Try Out</h3>
                     <ul className="app_btn">
                       <li>
-                        <Link to="https://play.google.com/store/apps/details?id=com.mermsemr.myfit">
+                        <a href={process.env.REACT_APP_ANDROID_URL}>
-                          <img
+                          <img src={blueapp} alt="image" />
-                            src="assets/images/appstore_blue.png"
+                        </a>
-                            alt="image"
-                          />
-                        </Link>
                       </li>
                       <li>
-                        <Link to="https://play.google.com/store/apps/details?id=com.mermsemr.myfit">
+                        <a href={process.env.REACT_APP_IOS_URL}>
-                          <img
+                          <img src={blue} alt="image" />
-                            src="assets/images/googleplay_blue.png"
+                        </a>
-                            alt="image"
-                          />
-                        </Link>
                       </li>
                     </ul>
                   </div>
@@ -587,24 +581,32 @@ const Main = ({ footer }) => {
                     </div>
                     <ul>
                       <li>
-                        <Link to="#">
+                        {/* <Link to="#">
                           {process.env.REACT_APP_SUPPORT_EMAIL}
-                        </Link>
+                        </Link> */}
+                        <a
+                          href={`mailto: ${process.env.REACT_APP_SUPPORT_EMAIL}`}
+                        >
+                          {process.env.REACT_APP_SUPPORT_EMAIL}
+                        </a>
                       </li>
                       <li>
-                        <Link to="#">{process.env.REACT_APP_US_PHONE}</Link>
+                        {/* <Link to="#">{process.env.REACT_APP_US_PHONE}</Link> */}
+                        <a href={`tel: ${process.env.REACT_APP_US_PHONE}`}>
+                          {process.env.REACT_APP_US_PHONE}
+                        </a>
                       </li>
                     </ul>
                     <ul className="social_media">
                       <li>
-                        <Link to="#">
+                        <a href={process.env.REACT_APP_FACEBOOK}>
                           <i className="icofont-facebook"></i>
-                        </Link>
+                        </a>
                       </li>
                       <li>
-                        <Link to="#">
+                        <a href={process.env.REACT_APP_TWITTER}>
                           <i className="icofont-twitter"></i>
-                        </Link>
+                        </a>
                       </li>
                     </ul>
                   </div>
@@ -633,7 +635,7 @@ const Main = ({ footer }) => {
                 </div>
                 <div className="col-lg-3 col-md-6 col-12">
                   <div className="links">
-                    <h3>Help & Suport</h3>
+                    <h3>Help & Support</h3>
                     <ul>
                       <li>
                         <Link to="/faq">FAQs</Link>
@@ -642,7 +644,7 @@ const Main = ({ footer }) => {
                         <Link to="#">Support</Link>
                       </li>
                       <li>
-                        <Link to="/work">How it works</Link>
+                        <HashLink to="/#how_it_work">How it works</HashLink>
                       </li>
                       <li>
                         <Link to="/terms">Terms & conditions</Link>
@@ -658,20 +660,14 @@ const Main = ({ footer }) => {
                     <h3>Let’s Try Out</h3>
                     <ul className="app_btn">
                       <li>
-                        <Link to="https://play.google.com/store/apps/details?id=com.mermsemr.myfit">
+                        <a href={process.env.REACT_APP_ANDROID_URL}>
-                          <img
+                          <img src={blueapp} alt="image" />
-                            src="assets/images/appstore_blue.png"
+                        </a>
-                            alt="image"
-                          />
-                        </Link>
                       </li>
                       <li>
-                        <Link to="https://play.google.com/store/apps/details?id=com.mermsemr.myfit">
+                        <a href={process.env.REACT_APP_IOS_URL}>
-                          <img
+                          <img src={blue} alt="image" />
-                            src="assets/images/googleplay_blue.png"
+                        </a>
-                            alt="image"
-                          />
-                        </Link>
                       </li>
                     </ul>
                   </div>

src/component/Home/Main.js

@@ -16,6 +16,9 @@ import white from "../../assets/images/googleplay_white.png";
 import msg from "../../assets/images/message_icon.png";
 import shield from "../../assets/images/shield_icon.png";
 import screen from "../../assets/images/screen.png";
+import firstSlide from "../../assets/images/myfitscreenhome.png";
+import secondSlide from "../../assets/images/myfitscreenlogin.png";
+import thirdSlide from "../../assets/images/myfitscreenstartpage.png";
 import frame from "../../assets/images/mobile_frame_svg.svg";
 
 const Main = ({ setfooter, setnavbar, setbrdcum }) => {
@@ -56,33 +59,11 @@ const Main = ({ setfooter, setnavbar, setbrdcum }) => {
       <section className="banner_section home-banner">
         <div className="container">
           <div className="anim_line">
-            <span>
+            {[...Array(9)].map((_, index) => (
-              <img src={anim} alt="anim_line" />
+              <span key={index}>
-            </span>
+                <img src={anim} alt="anim_line" />
-            <span>
+              </span>
-              <img src={anim} alt="anim_line" />
+            ))}
-            </span>
-            <span>
-              <img src={anim} alt="anim_line" />
-            </span>
-            <span>
-              <img src={anim} alt="anim_line" />
-            </span>
-            <span>
-              <img src={anim} alt="anim_line" />
-            </span>
-            <span>
-              <img src={anim} alt="anim_line" />
-            </span>
-            <span>
-              <img src={anim} alt="anim_line" />
-            </span>
-            <span>
-              <img src={anim} alt="anim_line" />
-            </span>
-            <span>
-              <img src={anim} alt="anim_line" />
-            </span>
           </div>
           <div className="row">
             <div
@@ -104,16 +85,16 @@ const Main = ({ setfooter, setnavbar, setbrdcum }) => {
               </div>
               <ul className="app_btn">
                 <li>
-                  <Link to="https://play.google.com/store/apps/details?id=com.mermsemr.myfit">
+                  <a href={process.env.REACT_APP_ANDROID_URL}>
-                    <img className="blue_img" src={blueapp} alt="image" />
+                    <img src={blueapp} alt="image" />
                     <img className="white_img" src={whiteapp} alt="image" />
-                  </Link>
+                  </a>
                 </li>
                 <li>
-                  <Link to="https://play.google.com/store/apps/details?id=com.mermsemr.myfit">
+                  <a href={process.env.REACT_APP_IOS_URL}>
-                    <img className="blue_img" src={blue} alt="image" />
+                    <img src={blue} alt="image" />
                     <img className="white_img" src={white} alt="image" />
-                  </Link>
+                  </a>
                 </li>
               </ul>
             </div>
@@ -136,17 +117,17 @@ const Main = ({ setfooter, setnavbar, setbrdcum }) => {
                 >
                   <div className="item">
                     <div className="slider_img">
-                      <img src={screen} alt="image" />
+                      <img src={firstSlide} alt="image" />
                     </div>
                   </div>
                   <div className="item">
                     <div className="slider_img">
-                      <img src={screen} alt="image" />
+                      <img src={secondSlide} alt="image" />
                     </div>
                   </div>
                   <div className="item">
                     <div className="slider_img">
-                      <img src={screen} alt="image" />
+                      <img src={thirdSlide} alt="image" />
                     </div>
                   </div>
                 </OwlCarousel>

src/component/HomeMain/Download/Main.js

@@ -1,82 +1,97 @@
-import { Link } from 'react-router-dom'
+import { Link } from "react-router-dom";
-import React, {useState} from 'react'
+import React, { useState } from "react";
-import img from '../../../assets/images/anim_line.png'
+import img from "../../../assets/images/anim_line.png";
-import blueapp from '../../../assets/images/appstore_blue.png'
+import blueapp from "../../../assets/images/appstore_blue.png";
-import blue from '../../../assets/images/googleplay_blue.png'
+import blue from "../../../assets/images/googleplay_blue.png";
-import screen from '../../../assets/images/download-screen01.png'
+import screen from "../../../assets/images/download-screen01.png";
-import screen1 from '../../../assets/images/download-screen02.png'
+import screen1 from "../../../assets/images/download-screen02.png";
-
 
 const Main = () => {
-    const [animate, setanimate] = useState()
+  const [animate, setAnimate] = useState(false);
+  const [purple, setPurple] = useState(false);
 
+//   useEffect(() => {
+//     const handleScroll = () => {
+//       const element = document.getElementsByClassName("free_text")[0];
+//       const position = element.getBoundingClientRect();
 
-    const [purple, setpurple] = useState()
+//       if (position.top < window.innerHeight && position.bottom >= 0) {
-    window.addEventListener('scroll', function() {
+//         document.getElementsByClassName("purple_backdrop")[0].style.opacity =
-        const element = document.getElementsByClassName('free_text');
+//           "1";
-        const position = element[0].getBoundingClientRect();
+//       } else {
+//         document.getElementsByClassName("purple_backdrop")[0].style.opacity =
+//           "0";
+//       }
+//     };
 
-        if(position.top < window.innerHeight && position.bottom >= 0) {
+//     window.addEventListener("scroll", handleScroll);
-            const elm = document.getElementsByClassName("purple_backdrop");
-            elm[0].style.opacity = "1"; 
-        }else{
-            const elm = document.getElementsByClassName("purple_backdrop");
-            elm[0].style.opacity = "0"; 
 
-        }
+//     return () => {
-    });
+//       window.removeEventListener("scroll", handleScroll);
+//     };
+//   }, []);
 
   return (
     <>
-        <section className="row_am free_app_section review_freeapp" id="getstarted">
+      <section
-            <div className="container">
+        className={`row_am free_app_section review_freeapp ${
-                <div className={`free_app_inner aos-init ${animate && "aos-animate"}`} data-aos="fade-in" data-aos-duration="1500" data-aos-delay="100"> 
+          animate && "aos-animate"
-                    <div className="anim_line dark_bg">
+        }`}
-                        <span><img src={img} alt="anim_line" /></span>
+        id="getstarted"
-                        <span><img src={img} alt="anim_line" /></span>
+      >
-                        <span><img src={img} alt="anim_line" /></span>
+        <div className="container">
-                        <span><img src={img} alt="anim_line" /></span>
+          <div
-                        <span><img src={img} alt="anim_line" /></span>
+            className="free_app_inner"
-                        <span><img src={img} alt="anim_line" /></span>
+            data-aos="fade-in"
-                        <span><img src={img} alt="anim_line" /></span>
+            data-aos-duration="1500"
-                        <span><img src={img} alt="anim_line" /></span>
+            data-aos-delay="100"
-                        <span><img src={img} alt="anim_line" /></span>
+          >
-                    </div>
+            <div className="anim_line dark_bg">
-                    <div className="row">
+              {[...Array(9)].map((_, index) => (
-                        <div className="col-md-6">
+                <span key={index}>
-                            <div className="free_text">
+                  <img src={img} alt="anim_line" />
-                                <div className="section_title">
+                </span>
-                                    <h2>Let’s download free from apple and play store</h2>
+              ))}
-                                    <p>Instant free download from apple and play store orem Ipsum is simply dummy text of the printing.
-                                    and typese tting indus orem Ipsum has beenthe standard</p>
-                                </div>
-                                <ul className="app_btn">
-                                <li>
-                                    <Link to="https://play.google.com/store/apps/details?id=com.mermsemr.myfit">
-                                    <img src={blueapp} alt="image" />
-                                    </Link>
-                                </li>
-                                <li>
-                                    <Link to="https://play.google.com/store/apps/details?id=com.mermsemr.myfit">
-                                    <img src={blue} alt="image" />
-                                    </Link>
-                                </li>
-                                </ul>
-                            </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>
-                        </div>
-                    </div>
-                </div>
             </div>
-        </section>
+            <div className="row">
-        <div className="purple_backdrop"></div>
+              <div className="col-md-6">
+                <div className="free_text">
+                  <div className="section_title">
+                    <h2>Let’s download free from apple and play store</h2>
+                    <p>
+                      Instant free download from apple and play store. All you
+                      need is an iPhone or Android device to enjoy all
+                      personalized metrics for personal use. Welcome to myFit
+                      App.
+                    </p>
+                  </div>
+                  <ul className="app_btn">
+                    <li>
+                      <a href={process.env.REACT_APP_ANDROID_URL}>
+                        <img src={blueapp} alt="image" />
+                      </a>
+                    </li>
+                    <li>
+                      <a href={process.env.REACT_APP_IOS_URL}>
+                        <img src={blue} alt="image" />
+                      </a>
+                    </li>
+                  </ul>
+                </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>
+              </div>
+            </div>
+          </div>
+        </div>
+      </section>
+      {/* <div className="purple_backdrop"></div> */}
     </>
-  )
+  );
-}
+};
 
-export default Main
+export default Main;

src/component/HomeMain/Faq/Main.js

@@ -24,77 +24,10 @@ const Main = ({gredient}) => {
             <div className="container">
                 <div className="section_title" data-aos="fade-up" data-aos-duration="1500" data-aos-delay="300">
                     <h2><span>FAQ</span> - Frequently Asked Questions</h2>
-                    <p>Lorem Ipsum is simply dummy text of the printing and typese tting <br/> indus orem Ipsum has beenthe
+                    <p>Organizing all types of wellness activity you desire.<br/>Proven step to increase pleasure and commitment.</p>
-                        standard dummy.</p>
                 </div>
                 <div className="faq_panel">
-                    <div className="accordion" id="accordionExample">
+                    <div className="accordion" id="accordionMyfitFaq">
-                        {/* <div className="card" data-aos="fade-up" data-aos-duration="1500">
-                            <div className="card-header" id="headingOne">
-                                <h2 className="mb-0">
-                                <button type="button" className={`btn btn-link ${activeFaq.a && "active"}`} onClick= {() => setActiveFaq(activeFaq.a ? {a : false} : {a : true})} data-toggle="collapse" data-target="#collapseOne">
-                                {activeFaq.a ? <i className="icon_faq icofont-minus"></i>  : <i className="icon_faq icofont-plus"></i>} How can i pay ?</button>
-                                </h2>
-                            </div>
-                            <div id="collapseOne" className="collapse show" aria-labelledby="headingOne" data-parent="#accordionExample">
-                                <div className="card-body">
-                                <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
-                                    scrambled it to make a type specimen book. It has survived not only five cen turies but also the
-                                    leap into electronic typesetting, remaining essentially unchanged.</p>
-                                </div>
-                            </div>
-                        </div>
-                        <div className="card" data-aos="fade-up" data-aos-duration="1500">
-                            <div className="card-header" id="headingTwo">
-                                <h2 className="mb-0">
-                                <button type="button" className={`btn btn-link ${activeFaq.b && "active"}`} onClick= {() => setActiveFaq(activeFaq.b ? {b : false} : {b : true})} data-toggle="collapse"
-                                    data-target="#collapseTwo">{activeFaq.b ? <i className="icon_faq icofont-minus"></i>  : <i className="icon_faq icofont-plus"></i>} How to setup account ?</button>
-                                </h2>
-                            </div>
-                            <div id="collapseTwo" className="collapse" aria-labelledby="headingTwo" data-parent="#accordionExample">
-                                <div className="card-body">
-                                <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
-                                    scrambled it to make a type specimen book. It has survived not only five cen turies but also the
-                                    leap into electronic typesetting, remaining essentially unchanged.</p>
-                                </div>
-                            </div>
-                        </div>
-                        <div className="card" data-aos="fade-up" data-aos-duration="1500">
-                            <div className="card-header" id="headingThree">
-                                <h2 className="mb-0">
-                                <button type="button" className={`btn btn-link ${activeFaq.c && "active"}`} onClick= {() => setActiveFaq(activeFaq.c ? {c : false} : {c : true})} data-toggle="collapse"
-                                    data-target="#collapseThree">{activeFaq.c ? <i className="icon_faq icofont-minus"></i>  : <i className="icon_faq icofont-plus"></i>}What is process to get refund
-                                    ?</button>
-                                </h2>
-                            </div>
-                            <div id="collapseThree" className="collapse" aria-labelledby="headingThree" data-parent="#accordionExample">
-                                <div className="card-body">
-                                <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
-                                    scrambled it to make a type specimen book. It has survived not only five cen turies but also the
-                                    leap into electronic typesetting, remaining essentially unchanged.</p>
-                                </div>
-                            </div>
-                        </div>
-                        <div className="card" data-aos="fade-up" data-aos-duration="1500">
-                            <div className="card-header" id="headingFour">
-                                <h2 className="mb-0">
-                                <button type="button" className={`btn btn-link ${activeFaq.d && "active"}`} onClick= {() => setActiveFaq(activeFaq.d ? {d : false} : {d : true})} data-toggle="collapse"
-                                    data-target="#collapseFour">{activeFaq.d ? <i className="icon_faq icofont-minus"></i>  : <i className="icon_faq icofont-plus"></i>}What is process to get refund
-                                    ?</button>
-                                </h2>
-                            </div>
-                            <div id="collapseFour" className="collapse" aria-labelledby="headingFour" data-parent="#accordionExample">
-                                <div className="card-body">
-                                <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
-                                    scrambled it to make a type specimen book. It has survived not only five cen turies but also the
-                                    leap into electronic typesetting, remaining essentially unchanged.</p>
-                                </div>
-                            </div>
-                        </div> */}
 
                         {/* displays loading ... while the page fetches the FAQs */}
                         {faqs.length < 1 && <h3>Loading...</h3>}
@@ -113,7 +46,7 @@ const Main = ({gredient}) => {
                                     </h2>
                                 </div>
 
-                                <div id={target} className="collapse" aria-labelledby={id} data-parent="#accordionExample">
+                                <div id={target} className="collapse" aria-labelledby={id} data-parent="#accordionMyfitFaq">
                                     <div className="card-body">
                                         <p>{faq.text}</p>
                                     </div>

src/component/HomeMain/Features/Main.js

@@ -8,63 +8,7 @@ import img5 from '../../../assets/images/features_frame.png'
 const Main = ({video}) => {
   return (
     <>
-        {video ?
+        {<section className="row_am features_section" id="features">
-        <section className="row_am features_section video-features" id="features">
-            <div className="container">
-                <div className="section_title" data-aos="fade-up" data-aos-duration="1500" data-aos-delay="100">
-                <h2><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</p>
-                </div>
-                <div className="feature_detail">
-                <div className="left_data feature_box">
-                    <div className="data_block" data-aos="fade-right" data-aos-duration="1500">
-                    <div className="icon">
-                        <img src="assets/images/secure.png" alt="image" />
-                    </div>
-                    <div className="text">
-                        <h4>Secure data</h4>
-                        <p>Lorem Ipsum is simply dummy text of the printing and type setting indus ideas.</p>
-                    </div>
-                    </div>
-                    <div className="data_block" data-aos="fade-right" data-aos-duration="1500">
-                    <div className="icon">
-                        <img src="assets/images/abt_functional.png" alt="image" />
-                    </div>
-                    <div className="text">
-                        <h4>Fully functional</h4>
-                        <p>Simply dummy text of the printing and typesetting indus lorem Ipsum is dummy.</p>
-                    </div>
-                    </div>
-                </div>
-                <div className="right_data feature_box">
-                    <div className="data_block" data-aos="fade-left" data-aos-duration="1500">
-                    <div className="icon">
-                        <img src="assets/images/communication.png" alt="image"/>
-                    </div>
-                    <div className="text">
-                        <h4>Live chat</h4>
-                        <p>Lorem Ipsum is simply dummy text of the printing and type setting indus ideas.</p>
-                    </div>
-                    </div>
-                    <div className="data_block" data-aos="fade-left" data-aos-duration="1500">
-                    <div className="icon">
-                        <img src="assets/images/abt_support.png" alt="image" />
-                    </div>
-                    <div className="text">
-                        <h4>24-7 Support</h4>
-                        <p>Simply dummy text of the printing and typesetting indus lorem Ipsum is dummy.</p>
-                    </div>
-                    </div>
-                </div>
-                <div className="feature_img" data-aos="fade-up" data-aos-duration="1500" data-aos-delay="100">
-                    <img src="assets/images/features_frame.png" alt="image" />
-                </div>
-                </div>
-            </div>
-        </section>
-        :
-        <section className="row_am features_section" id="features">
             <div className="container">
                 <div className="section_title" data-aos="fade-up" data-aos-duration="1500" data-aos-delay="100">
                 <h2><span>Features</span> that makes app different!</h2>
@@ -76,14 +20,14 @@ const Main = ({video}) => {
     
                     <div className="text">
                         <h4>Health Tips</h4>
-                        <p>myFit continuously help you organize both general and the few health questions relevant to you. We can privately help you find answer in our communities to new questions.</p>
+                        <p>myFit continuously help you organize both general and the few health questions relevant to you. </p>
                     </div>
                     </div>
                     <div className="data_block" data-aos="fade-right" data-aos-duration="1500">
         
                     <div className="text">
                         <h4>Health Statistics</h4>
-                        <p>Collect your health statistics yourself, weight changes, blood pressure, blood glucose data all helps to ensure that your provider is creating plans that fits you specifically..</p>
+                        <p>Collect your health statistics yourself, weight changes, blood pressure, blood glucose or data that fits you specifically.</p>
                     </div>
                     </div>
                 </div>

src/component/HomeMain/Interface/Main.js

@@ -1,81 +1,92 @@
-import OwlCarousel from 'react-owl-carousel'
+import OwlCarousel from "react-owl-carousel";
-import React from 'react'
+import React from "react";
-import img1 from '../../../assets/images/screen-1.png'
+import img1 from "../../../assets/images/myfitstartpage.png";
-import img2 from '../../../assets/images/screen-2.png'
+import img2 from "../../../assets/images/screen-2.png";
-import img3 from '../../../assets/images/screen-3.png'
+import img3 from "../../../assets/images/myfithomepage.png";
-import img4 from '../../../assets/images/screen-4.png'
+import img4 from "../../../assets/images/screen-4.png";
-import img5 from '../../../assets/images/screen-5.png'
+import img5 from "../../../assets/images/myfitloginpage.png";
 
 const Main = () => {
-
+  const screen_slider = {
-    const screen_slider = {
+    loop: true,
-        loop:true,
+    margin: 10,
-        margin:10,
+    nav: false,
-        nav:false,
+    autoplay: true,
-        autoplay: true,
+    smartSpeed: 1500,
-        smartSpeed: 1500,
+    center: true,
-        center: true,
+    dots: true,
-        dots: true, 
+    responsive: {
-        responsive:{
+      0: {
-            0:{
+        items: 2,
-                items:2
+      },
-            },
+      600: {
-            600:{
+        items: 3,
-                items:3
+      },
-            },
+      1000: {
-            1000:{
+        items: 5,
-                items:5
+      },
-            }
+    },
-        }
+  };
-    }
   return (
     <>
-        <section className="row_am interface_section">
+      <section className="row_am interface_section">
-            <div className="container-fluid">
+        <div className="container-fluid">
-                <div className="section_title" data-aos="fade-up" data-aos-duration="1500" data-aos-delay="300">
+          <div
-                    <h2>Beautifull <span>interface</span></h2>
+            className="section_title"
-                    <p>
+            data-aos="fade-up"
-                    Lorem Ipsum is simply dummy text of the printing and typese tting <br/> indus orem Ipsum has beenthe standard dummy.
+            data-aos-duration="1500"
-                    </p>
+            data-aos-delay="300"
+          >
+            <h2>
+              Beautiful <span>interface</span>
+            </h2>
+            <p>
+              myFit appends a fun yet simple process to keep you consistently
+              <br /> motivated,engaged and moving again without any shrewdness.
+            </p>
+          </div>
+          <div className="screen_slider">
+            <OwlCarousel
+              id="screen_slider"
+              {...screen_slider}
+              className="owl-carousel owl-theme owl-loaded owl-drag"
+            >
+              <div className="item">
+                <div className="screen_frame_img">
+                  <img src={img1} alt="image" />
                 </div>
-                <div className="screen_slider" >
+              </div>
-                    <OwlCarousel id="screen_slider" {...screen_slider} className="owl-carousel owl-theme owl-loaded owl-drag">
+              <div className="item">
-                        <div className="item">
+                <div className="screen_frame_img">
-                            <div className="screen_frame_img">
+                  <img src={img2} alt="image" />
-                                <img src={img1} alt="image" />
-                            </div>
-                        </div>
-                        <div className="item">
-                            <div className="screen_frame_img">
-                                <img src={img2} alt="image" />
-                            </div>
-                        </div>
-                        <div className="item">
-                            <div className="screen_frame_img">
-                                <img src={img3} alt="image" />
-                            </div>
-                        </div>
-                        <div className="item">
-                            <div className="screen_frame_img">
-                                <img src={img4} alt="image" />
-                            </div>
-                        </div>
-                        <div className="item">
-                            <div className="screen_frame_img">
-                                <img src={img5} alt="image" />
-                            </div>
-                        </div>
-                        <div className="item">
-                            <div className="screen_frame_img">
-                                <img src={img3} alt="image" />
-                            </div>
-                        </div>
-                    </OwlCarousel>
                 </div>
-            </div>
+              </div>
-        </section>
+              <div className="item">
+                <div className="screen_frame_img">
+                  <img src={img3} alt="image" />
+                </div>
+              </div>
+              <div className="item">
+                <div className="screen_frame_img">
+                  <img src={img4} alt="image" />
+                </div>
+              </div>
+              <div className="item">
+                <div className="screen_frame_img">
+                  <img src={img5} alt="image" />
+                </div>
+              </div>
+              <div className="item">
+                <div className="screen_frame_img">
+                  <img src={img2} alt="image" />
+                </div>
+              </div>
+            </OwlCarousel>
+          </div>
+        </div>
+      </section>
     </>
-  )
+  );
-}
+};
 
-export default Main
+export default Main;

src/component/HomeMain/Pricing/Main.js

@@ -13,6 +13,8 @@ const Main = ({gredient , video}) => {
 
     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>
+                    <h2>Flexible & 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
+                    <p className="gredient-p">
-                        standard dummy.</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>
@@ -41,7 +49,7 @@ const Main = ({gredient , video}) => {
                             <span className={`tog_btn ${tog && "month_active"}`} onClick = {() => setTog(tog === true ? false : true)}></span>
                         </div>
                         <span className="years">Yearly</span>
-                        <span className="offer">50% off</span>
+                        {/* <span className="offer">50% off</span> */}
                     </div>
 
                     <div className={`pricing_pannel monthly_plan ${tog ? '' : 'active'}`}>
@@ -49,10 +57,9 @@ const Main = ({gredient , video}) => {
 
                         {prices.length > 0 &&
                                 prices.map((price, index) => {
-                                    if (index % 2 == 0) {
                                         return (
                                             <div key={index} className="col-md-4">
-                                                <div className="pricing_block">
+                                                <div className={`pricing_block ${index % 2 == 0? '' : 'highlited_block'}`}>
                                                     <div className="icon">
                                                     { video ? <img src="assets/images/standard-one.png" alt="image" /> : <img src={price.icon} alt="image" /> }
                                                     </div>
@@ -62,32 +69,12 @@ const Main = ({gredient , video}) => {
                                                     </div>
                                                     <span className="price">{price.price}</span>
                                                     <ul className="benifits">
-                                                        {price.features.map((feature, index)=> <p key={index}>{feature}</p>)}
+                                                        {price.features.map((feature, index)=> <li key={index}><p>{feature}</p></li>)}
                                                     </ul>
                                                     <Link to="/" className="btn white_btn">Start Now</Link>
                                                 </div>
                                             </div>
                                         );
-                                    } else {
-                                        return (
-                                            <div key={index} className="col-md-4">
-                                                <div className="pricing_block highlited_block">
-                                                    <div className="icon">
-                                                    { video ? <img src="assets/images/standard-one.png" alt="image" /> : <img src={price.icon} alt="image" /> }
-                                                    </div>
-                                                    <div className="pkg_name">
-                                                    <h3>{price.title}</h3>
-                                                    <span>{price.text}</span>
-                                                    </div>
-                                                    <span className="price">{price.price}</span>
-                                                    <ul className="benifits">
-                                                        {price.features.map((feature, index)=> <p key={index}>{feature}</p>)}
-                                                    </ul>
-                                                    <Link to="/" className="btn white_btn">Start Now</Link>
-                                                </div>
-                                            </div>
-                                        );
-                                    }
                                 })
                             }
 
@@ -130,10 +117,9 @@ const Main = ({gredient , video}) => {
 
                         {prices.length > 0 &&
                                 prices.map((price, index) => {
-                                    if (index % 2 == 0) {
                                         return (
                                             <div key={index} className="col-md-4">
-                                                <div className="pricing_block">
+                                                <div className={`pricing_block ${index % 2 == 0? '' : 'highlited_block'}`}>
                                                     <div className="icon">
                                                     { video ? <img src="assets/images/standard-one.png" alt="image" /> : <img src={price.icon} alt="image" /> }
                                                     </div>
@@ -141,34 +127,14 @@ const Main = ({gredient , video}) => {
                                                     <h3>{price.title}</h3>
                                                     <span>{price.text}</span>
                                                     </div>
-                                                    <span className="price">{price.price}</span>
+                                                    <span className="price">{price.price_anual}</span>
                                                     <ul className="benifits">
-                                                        {price.features.map((feature, index)=> <p key={index}>{feature}</p>)}
+                                                        {price.features.map((feature, index)=> <li key={index}><p>{feature}</p></li>)}
                                                     </ul>
                                                     <Link to="/" className="btn white_btn">Start Now</Link>
                                                 </div>
                                             </div>
                                         );
-                                    } else {
-                                        return (
-                                            <div key={index} className="col-md-4">
-                                                <div className="pricing_block highlited_block">
-                                                    <div className="icon">
-                                                    { video ? <img src="assets/images/standard-one.png" alt="image" /> : <img src={price.icon} alt="image" /> }
-                                                    </div>
-                                                    <div className="pkg_name">
-                                                    <h3>{price.title}</h3>
-                                                    <span>{price.text}</span>
-                                                    </div>
-                                                    <span className="price">{price.price}</span>
-                                                    <ul className="benifits">
-                                                        {price.features.map((feature, index)=> <p key={index}>{feature}</p>)}
-                                                    </ul>
-                                                    <Link to="/" className="btn white_btn">Start Now</Link>
-                                                </div>
-                                            </div>
-                                        );
-                                    }
                                 })
                             }
 
@@ -182,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>
+                    <h2>Flexible & Simple <span>pricing</span></h2>
-                    <p>Lorem Ipsum is simply dummy text of the printing and typese tting <br/> indus orem Ipsum has beenthe
+                    <p>Choose your myFit Pricing Plan <br/> myFit has a free Standard for Basics , $5 per month for Premium <br />
-                        standard dummy.</p>
+                        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>
@@ -192,7 +158,7 @@ const Main = ({gredient , video}) => {
                             <span className={`tog_btn ${tog && "month_active"}`} onClick = {() => setTog(tog === true ? false : true)}></span>
                         </div>
                         <span className="years">Yearly</span>
-                        <span className="offer">50% off</span>
+                        {/* <span className="offer">50% off</span> */}
                     </div>
 
                     <div className={`pricing_pannel monthly_plan ${tog ? '' : 'active'}`}>
@@ -200,10 +166,9 @@ const Main = ({gredient , video}) => {
 
                             {prices.length > 0 &&
                                 prices.map((price, index) => {
-                                    if (index % 2 == 0) {
                                         return (
                                             <div key={index} className="col-md-4">
-                                                <div className="pricing_block">
+                                                <div className={`pricing_block ${index % 2 == 0? '' : 'highlited_block'}`}>
                                                     <div className="icon">
                                                     { video ? <img src="assets/images/standard-one.png" alt="image" /> : <img src={price.icon} alt="image" /> }
                                                     </div>
@@ -213,33 +178,13 @@ const Main = ({gredient , video}) => {
                                                     </div>
                                                     <span className="price">{price.price}</span>
                                                     <ul className="benifits">
-                                                        {price.features.map((feature, index)=> <p key={index}>{feature}</p>)}
+                                                        {price.features.map((feature, index)=> <li key={index}><p>{feature}</p></li>)}
                                                     </ul>
                                                     <Link to="/" className="btn white_btn">Start Now</Link>
                                                 </div>
                                             </div>
                                         );
-                                    } else {
+                                   })
-                                        return (
-                                            <div key={index} className="col-md-4">
-                                                <div className="pricing_block highlited_block">
-                                                    <div className="icon">
-                                                    { video ? <img src="assets/images/standard-one.png" alt="image" /> : <img src={price.icon} alt="image" /> }
-                                                    </div>
-                                                    <div className="pkg_name">
-                                                    <h3>{price.title}</h3>
-                                                    <span>{price.text}</span>
-                                                    </div>
-                                                    <span className="price">{price.price}</span>
-                                                    <ul className="benifits">
-                                                        {price.features.map((feature, index)=> <p key={index}>{feature}</p>)}
-                                                    </ul>
-                                                    <Link to="/" className="btn white_btn">Start Now</Link>
-                                                </div>
-                                            </div>
-                                        );
-                                    }
-                                })
                             }
 
                         </div>
@@ -250,10 +195,9 @@ const Main = ({gredient , video}) => {
 
                         {prices.length > 0 &&
                                 prices.map((price, index) => {
-                                    if (index % 2 == 0) {
                                         return (
                                             <div key={index} className="col-md-4">
-                                                <div className="pricing_block">
+                                                <div className={`pricing_block ${index % 2 == 0? '' : 'highlited_block'}`}>
                                                     <div className="icon">
                                                     { video ? <img src="assets/images/standard-one.png" alt="image" /> : <img src={price.icon} alt="image" /> }
                                                     </div>
@@ -261,34 +205,14 @@ const Main = ({gredient , video}) => {
                                                     <h3>{price.title}</h3>
                                                     <span>{price.text}</span>
                                                     </div>
-                                                    <span className="price">{price.price}</span>
+                                                    <span className="price">{price.price_anual}</span>
                                                     <ul className="benifits">
-                                                        {price.features.map((feature, index)=> <p key={index}>{feature}</p>)}
+                                                        {price.features.map((feature, index)=> <li key={index}><p>{feature}</p></li>)}
                                                     </ul>
                                                     <Link to="/" className="btn white_btn">Start Now</Link>
                                                 </div>
                                             </div>
                                         );
-                                    } else {
-                                        return (
-                                            <div key={index} className="col-md-4">
-                                                <div className="pricing_block highlited_block">
-                                                    <div className="icon">
-                                                    { video ? <img src="assets/images/standard-one.png" alt="image" /> : <img src={price.icon} alt="image" /> }
-                                                    </div>
-                                                    <div className="pkg_name">
-                                                    <h3>{price.title}</h3>
-                                                    <span>{price.text}</span>
-                                                    </div>
-                                                    <span className="price">{price.price}</span>
-                                                    <ul className="benifits">
-                                                        {price.features.map((feature, index)=> <p key={index}>{feature}</p>)}
-                                                    </ul>
-                                                    <Link to="/" className="btn white_btn">Start Now</Link>
-                                                </div>
-                                            </div>
-                                        );
-                                    }
                                 })
                             }
 

src/component/HomeMain/Story/Main.js

@@ -1,20 +1,68 @@
-import { Link } from 'react-router-dom'
+import React, { useEffect, useState } from "react";
-import React from 'react'
+import { Link } from 'react-router-dom';
-import story1 from '../../../assets/images/story01.png'
+// import story1 from '../../../assets/images/story01.png';
-import story2 from '../../../assets/images/story02.png'
+// import story2 from '../../../assets/images/story02.png';
-import story3 from '../../../assets/images/story03.png'
+// import story3 from '../../../assets/images/story03.png';
+import SiteService from "../../../vendors/service/siteService";
+
 
 const Main = () => {
+    const [blogData, setBlogData] = useState([]);
+
+  let api = new SiteService();
+  useEffect(() => {
+    getBlogData();
+  }, []);
+
+  const getBlogData = async () => { 
+      try {
+        let res = await api.blogData();
+        setBlogData(res.data);
+       
+      } catch (error) {
+        console.log("Error from blog data ", error);
+      }    
+  };
+  
   return (
     <>
         <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">
-                    <div className="col-md-4">
+                  
+                { (blogData !== undefined) && (blogData?.length > 0) && blogData.slice(1, 4).map((data, 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={data.meta_value}
+                      alt="image"
+                    />
+                    <span>{new Date(data.post_date).toDateString()}</span>
+                  </div>
+                  <div className="story_text">
+                    <h3>{data.post_title}</h3>
+                    <div
+                      dangerouslySetInnerHTML={{
+                        __html: data.post_content.substring(0, 100) + "  . . .",
+                      }}></div>
+                      <Link to={`/blogdetails/${data.id}`} state={{data, allData: blogData}}>
+                                 READ MORE
+                            </Link>
+                    {/* <Link to={`/blogdetails/${item.id}`}>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={story1} alt="image" />
@@ -53,7 +101,7 @@ const Main = () => {
                                 <Link to="/blog-single">READ MORE</Link>
                             </div>
                         </div>
-                    </div>
+                    </div> */}
                 </div>
             </div>
         </section> 

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_app.jpg'
+import img from '../../../assets/images/appdownload.png'
-import img1 from '../../../assets/images/create_account.jpg'
+// import img1 from '../../../assets/images/create_account2.png'
-import img2 from '../../../assets/images/enjoy_app.jpg'
+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>
+                                    <a href={process.env.REACT_APP_ANDROID_URL}><i className="icofont-brand-android-robot"></i></a>
-                                    <Link to={process.env.REACT_APP_IOS_URL}><i className="icofont-brand-apple"></i></Link>
+                                    <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>
@@ -43,14 +44,14 @@ const Main = ({dark}) => {
                             <li>
                                 <div className="step_text" data-aos="fade-left" data-aos-duration="1500">
                                 <h4>Create account</h4>
-                                <span>14 days free trial</span>
+                                <span>Free Account</span>
                                 <p>Sign up free for App account. One account for all devices.</p>
                                 </div>
                                 <div className="step_number"> 
                                 <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

@@ -55,7 +55,7 @@ const Main = ({navbar}) => {
                                 <Link to="/contact" className="nav-link" >Contact</Link>
                             </li>
                             <li className="nav-item">
-                                <Link to={process.env.REACT_APP_APPSITE} className="nav-link dark_btn">GET STARTED</Link>
+                                <a href={process.env.REACT_APP_APPSITE} className="nav-link dark_btn">GET STARTED</a>
                             </li>
                         </ul>
                     </div>
@@ -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>
@@ -286,7 +289,7 @@ const Main = ({navbar}) => {
                                 <span className="drp_btn" ><i className="icofont-rounded-down"></i></span>
                                 <div className="sub_menu" style={{ display: show ? "block" : "none" }}>
                                 <ul>
-                                    <li><Link to="/">Home Defoult</Link></li>
+                                    <li><Link to="/">Home Default</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>
@@ -359,7 +363,7 @@ const Main = ({navbar}) => {
                                 <span className="drp_btn" ><i className="icofont-rounded-down"></i></span>
                                 <div className="sub_menu">
                                 <ul>
-                                    <li><Link to="/">Home Defoult</Link></li>
+                                    <li><Link to="/">Home Default</Link></li>
                                   
                                   
                                 </ul>
@@ -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>
@@ -404,7 +409,7 @@ const Main = ({navbar}) => {
                                 <span className="drp_btn" ><i className="icofont-rounded-down"></i></span>
                                 <div className="sub_menu" style={{ display: show ? "block" : "none" }}>
                                 <ul>
-                                    <li><Link to="/">Home Defoult</Link></li>
+                                    <li><Link to="/">Home Default</Link></li>
                                   
                                   
                                 </ul>
@@ -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>
@@ -477,7 +483,7 @@ const Main = ({navbar}) => {
                                 <span className="drp_btn" ><i className="icofont-rounded-down"></i></span>
                                 <div className="sub_menu">
                                 <ul>
-                                    <li><Link to="/">Home Defoult</Link></li>
+                                    <li><Link to="/">Home Default</Link></li>
                                   
                                   
                                 </ul>
@@ -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>
@@ -533,7 +540,7 @@ const Main = ({navbar}) => {
                                 <span className="drp_btn" ><i className="icofont-rounded-down"></i></span>
                                 <div className="sub_menu" style={{ display: show ? "block" : "none" }}>
                                 <ul>
-                                    <li><Link to="/">Home Defoult</Link></li>
+                                    <li><Link to="/">Home Default</Link></li>
                                    
                                    
                                 </ul>
@@ -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

@@ -1,34 +1,39 @@
 import React , { useState , useEffect} from 'react'
 import { Link } from 'react-router-dom'
+import blueapp from "../../../assets/images/appstore_blue.png"
+import blue from "../../../assets/images/googleplay_blue.png"
 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 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'
 
 const Main = ({brdcum}) => {
 
-    const[activeFaq, setActiveFaq] = useState({btn0 : false})
+    // const[activeFaq, setActiveFaq] = useState({btn0 : false})
 
-    const [faqs, setFaqs] = useState([]); // initial state for FAQs before API call
+    // const [faqs, setFaqs] = useState([]); // initial state for FAQs before API call
 
-    let faqServices = new SiteService(); // instantiating the class
+    // let faqServices = new SiteService(); // instantiating the class
 
-    const allFaqData = () => {
+    // const allFaqData = () => {
-        return faqServices.faqData();
+    //     return faqServices.faqData();
-    };
+    // };
 
-    useEffect(() => {
+    // useEffect(() => {
-        allFaqData().then((data) => setFaqs(data.data));
+    //     allFaqData().then((data) => setFaqs(data.data));
-    }, []);
+    // }, []);
   return (
     <>
         {brdcum.b1 && 
         <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}/>}
 
@@ -36,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}/>}
 
@@ -44,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}/>}
 
@@ -52,24 +57,23 @@ 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}/>}
 
-
+        {/* <section className="row_am faq_section">
-        <section className="row_am faq_section">
             <div className="container">
                 <div className="faq_panel">
                     <div className="accordion" id="accordionExample">
 
-                        {/* <div className="card" data-aos="fade-up" >
+                        <div className="card" data-aos="fade-up" >
                             <div className="card-header" id="headingOne">
                                 <h2 className="mb-0">
                                 <button type="button" className={`btn btn-link ${activeFaq.a && "active"}`} onClick= {() => setActiveFaq(activeFaq.a ? {a : false} : {a : true})} data-toggle="collapse" data-target="#collapseOne">
@@ -84,9 +88,9 @@ const Main = ({brdcum}) => {
                                     leap into electronic typesetting, remaining essentially unchanged.</p>
                                 </div>
                             </div>
-                        </div> */}
+                        </div>
 
-                        {/* <div className="card" data-aos="fade-up" >
+                        <div className="card" data-aos="fade-up" >
                             <div className="card-header" id="headingTwo">
                                 <h2 className="mb-0">
                                 <button type="button" className={`btn btn-link collapsed ${activeFaq.b && "active"}`} onClick= {() => setActiveFaq(activeFaq.b ? {b : false} : {b : true})} data-toggle="collapse"
@@ -101,9 +105,9 @@ const Main = ({brdcum}) => {
                                     leap into electronic typesetting, remaining essentially unchanged.</p>
                                 </div>
                             </div>
-                        </div> */}
+                        </div>
 
-                        {/* <div className="card" data-aos="fade-up" >
+                        <div className="card" data-aos="fade-up" >
                             <div className="card-header" id="headingThree">
                                 <h2 className="mb-0">
                                 <button type="button" className={`btn btn-link collapsed ${activeFaq.c && "active"}`} onClick= {() => setActiveFaq(activeFaq.c ? {c : false} : {c : true})} data-toggle="collapse"
@@ -119,9 +123,9 @@ const Main = ({brdcum}) => {
                                     leap into electronic typesetting, remaining essentially unchanged.</p>
                                 </div>
                             </div>
-                        </div> */}
+                        </div>
 
-                        {/* <div className="card" data-aos="fade-up" >
+                        <div className="card" data-aos="fade-up" >
                             <div className="card-header" id="headingFour">
                                 <h2 className="mb-0">
                                 <button type="button" className={`btn btn-link collapsed ${activeFaq.d && "active"}`} onClick= {() => setActiveFaq(activeFaq.d ? {d : false} : {d : true})} data-toggle="collapse"
@@ -138,9 +142,9 @@ const Main = ({brdcum}) => {
                                     leap into electronic typesetting, remaining essentially unchanged.</p>
                                 </div>
                             </div>
-                        </div> */}
+                        </div>
 
-                        {/* <div className="card" data-aos="fade-up" >
+                        <div className="card" data-aos="fade-up" >
                             <div className="card-header" id="headingFive">
                                 <h2 className="mb-0">
                                 <button type="button" className={`btn btn-link collapsed ${activeFaq.e && "active"}`} onClick= {() => setActiveFaq(activeFaq.e ? {e : false} : {e : true})} data-toggle="collapse"
@@ -157,9 +161,9 @@ const Main = ({brdcum}) => {
                                     leap into electronic typesetting, remaining essentially unchanged.</p>
                                 </div>
                             </div>
-                        </div> */}
+                        </div>
 
-                        {/* <div className="card" data-aos="fade-up" >
+                        <div className="card" data-aos="fade-up" >
                             <div className="card-header" id="headingSix">
                                 <h2 className="mb-0">
                                 <button type="button" className={`btn btn-link collapsed ${activeFaq.f && "active"}`} onClick= {() => setActiveFaq(activeFaq.f ? {f : false} : {f : true})} data-toggle="collapse"
@@ -176,9 +180,9 @@ const Main = ({brdcum}) => {
                                     leap into electronic typesetting, remaining essentially unchanged.</p>
                                 </div>
                             </div>
-                        </div> */}
+                        </div>
 
-                        {/* <div className="card" data-aos="fade-up" >
+                        <div className="card" data-aos="fade-up" >
                             <div className="card-header" id="headingSeven">
                                 <h2 className="mb-0">
                                 <button type="button" className={`btn btn-link collapsed ${activeFaq.g && "active"}`} onClick= {() => setActiveFaq(activeFaq.g ? {g : false} : {g : true})} data-toggle="collapse"
@@ -195,37 +199,14 @@ const Main = ({brdcum}) => {
                                     leap into electronic typesetting, remaining essentially unchanged.</p>
                                 </div>
                             </div>
-                        </div> */}
-
-                    {/* displays loading ... while the page fetches the FAQs */}
-                    {faqs.length < 1 && <h3>Loading...</h3>}
-
-                    {faqs.length > 0 && faqs.map((faq, index) => {
-                        let id = `heading${index}`; //headingSeven
-                        let target = `collapse${index}`; //#collapseSeven
-
-                        return(
-                        <div key={index} className="card" data-aos="fade-up" >
-                            <div className="card-header" id={id}>
-                                <h2 className="mb-0">
-                                <button type="button" className={`btn btn-link collapsed ${activeFaq.b && "active"}`} data-toggle="collapse"
-                                    data-target={`#${target}`}>{activeFaq.b ? <i className="icon_faq icofont-minus"></i>  : <i className="icon_faq icofont-plus"></i>}{faq.title}
-                                </button>
-                                </h2>
-                            </div>
-
-                            <div id={target} className="collapse" aria-labelledby={id} data-parent="#accordionExample">
-                                <div className="card-body">
-                                    <p>{faq.text}</p>
-                                </div>
-                            </div>
                         </div>
-                        )
-                    })}
                     </div>
                 </div>
             </div>
-        </section>
+        </section> */}
+
+        <Faq />
+
         <section className="row_am free_app_section review_freeapp" id="getstarted">
             <div className="container">
                 <div className="free_app_inner aos-init" data-aos="fade-in" data-aos-duration="1500" data-aos-delay="100"> 
@@ -245,27 +226,31 @@ const Main = ({brdcum}) => {
                             <div className="free_text">
                                 <div className="section_title">
                                     <h2>Let’s download free from apple and play store</h2>
-                                    <p>Instant free download from apple and play store orem Ipsum is simply dummy text of the printing.
+                                    <p>Instant free download from apple and play store. All you need is an iPhone or Android device to enjoy all personalized metrics for personal use. Welcome to myFit App.</p>
-                                    and typese tting indus orem Ipsum has beenthe standard</p>
                                 </div>
                                 <ul className="app_btn">
-                                <li>
+                                    <li>
-                                    <Link to="#">
+                                        <a href={process.env.REACT_APP_ANDROID_URL}>
-                                    <img src="assets/images/appstore_blue.png" alt="image" />
+                                        <img src={blueapp} alt="image" />
-                                    </Link>
+                                        </a>
-                                </li>
+                                    </li>
-                                <li>
+                                    <li>
-                                    <Link to="#">
+                                        <a href={process.env.REACT_APP_IOS_URL}>
-                                    <img src="assets/images/googleplay_blue.png" alt="image" />
+                                        <img src={blue} alt="image" />
-                                    </Link>
+                                        </a>
-                                </li>
+                                    </li>
+
                                 </ul>
                             </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,10 @@ 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'
+import blueapp from "../../../assets/images/appstore_blue.png";
+import blue from "../../../assets/images/googleplay_blue.png";
 
 const Main = ({brdcum}) => {
 
@@ -326,27 +330,30 @@ const Main = ({brdcum}) => {
                             <div className="free_text">
                                 <div className="section_title">
                                     <h2>Let’s download free from apple and play store</h2>
-                                    <p>Instant free download from apple and play store orem Ipsum is simply dummy text of the printing.
+                                   <p>Instant free download from apple and play store. All you need is an iPhone or Android device to enjoy all personalized metrics for personal use. Welcome to myFit App.</p>
-                                    and typese tting indus orem Ipsum has beenthe standard</p>
                                 </div>
-                                <ul className="app_btn">
+                                 <ul className="app_btn">
                                 <li>
-                                    <Link to="#">
+                                    <a href={process.env.REACT_APP_ANDROID_URL}>
-                                    <img src="assets/images/appstore_blue.png" alt="image" />
+                                    <img src={blueapp} alt="image" />
-                                    </Link>
+                                    </a>
                                 </li>
                                 <li>
-                                    <Link to="#">
+                                    <a href={process.env.REACT_APP_IOS_URL}>
-                                    <img src="assets/images/googleplay_blue.png" alt="image" />
+                                    <img src={blue} alt="image" />
-                                    </Link>
+                                    </a>
                                 </li>
                                 </ul>
                             </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

@@ -1,10 +1,16 @@
 import { Link } from 'react-router-dom'
 import React , {useState ,useEffect} from 'react'
 import Pricing from '../HomeMain/Pricing/Main'
+import Faq from '../HomeMain/Faq/Main'
 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 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}) => {
@@ -16,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}/>}
 
@@ -24,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}/>}
 
@@ -32,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}/>}
 
@@ -41,19 +47,20 @@ 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}/>}
 
         <Pricing/>
-        <section className="row_am faq_section">
+        <Faq />
+        {/* <section className="row_am faq_section">
             <div className="container">
                 <div className="faq_panel">
                     <div className="accordion" id="accordionExample">
@@ -187,7 +194,7 @@ const Main = ({brdcum}) => {
             </div>
             </div>
         </div>
-        </section>
+        </section> */}
         <section className="row_am free_app_section review_freeapp" id="getstarted">
             <div className="container">
                 <div className="free_app_inner aos-init" data-aos="fade-in" data-aos-duration="1500" data-aos-delay="100"> 
@@ -207,27 +214,27 @@ const Main = ({brdcum}) => {
                             <div className="free_text">
                                 <div className="section_title">
                                     <h2>Let’s download free from apple and play store</h2>
-                                    <p>Instant free download from apple and play store orem Ipsum is simply dummy text of the printing.
+                                   <p>Instant free download from apple and play store. All you need is an iPhone or Android device to enjoy all personalized metrics for personal use. Welcome to myFit App.</p>
-                                    and typese tting indus orem Ipsum has beenthe standard</p>
                                 </div>
                                 <ul className="app_btn">
-                                <li>
+                                     <li>
-                                    <Link to="#">
+                                        <a href={process.env.REACT_APP_ANDROID_URL}>
-                                    <img src="assets/images/appstore_blue.png" alt="image" />
+                                        <img src={blueapp} alt="image" />
-                                    </Link>
+                                        </a>
-                                </li>
+                                    </li>
-                                <li>
+                                    <li>
-                                    <Link to="#">
+                                        <a href={process.env.REACT_APP_IOS_URL}>
-                                    <img src="assets/images/googleplay_blue.png" alt="image" />
+                                        <img src={blue} alt="image" />
-                                    </Link>
+                                        </a>
-                                </li>
+                                    </li>
+
                                 </ul>
                             </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 src={screen} alt="image" />
-                                <img className="mobile_mockup" src="assets/images/download-screen02.png" alt="image" />
+                                <img className="mobile_mockup" src={screen1} alt="image" />
                             </div>
                         </div>
                     </div>

src/routes/index.js

@@ -13,49 +13,55 @@ import Pricing from "../component/Pricing/Main";
 import Blog from "../component/Blog/Blog/Main";
 import BlogSingle from "../component/Blog/BlogSingle/Main";
 
+
 import Terms from "../component/Terms/Main";
 import Privacy from "../component/Privacy/Main";
 
+/**
+ * Renders the appropriate component based on the current URL path.
+ * Manages the state of the navbar and footer components based on the current path.
+ * @returns {JSX.Element} The rendered components based on the current URL path.
+ */
 const Routing = () => {
-  const [homepage, sethomepage] = useState(false);
+  const [homepage, setHomepage] = useState(false);
+  const [footerpage, setFooterpage] = useState(false);
+  const [footer, setFooter] = useState({ f1: true });
+  const [navbar, setNavbar] = useState({ n1: true });
+  const [brdcum, setBrdcum] = useState({ n1: true });
   const location = useLocation();
 
   useEffect(() => {
     if (location.pathname === "/sign-in" || location.pathname === "/sign-up") {
-      sethomepage(false);
+      setHomepage(false);
     } else {
-      sethomepage(true);
+      setHomepage(true);
     }
   }, [location]);
 
-  const [footerpage, setfooterpage] = useState(false);
   useEffect(() => {
     if (location.pathname === "/sign-in" || location.pathname === "/sign-up") {
-      setfooterpage(false);
+      setFooterpage(false);
     } else {
-      setfooterpage(true);
+      setFooterpage(true);
     }
   }, [location]);
 
   useEffect(() => {
-    if (localStorage.getItem("navbar") === "darkhome") {
+    const navbarValue = localStorage.getItem("navbar");
-      setfooter({ f2: true });
+    if (navbarValue === "darkhome") {
-      setnavbar({ n3: true });
+      setFooter({ f2: true });
-      setbrdcum({ b2: true });
+      setNavbar({ n3: true });
-    } else if (localStorage.getItem("navbar") === "home") {
+      setBrdcum({ b2: true });
-      setfooter({ f1: true });
+    } else if (navbarValue === "home") {
-      setnavbar({ n2: true });
+      setFooter({ f1: true });
-      setbrdcum({ b1: true });
+      setNavbar({ n2: true });
+      setBrdcum({ b1: true });
     } else {
-      setfooter({ f1: true });
+      setFooter({ f1: true });
-      setnavbar({ n2: true });
+      setNavbar({ n2: true });
     }
   }, []);
 
-  const [footer, setfooter] = useState({ f1: true });
-  const [navbar, setnavbar] = useState({ n1: true });
-  const [brdcum, setbrdcum] = useState({ n1: true });
-
   return (
     <>
       {homepage && <Navbar navbar={navbar} />}
@@ -64,19 +70,19 @@ const Routing = () => {
           path="/"
           element={
             <Home
-              setfooter={setfooter}
+              setfooter={setFooter}
-              setnavbar={setnavbar}
+              setnavbar={setNavbar}
-              setbrdcum={setbrdcum}
+              setbrdcum={setBrdcum}
             />
           }
         />
         <Route
           path="/about"
-          element={<AboutUs setnavbar={setnavbar} brdcum={brdcum} />}
+          element={<AboutUs setnavbar={setNavbar} brdcum={brdcum} />}
         />
         <Route
           path="/review"
-          element={<Review setnavbar={setnavbar} brdcum={brdcum} />}
+          element={<Review setnavbar={setNavbar} brdcum={brdcum} />}
         />
         <Route path="/contact" element={<Contact brdcum={brdcum} />} />
         <Route path="/faq" element={<Faq brdcum={brdcum} />} />
@@ -84,7 +90,7 @@ const Routing = () => {
         <Route path="/sign-up" element={<SignUp />} />
         <Route path="/pricing" element={<Pricing brdcum={brdcum} />} />
         <Route path="/blog" element={<Blog brdcum={brdcum} />} />
-        <Route path="/blog-single" element={<BlogSingle brdcum={brdcum} />} />
+        <Route path="/blogdetails/:id" element={<BlogSingle brdcum={brdcum} />} />
         <Route path="/terms" element={<Terms brdcum={brdcum} />} />
         <Route path="/privacy" element={<Privacy brdcum={brdcum} />} />
       </Routes>

src/vendors/service/siteService.js

@@ -6,8 +6,9 @@ class SiteService {
     console.log("Er are here anyway");
   }
   // Blog Data {Get}
-  blogData() {
+  blogData(id) {
-    return this.getAuxEnd("blogdata", null);
+    //myfit
+    return this.getBlogEnd("/myfit", null);
   }
 
   // Country Data {GET}
@@ -16,8 +17,8 @@ class SiteService {
   }
 
   // Contact Data{POST}
-  contactData() {
+  contactData(value) {
-    return this.postAuxEnd("/contact", null)
+    return this.postAuxEnd("/contact", value)
   }
 
   faqData() {
@@ -56,13 +57,34 @@ class SiteService {
       });
   }
 
+  getBlogEnd(uri, reqData) {
+    const endPoint = "https://blogdata.chiefsoft.net/blogdata" + 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;
     return Axios.post(endPoint, reqData)
       .then((response) => {
         console.log(response);
-        // res = response;
+        // res = response
-        console.log("~~~~~~~ Toks2 POST ~~~~~~~~");
         return response;
       })
       .catch((error) => {