Compare commits

...

18 Commits

Author SHA1 Message Date
VICTOR\anumu 84eacb05d7 Made the contact page input name to accept both first and last name 2023-01-23 20:32:14 +01:00
tokslaw 623dc8164b error message 2023-01-23 09:15:21 -05:00
tokslaw 8f07d4380f Merge branch 'task-37-fixed-broken-Nav-Bar' of MyFit/www-myfit into master 2023-01-23 12:23:12 +00:00
tokslaw d3d4f3f8f8 Merge branch 'master' of https://gitlab.chiefsoft.net/MyFit/www-myfit 2023-01-23 07:15:48 -05:00
tokslaw 92a802750d Merge branch 'myfit_implement_blogdata-api' of MyFit/www-myfit into master 2023-01-23 12:11:00 +00:00
ChineseChikki 8d47da611d Fixed broken nav-Bar of missing header 2023-01-21 09:04:49 +01:00
DESKTOP-QHP1O2H\MIKE ec475103b8 Merge branch 'master' of https://gitlab.chiefsoft.net/MyFit/www-myfit into myfit_implement_blogdata-api 2023-01-20 18:07:35 -05:00
DESKTOP-QHP1O2H\MIKE 5dde6e6e91 fixed latest story on homepage 2023-01-20 18:07:01 -05:00
tokslaw 0e7862df7f faq_header_text 2023-01-20 18:01:38 -05:00
tokslaw 3c1d1f4324 Merge branch 'myfit_update_pricing_page_broken_link' of MyFit/www-myfit into master 2023-01-20 21:52:59 +00:00
victor.ebuka d579941a8c Merge branch 'myfit_pricing_page_broken_link' of MyFit/www-myfit into master 2023-01-20 21:30:25 +00:00
tokslaw 4efb4bf2f8 Merge branch 'myfit_get_started_link_fixed' of MyFit/www-myfit into master 2023-01-20 21:00:30 +00:00
VICTOR\anumu fe311f8610 Updated pricing_page_broken link 2023-01-20 21:44:58 +01:00
VICTOR\anumu bcdcdc7b54 fixed pricing page broken link 2023-01-20 21:25:13 +01:00
tokslaw 0dd929c513 Merge branch 'myFit--BlogDetails' of MyFit/www-myfit into master 2023-01-20 19:05:55 +00:00
tokslaw 296ed23ec9 Merge branch 'myfit_apple_google_links' of MyFit/www-myfit into master 2023-01-20 19:04:17 +00:00
VICTOR\anumu 6866d405c9 fixed 'Get Started' broken link on nav bar 2023-01-20 19:39:53 +01:00
DESKTOP-QHP1O2H\MIKE c3c9c9d70f linked google play store link to .env file 2023-01-20 13:06:59 -05:00
12 changed files with 99 additions and 34 deletions
+1 -1
View File
@@ -6,7 +6,7 @@ REACT_APP_ANDROID_URL="https://play.google.com/store/apps/details?id=com.mermsem
REACT_APP_IOS_URL="https://play.google.com/store/apps/details?id=com.mermsemr.myfit"
REACT_APP_APPSITE=" https://myfitapp.mermsemr.com"
REACT_APP_APPSITE=" https://mermsemr.com"
#REACT_APP_APPSITE="http://localhost:7012"
# Social Media Links
+1
View File
@@ -42,6 +42,7 @@ const Main = ({ brdcum, bgimg }) => {
}
}
};
return (
<>
+3 -2
View File
@@ -16,7 +16,7 @@ const Main = ({ brdcum }) => {
let api_call = new SiteService();
useEffect(() => {
getBlogData();
}, [blogData]);
}, []);
const getBlogData = async () => {
/*
@@ -185,7 +185,8 @@ const Main = ({ brdcum }) => {
dangerouslySetInnerHTML={{
__html: item.post_content.substring(0, 100) + " . . .",
}}></div>
<Link to={`/blogdetails/${item.id}`}>READ MORE</Link>
<a href={`/blogdetails/${item.id}`}>READ MORE</a>
{/* <Link to={`/blogdetails/${item.id}`}>READ MORE</Link> */}
</div>
</div>
</div>
+7 -6
View File
@@ -94,7 +94,7 @@ const Main = ({ brdcum }) => {
// Checking for errors
if (contact?.data?.status < 1 || contact?.data?.message_id == "")
return (errText.textContent =
"unable to send your message, please try able");
"unable to send your message, please try again");
else {
response.innerHTML = `<p> SEND MESSAGE </p>`;
@@ -110,6 +110,7 @@ const Main = ({ brdcum }) => {
}
})
.catch((error) => {
errText.textContent = "unable to send your message, please try again"
console.log(error);
});
};
@@ -119,9 +120,9 @@ const Main = ({ brdcum }) => {
allCountry().then((data) => setCountries(Object.values(data.data)));
}, []);
useEffect(() => {
myData
}, [myData]);
// useEffect(() => {
// myData
// }, [myData]);
return (
<>
@@ -195,12 +196,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
+5 -5
View File
@@ -100,7 +100,7 @@ const Main = ({ footer }) => {
<Link to="/faq">FAQs</Link>
</li>
<li>
<Link to="/how_it_work">How it works</Link>
<a href="#how_it_work">How it works</a>
</li>
<li>
<Link to="/terms">Terms & conditions</Link>
@@ -237,7 +237,7 @@ const Main = ({ footer }) => {
<Link to="/faq">FAQs</Link>
</li>
<li>
<Link to="/how_it_work">How it works</Link>
<a href="/how_it_work">How it works</a>
</li>
<li>
<Link to="/terms">Terms & conditions</Link>
@@ -367,7 +367,7 @@ const Main = ({ footer }) => {
<Link to="#">Support</Link>
</li>
<li>
<Link to="/how_it_work">How it works</Link>
<a href="/how_it_work">How it works</a>
</li>
<li>
<Link to="/terms">Terms & conditions</Link>
@@ -492,7 +492,7 @@ const Main = ({ footer }) => {
<Link to="#">Support</Link>
</li>
<li>
<Link to="/how_it_work">How it works</Link>
<a href="/how_it_work">How it works</a>
</li>
<li>
<Link to="/terms">Terms & conditions</Link>
@@ -624,7 +624,7 @@ const Main = ({ footer }) => {
<Link to="#">Support</Link>
</li>
<li>
<Link to="/how_it_work">How it works</Link>
<a href="/how_it_work">How it works</a>
</li>
<li>
<Link to="/terms">Terms & conditions</Link>
+19 -1
View File
@@ -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"
+52 -8
View File
@@ -1,20 +1,64 @@
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((item, 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={item.meta_value}
alt="image"
/>
<span>{new Date(item.post_date).toDateString()}</span>
</div>
<div className="story_text">
<h3>{item.post_title}</h3>
<div
dangerouslySetInnerHTML={{
__html: item.post_content.substring(0, 100) + " . . .",
}}></div>
<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 +97,7 @@ const Main = () => {
<Link to="/blog-single">READ MORE</Link>
</div>
</div>
</div>
</div> */}
</div>
</div>
</section>
+2 -2
View File
@@ -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>
@@ -134,7 +134,7 @@ const Main = ({navbar}) => {
<Link smooth to="/#features" className="nav-link">Features</Link>
</li>
<li className="nav-item">
<Link smooth to="#how_it_work" className="nav-link">How it works</Link>
<Link smooth to="/#how_it_work" className="nav-link">How it works</Link>
</li>
<li className="nav-item" >
<Link to="/blog" className="nav-link">Blog</Link>
+5 -5
View File
@@ -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}/>}
+2
View File
@@ -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}) => {
-2
View File
@@ -3,7 +3,6 @@ import { Route, Routes, useLocation } from "react-router-dom";
import Navbar from "../component/Navbar/Main";
import Footer from "../component/Footer/Main";
import Home from "../component/Home/Main";
import Work from "../component/HomeMain/Work/Main"
import AboutUs from "../component/AboutUs/Main";
import Review from "../component/Pages/Review/Main";
import Contact from "../component/Contact/Main";
@@ -89,7 +88,6 @@ const Routing = () => {
<Route path="/blogdetails/:id" element={<BlogSingle brdcum={brdcum} />} />
<Route path="/terms" element={<Terms brdcum={brdcum} />} />
<Route path="/privacy" element={<Privacy brdcum={brdcum} />} />
<Route path="/how_it_work" element={<Work brdcum={brdcum} />} />
</Routes>
{footerpage && <Footer footer={footer} />}
+2 -2
View File
@@ -16,8 +16,8 @@ class SiteService {
}
// Contact Data{POST}
contactData() {
return this.postAuxEnd("/contact", null)
contactData(value) {
return this.postAuxEnd("/contact", value)
}
faqData() {