From a3a3a4092bc4365c431716d6546a5071ed7552f6 Mon Sep 17 00:00:00 2001 From: FallenGravity Date: Tue, 22 Oct 2019 17:32:38 +0200 Subject: [PATCH] (WIP) First steps to #32 --- assets/dashboard/styles/materialize.min.css | 2 +- assets/styles/forms.css | 31 +++--- assets/styles/materialize.min.css | 2 +- assets/templates/transactions.html | 1 - renderer/tableTransactions.js | 114 ++++++++++---------- 5 files changed, 77 insertions(+), 73 deletions(-) diff --git a/assets/dashboard/styles/materialize.min.css b/assets/dashboard/styles/materialize.min.css index 9875238..727617f 100644 --- a/assets/dashboard/styles/materialize.min.css +++ b/assets/dashboard/styles/materialize.min.css @@ -5099,7 +5099,7 @@ small { } .btn:focus, .btn-large:focus, .btn-small:focus, .btn-floating:focus { - background-color: #1d7d74 + background-color: #c3300f } .btn, .btn-large, .btn-small { diff --git a/assets/styles/forms.css b/assets/styles/forms.css index 985b317..7215575 100755 --- a/assets/styles/forms.css +++ b/assets/styles/forms.css @@ -1,44 +1,47 @@ .select-wrapper .caret { - fill: #aaa; + fill: #aaa; } -.select-dropdown -{ - color: #aaa; +.select-dropdown { + color: #aaa; } .dropdown-content li>a, .dropdown-content li>span { - color: rgb(36, 13, 21); + color: rgb(36, 13, 21); } #sendFeeRange { - margin-top: 40px; + margin-top: 40px; } .card-panel { - background-color: #333 + background-color: #333 } .sendWrapper input { - color: #aaa; + color: #aaa; } -#tableTransactionsForAll .fa-arrow-right { - color: red; +#tableTransactionsForAll .fa-sign-in-alt { + color: green; +} + +#tableTransactionsForAll .fa-sign-out-alt { + color: red; } #tableTransactionsForAll .fa-arrow-left { - color: #228B22; + color: #228B22; } #tableTransactionsForAll .fa-arrows-alt-h { - color: #DCDCDC; + color: #DCDCDC; } #tableTransactionsForAll .fa-question { - color: #DCDCDC; + color: #DCDCDC; } #tableTransactionsForAll .fa-check { - color: #228B22; + color: #228B22; } diff --git a/assets/styles/materialize.min.css b/assets/styles/materialize.min.css index 50697a9..a901f28 100755 --- a/assets/styles/materialize.min.css +++ b/assets/styles/materialize.min.css @@ -4651,7 +4651,7 @@ small { } .btn:focus, .btn-large:focus, .btn-small:focus, .btn-floating:focus { - background-color: #1d7d74 + background-color: #c3300f } .btn, .btn-large, .btn-small { diff --git a/assets/templates/transactions.html b/assets/templates/transactions.html index c8633ad..a74edb3 100755 --- a/assets/templates/transactions.html +++ b/assets/templates/transactions.html @@ -1,5 +1,4 @@
- diff --git a/renderer/tableTransactions.js b/renderer/tableTransactions.js index bb02598..741b0a7 100755 --- a/renderer/tableTransactions.js +++ b/renderer/tableTransactions.js @@ -1,4 +1,6 @@ -const {ipcRenderer} = require("electron"); +const { + ipcRenderer +} = require("electron"); class tableTransactions { constructor() { @@ -9,12 +11,10 @@ class tableTransactions { // register the sort datetime format $.fn.dataTable.moment("MMM Do YYYY HH:mm:ss"); - var namesType = $.fn.dataTable.absoluteOrderNumber([ - { - value: null, - position: "top" - } - ]); + var namesType = $.fn.dataTable.absoluteOrderNumber([{ + value: null, + position: "top" + }]); // render the transactions $(id).DataTable({ dom: "Bfrtip", @@ -29,61 +29,63 @@ class tableTransactions { oSearch: { sSearch: EthoTransactions.getFilter() }, - buttons: [ - { - text: '', - action: function (e, dt, node, config) { - EthoTransactions.renderTransactions(); + buttons: [{ + text: '', + action: function(e, dt, node, config) { + EthoTransactions.renderTransactions(); + } + }], + columnDefs: [{ + targets: 0, + render: function(data, type, row) { + if (data == 0) { + var AccLogic1 = document.getElementById("txValue"); + AccLogic1.style.color = "green"; + return ''; + } else if (data == 1) { + var AccLogic1 = document.getElementById("txValue"); + AccLogic1.style.color = "red"; + return ''; + } else { + var AccLogic1 = document.getElementById("txValue"); + AccLogic1.style.color = "red"; + return ''; } } - ], - columnDefs: [ - { - targets: 0, - render: function (data, type, row) { - if (data == 0) { - return ''; - } else if (data == 1) { - return ''; - } else { - return ''; - } - } - }, { - className: "transactionsBlockNum", - type: namesType, - targets: 1 - }, { - targets: 2, - render: function (data, type, row) { - return moment(data, "YYYY-MM-DD HH:mm:ss").format("MMM Do YYYY HH:mm:ss"); - } - }, { - targets: 3, - visible: false - }, { - targets: 6, - render: function (data, type, row) { - return parseFloat(web3Local.utils.fromWei(EthoUtils.toFixed(parseFloat(data)).toString(), "ether")).toFixed(2); - } - }, { - targets: 7, - defaultContent: "", - render: function (data, type, row) { - if (row[1]) { - return ''; - } else { - return ''; - } + }, { + className: "transactionsBlockNum", + type: namesType, + targets: 1 + }, { + targets: 2, + render: function(data, type, row) { + return moment(data, "YYYY-MM-DD HH:mm:ss").format("MMM Do YYYY HH:mm:ss"); + } + }, { + targets: 3, + visible: false + }, { + targets: 6, + render: function(data, type, row) { + return parseFloat(web3Local.utils.fromWei(EthoUtils.toFixed(parseFloat(data)).toString(), "ether")).toFixed(2); + } + }, { + targets: 7, + defaultContent: "", + render: function(data, type, row) { + if (row[1]) { + return ''; + } else { + return ''; } } - ], - drawCallback: function (settings) { + }], + drawCallback: function(settings) { $("#loadingTransactionsOverlay").css("display", "none"); } }); - $(id + " tbody").off("click").on("click", "td", function () { + $(id + " tbody").off("click").on("click", "td", function() { if ($(id).DataTable().cell(this).index().column == 1) { var rowIdx = $(id).DataTable().cell(this).index().row; var rowData = $(id).DataTable().rows(rowIdx).data()[0]; @@ -99,12 +101,12 @@ class tableTransactions { $("#txToAddress").attr("href", vsprintf("https://explorer.ether1.org/addr/%s", [rowData[5]])); $("#txValue").html(web3Local.utils.fromWei(EthoUtils.toFixed(parseFloat(rowData[6])).toString(), "ether")); - $("#dlgTransactionInfo a").off("click").on("click", function (even) { + $("#dlgTransactionInfo a").off("click").on("click", function(even) { event.preventDefault(); ipcRenderer.send("openURL", $(this).attr("href")); }); - $("#btnTxInfoClose").off("click").on("click", function () { + $("#btnTxInfoClose").off("click").on("click", function() { $("#dlgTransactionInfo").iziModal("close"); });