Compare commits

..

2 Commits

Author SHA1 Message Date
ChineseChikki 20bffa1409 undo 2023-01-19 14:34:55 +01:00
ChineseChikki e28f521632 links in variable format 2023-01-19 14:23:42 +01:00
10 changed files with 126 additions and 146 deletions
+1 -1
View File
@@ -6,7 +6,7 @@ services:
dockerfile: Dockerfile
restart: unless-stopped
ports:
- 7010:3000
- 9057:3000
stdin_open: true
working_dir: /usr/src/app
volumes:
+2 -3
View File
@@ -6,7 +6,6 @@ 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(() => {
@@ -19,7 +18,7 @@ const Main = ({ brdcum, bgimg }) => {
setBlogData(res.data);
// console.log(res.data);
console.log(res.data);
} catch (error) {
@@ -125,7 +124,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, allData: blogData}}>
<Link to={`/blog-single/${data.id}`} state={{data}}>
READ MORE
</Link>
</div>
+21 -65
View File
@@ -5,46 +5,15 @@ 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 [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);
}
};
const data = location.state?.data;
console.log("location", location, data);
return (
<>
@@ -269,34 +238,21 @@ 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">
{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="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">
<div className="story_box" data-aos="fade-up" data-aos-duration="1500">
<div className="story_img">
<img src="assets/images/story02.png" alt="image" />
@@ -321,7 +277,7 @@ const Main = ({brdcum}) => {
<Link to="#">READ MORE</Link>
</div>
</div>
</div> */}
</div>
</div>
</div>
</section>
+67 -43
View File
@@ -61,14 +61,14 @@ const Main = ({ footer }) => {
</ul>
<ul className="social_media">
<li>
<a href={process.env.REACT_APP_FACEBOOK}>
<Link to="#">
<i className="icofont-facebook"></i>
</a>
</Link>
</li>
<li>
<a href ={process.env.REACT_APP_TWITTER}>
<Link to="#">
<i className="icofont-twitter"></i>
</a>
</Link>
</li>
</ul>
</div>
@@ -116,12 +116,12 @@ const Main = ({ footer }) => {
<h3>Lets Try Out</h3>
<ul className="app_btn">
<li>
<a href={process.env.REACT_APP_ANDROID_URL}>
<a href="https://play.google.com/store/apps/details?id=com.mermsemr.myfit">
<img src={blueapp} alt="image" />
</a>
</li>
<li>
<a href={process.env.REACT_APP_IOS_URL}>
<a href="https://play.google.com/store/apps/details?id=com.mermsemr.myfit">
<img src={blue} alt="image" />
</a>
</li>
@@ -197,15 +197,15 @@ const Main = ({ footer }) => {
</li>
</ul>
<ul className="social_media">
<li>
<a href={process.env.REACT_APP_FACEBOOK}>
<i className="icofont-facebook"></i>
</a>
<li>
<Link to="#">
<i className="icofont-facebook"></i>
</Link>
</li>
<li>
<a href ={process.env.REACT_APP_TWITTER}>
<i className="icofont-twitter"></i>
</a>
<Link to="#">
<i className="icofont-twitter"></i>
</Link>
</li>
</ul>
</div>
@@ -253,13 +253,19 @@ const Main = ({ footer }) => {
<h3>Lets Try Out</h3>
<ul className="app_btn">
<li>
<a href={process.env.REACT_APP_ANDROID_URL}>
<img src={blueapp} alt="image" />
<a href="https://play.google.com/store/apps/details?id=com.mermsemr.myfit">
<img
src="assets/images/appstore_blue.png"
alt="image"
/>
</a>
</li>
<li>
<a href={process.env.REACT_APP_IOS_URL}>
<img src={blue} alt="image" />
<a href="https://play.google.com/store/apps/details?id=com.mermsemr.myfit">
<img
src="assets/images/googleplay_blue.png"
alt="image"
/>
</a>
</li>
</ul>
@@ -321,14 +327,14 @@ const Main = ({ footer }) => {
</ul>
<ul className="social_media">
<li>
<a href={process.env.REACT_APP_FACEBOOK}>
<Link to="#">
<i className="icofont-facebook"></i>
</a>
</Link>
</li>
<li>
<a href ={process.env.REACT_APP_TWITTER}>
<Link to="#">
<i className="icofont-twitter"></i>
</a>
</Link>
</li>
</ul>
</div>
@@ -383,14 +389,20 @@ const Main = ({ footer }) => {
<div className="try_out">
<h3>Lets Try Out</h3>
<ul className="app_btn">
<li>
<a href={process.env.REACT_APP_ANDROID_URL}>
<img src={blueapp} alt="image" />
<li>
<a href="https://play.google.com/store/apps/details?id=com.mermsemr.myfit">
<img
src="assets/images/appstore_blue.png"
alt="image"
/>
</a>
</li>
<li>
<a href={process.env.REACT_APP_IOS_URL}>
<img src={blue} alt="image" />
<a href to="https://play.google.com/store/apps/details?id=com.mermsemr.myfit">
<img
src="assets/images/googleplay_blue.png"
alt="image"
/>
</a>
</li>
</ul>
@@ -446,14 +458,14 @@ const Main = ({ footer }) => {
</ul>
<ul className="social_media">
<li>
<a href={process.env.REACT_APP_FACEBOOK}>
<Link to="#">
<i className="icofont-facebook"></i>
</a>
</Link>
</li>
<li>
<a href ={process.env.REACT_APP_TWITTER}>
<Link to="#">
<i className="icofont-twitter"></i>
</a>
</Link>
</li>
</ul>
</div>
@@ -509,13 +521,19 @@ const Main = ({ footer }) => {
<h3>Lets Try Out</h3>
<ul className="app_btn">
<li>
<a href={process.env.REACT_APP_ANDROID_URL}>
<img src={blueapp} alt="image" />
<a href="https://play.google.com/store/apps/details?id=com.mermsemr.myfit">
<img
src="assets/images/appstore_blue.png"
alt="image"
/>
</a>
</li>
<li>
<a href={process.env.REACT_APP_IOS_URL}>
<img src={blue} alt="image" />
<a href="https://play.google.com/store/apps/details?id=com.mermsemr.myfit">
<img
src="assets/images/googleplay_blue.png"
alt="image"
/>
</a>
</li>
</ul>
@@ -579,14 +597,14 @@ const Main = ({ footer }) => {
</ul>
<ul className="social_media">
<li>
<a href={process.env.REACT_APP_FACEBOOK}>
<Link to="#">
<i className="icofont-facebook"></i>
</a>
</Link>
</li>
<li>
<a href ={process.env.REACT_APP_TWITTER}>
<Link to="#">
<i className="icofont-twitter"></i>
</a>
</Link>
</li>
</ul>
</div>
@@ -639,14 +657,20 @@ const Main = ({ footer }) => {
<div className="try_out">
<h3>Lets Try Out</h3>
<ul className="app_btn">
<li>
<a href={process.env.REACT_APP_ANDROID_URL}>
<img src={blueapp} alt="image" />
<li>
<a href="https://play.google.com/store/apps/details?id=com.mermsemr.myfit">
<img
src="assets/images/appstore_blue.png"
alt="image"
/>
</a>
</li>
<li>
<a href={process.env.REACT_APP_IOS_URL}>
<img src={blue} alt="image" />
<a href="https://play.google.com/store/apps/details?id=com.mermsemr.myfit">
<img
src="assets/images/googleplay_blue.png"
alt="image"
/>
</a>
</li>
</ul>
+6 -5
View File
@@ -47,18 +47,19 @@ const Main = () => {
<div className="free_text">
<div className="section_title">
<h2>Lets 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>
<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>
</div>
<ul className="app_btn">
<li>
<a href={process.env.REACT_APP_ANDROID_URL}>
<Link to="https://play.google.com/store/apps/details?id=com.mermsemr.myfit">
<img src={blueapp} alt="image" />
</a>
</Link>
</li>
<li>
<a href={process.env.REACT_APP_IOS_URL}>
<Link to="https://play.google.com/store/apps/details?id=com.mermsemr.myfit">
<img src={blue} alt="image" />
</a>
</Link>
</li>
</ul>
</div>
+2 -3
View File
@@ -33,10 +33,9 @@ const Main = () => {
<section className="row_am interface_section">
<div className="container-fluid">
<div className="section_title" data-aos="fade-up" data-aos-duration="1500" data-aos-delay="300">
<h2>Beautiful <span>interface</span></h2>
<h2>Beautifull <span>interface</span></h2>
<p>
myFit appends a fun yet simple process to keep you consistently<br/> motivated,engaged and moving again without any shrewdness.
Lorem Ipsum is simply dummy text of the printing and typese tting <br/> indus orem Ipsum has beenthe standard dummy.
</p>
</div>
<div className="screen_slider" >
+12 -12
View File
@@ -223,20 +223,20 @@ const Main = ({brdcum}) => {
<div className="free_text">
<div className="section_title">
<h2>Lets 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>
<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>
</div>
<ul className="app_btn">
<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>
<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>
</ul>
</div>
</div>
+2 -1
View File
@@ -326,7 +326,8 @@ const Main = ({brdcum}) => {
<div className="free_text">
<div className="section_title">
<h2>Lets 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>
<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>
</div>
<ul className="app_btn">
<li>
+12 -12
View File
@@ -209,20 +209,20 @@ const Main = ({brdcum}) => {
<div className="free_text">
<div className="section_title">
<h2>Lets 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>
<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>
</div>
<ul className="app_btn">
<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>
<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>
</ul>
</div>
</div>
+1 -1
View File
@@ -6,7 +6,7 @@ class SiteService {
console.log("Er are here anyway");
}
// Blog Data {Get}
blogData(id) {
blogData() {
return this.getAuxEnd("/blogdata", null);
}