Compare commits

...

6 Commits

Author SHA1 Message Date
victorAnumudu 958cc316e7 removed EPS from about main image 2023-02-09 20:27:53 +01:00
victorAnumudu 72fcb763e1 about main image added to about page 2023-02-08 20:19:18 +01:00
jenkins 0ef7ec3d10 white logo 2023-02-04 23:37:49 -05:00
tokslaw 2cf139db18 Merge branch 'successful_contact_us_image' of MyFit/www-myfit into master 2023-02-04 19:16:55 +00:00
tokslaw 4f567b3acf pricing text 2023-02-04 13:39:18 -05:00
tokslaw 1dcccce8c6 pricing options text 2023-02-04 12:22:47 -05:00
7 changed files with 53 additions and 15 deletions
+17
View File
@@ -12,6 +12,7 @@
"@testing-library/react": "^13.4.0",
"@testing-library/user-event": "^13.5.0",
"aos": "^2.3.4",
"axios": "^0.24.0",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-owl-carousel": "^2.3.3",
@@ -4998,6 +4999,14 @@
"node": ">=4"
}
},
"node_modules/axios": {
"version": "0.24.0",
"resolved": "https://registry.npmjs.org/axios/-/axios-0.24.0.tgz",
"integrity": "sha512-Q6cWsys88HoPgAaFAVUb0WpPk0O8iTeisR9IMqy9G8AbO4NlpVknrnQS03zzF9PGAWgO3cgletO3VjV/P7VztA==",
"dependencies": {
"follow-redirects": "^1.14.4"
}
},
"node_modules/axobject-query": {
"version": "2.2.0",
"resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-2.2.0.tgz",
@@ -20670,6 +20679,14 @@
"resolved": "https://registry.npmjs.org/axe-core/-/axe-core-4.5.2.tgz",
"integrity": "sha512-u2MVsXfew5HBvjsczCv+xlwdNnB1oQR9HlAcsejZttNjKKSkeDNVwB1vMThIUIFI9GoT57Vtk8iQLwqOfAkboA=="
},
"axios": {
"version": "0.24.0",
"resolved": "https://registry.npmjs.org/axios/-/axios-0.24.0.tgz",
"integrity": "sha512-Q6cWsys88HoPgAaFAVUb0WpPk0O8iTeisR9IMqy9G8AbO4NlpVknrnQS03zzF9PGAWgO3cgletO3VjV/P7VztA==",
"requires": {
"follow-redirects": "^1.14.4"
}
},
"axobject-query": {
"version": "2.2.0",
"resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-2.2.0.tgz",
+11
View File
@@ -2776,6 +2776,17 @@ header.fix_style.white_header {
.about_page_sectino img {
max-width: 100%;
}
.about_page_sectino .abt_img img{
animation-name: scale-image;
animation-duration: 1s;
animation-timing-function: linear;
animation-iteration-count: infinite;
}
@keyframes scale-image {
0%{transform: scale(1);}
50%{transform: scale(1.01);}
100%{transform: scale(1);}
}
/* -----------experts_team_sectio---------- */
Binary file not shown.

After

Width:  |  Height:  |  Size: 35 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 56 KiB

After

Width:  |  Height:  |  Size: 115 KiB

+4 -2
View File
@@ -10,12 +10,14 @@ import About1 from '../../assets/images/about_one.png'
import About2 from '../../assets/images/about_two.png'
import About3 from '../../assets/images/about_three.png'
import AboutMainImg from '../../assets/images/about_main_image.png'
const Main = ({brdcum}) => {
const [ytShow , setytShow] = useState (false)
// About us text variables
let innovativeDesc = 'The team at myFit by Fluxtra 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.',
secureDesc:"MyFit is built to keep your data secure and protect your privacy. Your data is encrypted and you are always in control of your information.",
@@ -171,7 +173,7 @@ const Main = ({brdcum}) => {
<div className="row">
<div className="col-lg-6">
<div className="abt_img" data-aos="fade-in" data-aos-duration="1500">
<img src="assets/images/about_main.png" alt="image"/>
<img src={AboutMainImg} alt="image"/>
</div>
</div>
<div className="col-lg-6">
+16 -8
View File
@@ -8,11 +8,13 @@ import img3 from '../../../assets/images/premium.png'
import SiteService from '../../../vendors/service/siteService'
const Main = ({gredient , video}) => {
const[tog, setTog] = useState()
const [prices, setPrices] = useState([]); // initial state for FAQs before API call
const [pricing_text_02, setPricingtext02] = useState('');
let priceServices = new SiteService(); // instantiating the class
const getAllPriceData = () => {
@@ -20,7 +22,9 @@ const Main = ({gredient , video}) => {
};
useEffect(() => {
getAllPriceData().then((data) => setPrices(data.data));
getAllPriceData().then((data) => {
setPricingtext02(data.data.pricing_text_02);
setPrices(data.data.pricing) });
AOS.init();
AOS.refresh();
}, []);
@@ -31,9 +35,13 @@ const Main = ({gredient , video}) => {
<section className="row_am pricing_section gredient-pricing" id="pricing">
<div className="container">
<div className="section_title" data-aos="fade-up" data-aos-duration="1500" data-aos-delay="300">
<h2>Best & simple <span>pricing</span></h2>
<p className="gredient-p">Lorem Ipsum is simply dummy text of the printing and typese tting <br/> indus orem Ipsum has beenthe
standard dummy.</p>
<h2>Flexible & Simple <span>pricing</span></h2>
<p className="gredient-p">
{/* <>*/}
{/* {pricing_text_02}*/}
{/*</>*/}
Choose your myFit Pricing Plan <br/> myFit has a free Standard for Basics , $5 per month for Premium <br />
and $7.99 per month for Gold-tier</p>
</div>
<div className="toggle_block" data-aos="fade-up" data-aos-duration="1500">
<span className={`month ${tog ? 'active' : ''}`}>Monthly</span>
@@ -140,9 +148,9 @@ const Main = ({gredient , video}) => {
<section className="row_am pricing_section" id="pricing">
<div className="container">
<div className="section_title" data-aos="fade-up" data-aos-duration="1500" data-aos-delay="300">
<h2>Best & simple <span>pricing</span></h2>
<p>Lorem Ipsum is simply dummy text of the printing and typese tting <br/> indus orem Ipsum has beenthe
standard dummy.</p>
<h2>Flexible & Simple <span>pricing</span></h2>
<p>Choose your myFit Pricing Plan <br/> myFit has a free Standard for Basics , $5 per month for Premium <br />
and $7.99 per month for Gold-tier.</p>
</div>
<div className="toggle_block" data-aos="fade-up" data-aos-duration="1500">
<span className={`month ${tog ? 'active' : ''}`}>Monthly</span>
+5 -5
View File
@@ -22,7 +22,7 @@ const Main = ({brdcum}) => {
<Bredcrumb
no={1}
title="Our Pricing & Plans"
paragraph="Lorem Ipsum is simply dummy text of the printing and typesetting"
paragraph="Flexible & Convienent Pricing Options"
tag="Our Pricing & Plans"
bgimg={BGImg}/>}
@@ -30,7 +30,7 @@ const Main = ({brdcum}) => {
<Bredcrumb
no={2}
title="Our Pricing & Plans"
paragraph="Lorem Ipsum is simply dummy text of the printing and typesetting"
paragraph="Flexible & Convienent Pricing Options"
tag="Our Pricing & Plans"
bgimg={BGImg1}/>}
@@ -38,7 +38,7 @@ const Main = ({brdcum}) => {
<Bredcrumb
no={5}
title="Our Pricing & Plans"
paragraph="Lorem Ipsum is simply dummy text of the printing and typesetting"
paragraph="Flexible & Convienent Pricing Options"
tag="Our Pricing & Plans"
bgimg={BGImg}/>}
@@ -47,14 +47,14 @@ const Main = ({brdcum}) => {
<Bredcrumb
no={3}
title="Our Pricing & Plans"
paragraph="Lorem Ipsum is simply dummy text of the printing and typesetting"
paragraph="Flexible & Convienent Pricing Options"
tag="Our Pricing & Plans" />}
{brdcum.b4 &&
<Bredcrumb
no={4}
title="Our Pricing & Plans"
paragraph="Lorem Ipsum is simply dummy text of the printing and typesetting"
paragraph="Flexible & Convienent Pricing Options"
tag="Our Pricing & Plans"
bgimg={BGImg2}/>}