From 9e2699ca87631486d61fe44bcf2157061d9c9dcc Mon Sep 17 00:00:00 2001 From: wowario Date: Thu, 21 May 2020 09:09:35 +0300 Subject: [PATCH 1/4] bump up to v0.1.4 --- src/renderer/components/Landing/LandingPage.vue | 2 +- src/renderer/components/Landing/WarioLanding.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/renderer/components/Landing/LandingPage.vue b/src/renderer/components/Landing/LandingPage.vue index 7b2e527..0b00be3 100644 --- a/src/renderer/components/Landing/LandingPage.vue +++ b/src/renderer/components/Landing/LandingPage.vue @@ -122,7 +122,7 @@ this.$store.commit('addRate', response.data.usd); }); - axios.get(`https://funding.wownero.com/api/1/wowlight?version=0.1.3`).then(response => { + axios.get(`https://funding.wownero.com/api/1/wowlight?version=0.1.4`).then(response => { if(response.data.data === false) { const {dialog} = require('electron').remote const dialogOptions = { diff --git a/src/renderer/components/Landing/WarioLanding.vue b/src/renderer/components/Landing/WarioLanding.vue index f9c775e..ebddddc 100644 --- a/src/renderer/components/Landing/WarioLanding.vue +++ b/src/renderer/components/Landing/WarioLanding.vue @@ -17,7 +17,7 @@
- 0.1.3 - {{version_embedded}} + 0.1.4 - {{version_embedded}} Credits From 861521d83210acd2d52e94ffd7828cbbe2ae226e Mon Sep 17 00:00:00 2001 From: wowario Date: Wed, 20 May 2020 22:44:22 +0300 Subject: [PATCH 2/4] bump up electron-builder --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index ac597f7..04ec6d5 100644 --- a/package.json +++ b/package.json @@ -108,7 +108,7 @@ "electron-debug": "3.0.0", "electron-util": "0.11.0", "electron-devtools-installer": "^2.2.4", - "electron-builder": "^20.19.2", + "electron-builder": "^21.2.0", "mini-css-extract-plugin": "0.4.0", "file-loader": "^1.1.11", "html-webpack-plugin": "^3.2.0", From af99864ed4956872e654d63852f079025a1e98f3 Mon Sep 17 00:00:00 2001 From: wowario Date: Wed, 20 May 2020 23:44:42 +0300 Subject: [PATCH 3/4] get BTC price --- src/main/index.js | 2 +- .../components/Landing/LandingPage.vue | 4 +-- .../Landing/components/WarioPassword.vue | 18 ++++++------ src/renderer/components/Pages/WarioTxs.vue | 28 +++++++++---------- .../components/Pages/components/Navbar.vue | 10 +++---- .../components/Pages/components/Send.vue | 16 +++++------ .../Pages/components/TxHistoryList.vue | 6 ++-- src/renderer/store/index.js | 8 +++--- 8 files changed, 46 insertions(+), 46 deletions(-) diff --git a/src/main/index.js b/src/main/index.js index 8742ef7..80e9683 100644 --- a/src/main/index.js +++ b/src/main/index.js @@ -175,7 +175,7 @@ ipcMain.on('rpc_commit_wallet', (event, data) => { event.sender.send('rpc_wallet_committed'); }); -ipcMain.on('rate_usd_wow', (event, data) => { +ipcMain.on('rate_btc_wow', (event, data) => { console.log(data); }); diff --git a/src/renderer/components/Landing/LandingPage.vue b/src/renderer/components/Landing/LandingPage.vue index 0b00be3..7ed7238 100644 --- a/src/renderer/components/Landing/LandingPage.vue +++ b/src/renderer/components/Landing/LandingPage.vue @@ -118,8 +118,8 @@ mounted() { let select_node = jQuery('#selectnode'); const axios = require('axios'); - axios.get('https://funding.wownero.com/api/1/convert/wow-usd?amount=1000').then(response => { - this.$store.commit('addRate', response.data.usd); + axios.get('https://tradeogre.com/api/v1/ticker/btc-wow').then(response => { + this.$store.commit('addRate', response.data.ask); }); axios.get(`https://funding.wownero.com/api/1/wowlight?version=0.1.4`).then(response => { diff --git a/src/renderer/components/Landing/components/WarioPassword.vue b/src/renderer/components/Landing/components/WarioPassword.vue index e79986b..c9c8c0d 100644 --- a/src/renderer/components/Landing/components/WarioPassword.vue +++ b/src/renderer/components/Landing/components/WarioPassword.vue @@ -26,22 +26,22 @@ wallet() { return this.$store.getters.wallet; }, - usd(){ - return (this.$store.getters.usd_rate / 1000) * this.$store.getters.wallet.balance; + btc(){ + return (this.$store.getters.btc_rate) * this.$store.getters.wallet.balance; }, bubble_img() { - let rate = this.$store.getters.usd_rate; - let usd = (rate / 1000) * this.$store.getters.wallet.balance; + let rate = this.$store.getters.btc_rate; + let btc = rate * this.$store.getters.wallet.balance; - if(usd < 1){ + if(btc < 1){ return this.path_bubble(0); - } else if(usd < 100){ + } else if(btc < 100){ return this.path_bubble(1); - } else if(usd < 500){ + } else if(btc < 500){ return this.path_bubble(2); - } else if(usd < 1000){ + } else if(btc < 1000){ return this.path_bubble(3); - } else if(usd < 1000){ + } else if(btc < 1000){ return this.path_bubble(4); } } diff --git a/src/renderer/components/Pages/WarioTxs.vue b/src/renderer/components/Pages/WarioTxs.vue index f84938f..7faae36 100644 --- a/src/renderer/components/Pages/WarioTxs.vue +++ b/src/renderer/components/Pages/WarioTxs.vue @@ -6,23 +6,23 @@
-
+
-
+
-
+
-
+
-
+
@@ -43,22 +43,22 @@ wallet() { return this.$store.getters.wallet; }, - usd(){ - return (this.$store.getters.usd_rate / 1000) * this.$store.getters.wallet.balance; + btc(){ + return this.$store.getters.btc_rate * this.$store.getters.wallet.balance; }, bubble_img() { - let rate = this.$store.getters.usd_rate; - let usd = (rate / 1000) * this.$store.getters.wallet.balance; + let rate = this.$store.getters.btc_rate; + let btc = rate * this.$store.getters.wallet.balance; - if(usd < 1){ + if(btc < 1){ return this.path_bubble(0); - } else if(usd < 100){ + } else if(btc < 100){ return this.path_bubble(1); - } else if(usd < 500){ + } else if(btc < 500){ return this.path_bubble(2); - } else if(usd < 1000){ + } else if(btc < 1000){ return this.path_bubble(3); - } else if(usd < 1000){ + } else if(btc < 1000){ return this.path_bubble(4); } } diff --git a/src/renderer/components/Pages/components/Navbar.vue b/src/renderer/components/Pages/components/Navbar.vue index 6c31b21..16339be 100644 --- a/src/renderer/components/Pages/components/Navbar.vue +++ b/src/renderer/components/Pages/components/Navbar.vue @@ -10,12 +10,12 @@ Balance: {{wallet.balance}} | - + Unlocked: {{wallet.unlocked}} | - - USD: {{Number((usd_rate/1000)*wallet.balance).toFixed(2)}} + + BTC: {{Number(btc_rate*wallet.balance).toFixed(9)}}
@@ -45,8 +45,8 @@ wallet() { return this.$store.getters.wallet; }, - usd_rate() { - return this.$store.getters.usd_rate; + btc_rate() { + return this.$store.getters.btc_rate; } }, methods: { diff --git a/src/renderer/components/Pages/components/Send.vue b/src/renderer/components/Pages/components/Send.vue index 1a474ea..3204c77 100644 --- a/src/renderer/components/Pages/components/Send.vue +++ b/src/renderer/components/Pages/components/Send.vue @@ -18,7 +18,7 @@
- +
@@ -74,8 +74,8 @@ wallet() { return this.$store.getters.wallet; }, - usd_rate() { - return this.$store.getters.usd_rate; + btc_rate() { + return this.$store.getters.btc_rate; } }, methods: { @@ -126,7 +126,7 @@ let regexp_address = /([S|W][o|W][a-zA-Z0-9]{95})|(So[a-zA-Z0-9]{106})/g; let address = form.find('textarea.address').val().trim(); let amount = form.find('input.amount').val().trim(); - let usd = jQuery('form#sendForm .amount label small'); + let btc = jQuery('form#sendForm .amount label small'); let invalid = function(msg){ jQuery('button.send_btn').addClass('disabled'); @@ -134,23 +134,23 @@ if(amount.startsWith('.') || amount.endsWith('.')) { this.error = 'Invalid WOW amount' - usd.html(''); + btc.html(''); return invalid(); } if((amount.split('.').length - 1) > 1){ this.error = 'Invalid WOW amount'; - usd.html(''); + btc.html(''); return invalid(); } if((amount === 0)){ //this.error = 'Invalid WOW amount'; - usd.html(''); + btc.html(''); return invalid(); } - usd.html(`(${Number((this.usd_rate/1000)*amount).toFixed(2)} USD)`); + btc.html(`(${Number(this.btc_rate*amount).toFixed(9)} BTC)`); let addy_match = address.match(regexp_address); if(!addy_match){ diff --git a/src/renderer/components/Pages/components/TxHistoryList.vue b/src/renderer/components/Pages/components/TxHistoryList.vue index 29631bc..a6136e2 100644 --- a/src/renderer/components/Pages/components/TxHistoryList.vue +++ b/src/renderer/components/Pages/components/TxHistoryList.vue @@ -34,7 +34,7 @@ {{tx.in === 'in' ? '+' : '-'}}{{tx.amount}} - ➞ $ {{Number((usd_rate/1000)*tx.amount).toFixed(2)}} + ➞ $ {{Number(btc_rate*tx.amount).toFixed(9)}} @@ -55,8 +55,8 @@ export default { name: "TxHistoryList", computed: { - usd_rate() { - return this.$store.getters.usd_rate; + btc_rate() { + return this.$store.getters.btc_rate; }, wallet() { return this.$store.getters.wallet; diff --git a/src/renderer/store/index.js b/src/renderer/store/index.js index 64ca8fb..daf2a45 100644 --- a/src/renderer/store/index.js +++ b/src/renderer/store/index.js @@ -23,14 +23,14 @@ export default new Vuex.Store({ password_box: { 'message': '' }, - usd_rate: 0, // per 1000 WOW + btc_rate: 0, // per 1000 WOW wallet: { 'path': '', 'txs': [], 'balance': 0, 'unlocked': 0, 'address': '', - 'usd': 0, + 'btc': 0, 'state': -1 }, // wallet opened wallet_path: '', @@ -78,7 +78,7 @@ export default new Vuex.Store({ state.appState = data; }, addRate(state, data){ - state.usd_rate = data; + state.btc_rate = data; }, showError(state, data){ state.error = data; @@ -136,7 +136,7 @@ export default new Vuex.Store({ wallet: state => state.wallet, wallet_path: state => state.wallet_path, wallet_password: state => state.wallet_password, - usd_rate: state => state.usd_rate, + btc_rate: state => state.btc_rate, message_box: state => state.message_box, password_box: state => state.password_box, height_from: state => state.height_from, From 55324022a692c83b841e7dba4a5bc57586ca5aab Mon Sep 17 00:00:00 2001 From: wowario Date: Thu, 21 May 2020 09:04:25 +0300 Subject: [PATCH 4/4] get XMR price --- src/renderer/components/Landing/LandingPage.vue | 4 ++++ .../Landing/components/WarioPassword.vue | 14 +++++++------- src/renderer/components/Pages/WarioTxs.vue | 14 +++++++------- .../components/Pages/components/Navbar.vue | 7 +++++++ src/renderer/store/index.js | 4 ++++ 5 files changed, 29 insertions(+), 14 deletions(-) diff --git a/src/renderer/components/Landing/LandingPage.vue b/src/renderer/components/Landing/LandingPage.vue index 7ed7238..c555f83 100644 --- a/src/renderer/components/Landing/LandingPage.vue +++ b/src/renderer/components/Landing/LandingPage.vue @@ -122,6 +122,10 @@ this.$store.commit('addRate', response.data.ask); }); + axios.get('https://tradeogre.com/api/v1/ticker/btc-xmr').then(response => { + this.$store.commit('addRateXMR', response.data.ask); + }); + axios.get(`https://funding.wownero.com/api/1/wowlight?version=0.1.4`).then(response => { if(response.data.data === false) { const {dialog} = require('electron').remote diff --git a/src/renderer/components/Landing/components/WarioPassword.vue b/src/renderer/components/Landing/components/WarioPassword.vue index c9c8c0d..e9c6390 100644 --- a/src/renderer/components/Landing/components/WarioPassword.vue +++ b/src/renderer/components/Landing/components/WarioPassword.vue @@ -30,18 +30,18 @@ return (this.$store.getters.btc_rate) * this.$store.getters.wallet.balance; }, bubble_img() { - let rate = this.$store.getters.btc_rate; - let btc = rate * this.$store.getters.wallet.balance; + let rate = this.$store.getters.usd_rate; + let usd = (rate / 1000) * this.$store.getters.wallet.balance; - if(btc < 1){ + if(usd < 1){ return this.path_bubble(0); - } else if(btc < 100){ + } else if(usd < 100){ return this.path_bubble(1); - } else if(btc < 500){ + } else if(usd < 500){ return this.path_bubble(2); - } else if(btc < 1000){ + } else if(usd < 1000){ return this.path_bubble(3); - } else if(btc < 1000){ + } else if(usd < 1000){ return this.path_bubble(4); } } diff --git a/src/renderer/components/Pages/WarioTxs.vue b/src/renderer/components/Pages/WarioTxs.vue index 7faae36..50d6770 100644 --- a/src/renderer/components/Pages/WarioTxs.vue +++ b/src/renderer/components/Pages/WarioTxs.vue @@ -47,18 +47,18 @@ return this.$store.getters.btc_rate * this.$store.getters.wallet.balance; }, bubble_img() { - let rate = this.$store.getters.btc_rate; - let btc = rate * this.$store.getters.wallet.balance; + let rate = this.$store.getters.usd_rate; + let usd = (rate / 1000) * this.$store.getters.wallet.balance; - if(btc < 1){ + if(usd < 1){ return this.path_bubble(0); - } else if(btc < 100){ + } else if(usd < 100){ return this.path_bubble(1); - } else if(btc < 500){ + } else if(usd < 500){ return this.path_bubble(2); - } else if(btc < 1000){ + } else if(usd < 1000){ return this.path_bubble(3); - } else if(btc < 1000){ + } else if(usd < 1000){ return this.path_bubble(4); } } diff --git a/src/renderer/components/Pages/components/Navbar.vue b/src/renderer/components/Pages/components/Navbar.vue index 16339be..72524d8 100644 --- a/src/renderer/components/Pages/components/Navbar.vue +++ b/src/renderer/components/Pages/components/Navbar.vue @@ -17,6 +17,10 @@ BTC: {{Number(btc_rate*wallet.balance).toFixed(9)}} + | + + XMR: {{Number(btc_rate*wallet.balance/xmr_rate).toFixed(9)}} +