Compare commits
1 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 4af750f7a7 |
@@ -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://mermsemr.com"
|
||||
REACT_APP_APPSITE=" https://myfitapp.mermsemr.com"
|
||||
#REACT_APP_APPSITE="http://localhost:7012"
|
||||
|
||||
# Social Media Links
|
||||
|
||||
@@ -29,7 +29,7 @@ const Main = ({ brdcum, bgimg }) => {
|
||||
// Set a time out for the blog data to be deleted from local storage
|
||||
setTimeout(() => {
|
||||
localStorage.removeItem("myFit--blogData");
|
||||
}, 3600);
|
||||
}, 3600000);
|
||||
} catch (error) {
|
||||
console.log("Error from blog data ", error);
|
||||
}
|
||||
|
||||
@@ -19,33 +19,14 @@ 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 {
|
||||
let res = await api_call.blogData();
|
||||
|
||||
// Set the blog data to local storage
|
||||
localStorage.setItem("myFit--blogData", JSON.stringify(res.data));
|
||||
setBlogData(res.data);
|
||||
// Set a time out for the blog data to be deleted from local storage
|
||||
setTimeout(() => {
|
||||
localStorage.removeItem("myFit--blogData");
|
||||
}, 3600);
|
||||
|
||||
} catch (error) {
|
||||
console.log("Error from blog data ", error);
|
||||
}
|
||||
} else {
|
||||
try {
|
||||
let data = JSON.parse(localStorage.getItem("myFit--blogData"));
|
||||
setBlogData(data);
|
||||
} catch (error) {
|
||||
console.error("Error parsing JSON data: ", error);
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
return (
|
||||
|
||||
@@ -100,7 +100,7 @@ const Main = ({ footer }) => {
|
||||
<Link to="/faq">FAQs</Link>
|
||||
</li>
|
||||
<li>
|
||||
<a href="#how_it_work">How it works</a>
|
||||
<Link to="/how_it_work">How it works</Link>
|
||||
</li>
|
||||
<li>
|
||||
<Link to="/terms">Terms & conditions</Link>
|
||||
@@ -237,7 +237,7 @@ const Main = ({ footer }) => {
|
||||
<Link to="/faq">FAQs</Link>
|
||||
</li>
|
||||
<li>
|
||||
<a href="/how_it_work">How it works</a>
|
||||
<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>
|
||||
<a href="/how_it_work">How it works</a>
|
||||
<Link to="/how_it_work">How it works</Link>
|
||||
</li>
|
||||
<li>
|
||||
<Link to="/terms">Terms & conditions</Link>
|
||||
@@ -492,7 +492,7 @@ const Main = ({ footer }) => {
|
||||
<Link to="#">Support</Link>
|
||||
</li>
|
||||
<li>
|
||||
<a href="/how_it_work">How it works</a>
|
||||
<Link to="/how_it_work">How it works</Link>
|
||||
</li>
|
||||
<li>
|
||||
<Link to="/terms">Terms & conditions</Link>
|
||||
@@ -624,7 +624,7 @@ const Main = ({ footer }) => {
|
||||
<Link to="#">Support</Link>
|
||||
</li>
|
||||
<li>
|
||||
<a href="/how_it_work">How it works</a>
|
||||
<Link to="/how_it_work">How it works</Link>
|
||||
</li>
|
||||
<li>
|
||||
<Link to="/terms">Terms & conditions</Link>
|
||||
|
||||
@@ -103,22 +103,6 @@ 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" />
|
||||
@@ -131,9 +115,7 @@ 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"
|
||||
|
||||
@@ -55,7 +55,7 @@ const Main = ({navbar}) => {
|
||||
<Link to="/contact" className="nav-link" >Contact</Link>
|
||||
</li>
|
||||
<li className="nav-item">
|
||||
<a href={process.env.REACT_APP_APPSITE} className="nav-link dark_btn">GET STARTED</a>
|
||||
<Link to={process.env.REACT_APP_APPSITE} className="nav-link dark_btn">GET STARTED</Link>
|
||||
</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>
|
||||
|
||||
@@ -6,8 +6,6 @@ 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}) => {
|
||||
|
||||
@@ -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";
|
||||
@@ -88,6 +89,7 @@ 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} />}
|
||||
|
||||
Reference in New Issue
Block a user