Compare commits
12 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| dc921d42d2 | |||
| fa649aef81 | |||
| 30ac6f6a69 | |||
| f81aa3e467 | |||
| de6044b561 | |||
| e8fcf95efb | |||
| 6c99163825 | |||
| 1db651722b | |||
| d2f4996186 | |||
| 2f5ab5a1f7 | |||
| 40caafdeb5 | |||
| e2bc8b517e |
@@ -6,7 +6,8 @@ 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_APPSITE=" https://mermsemr.com"
|
||||
REACT_APP_APPSITE="https://dev142.users.myfit.mermsemr.com/login"
|
||||
# " https://mermsemr.com"
|
||||
#REACT_APP_APPSITE="http://localhost:7012"
|
||||
|
||||
# Social Media Links
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 64 KiB After Width: | Height: | Size: 140 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 64 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 115 KiB After Width: | Height: | Size: 51 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 115 KiB |
@@ -117,14 +117,10 @@ const Main = ({ brdcum }) => {
|
||||
|
||||
//CALLS THE API AFTER COMPONENT LOADS
|
||||
useEffect(() => {
|
||||
allCountry().then((data) => setCountries(Object.keys(data.data))).catch((err)=>console.log(err.message));
|
||||
allCountry().then((data) => setCountries(Object.entries(data.data))).catch((err)=>console.log(err.message));
|
||||
}, []);
|
||||
|
||||
|
||||
// useEffect(() => {
|
||||
// myData
|
||||
// }, [myData]);
|
||||
|
||||
return (
|
||||
<>
|
||||
{brdcum.b1 && (
|
||||
@@ -202,7 +198,7 @@ const Main = ({ brdcum }) => {
|
||||
maxLenght={35}
|
||||
value={values.name}
|
||||
onChange={onChange}
|
||||
pattern="^$|^[a-zA-Z]+( [a-zA-Z]+)?$+( [a-zA-Z]+)?$"
|
||||
pattern="^\w+( \w+)$"
|
||||
/>
|
||||
|
||||
<FormInput
|
||||
@@ -230,8 +226,8 @@ const Main = ({ brdcum }) => {
|
||||
countries.map((country, index) => (
|
||||
<option
|
||||
key={index}
|
||||
value={country}>
|
||||
{country}
|
||||
value={country[0]}>
|
||||
{country[1]}
|
||||
</option>
|
||||
))}
|
||||
</select>
|
||||
|
||||
@@ -7,6 +7,8 @@ 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 Faq from '../../HomeMain/Faq/Main'
|
||||
import screen from '../../../assets/images/download-screen01.png'
|
||||
import screen1 from '../../../assets/images/download-screen02.png'
|
||||
|
||||
import SiteService from '../../../vendors/service/siteService'
|
||||
|
||||
@@ -242,9 +244,13 @@ const Main = ({brdcum}) => {
|
||||
</div>
|
||||
</div>
|
||||
<div className="col-md-6">
|
||||
<div className="free_img">
|
||||
{/* <div className="free_img">
|
||||
<img src="assets/images/download-screen01.png" alt="image" />
|
||||
<img className="mobile_mockup" src="assets/images/download-screen02.png" alt="image" />
|
||||
</div> */}
|
||||
<div className="free_img">
|
||||
<img src={screen} alt="image" />
|
||||
<img className="mobile_mockup" src={screen1} alt="image" />
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -4,6 +4,8 @@ import Bredcrumb from '../../Bredcrumb/Main'
|
||||
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 screen from '../../../assets/images/download-screen01.png'
|
||||
import screen1 from '../../../assets/images/download-screen02.png'
|
||||
|
||||
const Main = ({brdcum}) => {
|
||||
|
||||
@@ -343,9 +345,13 @@ const Main = ({brdcum}) => {
|
||||
</div>
|
||||
</div>
|
||||
<div className="col-md-6">
|
||||
<div className="free_img">
|
||||
{/* <div className="free_img">
|
||||
<img src="assets/images/download-screen01.png" alt="image" />
|
||||
<img className="mobile_mockup" src="assets/images/download-screen02.png" alt="image" />
|
||||
</div> */}
|
||||
<div className="free_img">
|
||||
<img src={screen} alt="image" />
|
||||
<img className="mobile_mockup" src={screen1} alt="image" />
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -8,6 +8,9 @@ import BGImg1 from "../../assets/images/bread_crumb_bg_one.png"
|
||||
import BGImg2 from "../../assets/images/bread_crumb_bg_two.png"
|
||||
import blueapp from "../../assets/images/appstore_blue.png";
|
||||
import blue from "../../assets/images/googleplay_blue.png";
|
||||
import screen from '../../assets/images/download-screen01.png'
|
||||
import screen1 from '../../assets/images/download-screen02.png'
|
||||
|
||||
|
||||
|
||||
const Main = ({brdcum}) => {
|
||||
@@ -229,9 +232,9 @@ const Main = ({brdcum}) => {
|
||||
</div>
|
||||
</div>
|
||||
<div className="col-md-6">
|
||||
<div className="free_img">
|
||||
<img src="assets/images/download-screen01.png" alt="image" />
|
||||
<img className="mobile_mockup" src="assets/images/download-screen02.png" alt="image" />
|
||||
<div className="free_img">
|
||||
<img src={screen} alt="image" />
|
||||
<img className="mobile_mockup" src={screen1} alt="image" />
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
Reference in New Issue
Block a user