Compare commits

...

30 Commits

Author SHA1 Message Date
ChineseChikki 175e66d132 Review page fixed to variable 2023-01-20 15:13:34 +01:00
tokslaw 2d5412c1df Merge branch 'task-33-how-it-works-broken-link' of MyFit/www-myfit into master 2023-01-20 13:12:16 +00:00
tokslaw c795c861a9 Merge branch 'myfit_read_latest_story' of MyFit/www-myfit into master 2023-01-20 13:12:04 +00:00
tokslaw 58c5773776 Merge branch 'myfit_about_us_text' of MyFit/www-myfit into master 2023-01-20 13:07:57 +00:00
ChineseChikki bb7b54f8a4 Fixed broken footer link of how it work 2023-01-20 12:39:14 +01:00
VICTOR\anumu 24732b6c05 assigned text to variable in about us page and used the variables in place of text 2023-01-19 18:43:04 +01:00
DESKTOP-QHP1O2H\MIKE d39e404f0b Merge branch 'master' of https://gitlab.chiefsoft.net/MyFit/www-myfit into myfit_read_latest_story 2023-01-19 10:54:22 -05:00
DESKTOP-QHP1O2H\MIKE 745cd01429 modified latest blog on blog-single 2023-01-19 10:43:59 -05:00
tokslaw 523235a196 Merge branch 'task-31-download-active-pricing' of MyFit/www-myfit into master 2023-01-19 15:18:37 +00:00
tokslaw f513e5561f Merge branch 'task-31-social-media-link-activate' of MyFit/www-myfit into master 2023-01-19 15:17:59 +00:00
tokslaw 36b3c01f81 Merge branch 'task-29-content-download-free' of MyFit/www-myfit into master 2023-01-19 15:15:26 +00:00
tokslaw 571c6e7a7b Merge branch 'task-29-download-free-faq' of MyFit/www-myfit into master 2023-01-19 15:14:50 +00:00
ChineseChikki 08cf607c47 links in variable 2023-01-19 14:48:51 +01:00
ChineseChikki a61416b006 links into variables 2023-01-19 14:40:23 +01:00
ChineseChikki e0a1cbc42a Link is now in variable format 2023-01-19 14:14:44 +01:00
ChineseChikki 5f94cc3bec All links in footer is now in .env formate 2023-01-19 12:48:22 +01:00
jenkins 2ae9eaf3e4 Port corrected 2023-01-18 20:35:22 -05:00
ChineseChikki ff11dbbbd3 social media link activated 2023-01-19 01:52:50 +01:00
ChineseChikki 036b53fa97 activated the pricing link 2023-01-19 01:04:07 +01:00
tokslaw 0069998c6b Merge branch 'task-29-download-free-faq' of MyFit/www-myfit into master 2023-01-18 18:26:28 +00:00
tokslaw 89604def94 Merge branch 'task-29-download-free-review' of MyFit/www-myfit into master 2023-01-18 18:26:13 +00:00
tokslaw 11d1abc6dc Merge branch 'task-29-download-free-pricing' of MyFit/www-myfit into master 2023-01-18 18:26:05 +00:00
ChineseChikki 63255bc441 free-download-pricing-page 2023-01-18 17:34:05 +01:00
ChineseChikki 1975e3ba77 free download-review 2023-01-18 17:19:00 +01:00
ChineseChikki 13efc5bf0f free-download-faq 2023-01-18 16:58:36 +01:00
tokslaw 80e8141a11 Merge branch 'task-29-content-download-free' of MyFit/www-myfit into master 2023-01-18 14:44:15 +00:00
tokslaw e662f15bd1 Merge branch 'task-29-content-beautiful-interface' of MyFit/www-myfit into master 2023-01-18 14:44:05 +00:00
tokslaw 907be131de Merge branch '#29-content-FAQ' of MyFit/www-myfit into master 2023-01-18 14:43:47 +00:00
ChineseChikki 3b57d23ec1 free download text updated 2023-01-18 10:55:04 +01:00
ChineseChikki fc0e85f5d6 updated text for faq 2023-01-18 09:48:03 +01:00
13 changed files with 197 additions and 169 deletions
+1 -1
View File
@@ -6,7 +6,7 @@ services:
dockerfile: Dockerfile dockerfile: Dockerfile
restart: unless-stopped restart: unless-stopped
ports: ports:
- 9057:3000 - 7010:3000
stdin_open: true stdin_open: true
working_dir: /usr/src/app working_dir: /usr/src/app
volumes: volumes:
+27 -21
View File
@@ -9,6 +9,17 @@ import BGImg2 from "../../assets/images/bread_crumb_bg_two.png"
const Main = ({brdcum}) => { const Main = ({brdcum}) => {
const [ytShow , setytShow] = useState (false) 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'
}
return ( return (
<> <>
{brdcum.b1 && {brdcum.b1 &&
@@ -56,17 +67,13 @@ const Main = ({brdcum}) => {
life easy to grow.</h2> life easy to grow.</h2>
</div> </div>
<p data-aos="fade-up" data-aos-duration="1500"> <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>
<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 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 make a type specien book. It has survived not only five centuries, but also the leap into electronic
typesetting. typesetting.
</p> </p> */}
</div> </div>
</div> </div>
<div className="col-lg-6"> <div className="col-lg-6">
@@ -98,17 +105,16 @@ const Main = ({brdcum}) => {
<div className="container"> <div className="container">
<div className="section_title" data-aos="fade-up" data-aos-duration="1500" data-aos-delay="100"> <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> <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>
<div className="row"> <div className="row">
<div className="col-md-6 col-lg-3"> <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="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"/> <img src="assets/images/secure.png" alt="image"/>
</div> </div> */}
<div className="text"> <div className="text">
<h3>Secure code</h3> <h3>{whyWeAreDiff.title1}</h3>
<p>Lorem Ipsum is simply dummy text of the printing and type <p>Lorem Ipsum is simply dummy text of the printing and type
setting indus ideas. setting indus ideas.
</p> </p>
@@ -117,22 +123,22 @@ const Main = ({brdcum}) => {
</div> </div>
<div className="col-md-6 col-lg-3"> <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="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"/> <img src="assets/images/abt_functional.png" alt="image"/>
</div> </div> */}
<div className="text"> <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>Simply dummy text of the printing and typesetting indus lorem Ipsum is dummy.</p>
</div> </div>
</div> </div>
</div> </div>
<div className="col-md-6 col-lg-3"> <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="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"/> <img src="assets/images/communication.png" alt="image"/>
</div> </div> */}
<div className="text"> <div className="text">
<h3>Best communication</h3> <h3>{whyWeAreDiff.title3}</h3>
<p>Lorem Ipsum is simply dummy text of the printing and type <p>Lorem Ipsum is simply dummy text of the printing and type
setting indus ideas. setting indus ideas.
</p> </p>
@@ -141,11 +147,11 @@ const Main = ({brdcum}) => {
</div> </div>
<div className="col-md-6 col-lg-3"> <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="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"/> <img src="assets/images/abt_support.png" alt="image"/>
</div> </div> */}
<div className="text"> <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>Simply dummy text of the printing and typesetting indus lorem Ipsum is dummy.</p>
</div> </div>
</div> </div>
+3 -2
View File
@@ -6,6 +6,7 @@ import BGImg2 from "../../../assets/images/bread_crumb_bg_two.png";
import SiteService from "../../../vendors/service/siteService"; import SiteService from "../../../vendors/service/siteService";
const Main = ({ brdcum, bgimg }) => { const Main = ({ brdcum, bgimg }) => {
const [blogData, setBlogData] = useState([]); const [blogData, setBlogData] = useState([]);
console.log(blogData);
const api = new SiteService(); const api = new SiteService();
useEffect(() => { useEffect(() => {
@@ -18,7 +19,7 @@ const Main = ({ brdcum, bgimg }) => {
setBlogData(res.data); setBlogData(res.data);
console.log(res.data); // console.log(res.data);
} catch (error) { } catch (error) {
@@ -124,7 +125,7 @@ const Main = ({ brdcum, bgimg }) => {
<div className="story_text"> <div className="story_text">
<h3>{data.post_title}</h3> <h3>{data.post_title}</h3>
<div dangerouslySetInnerHTML={{__html: data && data.post_content.substring(0,100)+' . . .'}}></div> <div dangerouslySetInnerHTML={{__html: data && data.post_content.substring(0,100)+' . . .'}}></div>
<Link to={`/blog-single/${data.id}`} state={{data}}> <Link to={`/blog-single/${data.id}`} state={{data, allData: blogData}}>
READ MORE READ MORE
</Link> </Link>
</div> </div>
+63 -19
View File
@@ -5,14 +5,45 @@ import BGImg from "../../../assets/images/bread_crumb_bg.png"
import BGImg1 from "../../../assets/images/bread_crumb_bg_one.png" import BGImg1 from "../../../assets/images/bread_crumb_bg_one.png"
import BGImg2 from "../../../assets/images/bread_crumb_bg_two.png" import BGImg2 from "../../../assets/images/bread_crumb_bg_two.png"
import { useParams } from "react-router-dom"; import { useParams } from "react-router-dom";
import SiteService from "../../../vendors/service/siteService";
const Main = ({brdcum}) => { const Main = ({brdcum}) => {
const { id } = useParams(); const { id } = useParams();
const location = useLocation(); const location = useLocation();
const data = location.state?.data; const [blogData, setBlogData] = useState([]);
const [newAllData, setNewAllData] = useState([]);
console.log("location", location, data);
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 ( return (
<> <>
@@ -238,21 +269,34 @@ 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> <p>Lorem Ipsum is simply dummy text of the printing and typese tting <br/> indus orem Ipsum has beenthe standard dummy.</p>
</div> </div>
<div className="row"> <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>
</div>
</div>
</div>
)})}
{/* <div className="col-md-4">
<div className="story_box" data-aos="fade-up" data-aos-duration="1500"> <div className="story_box" data-aos="fade-up" data-aos-duration="1500">
<div className="story_img"> <div className="story_img">
<img src="assets/images/story02.png" alt="image" /> <img src="assets/images/story02.png" alt="image" />
@@ -277,7 +321,7 @@ const Main = ({brdcum}) => {
<Link to="#">READ MORE</Link> <Link to="#">READ MORE</Link>
</div> </div>
</div> </div>
</div> </div> */}
</div> </div>
</div> </div>
</section> </section>
+52 -76
View File
@@ -61,14 +61,14 @@ const Main = ({ footer }) => {
</ul> </ul>
<ul className="social_media"> <ul className="social_media">
<li> <li>
<Link to="#"> <a href={process.env.REACT_APP_FACEBOOK}>
<i className="icofont-facebook"></i> <i className="icofont-facebook"></i>
</Link> </a>
</li> </li>
<li> <li>
<Link to="#"> <a href ={process.env.REACT_APP_TWITTER}>
<i className="icofont-twitter"></i> <i className="icofont-twitter"></i>
</Link> </a>
</li> </li>
</ul> </ul>
</div> </div>
@@ -94,13 +94,13 @@ const Main = ({ footer }) => {
</div> </div>
<div className="col-lg-3 col-md-6 col-12"> <div className="col-lg-3 col-md-6 col-12">
<div className="links"> <div className="links">
<h3>Help & Suport</h3> <h3>Help & Support</h3>
<ul> <ul>
<li> <li>
<Link to="/faq">FAQs</Link> <Link to="/faq">FAQs</Link>
</li> </li>
<li> <li>
<Link to="/#how_it_work">How it works</Link> <Link to="/how_it_work">How it works</Link>
</li> </li>
<li> <li>
<Link to="/terms">Terms & conditions</Link> <Link to="/terms">Terms & conditions</Link>
@@ -116,12 +116,12 @@ const Main = ({ footer }) => {
<h3>Lets Try Out</h3> <h3>Lets Try Out</h3>
<ul className="app_btn"> <ul className="app_btn">
<li> <li>
<a href="https://play.google.com/store/apps/details?id=com.mermsemr.myfit"> <a href={process.env.REACT_APP_ANDROID_URL}>
<img src={blueapp} alt="image" /> <img src={blueapp} alt="image" />
</a> </a>
</li> </li>
<li> <li>
<a href="https://play.google.com/store/apps/details?id=com.mermsemr.myfit"> <a href={process.env.REACT_APP_IOS_URL}>
<img src={blue} alt="image" /> <img src={blue} alt="image" />
</a> </a>
</li> </li>
@@ -197,15 +197,15 @@ const Main = ({ footer }) => {
</li> </li>
</ul> </ul>
<ul className="social_media"> <ul className="social_media">
<li> <li>
<Link to="#"> <a href={process.env.REACT_APP_FACEBOOK}>
<i className="icofont-facebook"></i> <i className="icofont-facebook"></i>
</Link> </a>
</li> </li>
<li> <li>
<Link to="#"> <a href ={process.env.REACT_APP_TWITTER}>
<i className="icofont-twitter"></i> <i className="icofont-twitter"></i>
</Link> </a>
</li> </li>
</ul> </ul>
</div> </div>
@@ -231,13 +231,13 @@ const Main = ({ footer }) => {
</div> </div>
<div className="col-lg-3 col-md-6 col-12"> <div className="col-lg-3 col-md-6 col-12">
<div className="links"> <div className="links">
<h3>Help & Suport</h3> <h3>Help & Support</h3>
<ul> <ul>
<li> <li>
<Link to="/faq">FAQs</Link> <Link to="/faq">FAQs</Link>
</li> </li>
<li> <li>
<Link to="/#how_it_work">How it works</Link> <Link to="/how_it_work">How it works</Link>
</li> </li>
<li> <li>
<Link to="/terms">Terms & conditions</Link> <Link to="/terms">Terms & conditions</Link>
@@ -253,19 +253,13 @@ const Main = ({ footer }) => {
<h3>Lets Try Out</h3> <h3>Lets Try Out</h3>
<ul className="app_btn"> <ul className="app_btn">
<li> <li>
<a href="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"
alt="image"
/>
</a> </a>
</li> </li>
<li> <li>
<a href="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"
alt="image"
/>
</a> </a>
</li> </li>
</ul> </ul>
@@ -327,14 +321,14 @@ const Main = ({ footer }) => {
</ul> </ul>
<ul className="social_media"> <ul className="social_media">
<li> <li>
<Link to="#"> <a href={process.env.REACT_APP_FACEBOOK}>
<i className="icofont-facebook"></i> <i className="icofont-facebook"></i>
</Link> </a>
</li> </li>
<li> <li>
<Link to="#"> <a href ={process.env.REACT_APP_TWITTER}>
<i className="icofont-twitter"></i> <i className="icofont-twitter"></i>
</Link> </a>
</li> </li>
</ul> </ul>
</div> </div>
@@ -373,7 +367,7 @@ const Main = ({ footer }) => {
<Link to="#">Support</Link> <Link to="#">Support</Link>
</li> </li>
<li> <li>
<Link to="/work">How it works</Link> <Link to="/how_it_work">How it works</Link>
</li> </li>
<li> <li>
<Link to="/terms">Terms & conditions</Link> <Link to="/terms">Terms & conditions</Link>
@@ -389,20 +383,14 @@ const Main = ({ footer }) => {
<div className="try_out"> <div className="try_out">
<h3>Lets Try Out</h3> <h3>Lets Try Out</h3>
<ul className="app_btn"> <ul className="app_btn">
<li> <li>
<a href="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"
alt="image"
/>
</a> </a>
</li> </li>
<li> <li>
<a href 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"
alt="image"
/>
</a> </a>
</li> </li>
</ul> </ul>
@@ -458,14 +446,14 @@ const Main = ({ footer }) => {
</ul> </ul>
<ul className="social_media"> <ul className="social_media">
<li> <li>
<Link to="#"> <a href={process.env.REACT_APP_FACEBOOK}>
<i className="icofont-facebook"></i> <i className="icofont-facebook"></i>
</Link> </a>
</li> </li>
<li> <li>
<Link to="#"> <a href ={process.env.REACT_APP_TWITTER}>
<i className="icofont-twitter"></i> <i className="icofont-twitter"></i>
</Link> </a>
</li> </li>
</ul> </ul>
</div> </div>
@@ -495,7 +483,7 @@ const Main = ({ footer }) => {
<div className="col-lg-3 col-md-6 col-12"> <div className="col-lg-3 col-md-6 col-12">
<div className="links"> <div className="links">
<h3>Help & Suport</h3> <h3>Help & Support</h3>
<ul> <ul>
<li> <li>
<Link to="/faq">FAQs</Link> <Link to="/faq">FAQs</Link>
@@ -504,7 +492,7 @@ const Main = ({ footer }) => {
<Link to="#">Support</Link> <Link to="#">Support</Link>
</li> </li>
<li> <li>
<Link to="/work">How it works</Link> <Link to="/how_it_work">How it works</Link>
</li> </li>
<li> <li>
<Link to="/terms">Terms & conditions</Link> <Link to="/terms">Terms & conditions</Link>
@@ -521,19 +509,13 @@ const Main = ({ footer }) => {
<h3>Lets Try Out</h3> <h3>Lets Try Out</h3>
<ul className="app_btn"> <ul className="app_btn">
<li> <li>
<a href="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"
alt="image"
/>
</a> </a>
</li> </li>
<li> <li>
<a href="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"
alt="image"
/>
</a> </a>
</li> </li>
</ul> </ul>
@@ -597,14 +579,14 @@ const Main = ({ footer }) => {
</ul> </ul>
<ul className="social_media"> <ul className="social_media">
<li> <li>
<Link to="#"> <a href={process.env.REACT_APP_FACEBOOK}>
<i className="icofont-facebook"></i> <i className="icofont-facebook"></i>
</Link> </a>
</li> </li>
<li> <li>
<Link to="#"> <a href ={process.env.REACT_APP_TWITTER}>
<i className="icofont-twitter"></i> <i className="icofont-twitter"></i>
</Link> </a>
</li> </li>
</ul> </ul>
</div> </div>
@@ -633,7 +615,7 @@ const Main = ({ footer }) => {
</div> </div>
<div className="col-lg-3 col-md-6 col-12"> <div className="col-lg-3 col-md-6 col-12">
<div className="links"> <div className="links">
<h3>Help & Suport</h3> <h3>Help & Support</h3>
<ul> <ul>
<li> <li>
<Link to="/faq">FAQs</Link> <Link to="/faq">FAQs</Link>
@@ -642,7 +624,7 @@ const Main = ({ footer }) => {
<Link to="#">Support</Link> <Link to="#">Support</Link>
</li> </li>
<li> <li>
<Link to="/work">How it works</Link> <Link to="/how_it_work">How it works</Link>
</li> </li>
<li> <li>
<Link to="/terms">Terms & conditions</Link> <Link to="/terms">Terms & conditions</Link>
@@ -657,20 +639,14 @@ const Main = ({ footer }) => {
<div className="try_out"> <div className="try_out">
<h3>Lets Try Out</h3> <h3>Lets Try Out</h3>
<ul className="app_btn"> <ul className="app_btn">
<li> <li>
<a href="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"
alt="image"
/>
</a> </a>
</li> </li>
<li> <li>
<a href="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"
alt="image"
/>
</a> </a>
</li> </li>
</ul> </ul>
+5 -6
View File
@@ -47,19 +47,18 @@ const Main = () => {
<div className="free_text"> <div className="free_text">
<div className="section_title"> <div className="section_title">
<h2>Lets download free from apple and play store</h2> <h2>Lets 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> </div>
<ul className="app_btn"> <ul className="app_btn">
<li> <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" /> <img src={blueapp} alt="image" />
</Link> </a>
</li> </li>
<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" /> <img src={blue} alt="image" />
</Link> </a>
</li> </li>
</ul> </ul>
</div> </div>
+1 -2
View File
@@ -24,8 +24,7 @@ const Main = ({gredient}) => {
<div className="container"> <div className="container">
<div className="section_title" data-aos="fade-up" data-aos-duration="1500" data-aos-delay="300"> <div className="section_title" data-aos="fade-up" data-aos-duration="1500" data-aos-delay="300">
<h2><span>FAQ</span> - Frequently Asked Questions</h2> <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>
<div className="faq_panel"> <div className="faq_panel">
<div className="accordion" id="accordionExample"> <div className="accordion" id="accordionExample">
+6 -6
View File
@@ -134,7 +134,7 @@ const Main = ({navbar}) => {
<Link smooth to="/#features" className="nav-link">Features</Link> <Link smooth to="/#features" className="nav-link">Features</Link>
</li> </li>
<li className="nav-item"> <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>
<li className="nav-item" > <li className="nav-item" >
<Link to="/blog" className="nav-link">Blog</Link> <Link to="/blog" className="nav-link">Blog</Link>
@@ -286,7 +286,7 @@ const Main = ({navbar}) => {
<span className="drp_btn" ><i className="icofont-rounded-down"></i></span> <span className="drp_btn" ><i className="icofont-rounded-down"></i></span>
<div className="sub_menu" style={{ display: show ? "block" : "none" }}> <div className="sub_menu" style={{ display: show ? "block" : "none" }}>
<ul> <ul>
<li><Link to="/">Home Defoult</Link></li> <li><Link to="/">Home Default</Link></li>
</ul> </ul>
</div> </div>
@@ -359,7 +359,7 @@ const Main = ({navbar}) => {
<span className="drp_btn" ><i className="icofont-rounded-down"></i></span> <span className="drp_btn" ><i className="icofont-rounded-down"></i></span>
<div className="sub_menu"> <div className="sub_menu">
<ul> <ul>
<li><Link to="/">Home Defoult</Link></li> <li><Link to="/">Home Default</Link></li>
</ul> </ul>
@@ -404,7 +404,7 @@ const Main = ({navbar}) => {
<span className="drp_btn" ><i className="icofont-rounded-down"></i></span> <span className="drp_btn" ><i className="icofont-rounded-down"></i></span>
<div className="sub_menu" style={{ display: show ? "block" : "none" }}> <div className="sub_menu" style={{ display: show ? "block" : "none" }}>
<ul> <ul>
<li><Link to="/">Home Defoult</Link></li> <li><Link to="/">Home Default</Link></li>
</ul> </ul>
@@ -477,7 +477,7 @@ const Main = ({navbar}) => {
<span className="drp_btn" ><i className="icofont-rounded-down"></i></span> <span className="drp_btn" ><i className="icofont-rounded-down"></i></span>
<div className="sub_menu"> <div className="sub_menu">
<ul> <ul>
<li><Link to="/">Home Defoult</Link></li> <li><Link to="/">Home Default</Link></li>
</ul> </ul>
@@ -533,7 +533,7 @@ const Main = ({navbar}) => {
<span className="drp_btn" ><i className="icofont-rounded-down"></i></span> <span className="drp_btn" ><i className="icofont-rounded-down"></i></span>
<div className="sub_menu" style={{ display: show ? "block" : "none" }}> <div className="sub_menu" style={{ display: show ? "block" : "none" }}>
<ul> <ul>
<li><Link to="/">Home Defoult</Link></li> <li><Link to="/">Home Default</Link></li>
</ul> </ul>
+12 -12
View File
@@ -223,20 +223,20 @@ const Main = ({brdcum}) => {
<div className="free_text"> <div className="free_text">
<div className="section_title"> <div className="section_title">
<h2>Lets download free from apple and play store</h2> <h2>Lets 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> </div>
<ul className="app_btn"> <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> </ul>
</div> </div>
</div> </div>
+8 -9
View File
@@ -326,19 +326,18 @@ const Main = ({brdcum}) => {
<div className="free_text"> <div className="free_text">
<div className="section_title"> <div className="section_title">
<h2>Lets download free from apple and play store</h2> <h2>Lets 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> </div>
<ul className="app_btn"> <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> </ul>
</div> </div>
+12 -12
View File
@@ -209,20 +209,20 @@ const Main = ({brdcum}) => {
<div className="free_text"> <div className="free_text">
<div className="section_title"> <div className="section_title">
<h2>Lets download free from apple and play store</h2> <h2>Lets 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> </div>
<ul className="app_btn"> <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> </ul>
</div> </div>
</div> </div>
+4
View File
@@ -3,6 +3,7 @@ import { Route, Routes, useLocation } from "react-router-dom";
import Navbar from "../component/Navbar/Main"; import Navbar from "../component/Navbar/Main";
import Footer from "../component/Footer/Main"; import Footer from "../component/Footer/Main";
import Home from "../component/Home/Main"; import Home from "../component/Home/Main";
import Work from "../component/HomeMain/Work/Main"
import AboutUs from "../component/AboutUs/Main"; import AboutUs from "../component/AboutUs/Main";
import Review from "../component/Pages/Review/Main"; import Review from "../component/Pages/Review/Main";
import Contact from "../component/Contact/Main"; import Contact from "../component/Contact/Main";
@@ -13,6 +14,7 @@ import Pricing from "../component/Pricing/Main";
import Blog from "../component/Blog/Blog/Main"; import Blog from "../component/Blog/Blog/Main";
import BlogSingle from "../component/Blog/BlogSingle/Main"; import BlogSingle from "../component/Blog/BlogSingle/Main";
import Terms from "../component/Terms/Main"; import Terms from "../component/Terms/Main";
import Privacy from "../component/Privacy/Main"; import Privacy from "../component/Privacy/Main";
@@ -87,6 +89,8 @@ const Routing = () => {
<Route path="/blog-single/:id" element={<BlogSingle brdcum={brdcum} />} /> <Route path="/blog-single/:id" element={<BlogSingle brdcum={brdcum} />} />
<Route path="/terms" element={<Terms brdcum={brdcum} />} /> <Route path="/terms" element={<Terms brdcum={brdcum} />} />
<Route path="/privacy" element={<Privacy brdcum={brdcum} />} /> <Route path="/privacy" element={<Privacy brdcum={brdcum} />} />
<Route path="/how_it_work" element={<Work brdcum={brdcum} />} />
</Routes> </Routes>
{footerpage && <Footer footer={footer} />} {footerpage && <Footer footer={footer} />}
</> </>
+1 -1
View File
@@ -6,7 +6,7 @@ class SiteService {
console.log("Er are here anyway"); console.log("Er are here anyway");
} }
// Blog Data {Get} // Blog Data {Get}
blogData() { blogData(id) {
return this.getAuxEnd("/blogdata", null); return this.getAuxEnd("/blogdata", null);
} }