diff --git a/.env b/.env index 3a6cd48..4973273 100644 --- a/.env +++ b/.env @@ -6,7 +6,7 @@ TWITTER_URL=https://twitter.com INSTAGRAM_URL=https://www.instagram.com # BACKEND END POINTS -REACT_APP_MAIN_API='https://backoffice-apidev.simbrellang.net' +REACT_APP_MAIN_API="https://devapi.mermsemr.com" # ENQUIRIES CONTACTS VITE_CALL_ENDPOINT='09099000000' @@ -17,4 +17,6 @@ VITE_BANK_NAME='First City Monument Bank' VITE_BANK_NAME_SHORT='FCMB' # Inactivity timeout/logout AT 10MINS -REACT_APP_TIMEOUT=600000 \ No newline at end of file +REACT_APP_TIMEOUT=600000 + + diff --git a/.env.development b/.env.development index 0915dd9..4af5082 100644 --- a/.env.development +++ b/.env.development @@ -6,7 +6,7 @@ VITE_TWITTER_URL=https://twitter.com VITE_INSTAGRAM_URL=https://www.instagram.com # BACKEND END POINTS -REACT_APP_MAIN_API='https://backoffice-apidev.simbrellang.net' +REACT_APP_MAIN_API="https://devapi.mermsemr.com" # ENQUIRIES CONTACTS VITE_CALL_ENDPOINT='09099000000' diff --git a/.env.production b/.env.production index 3a6cd48..3f93158 100644 --- a/.env.production +++ b/.env.production @@ -6,7 +6,7 @@ TWITTER_URL=https://twitter.com INSTAGRAM_URL=https://www.instagram.com # BACKEND END POINTS -REACT_APP_MAIN_API='https://backoffice-apidev.simbrellang.net' +REACT_APP_MAIN_API="https://api.mermsemr.com" # ENQUIRIES CONTACTS VITE_CALL_ENDPOINT='09099000000' diff --git a/docker-compose.yml b/docker-compose.yml index b04fd52..f683bd4 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -15,8 +15,10 @@ services: - "5173" - "3000" extra_hosts: - - digifi-apidev.chiefsoft.net:10.10.33.15 - - backend.wrenchboard.api.test:10.10.33.15 + - devapi.mermsemr.com:10.10.33.15 + - api.mermsemr.com:10.10.33.15 + - devsocket.mermsemr.com:10.10.33.15 + - socket.mermsemr.com:10.10.33.15 environment: - PORT=${DIGIFI_PORT} tty: true diff --git a/src/assets/login-bg.jpg b/src/assets/login-bg.jpg index 98d71bb..4a6d609 100644 Binary files a/src/assets/login-bg.jpg and b/src/assets/login-bg.jpg differ diff --git a/src/components/auth/LoginCom.jsx b/src/components/auth/LoginCom.jsx index 00aa232..7fed9db 100644 --- a/src/components/auth/LoginCom.jsx +++ b/src/components/auth/LoginCom.jsx @@ -89,20 +89,20 @@ export default function LoginCom() { {/* social login */} -
-
- - Sign in with Google -
-
- - Sign in with Apple -
-
+ {/*
*/} + {/*
*/} + {/* */} + {/* Sign in with Google*/} + {/*
*/} + {/*
*/} + {/* */} + {/* Sign in with Apple*/} + {/*
*/} + {/*
*/} -
-

Or with email

-
+ {/*
*/} + {/*

Or with email

*/} + {/*
*/}
@@ -148,7 +148,7 @@ export default function LoginCom() {
Terms - Plans + {/*Plans*/} Contact Us
diff --git a/src/services/siteServices.js b/src/services/siteServices.js index 0ce3a2f..25d37ff 100644 --- a/src/services/siteServices.js +++ b/src/services/siteServices.js @@ -22,7 +22,7 @@ axios.interceptors.request.use( const postAuxEnd = (path, postData, media=false) => { const basePath = media ? process.env.REACT_APP_MAIN_API : process.env.REACT_APP_MAIN_API - return axios.post(`${basePath}${path}`, postData).then(res => { + return axios.post(`${basePath}/office${path}`, postData).then(res => { return res }).catch(err => { throw new Error(err); @@ -31,7 +31,7 @@ const postAuxEnd = (path, postData, media=false) => { const getAuxEnd = (path, reqData= null) => { const basePath = process.env.REACT_APP_MAIN_API - return axios.get(`${basePath}${path}`,{ params: reqData }).then(res => { + return axios.get(`${basePath}/office${path}`,{ params: reqData }).then(res => { return res // localStorage.clear(); // window.location.href = `/login?sessionExpired=true`;