From 89ba2ee6d4b4edfbcbaeb74d96319854bc11817b Mon Sep 17 00:00:00 2001 From: Dexter Date: Tue, 15 Feb 2022 15:46:09 +0000 Subject: [PATCH] use environement variables for config --- apps/explorer/.env | 36 +++++++++---------- apps/explorer/apollo.config.js | 2 +- .../src/app/components/footer/index.tsx | 2 +- apps/explorer/src/app/config/index.tsx | 9 +++-- 4 files changed, 24 insertions(+), 25 deletions(-) diff --git a/apps/explorer/.env b/apps/explorer/.env index c934862c2..b481cd05d 100644 --- a/apps/explorer/.env +++ b/apps/explorer/.env @@ -3,23 +3,23 @@ # Netlify Environment Variables # https://www.netlify.com/docs/continuous-deployment/#environment-variables -REACT_APP_VERSION=$npm_package_version -REACT_APP_REPOSITORY_URL=$REPOSITORY_URL -REACT_APP_BRANCH=$BRANCH -REACT_APP_PULL_REQUEST=$PULL_REQUEST -REACT_APP_HEAD=$HEAD -REACT_APP_COMMIT_REF=$COMMIT_REF -REACT_APP_CONTEXT=$CONTEXT -REACT_APP_REVIEW_ID=$REVIEW_ID -REACT_APP_INCOMING_HOOK_TITLE=$INCOMING_HOOK_TITLE -REACT_APP_INCOMING_HOOK_URL=$INCOMING_HOOK_URL -REACT_APP_INCOMING_HOOK_BODY=$INCOMING_HOOK_BODY -REACT_APP_URL=$URL -REACT_APP_DEPLOY_URL=$DEPLOY_URL -REACT_APP_DEPLOY_PRIME_URL=$DEPLOY_PRIME_URL +NX_VERSION=$npm_package_version +NX_REPOSITORY_URL=$REPOSITORY_URL +NX_BRANCH=$BRANCH +NX_PULL_REQUEST=$PULL_REQUEST +NX_HEAD=$HEAD +NX_COMMIT_REF=$COMMIT_REF +NX_CONTEXT=$CONTEXT +NX_REVIEW_ID=$REVIEW_ID +NX_INCOMING_HOOK_TITLE=$INCOMING_HOOK_TITLE +NX_INCOMING_HOOK_URL=$INCOMING_HOOK_URL +NX_INCOMING_HOOK_BODY=$INCOMING_HOOK_BODY +NX_URL=$URL +NX_DEPLOY_URL=$DEPLOY_URL +NX_DEPLOY_PRIME_URL=$DEPLOY_PRIME_URL # App configuration variables -REACT_APP_CHAIN_EXPLORER_URL = "https://explorer.vega.trading/.netlify/functions/chain-explorer-api" -REACT_APP_TENDERMINT_URL = "https://lb.testnet.vega.xyz/tm" -REACT_APP_TENDERMINT_WEBSOCKET_URL = "wss://lb.testnet.vega.xyz/tm/websocket" -REACT_APP_VEGA_URL = "https://lb.testnet.vega.xyz/query" +NX_CHAIN_EXPLORER_URL = "https://explorer.vega.trading/.netlify/functions/chain-explorer-api" +NX_TENDERMINT_URL = "https://lb.testnet.vega.xyz/tm" +NX_TENDERMINT_WEBSOCKET_URL = "wss://lb.testnet.vega.xyz/tm/websocket" +NX_VEGA_URL = "https://lb.testnet.vega.xyz/query" diff --git a/apps/explorer/apollo.config.js b/apps/explorer/apollo.config.js index 7d4e1e1f4..97e1c2c59 100644 --- a/apps/explorer/apollo.config.js +++ b/apps/explorer/apollo.config.js @@ -2,7 +2,7 @@ module.exports = { client: { service: { name: 'vega', - url: process.env.REACT_APP_VEGA_URL, + url: process.env.NX_VEGA_URL, }, }, }; diff --git a/apps/explorer/src/app/components/footer/index.tsx b/apps/explorer/src/app/components/footer/index.tsx index 8cd16cd76..6e40fb7a2 100644 --- a/apps/explorer/src/app/components/footer/index.tsx +++ b/apps/explorer/src/app/components/footer/index.tsx @@ -7,7 +7,7 @@ export const Footer = () => {
Reading Vega Fairground data from
{/* Version/commit hash: {packageJson.version} / */} - {process.env['REACT_APP_COMMIT_REF'] || 'dev'} + {process.env['NX_COMMIT_REF'] || 'dev'}
diff --git a/apps/explorer/src/app/config/index.tsx b/apps/explorer/src/app/config/index.tsx index 825a41e0c..a8e193ed3 100644 --- a/apps/explorer/src/app/config/index.tsx +++ b/apps/explorer/src/app/config/index.tsx @@ -1,7 +1,6 @@ export const DATA_SOURCES = { - chainExplorerUrl: - 'https://explorer.vega.trading/.netlify/functions/chain-explorer-api', - tendermintUrl: 'https://lb.testnet.vega.xyz/tm', - tendermintWebsocketUrl: 'wss://lb.testnet.vega.xyz/tm/websocket', - dataNodeUrl: 'https://lb.testnet.vega.xyz/query', + chainExplorerUrl: process.env['NX_CHAIN_EXPLORER_URL'] as string, + tendermintUrl: process.env['NX_TENDERMINT_URL'] as string, + tendermintWebsocketUrl: process.env['NX_TENDERMINT_WEBSOCKET_URL'] as string, + dataNodeUrl: process.env['NX_VEGA_URL'] as string, };