Compare commits

...

27 Commits

Author SHA1 Message Date
ChineseChikki 099c0ce0a4 FAQ broken link fixed 2023-01-20 15:02:02 +01:00
tokslaw 523235a196 Merge branch 'task-31-download-active-pricing' of MyFit/www-myfit into master 2023-01-19 15:18:37 +00:00
tokslaw f513e5561f Merge branch 'task-31-social-media-link-activate' of MyFit/www-myfit into master 2023-01-19 15:17:59 +00:00
tokslaw 36b3c01f81 Merge branch 'task-29-content-download-free' of MyFit/www-myfit into master 2023-01-19 15:15:26 +00:00
tokslaw 571c6e7a7b Merge branch 'task-29-download-free-faq' of MyFit/www-myfit into master 2023-01-19 15:14:50 +00:00
ChineseChikki 08cf607c47 links in variable 2023-01-19 14:48:51 +01:00
ChineseChikki a61416b006 links into variables 2023-01-19 14:40:23 +01:00
ChineseChikki e0a1cbc42a Link is now in variable format 2023-01-19 14:14:44 +01:00
ChineseChikki 5f94cc3bec All links in footer is now in .env formate 2023-01-19 12:48:22 +01:00
jenkins 2ae9eaf3e4 Port corrected 2023-01-18 20:35:22 -05:00
ChineseChikki ff11dbbbd3 social media link activated 2023-01-19 01:52:50 +01:00
ChineseChikki 036b53fa97 activated the pricing link 2023-01-19 01:04:07 +01:00
tokslaw 0069998c6b Merge branch 'task-29-download-free-faq' of MyFit/www-myfit into master 2023-01-18 18:26:28 +00:00
tokslaw 89604def94 Merge branch 'task-29-download-free-review' of MyFit/www-myfit into master 2023-01-18 18:26:13 +00:00
tokslaw 11d1abc6dc Merge branch 'task-29-download-free-pricing' of MyFit/www-myfit into master 2023-01-18 18:26:05 +00:00
ChineseChikki 63255bc441 free-download-pricing-page 2023-01-18 17:34:05 +01:00
ChineseChikki 1975e3ba77 free download-review 2023-01-18 17:19:00 +01:00
ChineseChikki 13efc5bf0f free-download-faq 2023-01-18 16:58:36 +01:00
tokslaw 80e8141a11 Merge branch 'task-29-content-download-free' of MyFit/www-myfit into master 2023-01-18 14:44:15 +00:00
tokslaw e662f15bd1 Merge branch 'task-29-content-beautiful-interface' of MyFit/www-myfit into master 2023-01-18 14:44:05 +00:00
tokslaw 907be131de Merge branch '#29-content-FAQ' of MyFit/www-myfit into master 2023-01-18 14:43:47 +00:00
ChineseChikki 3b57d23ec1 free download text updated 2023-01-18 10:55:04 +01:00
ChineseChikki c08e07b6d3 updated beautiful interface text 2023-01-18 10:26:42 +01:00
ChineseChikki fc0e85f5d6 updated text for faq 2023-01-18 09:48:03 +01:00
tokslaw 976e529ebf img 2023-01-17 14:10:50 -05:00
tokslaw 00191f19a2 How_it_works img added 2023-01-17 10:51:25 -05:00
tokslaw 75c71e01c4 Merge branch 'myfit_pricing_page_yearly_plan_implementation' of MyFit/www-myfit into master 2023-01-16 17:54:07 +00:00
19 changed files with 114 additions and 110 deletions
-1
View File
@@ -16,4 +16,3 @@ REACT_APP_AUX_ENDPOINT = "https://devapi.mermsemr.com/en/desktop/api/v2/myfit"
REACT_APP_FORM_TIMEOUT = 10000
REACT_APP_MAX_MESSAGE_LENGHT =300
REACT_APP_BLOGSITE="https://blog.mermsemr.com/"
+8
View File
@@ -0,0 +1,8 @@
# Default ignored files
/shelf/
/workspace.xml
# Datasource local storage ignored files
/dataSources/
/dataSources.local.xml
# Editor-based HTTP Client requests
/httpRequests/
+8
View File
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/.idea/www-myfit.iml" filepath="$PROJECT_DIR$/.idea/www-myfit.iml" />
</modules>
</component>
</project>
Generated
+6
View File
@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="$PROJECT_DIR$" vcs="Git" />
</component>
</project>
+8
View File
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="WEB_MODULE" version="4">
<component name="NewModuleRootManager">
<content url="file://$MODULE_DIR$" />
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module>
+1 -1
View File
@@ -6,7 +6,7 @@ services:
dockerfile: Dockerfile
restart: unless-stopped
ports:
- 9057:3000
- 7010:3000
stdin_open: true
working_dir: /usr/src/app
volumes:
Binary file not shown.

After

Width:  |  Height:  |  Size: 55 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 37 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 69 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 46 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 46 KiB

+43 -67
View File
@@ -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>Lets 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>Lets 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>Lets 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>Lets 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>Lets 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>
+5 -6
View File
@@ -47,19 +47,18 @@ 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 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>
+1 -2
View File
@@ -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">
+3 -2
View File
@@ -33,9 +33,10 @@ 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>Beautifull <span>interface</span></h2>
<h2>Beautiful <span>interface</span></h2>
<p>
Lorem Ipsum is simply dummy text of the printing and typese tting <br/> indus orem Ipsum has beenthe standard dummy.
myFit appends a fun yet simple process to keep you consistently<br/> motivated,engaged and moving again without any shrewdness.
</p>
</div>
<div className="screen_slider" >
+4 -4
View File
@@ -1,8 +1,8 @@
import React , {useState} from 'react'
import { Link } from 'react-router-dom'
import img from '../../../assets/images/download_app.jpg'
import img1 from '../../../assets/images/create_account.jpg'
import img2 from '../../../assets/images/enjoy_app.jpg'
import img from '../../../assets/images/download_app1.png'
import img1 from '../../../assets/images/create_account2.png'
import img2 from '../../../assets/images/enjoy_app01.png'
import line from '../../../assets/images/anim_line.png'
import banner from '../../../assets/images/banner-shape1.png'
import banner1 from '../../../assets/images/banner-shape2.png'
@@ -43,7 +43,7 @@ const Main = ({dark}) => {
<li>
<div className="step_text" data-aos="fade-left" data-aos-duration="1500">
<h4>Create account</h4>
<span>14 days free trial</span>
<span>Free Account</span>
<p>Sign up free for App account. One account for all devices.</p>
</div>
<div className="step_number">
+14 -13
View File
@@ -1,5 +1,7 @@
import React , { useState , useEffect} from 'react'
import { Link } from 'react-router-dom'
import blueapp from "../../../assets/images/appstore_blue.png"
import blue from "../../../assets/images/googleplay_blue.png"
import Bredcrumb from '../../Bredcrumb/Main'
import BGImg from "../../../assets/images/bread_crumb_bg.png"
import BGImg1 from "../../../assets/images/bread_crumb_bg_one.png"
@@ -64,7 +66,6 @@ const Main = ({brdcum}) => {
tag="Faq"
bgimg={BGImg2}/>}
{/* <section className="row_am faq_section">
<div className="container">
<div className="faq_panel">
@@ -223,20 +224,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 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>
+1 -2
View File
@@ -326,8 +326,7 @@ 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 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>
+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 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>