made country input tag to show country but returns country code as value

.env

@@ -5,12 +5,14 @@ REACT_APP_YEAR=2023
 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://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_FORM_TIMEOUT = 10000

src/assets/css/style.css

@@ -3008,11 +3008,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 +3030,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 +3049,29 @@ header.fix_style.white_header {
 }
 
 .blog_detail_section .blog_inner_pannel .info h3 {
-    font-weight: 700;
-    color: var(--dark-purple);
-    margin-top: 30px;
-    font-size: 25px;
-    margin-bottom: 15px;
+  font-weight: 700;
+  color: var(--dark-purple);
+  margin-top: 30px;
+  font-size: 25px;
+  margin-bottom: 15px;
 }
 
 /* To highlight the link in the terms section */
-.blog_detail_section .blog_inner_pannel .info p span a{
-    color: var(--dark-purple);
-    text-decoration: underline;
+.blog_detail_section .blog_inner_pannel .info p span a {
+  color: var(--dark-purple);
+  text-decoration: underline;
 }
 
 /* To reduce the fonts for sub-headers */
 .blog_detail_section .blog_inner_pannel .info h4 {
-    font-weight: 700;
-    color: var(--dark-purple);
-    margin-top: 30px;
-    font-size: 20px;
-    margin-bottom: 15px;
-  }
+  font-weight: 700;
+  color: var(--dark-purple);
+  margin-top: 30px;
+  font-size: 20px;
+  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,39 +3532,71 @@ 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 {
-  -webkit-box-shadow: inset 0 0 6px rgba(0,0,0,0.3); 
+.contact_page_section
+  .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;
@@ -3567,7 +3605,7 @@ header.fix_style.white_header {
   gap: 10px;
 }
 
-.contact_body{
+.contact_body {
   display: flex;
   flex-direction: column;
   align-content: center;
@@ -3598,28 +3636,44 @@ header.fix_style.white_header {
 }
 
 /* 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 +4743,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 +4766,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{
-  0%{
+@keyframes spin {
+  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

@@ -9,6 +9,18 @@ import BGImg2 from "../../assets/images/bread_crumb_bg_two.png"
 const Main = ({brdcum}) => {
     const [ytShow , setytShow] = useState (false)
 
+    // About us text variables
+    let innovativeDesc = 'The team at myFit by Flxuxtra LLC works with you to achieve your health objectives without getting in your way. Do your health your way to get the best result for you and your family. We are you, always ready and always engaged with the users to help get the best out of our solution.'
+    'We work with you to achieve your health and fitness goals by providing solutions that fit your goals.'
+    let whyWeAreDiff = {
+        desc:'We work with you to achieve your health and fitness goals by providing solutions that fit your goals.',
+        title1: 'Secure',
+        title2: 'Rich Features',
+        title3: 'Ease of Use',
+        title4: 'Support'
+    }
+    let queryDesc = 'If you have an query, please get in touch with us, we will revert back quickly.'
+    
   return (
     <>       
        {brdcum.b1 && 
@@ -56,17 +68,13 @@ 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
-                            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.
+                            {innovativeDesc}
                         </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">
@@ -98,17 +106,16 @@ 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
-                    dummy.</p>
+                    <p>{whyWeAreDiff.desc}</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
                             setting indus ideas.
                         </p>
@@ -117,22 +124,22 @@ const Main = ({brdcum}) => {
                     </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>
                         </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
                             setting indus ideas.
                         </p>
@@ -141,11 +148,11 @@ const Main = ({brdcum}) => {
                     </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>
                         </div>
                     </div>
@@ -167,45 +174,45 @@ const Main = ({brdcum}) => {
                         <div className="section_title" data-aos="fade-up" data-aos-duration="1500" data-aos-delay="100">
                             <h2> <span>We focus on quality,</span> never
                             focus on quantity</h2>
-                            <p>
-                            Lorem Ipsum is simply dummy text of the printing and typesetting industry lorem Ipsum has been the industrys standard dummy text ever since the when an unknown printer took a galley of type and.
-                            </p>
+                            
+                            <p>{innovativeDesc}</p>
                         </div>
                         <ul className="app_statstic" id="counter" data-aos="fade-in" data-aos-duration="1500">
                             <li>
-                            <div className="icon">
+                            {/* <div className="icon">
                                 <img src="assets/images/download.png" alt="image" />
-                            </div>
+                            </div> */}
                             <div className="text">
-                                <p><span className="counter-value" data-count="17">0</span><span>M+</span></p>
-                                <p>Download</p>
+                                <h3>Manage</h3>
+                                <p>health plan</p>
                             </div>
+                            
                             </li>
                             <li>
-                            <div className="icon">
+                            {/* <div className="icon">
                                 <img src="assets/images/followers.png" alt="image" />
-                            </div>
+                            </div> */}
                             <div className="text">
-                                <p><span className="counter-value" data-count="08">0 </span><span>M+</span></p>
-                                <p>Followers</p>
+                                <h3>Health Record</h3>
+                                <p>with you</p>
                             </div>
                             </li>
                             <li>
-                            <div className="icon">
+                            {/* <div className="icon">
                                 <img src="assets/images/reviews.png" alt="image" />
-                            </div>
+                            </div> */}
                             <div className="text">
-                                <p><span className="counter-value" data-count="2300">1500</span><span>+</span></p>
-                                <p>Reviews</p>
+                                <h3>Health</h3>
+                                <p>reminders</p>
                             </div>
                             </li>
                             <li>
-                            <div className="icon">
+                            {/* <div className="icon">
                                 <img src="assets/images/countries.png" alt="image" />
-                            </div>
+                            </div> */}
                             <div className="text">
-                                <p><span className="counter-value" data-count="150">0</span><span>+</span></p>
-                                <p>Countries</p>
+                                <h3>Quick</h3>
+                                <p>Schedule</p>
                             </div>
                             </li>
                         </ul>
@@ -224,7 +231,7 @@ const Main = ({brdcum}) => {
                 
                     <div className="section_title">
                         <h2>Have any query about ?</h2>
-                        <p>Lorem Ipsum is simply dummy text of the printing and typese tting <br/> indus orem Ipsum has beenthe standard dummy.</p>
+                        <p>{queryDesc}</p>
                     </div>
                     <Link to="/contact" className="btn white_btn">CONTACT US NOW</Link>
                 </div>

src/component/Blog/Blog/Main.js

@@ -1,11 +1,10 @@
 import React, { useEffect, useState } from "react";
 import { Link } from "react-router-dom";
 import BGImg from "../../../assets/images/bread_crumb_bg.png";
-import BGImg1 from "../../../assets/images/bread_crumb_bg_one.png";
-import BGImg2 from "../../../assets/images/bread_crumb_bg_two.png";
 import SiteService from "../../../vendors/service/siteService";
 const Main = ({ brdcum, bgimg }) => {
   const [blogData, setBlogData] = useState([]);
+  console.log(blogData);
 
   const api = new SiteService();
   useEffect(() => {
@@ -18,7 +17,7 @@ const Main = ({ brdcum, bgimg }) => {
 
       setBlogData(res.data);
 
-      console.log(res.data);
+      // console.log(res.data);
 
       
     } catch (error) {
@@ -94,9 +93,12 @@ const Main = ({ brdcum, bgimg }) => {
                     <div className="section_title">
                       <h2>{data.post_title}</h2>
                       <div dangerouslySetInnerHTML={{__html: data.post_content.substring(0,400)+'  . . .'}}></div>
-                      <Link to={`/blog-single/${data.id}`} state={{data}}>
+                      {/* <Link to={`/blog-single/${data.id}`} state={{data}}>
                           READ MORE
-                        </Link>
+                        </Link> */}
+                        <Link to={`/blogdetails/${data.id}`} state={{data, allData: blogData}}>
+                      READ MORE
+                    </Link>
                     </div>
                   </div>
                 </div>
@@ -124,7 +126,7 @@ const Main = ({ brdcum, bgimg }) => {
                   <div className="story_text">
                     <h3>{data.post_title}</h3>
                     <div dangerouslySetInnerHTML={{__html: data && data.post_content.substring(0,100)+'  . . .'}}></div>
-                    <Link to={`/blog-single/${data.id}`} state={{data}}>
+                    <Link to={`/blogdetails/${data.id}`} state={{data, allData: blogData}}>
                       READ MORE
                     </Link>
                   </div>
@@ -139,7 +141,8 @@ const Main = ({ brdcum, bgimg }) => {
           <div className="pagination_block">
             <ul>
               <li>
-                <Link to="#" className="prev">
+                <Link to={process.env.REACT_APP_BLOGSITE}
+                 className="prev">
                   {" "}
                   Visit our blog
                 </Link>

src/component/Blog/BlogSingle/Main.js

@@ -5,15 +5,46 @@ 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 data = location.state?.data;
-    
-    console.log("location", location, data);
-    
+    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 (
     <>
         
@@ -118,25 +149,27 @@ const Main = ({brdcum}) => {
                         </div>
                         <div className="social_media">
                             <ul>
-                                <li><Link to="#"><i className="icofont-facebook"></i></Link></li>
-                                <li><Link to="#"><i className="icofont-twitter"></i></Link></li>
-                                <li><Link to="#"><i className="icofont-instagram"></i></Link></li>
-                                <li><Link to="#"><i className="icofont-pinterest"></i></Link></li>
+                                <li>
+                                <a href={process.env.REACT_APP_FACEBOOK}>
+                                    <i className="icofont-facebook"></i>
+                                </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>
-                        <li className="tags"><p>Tags:</p></li>
-                        <li><span>app,</span></li>
-                        <li><span>rating,</span></li>
-                        <li><span>development</span></li>
-                        </ul>
+                        <a href={process.env.REACT_APP_BLOGSITE}>Visit Blog Site </a>
                     </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>
@@ -229,7 +262,7 @@ const Main = ({brdcum}) => {
                     </div>
                 </form>
             </div>
-        </section>
+        </section> */}
 
         <section className="row_am latest_story" id="blog">
             <div className="container">
@@ -238,21 +271,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">
-                            <div className="story_img">
-                            <img src="assets/images/story01.png" 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="#">READ MORE</Link>
-                            </div>
-                        </div>
-                    </div>
-                    <div className="col-md-4">
+
+                 {newAllData.map((data) => {
+                    
+                    return (
+
+                     <div className="col-md-4">
+                     <div className="story_box" data-aos="fade-up" data-aos-duration="1500">
+                         <div className="story_img">
+                        <img src={data.meta_value} alt="image" />
+                         <span>45 min ago</span>
+                         </div>
+                         <div className="story_text">
+                            <h3>{data.post_title}</h3>
+                             <div dangerouslySetInnerHTML={{__html: data.post_content.substring(0,300)+'  . . .'}}></div>
+                            {/* <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" />
@@ -277,7 +322,7 @@ const Main = ({brdcum}) => {
                                 <Link to="#">READ MORE</Link>
                             </div>
                         </div>
-                    </div>
+                    </div> */}
                 </div>
             </div>
         </section>

src/component/Contact/Main.js

@@ -64,7 +64,9 @@ const Main = ({ brdcum }) => {
     country: "",
   }); //initial state values
   const [countries, setCountries] = useState([]); // initial state for country dropdown
+
   const [myData, setMyData] = useState(null);
+
   // Gave a generic name for multiple calls
   const API_CALL = new SiteService(); // instantiating the class
   // API CALL
@@ -78,7 +80,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,10 +94,10 @@ const Main = ({ brdcum }) => {
         setMyData(contact);
 
         // Checking for errors
-        if (contact?.data?.status < 1 || contact?.data?.message_id == "")
-          return (errText.textContent =
-            "unable to send your message, please try able");
-        else {
+        if (contact?.data?.status < 1 || contact?.data?.message_id == ""){
+          errText.textContent = "unable to send your message, please try again";
+          response.innerHTML = `<p> SEND MESSAGE </p>`;
+        }else {
           response.innerHTML = `<p> SEND MESSAGE </p>`;
 
           contact_body.innerHTML = `<div class='contact_body animate pop'>
@@ -106,23 +107,19 @@ const Main = ({ brdcum }) => {
           setTimeout(() => {
             navigate("/");
           }, 10000);
-
-          setValues((prev) => ({ ...prev, [e.target.name]: "" }));
         }
       })
-      .catch((error) => {
-        console.log(error);
+      .catch(() => {
+        errText.textContent = "unable to send your message, please try again";
+        response.innerHTML = `<p> SEND MESSAGE </p>`;
       });
   };
 
   //CALLS THE API AFTER COMPONENT LOADS
   useEffect(() => {
-    allCountry().then((data) => setCountries(Object.values(data.data)));
+    allCountry().then((data) => setCountries(Object.entries(data.data))).catch((err)=>console.log(err.message));
   }, []);
 
-  useEffect(() => {
-    console.log(myData);
-  }, [myData]);
 
   return (
     <>
@@ -196,12 +193,12 @@ const Main = ({ brdcum }) => {
                   name="name"
                   type="text"
                   placeholder="Name"
-                  errorMessage="Please enter your name"
+                  errorMessage="Please enter your first and last name. (e.g: Mark John)"
                   required={true}
                   maxLenght={35}
                   value={values.name}
                   onChange={onChange}
-                  pattern="^[A-Za-z]{1,35}$"
+                  pattern="^$|^[a-zA-Z]+( [a-zA-Z]+)?$+( [a-zA-Z]+)?$"
                 />
 
                 <FormInput
@@ -222,17 +219,15 @@ const Main = ({ brdcum }) => {
                     value={values.country}
                     onChange={onChange}
                     required>
-                    <option
-                      value={""}
-                      onCha>
+                    <option value={""}>
                       Country
                     </option>
                     {countries.length > 0 &&
                       countries.map((country, index) => (
                         <option
                           key={index}
-                          value={country}>
-                          {country}
+                          value={country[0]}>
+                          {country[1]}
                         </option>
                       ))}
                   </select>
@@ -251,11 +246,10 @@ const Main = ({ brdcum }) => {
 
                 <div className="form-group">
                   <textarea
-                    name="msg"
+                    name="message"
                     className="form-control"
                     placeholder="Your message"
-                    value={values.msg}
-                    errorMessage='words have exceeded 350 characters!'
+                    value={values.message}
                     onChange={onChange}
                     maxLength={300}
                     pattern="^[A-Za-z0-9]{5, 300}$"
@@ -283,7 +277,7 @@ const Main = ({ brdcum }) => {
                 </div>
               </form>
               {/* Error Tag */}
-              <p id="errText" />
+              <p id="errText"></p>
             </div>
 
             {/* Contact Info */}
@@ -355,7 +349,9 @@ const Main = ({ brdcum }) => {
         </div>
       </section>
       <section className="row_am map_section">
-        <div className="container" />
+        <div className="container">
+
+        </div>
       </section>
     </>
   );

src/component/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";
@@ -94,13 +95,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>
@@ -231,13 +232,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>
@@ -367,7 +368,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>
@@ -483,7 +484,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>
@@ -492,7 +493,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>
@@ -615,7 +616,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>
@@ -624,7 +625,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>

src/component/Home/Main.js

@@ -103,6 +103,22 @@ const Main = ({ setfooter, setnavbar, setbrdcum }) => {
                 </p>
               </div>
               <ul className="app_btn">
+                  <li>
+                      <a href={process.env.REACT_APP_ANDROID_URL}>
+                        <img src={blueapp} alt="image" />
+                        <img className="white_img" src={whiteapp} alt="image" />
+                      </a>
+                  </li>
+                  <li>
+                      <a href={process.env.REACT_APP_IOS_URL}>
+                        <img src={blue} alt="image" />
+                        <img className="white_img" src={white} alt="image" />
+                      </a>
+                  </li>
+              </ul>
+
+
+              {/* <ul className="app_btn">
                 <li>
                   <Link to="https://play.google.com/store/apps/details?id=com.mermsemr.myfit">
                     <img className="blue_img" src={blueapp} alt="image" />
@@ -115,7 +131,9 @@ const Main = ({ setfooter, setnavbar, setbrdcum }) => {
                     <img className="white_img" src={white} alt="image" />
                   </Link>
                 </li>
-              </ul>
+              </ul> */}
+
+
             </div>
             <div
               className="col-lg-6 col-md-12"

src/component/HomeMain/Story/Main.js

@@ -1,20 +1,68 @@
-import { Link } from 'react-router-dom'
-import React from 'react'
-import story1 from '../../../assets/images/story01.png'
-import story2 from '../../../assets/images/story02.png'
-import story3 from '../../../assets/images/story03.png'
+import React, { useEffect, useState } from "react";
+import { Link } from 'react-router-dom';
+// import story1 from '../../../assets/images/story01.png';
+// import story2 from '../../../assets/images/story02.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.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/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>
@@ -286,7 +286,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>
@@ -359,7 +359,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>
@@ -404,7 +404,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>
@@ -477,7 +477,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>
@@ -533,7 +533,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>

src/component/Pages/Faq/Main.js

@@ -31,7 +31,7 @@ const Main = ({brdcum}) => {
         <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}/>}
 
@@ -39,7 +39,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}/>}
 
@@ -47,7 +47,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}/>}
 
@@ -55,14 +55,14 @@ 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}/>}
 

src/component/Pages/Review/Main.js

@@ -328,16 +328,16 @@ const Main = ({brdcum}) => {
                                     <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">
+                                 <ul className="app_btn">
                                 <li>
-                                    <Link to="#">
-                                    <img src="assets/images/appstore_blue.png" alt="image" />
-                                    </Link>
+                                    <a href={process.env.REACT_APP_ANDROID_URL}>
+                                    <img src={blueapp} alt="image" />
+                                    </a>
                                 </li>
                                 <li>
-                                    <Link to="#">
-                                    <img src="assets/images/googleplay_blue.png" alt="image" />
-                                    </Link>
+                                    <a href={process.env.REACT_APP_IOS_URL}>
+                                    <img src={blue} alt="image" />
+                                    </a>
                                 </li>
                                 </ul>
                             </div>

src/component/Pricing/Main.js

@@ -6,6 +6,8 @@ import Bredcrumb from '../Bredcrumb/Main'
 import BGImg from "../../assets/images/bread_crumb_bg.png"
 import BGImg1 from "../../assets/images/bread_crumb_bg_one.png"
 import BGImg2 from "../../assets/images/bread_crumb_bg_two.png"
+import blueapp from "../../assets/images/appstore_blue.png";
+import blue from "../../assets/images/googleplay_blue.png";
 
 
 const Main = ({brdcum}) => {

src/routes/index.js

@@ -13,6 +13,7 @@ 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";
 
@@ -84,9 +85,10 @@ 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/:id" 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>
       {footerpage && <Footer footer={footer} />}
     </>

src/vendors/service/siteService.js

@@ -6,7 +6,7 @@ class SiteService {
     console.log("Er are here anyway");
   }
   // Blog Data {Get}
-  blogData() {
+  blogData(id) {
     return this.getAuxEnd("/blogdata", null);
   }
 
@@ -16,8 +16,8 @@ class SiteService {
   }
 
   // Contact Data{POST}
-  contactData() {
-    return this.postAuxEnd("/contact", null)
+  contactData(value) {
+    return this.postAuxEnd("/contact", value)
   }
 
   faqData() {