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_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"
|
#REACT_APP_APPSITE="http://localhost:7012"
|
||||||
|
|
||||||
# Social Media Links
|
# 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
|
// Set a time out for the blog data to be deleted from local storage
|
||||||
setTimeout(() => {
|
setTimeout(() => {
|
||||||
localStorage.removeItem("myFit--blogData");
|
localStorage.removeItem("myFit--blogData");
|
||||||
}, 3600);
|
}, 3600000);
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.log("Error from blog data ", error);
|
console.log("Error from blog data ", error);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -19,33 +19,14 @@ const Main = ({ brdcum }) => {
|
|||||||
}, [blogData]);
|
}, [blogData]);
|
||||||
|
|
||||||
const getBlogData = async () => {
|
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 {
|
try {
|
||||||
let res = await api_call.blogData();
|
let res = await api_call.blogData();
|
||||||
|
|
||||||
// Set the blog data to local storage
|
|
||||||
localStorage.setItem("myFit--blogData", JSON.stringify(res.data));
|
|
||||||
setBlogData(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) {
|
} catch (error) {
|
||||||
console.log("Error from blog data ", 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 (
|
return (
|
||||||
|
|||||||
@@ -103,22 +103,6 @@ const Main = ({ setfooter, setnavbar, setbrdcum }) => {
|
|||||||
</p>
|
</p>
|
||||||
</div>
|
</div>
|
||||||
<ul className="app_btn">
|
<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>
|
<li>
|
||||||
<Link to="https://play.google.com/store/apps/details?id=com.mermsemr.myfit">
|
<Link to="https://play.google.com/store/apps/details?id=com.mermsemr.myfit">
|
||||||
<img className="blue_img" src={blueapp} alt="image" />
|
<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" />
|
<img className="white_img" src={white} alt="image" />
|
||||||
</Link>
|
</Link>
|
||||||
</li>
|
</li>
|
||||||
</ul> */}
|
</ul>
|
||||||
|
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
<div
|
<div
|
||||||
className="col-lg-6 col-md-12"
|
className="col-lg-6 col-md-12"
|
||||||
|
|||||||
@@ -55,7 +55,7 @@ const Main = ({navbar}) => {
|
|||||||
<Link to="/contact" className="nav-link" >Contact</Link>
|
<Link to="/contact" className="nav-link" >Contact</Link>
|
||||||
</li>
|
</li>
|
||||||
<li className="nav-item">
|
<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>
|
</li>
|
||||||
</ul>
|
</ul>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
Reference in New Issue
Block a user