MERMS/MermsFirstOffice
1
0
Fork 0
Code Issues Pull Requests 1 Releases Activity

fix url

Browse Source
This commit is contained in:
CHIEFSOFT\ameye
2025-07-21 06:21:36 -04:00
parent 7e28fc8f51
commit 710aec5990
7 changed files with 26 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.env
+3 -1
View File
@@ -6,7 +6,7 @@ TWITTER_URL=https://twitter.com
INSTAGRAM_URL=https://www.instagram.com INSTAGRAM_URL=https://www.instagram.com
# BACKEND END POINTS # BACKEND END POINTS
REACT_APP_MAIN_API='https://backoffice-apidev.simbrellang.net' REACT_APP_MAIN_API="https://devapi.mermsemr.com"
# ENQUIRIES CONTACTS # ENQUIRIES CONTACTS
VITE_CALL_ENDPOINT='09099000000' VITE_CALL_ENDPOINT='09099000000'
@@ -18,3 +18,5 @@ VITE_BANK_NAME_SHORT='FCMB'
# Inactivity timeout/logout AT 10MINS # Inactivity timeout/logout AT 10MINS
REACT_APP_TIMEOUT=600000 REACT_APP_TIMEOUT=600000
.env.development
+1 -1
View File
@@ -6,7 +6,7 @@ VITE_TWITTER_URL=https://twitter.com
VITE_INSTAGRAM_URL=https://www.instagram.com VITE_INSTAGRAM_URL=https://www.instagram.com
# BACKEND END POINTS # BACKEND END POINTS
REACT_APP_MAIN_API='https://backoffice-apidev.simbrellang.net' REACT_APP_MAIN_API="https://devapi.mermsemr.com"
# ENQUIRIES CONTACTS # ENQUIRIES CONTACTS
VITE_CALL_ENDPOINT='09099000000' VITE_CALL_ENDPOINT='09099000000'
.env.production
+1 -1
View File
@@ -6,7 +6,7 @@ TWITTER_URL=https://twitter.com
INSTAGRAM_URL=https://www.instagram.com INSTAGRAM_URL=https://www.instagram.com
# BACKEND END POINTS # BACKEND END POINTS
REACT_APP_MAIN_API='https://backoffice-apidev.simbrellang.net' REACT_APP_MAIN_API="https://api.mermsemr.com"
# ENQUIRIES CONTACTS # ENQUIRIES CONTACTS
VITE_CALL_ENDPOINT='09099000000' VITE_CALL_ENDPOINT='09099000000'
docker-compose.yml
+4 -2
View File
@@ -15,8 +15,10 @@ services:
- "5173" - "5173"
- "3000" - "3000"
extra_hosts: extra_hosts:
- digifi-apidev.chiefsoft.net:10.10.33.15 - devapi.mermsemr.com:10.10.33.15
- backend.wrenchboard.api.test: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: environment:
- PORT=${DIGIFI_PORT} - PORT=${DIGIFI_PORT}
tty: true tty: true
src/assets/login-bg.jpg
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 482 KiB

After

Width:  |  Height:  |  Size: 470 KiB

src/components/auth/LoginCom.jsx
+14 -14
View File
@@ -89,20 +89,20 @@ export default function LoginCom() {
</div> </div>
{/* social login */} {/* social login */}
<div className='grid grid-cols-2 gap-4 text-sm'> {/*<div className='grid grid-cols-2 gap-4 text-sm'>*/}
<div className='px-4 py-2 flex gap-2 items-center justify-center text-black-body font-medium border border-slate-300/50 rounded-md hover:text-primary hover:bg-sky-50 cursor-pointer'> {/* <div className='px-4 py-2 flex gap-2 items-center justify-center text-black-body font-medium border border-slate-300/50 rounded-md hover:text-primary hover:bg-sky-50 cursor-pointer'>*/}
<Icons name='google' /> {/* <Icons name='google' />*/}
<span>Sign in with Google</span> {/* <span>Sign in with Google</span>*/}
</div> {/* </div>*/}
<div className='px-4 py-2 flex gap-2 items-center justify-center text-black-body font-medium border border-slate-300/50 rounded-md hover:text-primary hover:bg-sky-50 cursor-pointer'> {/* <div className='px-4 py-2 flex gap-2 items-center justify-center text-black-body font-medium border border-slate-300/50 rounded-md hover:text-primary hover:bg-sky-50 cursor-pointer'>*/}
<Icons name='apple' /> {/* <Icons name='apple' />*/}
<span>Sign in with Apple</span> {/* <span>Sign in with Apple</span>*/}
</div> {/* </div>*/}
</div> {/*</div>*/}
<div className='relative h-[1px] bg-slate-300/50'> {/*<div className='relative h-[1px] bg-slate-300/50'>*/}
<p className='absolute left-1/2 -translate-x-1/2 top-1/2 -translate-y-1/2 bg-white p-4 text-12 text-slate-500'>Or with email</p> {/* <p className='absolute left-1/2 -translate-x-1/2 top-1/2 -translate-y-1/2 bg-white p-4 text-12 text-slate-500'>Or with email</p>*/}
</div> {/*</div>*/}
<div className='flex flex-col gap-6'> <div className='flex flex-col gap-6'>
<div className='relative text-input flex flex-col gap-2'> <div className='relative text-input flex flex-col gap-2'>
@@ -148,7 +148,7 @@ export default function LoginCom() {
<div className='flex justify-end gap-4 mt-6 text-[13px] font-medium'> <div className='flex justify-end gap-4 mt-6 text-[13px] font-medium'>
<Link className='text-primary' to=''>Terms</Link> <Link className='text-primary' to=''>Terms</Link>
<Link className='text-primary' to=''>Plans</Link> {/*<Link className='text-primary' to=''>Plans</Link>*/}
<Link className='text-primary' to=''>Contact Us</Link> <Link className='text-primary' to=''>Contact Us</Link>
</div> </div>
src/services/siteServices.js
+2 -2
View File
@@ -22,7 +22,7 @@ axios.interceptors.request.use(
const postAuxEnd = (path, postData, media=false) => { const postAuxEnd = (path, postData, media=false) => {
const basePath = media ? process.env.REACT_APP_MAIN_API : process.env.REACT_APP_MAIN_API 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 return res
}).catch(err => { }).catch(err => {
throw new Error(err); throw new Error(err);
@@ -31,7 +31,7 @@ const postAuxEnd = (path, postData, media=false) => {
const getAuxEnd = (path, reqData= null) => { const getAuxEnd = (path, reqData= null) => {
const basePath = process.env.REACT_APP_MAIN_API 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 return res
// localStorage.clear(); // localStorage.clear();
// window.location.href = `/login?sessionExpired=true`; // window.location.href = `/login?sessionExpired=true`;