status-im
/
embark-area-51
mirror of https://github.com/status-im/embark-area-51.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

consolidate DEFAULT_HOST logic

This commit is contained in:
Michael Bradley, Jr 2018-10-24 15:08:16 -05:00
parent 9533b57627
commit 10fa3fec9f
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
embark-ui/src/constants.js
View File

@ -5,5 +5,5 @@ export const LIGHT_THEME = 'light';
export const DEPLOYMENT_PIPELINES = { export const DEPLOYMENT_PIPELINES = {
injectedWeb3: 'injectedWeb3', injectedWeb3: 'injectedWeb3',
embark: 'embark' embark: 'embark'
} };
export const DEFAULT_HOST = 'localhost:8000'; export const DEFAULT_HOST = process.env.NODE_ENV === 'development' ? 'localhost:8000' : window.location.host;

2
embark-ui/src/containers/AppContainer.js
View File

@ -34,7 +34,7 @@ class AppContainer extends Component {
if (!token) { if (!token) {
return; return;
} }
const host = process.env.NODE_ENV === 'development' ? DEFAULT_HOST : window.location.host; const host = DEFAULT_HOST;
if (token === this.props.credentials.token && this.props.credentials.host === host) { if (token === this.props.credentials.token && this.props.credentials.host === host) {
return; return;
} }

2
embark-ui/src/reducers/index.js
View File

@ -201,7 +201,7 @@ function compilingContract(state = false, action) {
} }
const DEFAULT_CREDENTIALS_STATE = { const DEFAULT_CREDENTIALS_STATE = {
host: process.env.NODE_ENV === 'development' ? DEFAULT_HOST : window.location.host, host: DEFAULT_HOST,
token: '', token: '',
authenticated: false, authenticated: false,
authenticating: false, authenticating: false,