diff --git a/.env b/.env index 7460342..73dae62 100644 --- a/.env +++ b/.env @@ -7,3 +7,5 @@ REACT_APP_IOS_URL="https://play.google.com/store/apps/details?id=com.mermsemr.my REACT_APP_FACEBOOK="https://www.facebook.com/profile.php?id=100066498622246" REACT_APP_TWITTER="https://twitter.com/fluxtra" + +REACT_APP_APPSITE="https://myfitapp.mermsemr.com" diff --git a/Dockerfile b/Dockerfile index c484681..83c4d6c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,10 +2,12 @@ FROM node:alpine # set the working direction -WORKDIR /app +#WORKDIR /app +WORKDIR /usr/src/app # add `/app/node_modules/.bin` to $PATH -ENV PATH /app/node_modules/.bin:$PATH +# ENV PATH /app/node_modules/.bin:$PATH +ENV PATH /usr/src/app/node_modules/.bin:$PATH # install app dependencies COPY package.json ./ diff --git a/docker-compose.yml b/docker-compose.yml index fc6203c..0babfd6 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -5,17 +5,20 @@ services: context: . dockerfile: Dockerfile restart: unless-stopped - # image: registry.chiefsoft.net/wrenchboardmainsite_wrenchboard-www:latest ports: - 9057:3000 + stdin_open: true + working_dir: /usr/src/app + volumes: + - ./:/usr/src/app + - /usr/src/app/node_modules + - ./src/:/usr/src/app/src + - ./vendors/:/usr/src/app/vendors extra_hosts: - - backend.wrenchboard.api.live:10.10.33.15 - - backend.wrenchboard.api.test:10.10.33.15 - # #- backend.wrenchboard.api.live:172.31.4.27 - # #- backend.wrenchboard.api.test:10.20.30.27 - apigateway.wrenchboard.app.dev.fluxtra.net:10.20.30.19 - apigateway.wrenchboard.app.lotus.fluxtra.net:172.31.4.19 environment: - CHOKIDAR_USEPOLLING=true volumes: - src: \ No newline at end of file + src: + public: \ No newline at end of file diff --git a/src/component/Footer/Main.js b/src/component/Footer/Main.js index 5cb4224..4fe7789 100644 --- a/src/component/Footer/Main.js +++ b/src/component/Footer/Main.js @@ -1,434 +1,708 @@ -import { Link } from 'react-router-dom' -import React from 'react' -import line from '../../assets/images/anim_line.png' -import blueapp from '../../assets/images/appstore_blue.png' -import blue from '../../assets/images/googleplay_blue.png' -import logo from '../../assets/images/logo_white.png' -import top from '../../assets/images/go_top.png' +import { Link } from "react-router-dom"; +import React from "react"; +import line from "../../assets/images/anim_line.png"; +import blueapp from "../../assets/images/appstore_blue.png"; +import blue from "../../assets/images/googleplay_blue.png"; +import logo from "../../assets/images/logo_white.png"; +import top from "../../assets/images/go_top.png"; -const Main = ({footer}) => { - +const Main = ({ footer }) => { return ( <> - {footer.f1 && + {footer.f1 && ( } - - {footer.f2 && + +
+ + image + +
+ + )} + + {footer.f2 && ( } - - {footer.f3 && + +
+ + image + +
+ + )} + + {footer.f3 && ( } - {footer.f4 && +
+
+

Help & Suport

+ +
+
+ +
+
+

Let’s Try Out

+ +
+
+ + + +
+
+
+
+

+ © Copyrights {process.env.REACT_APP_YEAR}. All rights + reserved. +

+
+
+

.

+
+
+
+
+ +
+ + image + +
+ + )} + + {footer.f4 && ( } - {footer.f5 && +
+
+

Help & Suport

+ +
+
+ +
+
+

Let’s Try Out

+ +
+
+ + + +
+
+
+
+

+ © Copyrights {process.env.REACT_APP_YEAR}. All rights + reserved. +

+
+
+

.

+
+
+
+
+ +
+ + image + +
+ + )} + + {footer.f5 && ( } - + +
+ + image + +
+ + )} - ) -} + ); +}; -export default Main \ No newline at end of file +export default Main; diff --git a/src/component/Navbar/Main.js b/src/component/Navbar/Main.js index ce32236..a8e8fc1 100644 --- a/src/component/Navbar/Main.js +++ b/src/component/Navbar/Main.js @@ -55,7 +55,7 @@ const Main = ({navbar}) => { Contact
  • - GET STARTED + GET STARTED
    • @@ -76,13 +76,11 @@ const Main = ({navbar}) => {
    @@ -130,7 +128,7 @@ const Main = ({navbar}) => {
  • - Home4 + Home
  • Features @@ -145,7 +143,7 @@ const Main = ({navbar}) => { Contact
  • - GET STARTED + GET STARTED