From 419d1bd4d65343feb737e78068ff732f61a86531 Mon Sep 17 00:00:00 2001 From: Valer Cara Date: Thu, 24 Oct 2019 13:53:30 +0300 Subject: [PATCH] Add NETSTATS_API_URL=self for rev. proxy of api --- app/components/ConnectNodeModal/index.js | 4 ++-- app/netstatsApi.js | 4 ++-- app/utils/helpers.js | 11 +++++++++++ 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/app/components/ConnectNodeModal/index.js b/app/components/ConnectNodeModal/index.js index 20fee17..39a5811 100644 --- a/app/components/ConnectNodeModal/index.js +++ b/app/components/ConnectNodeModal/index.js @@ -1,7 +1,7 @@ import React from 'react'; import { connect } from 'react-redux'; import axios from 'axios'; -import { NETSTATS_API_URL } from 'config'; +import { netstatsApiUrl } from 'utils/helpers'; import onClickOutside from 'react-onclickoutside'; import PropTypes from 'prop-types'; import { hideConnectNodeModal as hideConnectNodeModalAction} from 'actions/global'; @@ -66,7 +66,7 @@ class ConnectNodeModal extends React.Component { nodeName: this.state.nodeName, accountEmail: this.state.email, }; - axios.post(`${NETSTATS_API_URL}/nodes`, user) + axios.post(`${netstatsApiUrl()}/nodes`, user) .then(res => { if (res.data.body.success) { this.setState({ diff --git a/app/netstatsApi.js b/app/netstatsApi.js index 7259d76..3020406 100644 --- a/app/netstatsApi.js +++ b/app/netstatsApi.js @@ -1,8 +1,8 @@ import axios from 'axios'; -import { NETSTATS_API_URL } from 'config'; +import { netstatsApiUrl } from 'utils/helpers'; const axiosApiInstance = axios.create({ - baseURL: NETSTATS_API_URL, + baseURL: netstatsApiUrl(), }); export function getInitialNodeHistory(nodeName) { diff --git a/app/utils/helpers.js b/app/utils/helpers.js index b09b528..63e55fa 100644 --- a/app/utils/helpers.js +++ b/app/utils/helpers.js @@ -6,6 +6,8 @@ import { ScriptLoader } from "@puzzl/browser/lib/network/ScriptLoader"; import moment from 'moment/moment'; import _ from 'lodash'; +import { NETSTATS_API_URL } from 'config'; + export function trimValue(string, digits = 4) { string = string.replace('0x', ''); return `${string.substr(0, digits)} ... ${string.substr(-digits)}`; @@ -393,3 +395,12 @@ export function initGoogleAnalytics(gaId) { gtag("config", gaId); } + +export function netstatsApiUrl() { + const currentHost = location.protocol + '//' + + location.hostname + + (location.port ? ':' + location.port: ''); + + return NETSTATS_API_URL !== "self" ? NETSTATS_API_URL : currentHost; +} +