MyFit/www-myfit
4
0
Fork 0
Code Issues Pull Requests Releases Activity

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

Browse Source
This commit is contained in:
Chukwumdiebube
2023-01-20 16:50:57 +01:00
parent 362324925b 0a22ac7ade
commit b5f78d1372
10 changed files with 61 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.env
-1
View File
@@ -20,4 +20,3 @@ 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/"
src/component/AboutUs/Main.js
+27 -21
View File
@@ -9,6 +9,17 @@ 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'
}
return (
<>
{brdcum.b1 &&
@@ -56,17 +67,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 +105,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 +123,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 +147,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>
src/component/Blog/Blog/Main.js
+1
View File
@@ -9,6 +9,7 @@ import SiteService from "../../../vendors/service/siteService";
const Main = ({ brdcum, bgimg }) => {
const [blogData, setBlogData] = useState([]);
console.log(blogData);
let api = new SiteService();
useEffect(() => {
src/component/Blog/BlogSingle/Main.js
+4
View File
@@ -21,6 +21,10 @@ const Main = ({ brdcum }) => {
}, [blogData]);
const getBlogData = async () => {
/*
The reason for this, is because of the breaking I had when building the blog
I decided to save to the local storage for an hour so that it won't need to be going to the server again but I can change this
*/
// Saving it locally to avoid interfering with server
if (localStorage.getItem("myFit--blogData") == null) {
try {
src/component/Footer/Main.js
+9 -9
View File
@@ -94,13 +94,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>
<Link to="/how_it_work">How it works</Link>
</li>
<li>
<Link to="/terms">Terms & conditions</Link>
@@ -231,13 +231,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>
<Link to="/how_it_work">How it works</Link>
</li>
<li>
<Link to="/terms">Terms & conditions</Link>
@@ -367,7 +367,7 @@ const Main = ({ footer }) => {
<Link to="#">Support</Link>
</li>
<li>
<Link to="/work">How it works</Link>
<Link to="/how_it_work">How it works</Link>
</li>
<li>
<Link to="/terms">Terms & conditions</Link>
@@ -483,7 +483,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 +492,7 @@ const Main = ({ footer }) => {
<Link to="#">Support</Link>
</li>
<li>
<Link to="/work">How it works</Link>
<Link to="/how_it_work">How it works</Link>
</li>
<li>
<Link to="/terms">Terms & conditions</Link>
@@ -615,7 +615,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 +624,7 @@ const Main = ({ footer }) => {
<Link to="#">Support</Link>
</li>
<li>
<Link to="/work">How it works</Link>
<Link to="/how_it_work">How it works</Link>
</li>
<li>
<Link to="/terms">Terms & conditions</Link>
src/component/Navbar/Main.js
+6 -6
View File
@@ -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>
@@ -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
+2 -1
View File
@@ -1,5 +1,7 @@
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"
@@ -64,7 +66,6 @@ const Main = ({brdcum}) => {
tag="Faq"
bgimg={BGImg2}/>}
{/* <section className="row_am faq_section">
<div className="container">
<div className="faq_panel">
src/component/Pages/Review/Main.js
+7 -7
View File
@@ -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/routes/index.js
+4
View File
@@ -3,6 +3,7 @@ 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";
@@ -13,6 +14,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";
@@ -87,6 +89,8 @@ 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} />}
</>
src/vendors/service/siteService.js
Vendored
+1 -1
View File
@@ -6,7 +6,7 @@ class SiteService {
console.log("Er are here anyway");
}
// Blog Data {Get}
blogData() {
blogData(id) {
return this.getAuxEnd("/blogdata", null);
}