From 34eb80c0037451b9d4f718793d7526c475c9e417 Mon Sep 17 00:00:00 2001 From: Hugo Date: Mon, 15 Jan 2018 12:22:59 -0200 Subject: [PATCH 1/4] working on issue#1 --- package.json | 7 +- pages/home.pg | 200 ++++++++++++++++++++++++++++++++++--------------- pages/login.pg | 90 +++++++++++----------- 3 files changed, 192 insertions(+), 105 deletions(-) diff --git a/package.json b/package.json index 817a9be..f994a7b 100644 --- a/package.json +++ b/package.json @@ -12,10 +12,13 @@ "jquery": "^3.2.1", "json-socket": "^0.3.0", "nedb": "^1.8.0", + "node-gyp": "^3.6.2", "pbkdf2": "^3.0.14", - "qrcodejs": "^1.0.0" + "qrcodejs": "^1.0.0", + "rebuild": "^0.1.2" }, "devDependencies": { - "electron": "~1.7.8" + "electron": "~1.7.8", + "electron-prebuilt": "^1.4.13" } } diff --git a/pages/home.pg b/pages/home.pg index 2bcfcf4..4484a50 100644 --- a/pages/home.pg +++ b/pages/home.pg @@ -1,81 +1,163 @@ -

WALLET

+

BALANCE

- - - + +
- + \ No newline at end of file + function update() { + if (typeof balance != 'undefined') { + $("#blvl").html(balance.toFixed(6) + " XRB"); + } else { + $("#blvl").html("0.00 XRB"); + } + if (typeof txhistory != 'undefined') { + //console.log(addresses[0]); blks = wallet.getLastNBlocks(addresses[0], 20, 0); + var html = ''; + for (let i in txhistory) { + html += '' + txhistory[i].getType() + '' + txhistory[i].getAmount().over("1000000000000000000000000").toJSNumber() / 1000000 + ' XRB'; + } + $('#thetable tr').html(html); + } + if (typeof price != 'undefined' && typeof balance != 'undefined') { + $("#blvf").html("$ " + balance.times(price).toFixed(2) + " USD"); + } else { + $("#blvf").html("0.00 USD"); + } + + // DEV + + txhistory = [ + { + transaction: 'Received', + ammount: '100', + time: Date.now() + }, { + transaction: 'Sent', + ammount: '100', + time: Date.now() + }, { + transaction: 'Received', + ammount: '100', + time: Date.now() + }, { + transaction: 'Sent', + ammount: '100', + time: Date.now() + }, { + transaction: 'Received', + ammount: '100', + time: Date.now() + }, { + transaction: 'Received', + ammount: '100', + time: Date.now() + }, { + transaction: 'Received', + ammount: '100', + time: Date.now() + }, { + transaction: 'Received', + ammount: '100', + time: Date.now() + }, { + transaction: 'Received', + ammount: '100', + time: Date.now() + }, { + transaction: 'Received', + ammount: '100', + time: Date.now() + } + ]; + + for (let i in txhistory) { + let cls = txhistory[i].transaction.toLowerCase(); + let signal; + if (cls === 'received') { + signal = '+' + } else { + signal = '-' + } + + html += '' + txhistory[i].time + '' + txhistory[i].transaction + '' + signal + txhistory[i].ammount + ' XRB'; + } + $('#thetable tbody').html(html); + + } + update(); + setTimeout(update, 100); + diff --git a/pages/login.pg b/pages/login.pg index 30c68c9..3dcf496 100644 --- a/pages/login.pg +++ b/pages/login.pg @@ -8,52 +8,54 @@
+ \ No newline at end of file + From 01926aee1888f1610c0d1292e89d6e7d01a6fb56 Mon Sep 17 00:00:00 2001 From: Hugo Date: Mon, 15 Jan 2018 22:45:28 -0200 Subject: [PATCH 2/4] =?UTF-8?q?fix=20na=20iss#1=20e=20remo=C3=A7=C3=A3o=20?= =?UTF-8?q?de=20c=C3=B3digo=20para=20desenvolvimento?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/home.pg | 86 +++++++++++++++----------------------------------- pages/login.pg | 37 +++++++++++----------- 2 files changed, 45 insertions(+), 78 deletions(-) diff --git a/pages/home.pg b/pages/home.pg index 4484a50..4162c20 100644 --- a/pages/home.pg +++ b/pages/home.pg @@ -14,6 +14,7 @@ color: rgba(255, 255, 255, 0.9); letter-spacing: 1.2px; } + #bltx { text-align: center; font-size: 15px; @@ -21,6 +22,7 @@ user-select: none; cursor: default; } + #blvl { text-align: center; color: #def58c; @@ -29,21 +31,25 @@ font-family: 'Montserrat'; letter-spacing: 1.2px; } + #blvf { text-align: center; color: rgba(170, 221, 221, 0.69); font-family: 'Montserrat'; letter-spacing: 1.2px; } + table { border-collapse: collapse; margin-left: auto; margin-right: auto; margin-top: 10vh; } + table::-webkit-scrollbar { display: none; } + tbody { height: 45vh; display: block; @@ -51,9 +57,11 @@ margin-left: auto; margin-right: auto; } + tbody::-webkit-scrollbar { display: none; } + td, th { padding: 15px 10px; @@ -62,19 +70,21 @@ width: 21vw; text-transform: uppercase; } + td { font-size: 11px; text-align: right; letter-spacing: 1.3px; font-weight: lighter; } + td.left { text-align: left; } + tr.received { color: #def58c; } - + \ No newline at end of file diff --git a/pages/login.pg b/pages/login.pg index 3dcf496..b1f3c87 100644 --- a/pages/login.pg +++ b/pages/login.pg @@ -13,6 +13,7 @@ #n { text-align: center; } + button { margin-top: 10px; background-color: #1ba79f; @@ -26,36 +27,36 @@ font-size: 16px; user-select: none; } + button:hover { background-color: #1fc0c3; } + button:focus { outline: 0; } + #mypassword { margin-top: 15px; } - + \ No newline at end of file From 510ad7ca7ec339f8a4bb61d3af57119470c0cc62 Mon Sep 17 00:00:00 2001 From: Hugo Date: Mon, 15 Jan 2018 22:47:26 -0200 Subject: [PATCH 3/4] =?UTF-8?q?inser=C3=A7=C3=A3o=20de=20timeout=20no=20lo?= =?UTF-8?q?cal=20correto?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/home.pg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pages/home.pg b/pages/home.pg index 4162c20..7abc720 100644 --- a/pages/home.pg +++ b/pages/home.pg @@ -89,6 +89,7 @@ \ No newline at end of file From a9bb458568bf3ae9bba3df0f4a44a8d0d79ba2d4 Mon Sep 17 00:00:00 2001 From: Hugo Date: Mon, 15 Jan 2018 22:51:32 -0200 Subject: [PATCH 4/4] remove unnecessary line of code --- pages/home.pg | 2 -- 1 file changed, 2 deletions(-) diff --git a/pages/home.pg b/pages/home.pg index 7abc720..1430748 100644 --- a/pages/home.pg +++ b/pages/home.pg @@ -122,8 +122,6 @@ $("#blvf").html("0.00 USD"); } - $('#thetable tbody').html(html); - } update(); \ No newline at end of file