Compare commits
24 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 DESKTOP-QHP1O2H\MIKE
|
d39e404f0b | ||
|
DESKTOP-QHP1O2H\MIKE
|
745cd01429 | ||
 tokslaw
|
523235a196 | ||
|
tokslaw
|
f513e5561f | ||
|
tokslaw
|
36b3c01f81 | ||
|
tokslaw
|
571c6e7a7b | ||
|
ChineseChikki
|
08cf607c47 | ||
|
ChineseChikki
|
a61416b006 | ||
|
ChineseChikki
|
e0a1cbc42a | ||
|
ChineseChikki
|
5f94cc3bec | ||
 jenkins
|
2ae9eaf3e4 | ||
|
ChineseChikki
|
ff11dbbbd3 | ||
|
ChineseChikki
|
036b53fa97 | ||
|
tokslaw
|
0069998c6b | ||
|
tokslaw
|
89604def94 | ||
|
tokslaw
|
11d1abc6dc | ||
|
ChineseChikki
|
63255bc441 | ||
|
ChineseChikki
|
1975e3ba77 | ||
|
ChineseChikki
|
13efc5bf0f | ||
|
tokslaw
|
80e8141a11 | ||
|
tokslaw
|
e662f15bd1 | ||
|
tokslaw
|
907be131de | ||
|
ChineseChikki
|
3b57d23ec1 | ||
|
ChineseChikki
|
fc0e85f5d6 |
+1
-1
@@ -6,7 +6,7 @@ services:
|
||||
dockerfile: Dockerfile
|
||||
restart: unless-stopped
|
||||
ports:
|
||||
- 9057:3000
|
||||
- 7010:3000
|
||||
stdin_open: true
|
||||
working_dir: /usr/src/app
|
||||
volumes:
|
||||
|
||||
@@ -6,6 +6,7 @@ import BGImg2 from "../../../assets/images/bread_crumb_bg_two.png";
|
||||
import SiteService from "../../../vendors/service/siteService";
|
||||
const Main = ({ brdcum, bgimg }) => {
|
||||
const [blogData, setBlogData] = useState([]);
|
||||
console.log(blogData);
|
||||
|
||||
const api = new SiteService();
|
||||
useEffect(() => {
|
||||
@@ -18,7 +19,7 @@ const Main = ({ brdcum, bgimg }) => {
|
||||
|
||||
setBlogData(res.data);
|
||||
|
||||
console.log(res.data);
|
||||
// console.log(res.data);
|
||||
|
||||
|
||||
} catch (error) {
|
||||
@@ -124,7 +125,7 @@ const Main = ({ brdcum, bgimg }) => {
|
||||
<div className="story_text">
|
||||
<h3>{data.post_title}</h3>
|
||||
<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
|
||||
</Link>
|
||||
</div>
|
||||
|
||||
@@ -5,15 +5,46 @@ 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 { useParams } from "react-router-dom";
|
||||
import SiteService from "../../../vendors/service/siteService";
|
||||
|
||||
|
||||
const Main = ({brdcum}) => {
|
||||
|
||||
const { id } = useParams();
|
||||
const location = useLocation();
|
||||
const data = location.state?.data;
|
||||
|
||||
console.log("location", location, data);
|
||||
|
||||
const [blogData, setBlogData] = useState([]);
|
||||
const [newAllData, setNewAllData] = useState([]);
|
||||
|
||||
|
||||
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 (
|
||||
<>
|
||||
|
||||
@@ -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>
|
||||
</div>
|
||||
<div className="row">
|
||||
<div className="col-md-4">
|
||||
<div className="story_box" data-aos="fade-up" data-aos-duration="1500">
|
||||
<div className="story_img">
|
||||
<img src="assets/images/story01.png" alt="image" />
|
||||
<span>45 min ago</span>
|
||||
</div>
|
||||
<div className="story_text">
|
||||
<h3>Cool features added!</h3>
|
||||
<p>Lorem Ipsum is simply dummy text of the printing and typesetting
|
||||
industry lorem Ipsum has.</p>
|
||||
<Link to="#">READ MORE</Link>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div className="col-md-4">
|
||||
|
||||
{newAllData.map((data) => {
|
||||
|
||||
return (
|
||||
|
||||
<div className="col-md-4">
|
||||
<div className="story_box" data-aos="fade-up" data-aos-duration="1500">
|
||||
<div className="story_img">
|
||||
<img src={data.meta_value} alt="image" />
|
||||
<span>45 min ago</span>
|
||||
</div>
|
||||
<div className="story_text">
|
||||
<h3>{data.post_title}</h3>
|
||||
<div dangerouslySetInnerHTML={{__html: data.post_content.substring(0,300)+' . . .'}}></div>
|
||||
<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_img">
|
||||
<img src="assets/images/story02.png" alt="image" />
|
||||
@@ -277,7 +321,7 @@ const Main = ({brdcum}) => {
|
||||
<Link to="#">READ MORE</Link>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div> */}
|
||||
</div>
|
||||
</div>
|
||||
</section>
|
||||
|
||||
@@ -61,14 +61,14 @@ const Main = ({ footer }) => {
|
||||
</ul>
|
||||
<ul className="social_media">
|
||||
<li>
|
||||
<Link to="#">
|
||||
<a href={process.env.REACT_APP_FACEBOOK}>
|
||||
<i className="icofont-facebook"></i>
|
||||
</Link>
|
||||
</a>
|
||||
</li>
|
||||
<li>
|
||||
<Link to="#">
|
||||
<a href ={process.env.REACT_APP_TWITTER}>
|
||||
<i className="icofont-twitter"></i>
|
||||
</Link>
|
||||
</a>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
@@ -116,12 +116,12 @@ const Main = ({ footer }) => {
|
||||
<h3>Let’s Try Out</h3>
|
||||
<ul className="app_btn">
|
||||
<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" />
|
||||
</a>
|
||||
</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" />
|
||||
</a>
|
||||
</li>
|
||||
@@ -197,15 +197,15 @@ const Main = ({ footer }) => {
|
||||
</li>
|
||||
</ul>
|
||||
<ul className="social_media">
|
||||
<li>
|
||||
<Link to="#">
|
||||
<i className="icofont-facebook"></i>
|
||||
</Link>
|
||||
<li>
|
||||
<a href={process.env.REACT_APP_FACEBOOK}>
|
||||
<i className="icofont-facebook"></i>
|
||||
</a>
|
||||
</li>
|
||||
<li>
|
||||
<Link to="#">
|
||||
<i className="icofont-twitter"></i>
|
||||
</Link>
|
||||
<a href ={process.env.REACT_APP_TWITTER}>
|
||||
<i className="icofont-twitter"></i>
|
||||
</a>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
@@ -253,19 +253,13 @@ const Main = ({ footer }) => {
|
||||
<h3>Let’s Try Out</h3>
|
||||
<ul className="app_btn">
|
||||
<li>
|
||||
<a href="https://play.google.com/store/apps/details?id=com.mermsemr.myfit">
|
||||
<img
|
||||
src="assets/images/appstore_blue.png"
|
||||
alt="image"
|
||||
/>
|
||||
<a href={process.env.REACT_APP_ANDROID_URL}>
|
||||
<img src={blueapp} alt="image" />
|
||||
</a>
|
||||
</li>
|
||||
<li>
|
||||
<a href="https://play.google.com/store/apps/details?id=com.mermsemr.myfit">
|
||||
<img
|
||||
src="assets/images/googleplay_blue.png"
|
||||
alt="image"
|
||||
/>
|
||||
<a href={process.env.REACT_APP_IOS_URL}>
|
||||
<img src={blue} alt="image" />
|
||||
</a>
|
||||
</li>
|
||||
</ul>
|
||||
@@ -327,14 +321,14 @@ const Main = ({ footer }) => {
|
||||
</ul>
|
||||
<ul className="social_media">
|
||||
<li>
|
||||
<Link to="#">
|
||||
<a href={process.env.REACT_APP_FACEBOOK}>
|
||||
<i className="icofont-facebook"></i>
|
||||
</Link>
|
||||
</a>
|
||||
</li>
|
||||
<li>
|
||||
<Link to="#">
|
||||
<a href ={process.env.REACT_APP_TWITTER}>
|
||||
<i className="icofont-twitter"></i>
|
||||
</Link>
|
||||
</a>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
@@ -389,20 +383,14 @@ const Main = ({ footer }) => {
|
||||
<div className="try_out">
|
||||
<h3>Let’s Try Out</h3>
|
||||
<ul className="app_btn">
|
||||
<li>
|
||||
<a href="https://play.google.com/store/apps/details?id=com.mermsemr.myfit">
|
||||
<img
|
||||
src="assets/images/appstore_blue.png"
|
||||
alt="image"
|
||||
/>
|
||||
<li>
|
||||
<a href={process.env.REACT_APP_ANDROID_URL}>
|
||||
<img src={blueapp} alt="image" />
|
||||
</a>
|
||||
</li>
|
||||
<li>
|
||||
<a href to="https://play.google.com/store/apps/details?id=com.mermsemr.myfit">
|
||||
<img
|
||||
src="assets/images/googleplay_blue.png"
|
||||
alt="image"
|
||||
/>
|
||||
<a href={process.env.REACT_APP_IOS_URL}>
|
||||
<img src={blue} alt="image" />
|
||||
</a>
|
||||
</li>
|
||||
</ul>
|
||||
@@ -458,14 +446,14 @@ const Main = ({ footer }) => {
|
||||
</ul>
|
||||
<ul className="social_media">
|
||||
<li>
|
||||
<Link to="#">
|
||||
<a href={process.env.REACT_APP_FACEBOOK}>
|
||||
<i className="icofont-facebook"></i>
|
||||
</Link>
|
||||
</a>
|
||||
</li>
|
||||
<li>
|
||||
<Link to="#">
|
||||
<a href ={process.env.REACT_APP_TWITTER}>
|
||||
<i className="icofont-twitter"></i>
|
||||
</Link>
|
||||
</a>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
@@ -521,19 +509,13 @@ const Main = ({ footer }) => {
|
||||
<h3>Let’s Try Out</h3>
|
||||
<ul className="app_btn">
|
||||
<li>
|
||||
<a href="https://play.google.com/store/apps/details?id=com.mermsemr.myfit">
|
||||
<img
|
||||
src="assets/images/appstore_blue.png"
|
||||
alt="image"
|
||||
/>
|
||||
<a href={process.env.REACT_APP_ANDROID_URL}>
|
||||
<img src={blueapp} alt="image" />
|
||||
</a>
|
||||
</li>
|
||||
<li>
|
||||
<a href="https://play.google.com/store/apps/details?id=com.mermsemr.myfit">
|
||||
<img
|
||||
src="assets/images/googleplay_blue.png"
|
||||
alt="image"
|
||||
/>
|
||||
<a href={process.env.REACT_APP_IOS_URL}>
|
||||
<img src={blue} alt="image" />
|
||||
</a>
|
||||
</li>
|
||||
</ul>
|
||||
@@ -597,14 +579,14 @@ const Main = ({ footer }) => {
|
||||
</ul>
|
||||
<ul className="social_media">
|
||||
<li>
|
||||
<Link to="#">
|
||||
<a href={process.env.REACT_APP_FACEBOOK}>
|
||||
<i className="icofont-facebook"></i>
|
||||
</Link>
|
||||
</a>
|
||||
</li>
|
||||
<li>
|
||||
<Link to="#">
|
||||
<a href ={process.env.REACT_APP_TWITTER}>
|
||||
<i className="icofont-twitter"></i>
|
||||
</Link>
|
||||
</a>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
@@ -657,20 +639,14 @@ const Main = ({ footer }) => {
|
||||
<div className="try_out">
|
||||
<h3>Let’s Try Out</h3>
|
||||
<ul className="app_btn">
|
||||
<li>
|
||||
<a href="https://play.google.com/store/apps/details?id=com.mermsemr.myfit">
|
||||
<img
|
||||
src="assets/images/appstore_blue.png"
|
||||
alt="image"
|
||||
/>
|
||||
<li>
|
||||
<a href={process.env.REACT_APP_ANDROID_URL}>
|
||||
<img src={blueapp} alt="image" />
|
||||
</a>
|
||||
</li>
|
||||
<li>
|
||||
<a href="https://play.google.com/store/apps/details?id=com.mermsemr.myfit">
|
||||
<img
|
||||
src="assets/images/googleplay_blue.png"
|
||||
alt="image"
|
||||
/>
|
||||
<a href={process.env.REACT_APP_IOS_URL}>
|
||||
<img src={blue} alt="image" />
|
||||
</a>
|
||||
</li>
|
||||
</ul>
|
||||
|
||||
@@ -47,19 +47,18 @@ const Main = () => {
|
||||
<div className="free_text">
|
||||
<div className="section_title">
|
||||
<h2>Let’s 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.
|
||||
and typese tting indus orem Ipsum has beenthe standard</p>
|
||||
<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">
|
||||
<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" />
|
||||
</Link>
|
||||
</a>
|
||||
</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" />
|
||||
</Link>
|
||||
</a>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
@@ -24,8 +24,7 @@ const Main = ({gredient}) => {
|
||||
<div className="container">
|
||||
<div className="section_title" data-aos="fade-up" data-aos-duration="1500" data-aos-delay="300">
|
||||
<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
|
||||
standard dummy.</p>
|
||||
<p>Organizing all types of wellness activity you desire.<br/>Proven step to increase pleasure and commitment.</p>
|
||||
</div>
|
||||
<div className="faq_panel">
|
||||
<div className="accordion" id="accordionExample">
|
||||
|
||||
@@ -223,20 +223,20 @@ const Main = ({brdcum}) => {
|
||||
<div className="free_text">
|
||||
<div className="section_title">
|
||||
<h2>Let’s 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.
|
||||
and typese tting indus orem Ipsum has beenthe standard</p>
|
||||
<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">
|
||||
<li>
|
||||
<Link to="#">
|
||||
<img src="assets/images/appstore_blue.png" alt="image" />
|
||||
</Link>
|
||||
</li>
|
||||
<li>
|
||||
<Link to="#">
|
||||
<img src="assets/images/googleplay_blue.png" alt="image" />
|
||||
</Link>
|
||||
</li>
|
||||
<li>
|
||||
<a href={process.env.REACT_APP_ANDROID_URL}>
|
||||
<img src={blueapp} alt="image" />
|
||||
</a>
|
||||
</li>
|
||||
<li>
|
||||
<a href={process.env.REACT_APP_IOS_URL}>
|
||||
<img src={blue} alt="image" />
|
||||
</a>
|
||||
</li>
|
||||
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -326,8 +326,7 @@ const Main = ({brdcum}) => {
|
||||
<div className="free_text">
|
||||
<div className="section_title">
|
||||
<h2>Let’s 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.
|
||||
and typese tting indus orem Ipsum has beenthe standard</p>
|
||||
<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">
|
||||
<li>
|
||||
|
||||
@@ -209,20 +209,20 @@ const Main = ({brdcum}) => {
|
||||
<div className="free_text">
|
||||
<div className="section_title">
|
||||
<h2>Let’s 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.
|
||||
and typese tting indus orem Ipsum has beenthe standard</p>
|
||||
<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">
|
||||
<li>
|
||||
<Link to="#">
|
||||
<img src="assets/images/appstore_blue.png" alt="image" />
|
||||
</Link>
|
||||
</li>
|
||||
<li>
|
||||
<Link to="#">
|
||||
<img src="assets/images/googleplay_blue.png" alt="image" />
|
||||
</Link>
|
||||
</li>
|
||||
<li>
|
||||
<a href={process.env.REACT_APP_ANDROID_URL}>
|
||||
<img src={blueapp} alt="image" />
|
||||
</a>
|
||||
</li>
|
||||
<li>
|
||||
<a href={process.env.REACT_APP_IOS_URL}>
|
||||
<img src={blue} alt="image" />
|
||||
</a>
|
||||
</li>
|
||||
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
Vendored
+1
-1
@@ -6,7 +6,7 @@ class SiteService {
|
||||
console.log("Er are here anyway");
|
||||
}
|
||||
// Blog Data {Get}
|
||||
blogData() {
|
||||
blogData(id) {
|
||||
return this.getAuxEnd("/blogdata", null);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user