diff --git a/.env b/.env new file mode 100644 index 0000000..7c2401e --- /dev/null +++ b/.env @@ -0,0 +1,2 @@ +VUE_APP_API_URL=https://testnet.getumbrel.com/ +VUE_APP_NETWORK=testnet \ No newline at end of file diff --git a/.env.production b/.env.production new file mode 100644 index 0000000..26fa8a7 --- /dev/null +++ b/.env.production @@ -0,0 +1,2 @@ +VUE_APP_API_URL=/ +VUE_APP_NETWORK=mainnet \ No newline at end of file diff --git a/.env.staging b/.env.staging index 802aea5..7c2401e 100644 --- a/.env.staging +++ b/.env.staging @@ -1 +1,2 @@ -NODE_ENV=staging \ No newline at end of file +VUE_APP_API_URL=https://testnet.getumbrel.com/ +VUE_APP_NETWORK=testnet \ No newline at end of file diff --git a/.gitignore b/.gitignore index d43f01b..7c50417 100644 --- a/.gitignore +++ b/.gitignore @@ -2,10 +2,6 @@ node_modules /dist -# local env files -.env.local -.env.*.local - # Log files npm-debug.log* yarn-debug.log* diff --git a/src/App.vue b/src/App.vue index 35fd84f..b2a46ba 100644 --- a/src/App.vue +++ b/src/App.vue @@ -107,6 +107,7 @@ export default { } }, created() { + console.log(process.env.VUE_APP_API_URL, process.env.VUE_APP_NETWORK); this.updateViewPortHeightCSS(); //for 100vh consistency window.addEventListener("resize", this.updateViewPortHeightCSS); diff --git a/src/components/BitcoinWallet.vue b/src/components/BitcoinWallet.vue index 562800f..baabbe7 100644 --- a/src/components/BitcoinWallet.vue +++ b/src/components/BitcoinWallet.vue @@ -589,7 +589,10 @@ export default { }; try { - const res = await API.post(`api/v1/lnd/transaction`, payload); + const res = await API.post( + `${process.env.VUE_APP_API_URL}api/v1/lnd/transaction`, + payload + ); const withdrawTx = res.data; this.state.withdraw.txHash = withdrawTx.txid; this.changeMode("withdrawn"); diff --git a/src/components/LightningWallet.vue b/src/components/LightningWallet.vue index 8ca10fa..07ca0e6 100644 --- a/src/components/LightningWallet.vue +++ b/src/components/LightningWallet.vue @@ -517,7 +517,10 @@ export default { }; try { - const res = await API.post(`api/v1/lnd/lightning/payInvoice`, payload); + const res = await API.post( + `${process.env.VUE_APP_API_URL}api/v1/lnd/lightning/payInvoice`, + payload + ); if (res.data.paymentError) { return (this.state.error = res.data.paymentError); } @@ -557,7 +560,10 @@ export default { }; try { - const res = await API.post(`api/v1/lnd/lightning/addInvoice`, payload); + const res = await API.post( + `${process.env.VUE_APP_API_URL}api/v1/lnd/lightning/addInvoice`, + payload + ); this.state.receive.invoiceQR = this.state.receive.invoiceText = res.data.paymentRequest; @@ -603,7 +609,7 @@ export default { this.state.loading = true; const fetchedInvoice = await API.get( - `api/v1/lnd/lightning/invoice?paymentRequest=${this.state.send.invoiceText}` + `${process.env.VUE_APP_API_URL}api/v1/lnd/lightning/invoice?paymentRequest=${this.state.send.invoiceText}` ); if (!fetchedInvoice) { diff --git a/src/layouts/DashboardLayout.vue b/src/layouts/DashboardLayout.vue index 6f8fb23..30440de 100644 --- a/src/layouts/DashboardLayout.vue +++ b/src/layouts/DashboardLayout.vue @@ -26,17 +26,12 @@ - + Development - Testnet + v-if="network !== 'mainnet'" + class="align-self-center mr-2 text-capitalize" + >{{ network }}
0) { commit('setConnectionCode', uris[0]); @@ -139,7 +139,7 @@ const actions = { // Instead we can calculate our total balance by getting the sum of each channel's localBalance async getBalance({ commit, state }) { if (state.operational && state.unlocked) { - const balance = await API.get(`api/v1/lnd/wallet/lightning`); + const balance = await API.get(`${process.env.VUE_APP_API_URL}api/v1/lnd/wallet/lightning`); if (balance) { commit('setBalance', { confirmed: balance.balance }); @@ -149,7 +149,7 @@ const actions = { async getChannels({ commit, state }) { if (state.operational && state.unlocked) { - const rawChannels = await API.get(`api/v1/lnd/channel`); + const rawChannels = await API.get(`${process.env.VUE_APP_API_URL}api/v1/lnd/channel`); const channels = []; let confirmedBalance = 0; let pendingBalance = 0; @@ -217,8 +217,8 @@ const actions = { async getTransactions({ commit, state }) { if (state.operational && state.unlocked) { // Get invoices and payments - const invoices = await API.get(`api/v1/lnd/lightning/invoices`); - const payments = await API.get(`api/v1/lnd/lightning/payments`); + const invoices = await API.get(`${process.env.VUE_APP_API_URL}api/v1/lnd/lightning/invoices`); + const payments = await API.get(`${process.env.VUE_APP_API_URL}api/v1/lnd/lightning/payments`); let transactions = []; if (invoices) { @@ -270,7 +270,7 @@ const actions = { } else { try { const invoiceDetails = await API.get( - `api/v1/lnd/lightning/invoice?paymentRequest=${tx.description}` + `${process.env.VUE_APP_API_URL}api/v1/lnd/lightning/invoice?paymentRequest=${tx.description}` ); tx.description = invoiceDetails.description; } catch (error) { diff --git a/src/store/modules/system.js b/src/store/modules/system.js index f9d0a8f..4c7a00d 100644 --- a/src/store/modules/system.js +++ b/src/store/modules/system.js @@ -18,7 +18,7 @@ const mutations = { // Functions to get data from the API const actions = { async getApi({ commit }) { - const api = await API.get(`api/ping`); + const api = await API.get(`${process.env.VUE_APP_API_URL}api/ping`); commit('setApi', { operational: !!(api && api.version), version: api && api.version ? api.version : "" diff --git a/src/views/Lightning.vue b/src/views/Lightning.vue index ec9ae64..194488b 100644 --- a/src/views/Lightning.vue +++ b/src/views/Lightning.vue @@ -226,7 +226,7 @@ export default { created() { //Get LND Status // axios - // .get(`api/v1/lnd/info/status`) + // .get(`${process.env.VUE_APP_API_URL}api/v1/lnd/info/status`) // .then(res => { // const { operational, unlocked } = res.data; @@ -249,7 +249,7 @@ export default { // }); //Get LND Info for showing stats - API.get(`api/v1/pages/lnd/`) + API.get(`${process.env.VUE_APP_API_URL}api/v1/pages/lnd/`) .then(res => { this.state.pubKey = res.lightningInfo.identityPubkey; this.state.lndVersion = res.lightningInfo.version; diff --git a/vue.config.js b/vue.config.js index 790c952..c098a7a 100644 --- a/vue.config.js +++ b/vue.config.js @@ -8,7 +8,7 @@ module.exports = { // } // } // } - devServer: { - proxy: 'http://umbrel.local/', - } + // devServer: { + // proxy: 'http://umbrel.local/', + // } } \ No newline at end of file