Compare commits

..

9 Commits

Author SHA1 Message Date
Olusesan Ameye 1b5df31a38 Registry switch 2025-05-14 08:00:59 +00:00
dev-chiefworks 15a165eecc updated urlsupdate URLS 2025-05-04 09:37:39 -04:00
dev-chiefworks 8945283aa8 ci cd process 2025-05-03 23:42:36 -04:00
dev-chiefworks 7374de357a End points updates 2025-05-03 22:21:20 -04:00
ameye bf3499eacc Merge branch 'auth-layout-text-color' of MyFit/users-myfit into master 2024-01-06 18:28:58 +00:00
ebube d72b003971 fixed a typo 2024-01-05 23:46:56 -08:00
ameye 64ce8d4a8c Merge branch 'auth-layout-text-color' of MyFit/users-myfit into master 2024-01-06 02:18:52 +00:00
ebube f1030fd52e Update: text color on auth-layout 2024-01-05 11:52:21 -08:00
ameye 0c995646cd Merge branch 'capability-to-hide-history' of MyFit/users-myfit into master 2023-10-04 11:40:26 +00:00
6 changed files with 37 additions and 19 deletions
+5 -3
View File
@@ -7,9 +7,11 @@ REACT_APP_APPSITE=" https://myfitapp.mermsemr.com"
#REACT_APP_APPSITE="http://localhost:7012"
REACT_APP_AUX_ENDPOINT="https://devapi.mermsemr.com/en/desktop/api/v2/myfit"
REACT_APP_USERS_ENDPOINT="https://devapi.mermsemr.com/en/desktop/api/v2/myfituser"
# REACT_APP_PASSWORD_ENDPOINT="https://devapi.mermsemr.com/en/desktop/api/v2/myfituser/resetpass"
# REACT_APP_AUX_ENDPOINT="https://devapi.mermsemr.com/en/desktop/api/v2/myfit"
# REACT_APP_USERS_ENDPOINT="https://devapi.mermsemr.com/en/desktop/api/v2/myfituser"
REACT_APP_AUX_ENDPOINT="https://api.myfit.ai/en/desktop/api/v2/myfit"
REACT_APP_USERS_ENDPOINT="https://api.myfit.ai/en/desktop/api/v2/myfituser"
REACT_APP_SESSION_EXPIRE_MINUTES=15
+2 -2
View File
@@ -7,8 +7,8 @@ REACT_APP_APPSITE=" https://myfitapp.mermsemr.com"
#REACT_APP_APPSITE="http://localhost:7012"
REACT_APP_AUX_ENDPOINT="https://devapi.mermsemr.com/en/desktop/api/v2/myfit"
REACT_APP_USERS_ENDPOINT="https://devapi.mermsemr.com/en/desktop/api/v2/myfituser"
REACT_APP_AUX_ENDPOINT="https://devapi.myfit.ai/en/desktop/api/v2/myfit"
REACT_APP_USERS_ENDPOINT="https://devapi.myfit.ai/en/desktop/api/v2/myfituser"
# REACT_APP_PASSWORD_ENDPOINT="https://devapi.mermsemr.com/en/desktop/api/v2/myfituser/resetpass"
REACT_APP_SESSION_EXPIRE_MINUTES=15
+2 -2
View File
@@ -6,9 +6,9 @@ REACT_APP_TWITTER="https://twitter.com/fluxtra"
REACT_APP_APPSITE=" https://myfitapp.mermsemr.com"
#REACT_APP_APPSITE="http://localhost:7012"
REACT_APP_AUX_ENDPOINT="https://api.myfit.ai/en/desktop/api/v2/myfit"
REACT_APP_USERS_ENDPOINT="https://api.myfit.ai/en/desktop/api/v2/myfituser"
REACT_APP_AUX_ENDPOINT="https://api.mermsemr.com/en/desktop/api/v2/myfit"
REACT_APP_USERS_ENDPOINT="https://api.mermsemr.com/en/desktop/api/v2/myfituser"
# REACT_APP_PASSWORD_ENDPOINT="https://api.mermsemr.com/en/desktop/api/v2/myfituser/resetpass"
REACT_APP_SESSION_EXPIRE_MINUTES=15
+23
View File
@@ -0,0 +1,23 @@
build-job:
stage: build
script:
- echo "Hello, $GITLAB_USER_LOGIN!"
test-job1:
stage: test
script:
- echo "This job tests something"
test-job2:
stage: test
script:
- echo "This job tests something, but takes more time than test-job1."
- echo "After the echo commands complete, it runs the sleep command for 20 seconds"
- echo "which simulates a test that runs 20 seconds longer than test-job1"
- sleep 20
deploy-prod:
stage: deploy
script:
- echo "This job deploys something from the $CI_COMMIT_BRANCH branch."
environment: production
+3 -10
View File
@@ -1,7 +1,7 @@
version: '3'
services:
users-myfit:
image: registry.myfit.ai/users-myfit:latest
image: registry.chiefsoft.net/users-myfit:latest
build:
context: .
dockerfile: docker/Dockerfile
@@ -17,17 +17,10 @@ services:
- ./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
- api.myfit.ai:10.10.33.15
- devapi.myfit.ai:10.10.33.15
environment:
- CHOKIDAR_USEPOLLING=true
# volumes:
# - ./:/app
# - /app/node_modules
tty: true
stdin_open: true
# working_dir: /app
+2 -2
View File
@@ -22,8 +22,8 @@ export default function LoginLayout({ slogan, children }) {
{/* <img src={loginThumb} alt="login-thumb" /> */}
</div>
<div className="article w-[600px]">
<p className="text-[60px] font-bold leading-[72px] text-white">
{slogan}
<p className="text-[60px] font-bold leading-[72px] text-[#a03774]">
{slogan}
</p>
</div>
</div>