aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrancesco Agosti <francesco.agosti93@gmail.com>2018-05-16 07:35:05 +0800
committerGitHub <noreply@github.com>2018-05-16 07:35:05 +0800
commitcc486cb86d46cefbd31a43a87be3ee9b3fd461a6 (patch)
tree8d84b11bb5e427e1987386ca82a40aeda6fdbf0e
parent7a45a579c072612b9c45da47db026635b721faec (diff)
parentdc58d539c2ec0561974323aced0841d17117927d (diff)
downloaddexon-sol-tools-cc486cb86d46cefbd31a43a87be3ee9b3fd461a6.tar
dexon-sol-tools-cc486cb86d46cefbd31a43a87be3ee9b3fd461a6.tar.gz
dexon-sol-tools-cc486cb86d46cefbd31a43a87be3ee9b3fd461a6.tar.bz2
dexon-sol-tools-cc486cb86d46cefbd31a43a87be3ee9b3fd461a6.tar.lz
dexon-sol-tools-cc486cb86d46cefbd31a43a87be3ee9b3fd461a6.tar.xz
dexon-sol-tools-cc486cb86d46cefbd31a43a87be3ee9b3fd461a6.tar.zst
dexon-sol-tools-cc486cb86d46cefbd31a43a87be3ee9b3fd461a6.zip
Merge pull request #593 from 0xProject/bug/website/fix-cirular-dependency
Fix circular dependency
-rw-r--r--packages/website/ts/utils/backend_client.ts10
-rw-r--r--packages/website/ts/utils/configs.ts5
-rw-r--r--packages/website/ts/utils/utils.ts9
3 files changed, 13 insertions, 11 deletions
diff --git a/packages/website/ts/utils/backend_client.ts b/packages/website/ts/utils/backend_client.ts
index 63e06fda7..c440b1604 100644
--- a/packages/website/ts/utils/backend_client.ts
+++ b/packages/website/ts/utils/backend_client.ts
@@ -1,8 +1,8 @@
import * as _ from 'lodash';
import { ArticlesBySection, WebsiteBackendGasInfo, WebsiteBackendPriceInfo, WebsiteBackendRelayerInfo } from 'ts/types';
-import { configs } from 'ts/utils/configs';
import { fetchUtils } from 'ts/utils/fetch_utils';
+import { utils } from 'ts/utils/utils';
const ETH_GAS_STATION_ENDPOINT = '/eth_gas_station';
const PRICES_ENDPOINT = '/prices';
@@ -11,7 +11,7 @@ const WIKI_ENDPOINT = '/wiki';
export const backendClient = {
async getGasInfoAsync(): Promise<WebsiteBackendGasInfo> {
- const result = await fetchUtils.requestAsync(configs.BACKEND_BASE_URL, ETH_GAS_STATION_ENDPOINT);
+ const result = await fetchUtils.requestAsync(utils.getBackendBaseUrl(), ETH_GAS_STATION_ENDPOINT);
return result;
},
async getPriceInfoAsync(tokenSymbols: string[]): Promise<WebsiteBackendPriceInfo> {
@@ -22,15 +22,15 @@ export const backendClient = {
const queryParams = {
tokens: joinedTokenSymbols,
};
- const result = await fetchUtils.requestAsync(configs.BACKEND_BASE_URL, PRICES_ENDPOINT, queryParams);
+ const result = await fetchUtils.requestAsync(utils.getBackendBaseUrl(), PRICES_ENDPOINT, queryParams);
return result;
},
async getRelayerInfosAsync(): Promise<WebsiteBackendRelayerInfo[]> {
- const result = await fetchUtils.requestAsync(configs.BACKEND_BASE_URL, RELAYERS_ENDPOINT);
+ const result = await fetchUtils.requestAsync(utils.getBackendBaseUrl(), RELAYERS_ENDPOINT);
return result;
},
async getWikiArticlesBySectionAsync(): Promise<ArticlesBySection> {
- const result = await fetchUtils.requestAsync(configs.BACKEND_BASE_URL, WIKI_ENDPOINT);
+ const result = await fetchUtils.requestAsync(utils.getBackendBaseUrl(), WIKI_ENDPOINT);
return result;
},
};
diff --git a/packages/website/ts/utils/configs.ts b/packages/website/ts/utils/configs.ts
index bea9c4ee2..9fec814b7 100644
--- a/packages/website/ts/utils/configs.ts
+++ b/packages/website/ts/utils/configs.ts
@@ -11,9 +11,8 @@ const INFURA_API_KEY = 'T5WSC8cautR4KXyYgsRs';
export const configs = {
AMOUNT_DISPLAY_PRECSION: 5,
- BACKEND_BASE_URL: utils.isDogfood()
- ? 'http://ec2-52-91-181-85.compute-1.amazonaws.com'
- : 'https://website-api.0xproject.com',
+ BACKEND_BASE_PROD_URL: 'https://website-api.0xproject.com',
+ BACKEND_BASE_STAGING_URL: 'http://ec2-52-91-181-85.compute-1.amazonaws.com',
BASE_URL,
BITLY_ACCESS_TOKEN: 'ffc4c1a31e5143848fb7c523b39f91b9b213d208',
DEFAULT_DERIVATION_PATH: `44'/60'/0'`,
diff --git a/packages/website/ts/utils/utils.ts b/packages/website/ts/utils/utils.ts
index c3e261ddb..3c99bd2fe 100644
--- a/packages/website/ts/utils/utils.ts
+++ b/packages/website/ts/utils/utils.ts
@@ -24,6 +24,8 @@ import * as u2f from 'ts/vendor/u2f_api';
const LG_MIN_EM = 64;
const MD_MIN_EM = 52;
+const isDogfood = (): boolean => _.includes(window.location.href, configs.DOMAIN_DOGFOOD);
+
export const utils = {
assert(condition: boolean, message: string): void {
if (!condition) {
@@ -302,13 +304,14 @@ export const utils = {
}
return parsedProviderName;
},
+ getBackendBaseUrl(): string {
+ return isDogfood() ? configs.BACKEND_BASE_STAGING_URL : configs.BACKEND_BASE_PROD_URL;
+ },
isDevelopment(): boolean {
return configs.ENVIRONMENT === Environments.DEVELOPMENT;
},
isStaging(): boolean {
return _.includes(window.location.href, configs.DOMAIN_STAGING);
},
- isDogfood(): boolean {
- return _.includes(window.location.href, configs.DOMAIN_DOGFOOD);
- },
+ isDogfood,
};