Commit b68b4a89 authored by ardiansyah's avatar ardiansyah

Merge branch 'ENV-STAGING' into 'ENV-DEV'

# Conflicts:
#   package.json
#   src/library/Utils.js
#   src/utils/services.js
parents 1bb7f45c 249be92e
// contents of .env // contents of .env
REACT_APP_URL_MAIN_BE=https://tia.eksad.com/tia-reporting-staging REACT_APP_URL_MAIN_BE=https://tia.eksad.com/tia-reporting-debug
REACT_APP_URL_MAIN_FE=/web-staging REACT_APP_URL_MAIN_FE=/web-staging
\ No newline at end of file GENERATE_SOURCEMAP=false
\ No newline at end of file
{ {
"name": "my-app", "name": "my-app",
"version": "0.1.0", "version": "0.1.0",
"homepage": "http://localhost:8080/web/", "homepage": "http://localhost:8080/web-staging/",
"private": true, "private": true,
"dependencies": { "dependencies": {
"@date-io/date-fns": "^1.3.13", "@date-io/date-fns": "^1.3.13",
......
.main-color{ .main-color{
background-color: #273b80 !important; background-color: #319c23 !important;
} }
/* for staging */ /* for staging */
...@@ -71,7 +71,7 @@ const useStyles = makeStyles((theme) => ({ ...@@ -71,7 +71,7 @@ const useStyles = makeStyles((theme) => ({
easing: theme.transitions.easing.sharp, easing: theme.transitions.easing.sharp,
duration: theme.transitions.duration.enteringScreen, duration: theme.transitions.duration.enteringScreen,
}), }),
backgroundColor: '#273b80' backgroundColor: '#319c23'
}, },
topleftClose: { topleftClose: {
borderRight: 0, borderRight: 0,
...@@ -87,7 +87,7 @@ const useStyles = makeStyles((theme) => ({ ...@@ -87,7 +87,7 @@ const useStyles = makeStyles((theme) => ({
}, },
padding: 20, padding: 20,
display: 'flex', display: 'flex',
backgroundColor: '#273b80' backgroundColor: '#319c23'
}, },
drawerOpen: { drawerOpen: {
width: drawerWidth, width: drawerWidth,
......
This diff is collapsed.
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -5,7 +5,7 @@ const Constant = { ...@@ -5,7 +5,7 @@ const Constant = {
EMAIL: 'TOKEN', EMAIL: 'TOKEN',
PASSWORD: 'PASSWORD', PASSWORD: 'PASSWORD',
URL_BE_DEV: '${process.env.REACT_APP_URL_MAIN_BE}', URL_BE_DEV: '${process.env.REACT_APP_URL_MAIN_BE}',
URL_BE_STAGING: 'https://tia.eksad.com/tia-reporting-staging', URL_BE_STAGING: 'https://tia.eksad.com/tia-reporting-debug',
URL_BE_DEMO: 'https://tia.eksad.com/tia-reporting-demo', URL_BE_DEMO: 'https://tia.eksad.com/tia-reporting-demo',
URL_BE_PROD: 'https://dashboard.triputra-group.com/tia-reporting', URL_BE_PROD: 'https://dashboard.triputra-group.com/tia-reporting',
URL_FE_DEV: 'https://tia.eksad.com/tia-web-dev', URL_FE_DEV: 'https://tia.eksad.com/tia-web-dev',
...@@ -25,6 +25,10 @@ const Constant = { ...@@ -25,6 +25,10 @@ const Constant = {
MTD: 'Monthly Historical', MTD: 'Monthly Historical',
YTD: 'Annual Historical', YTD: 'Annual Historical',
}, },
COLORS_TEXT_COLUMNS: {
active: '#5198ea',
disabled: '#000000de',
}
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment