matt/paperclip-wallet
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Semi-Clean ethoFS integration, Fix image file which contained HTML, clean up.

Browse Source
This commit is contained in:
FallenGravity
2019-10-13 03:29:16 +02:00
parent 80f5731912
commit 2f0e49f481
15 changed files with 18030 additions and 1355 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
assets/dashboard/css/style.css
View File

@@ -1,4 +1,6 @@
@import "https://fonts.googleapis.com/css?family=Montserrat:300,400,700";
.rwd-table {
margin: 1em 0;
min-width: 300px;
@@ -323,8 +325,8 @@
.navbar .navbar-collapse.in {
overflow: visible; }
.ls-closed .sidebar {
margin-left: -300px; }
/*.ls-closed .sidebar {
margin-left: -300px; }*/
.ls-closed section.content {
margin-left: 15px; }
@@ -2609,7 +2611,7 @@
@media (max-width: 767px) {
.navbar > .container .navbar-brand,
.navbar > .container-fluid .navbar-brand {
margin-left: 35px;
/*margin-left: 35px;*/
width: 73%; }
.navbar .navbar-header {
display: inline-block;
@@ -2687,7 +2689,7 @@ a {
animation: none !important; }
section.content {
margin: 100px 15px 0 315px;
margin: 35px 15px 0 10px;
-moz-transition: 0.5s;
-o-transition: 0.5s;
-webkit-transition: 0.5s;
@@ -7006,8 +7008,8 @@ fieldset[disabled] .form-control {
.navbar .navbar-collapse.in {
overflow: visible; }
.ls-closed .sidebar {
margin-left: -300px; }
/*.ls-closed .sidebar {
margin-left: -300px; }*/
.ls-closed section.content {
margin-left: 15px; }
@@ -7794,11 +7796,11 @@ fieldset[disabled] .form-control {
display: none;
z-index: 10; }
.overlay-open .sidebar {
/*.overlay-open .sidebar {
margin-left: 0;
z-index: 99999999; }
z-index: 99999999; }*/
.sidebar {
/*.sidebar {
-moz-transition: all 0.5s;
-o-transition: all 0.5s;
-webkit-transition: all 0.5s;
@@ -7806,7 +7808,6 @@ fieldset[disabled] .form-control {
font-family: "Roboto", sans-serif;
background: #000;
color: white;
width: 300px;
overflow: hidden;
display: inline-block;
height: calc(100vh - 70px);
@@ -8022,7 +8023,7 @@ fieldset[disabled] .form-control {
.right-sidebar .nav-tabs li:first-child {
width: 45%; }
.right-sidebar .nav-tabs li:last-child {
width: 55%; }
width: 55%; }*/
/* Bootstrap Notify ============================ */
.bootstrap-notify-container {
@@ -8458,7 +8459,7 @@ fieldset[disabled] .form-control {
border-radius: 0 !important; }
/* For Internet Explorer 10 ===================== */
html.ie10 .sidebar .menu .list li {
/*html.ie10 .sidebar .menu .list li {
line-height: 30px; }
html.ie10 .sidebar .menu .list .ml-menu li.active a:not(.menu-toggle).toggled:before {
@@ -8466,7 +8467,7 @@ html.ie10 .sidebar .menu .list .ml-menu li.active a:not(.menu-toggle).toggled:be
line-height: 20px !important; }
html.ie10 .sidebar .user-info .info-container {
top: 15px; }
top: 15px; }*/
html.ie10 .search-bar input[type="text"] {
padding: 26px 60px 26px 56px; }
@@ -8478,12 +8479,12 @@ html.ie10 .bs-searchbox .form-control {
width: 90%; }
/* For Internet Explorer 11 ===================== */
html.ie11 .sidebar .menu .list .ml-menu li.active a:not(.menu-toggle).toggled:before {
/*html.ie11 .sidebar .menu .list .ml-menu li.active a:not(.menu-toggle).toggled:before {
top: 6px !important;
line-height: 20px !important; }
html.ie11 .sidebar .user-info .info-container {
top: 15px; }
top: 15px; }*/
html.ie11 .search-bar input[type="text"] {
padding: 26px 60px 26px 56px; }

6
assets/dashboard/plugins/bootstrap/css/bootstrap.css vendored
View File

@@ -5917,7 +5917,8 @@ button.close {
-webkit-box-shadow: 0 3px 9px rgba(0, 0, 0, .5);
box-shadow: 0 3px 9px rgba(0, 0, 0, .5);
}
.modal-backdrop {
/*.modal-backdrop {
position: fixed;
top: 0;
right: 0;
@@ -5933,7 +5934,8 @@ button.close {
.modal-backdrop.in {
filter: alpha(opacity=50);
opacity: .5;
}
}*/
.modal-header {
padding: 15px;
border-bottom: 1px solid #e5e5e5;

7216
assets/dashboard/plugins/bootstrap/css/bootstrap.min.css vendored
View File

File diff suppressed because one or more lines are too long

897
assets/dashboard/plugins/bootstrap/js/bootstrap.js vendored
View File

File diff suppressed because it is too large Load Diff

942
assets/dashboard/plugins/bootstrap/js/bootstrap.min.js vendored
View File

File diff suppressed because one or more lines are too long

BIN
assets/images/sort_asc.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 91 KiB

After

Width:  |  Height:  |  Size: 160 B

BIN
assets/images/sort_asc_disabled.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 92 KiB

After

Width:  |  Height:  |  Size: 148 B

BIN
assets/images/sort_both.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 91 KiB

After

Width:  |  Height:  |  Size: 201 B

BIN
assets/images/sort_desc.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 91 KiB

After

Width:  |  Height:  |  Size: 158 B

BIN
assets/images/sort_desc_disabled.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 92 KiB

After

Width:  |  Height:  |  Size: 146 B

8551
assets/styles/materialize.min.css vendored
View File

File diff suppressed because one or more lines are too long

1389
assets/templates/uploads.html
View File

File diff suppressed because it is too large Load Diff

348
index.html
View File

@@ -1,181 +1,195 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="UTF-8">
<title>Ether-1 Desktop Wallet</title>
<link href="https://fonts.googleapis.com/css?family=Roboto" rel="stylesheet">
<link rel="stylesheet" href="./assets/styles/materialize.min.css">
<link rel="stylesheet" href="./assets/styles/datatables.min.css">
<link rel="stylesheet" href="./assets/styles/iziModal.min.css">
<link rel="stylesheet" href="./assets/styles/iziToast.min.css">
<link rel="stylesheet" href="./assets/styles/transactions.css">
<link rel="stylesheet" href="./assets/styles/please-wait.css">
<link rel="stylesheet" href="./assets/styles/indicators.css">
<link rel="stylesheet" href="./assets/styles/tablesort.css">
<link rel="stylesheet" href="./assets/styles/all.min.css">
<link rel="stylesheet" href="./assets/styles/spinner.css">
<link rel="stylesheet" href="./assets/styles/buttons.css">
<link rel="stylesheet" href="./assets/styles/style.css">
<link rel="stylesheet" href="./assets/styles/forms.css">
<!-- Insert this line above script imports -->
<script>
if (typeof module === 'object') {
window.module = module;
module = undefined;
<head>
<meta charset="UTF-8">
<title>Ether-1 Desktop Wallet</title>
<link href="https://fonts.googleapis.com/css?family=Roboto" rel="stylesheet">
<link rel="stylesheet" href="./assets/styles/materialize.min.css">
<link rel="stylesheet" href="./assets/styles/datatables.min.css">
<link rel="stylesheet" href="./assets/styles/iziModal.min.css">
<link rel="stylesheet" href="./assets/styles/iziToast.min.css">
<link rel="stylesheet" href="./assets/styles/transactions.css">
<link rel="stylesheet" href="./assets/styles/please-wait.css">
<link rel="stylesheet" href="./assets/styles/indicators.css">
<link rel="stylesheet" href="./assets/styles/tablesort.css">
<link rel="stylesheet" href="./assets/styles/all.min.css">
<link rel="stylesheet" href="./assets/styles/spinner.css">
<link rel="stylesheet" href="./assets/styles/buttons.css">
<link rel="stylesheet" href="./assets/styles/style.css">
<link rel="stylesheet" href="./assets/styles/forms.css">
<!-- Insert this line above script imports -->
<script>
if (typeof module === 'object') {
window.module = module;
module = undefined;
}
</script>
<!-- normal script imports etc -->
<script src="https://cdn.jsdelivr.net/gh/ethereum/web3.js@1.0.0-beta.36/dist/web3.min.js" integrity="sha256-nWBTbvxhJgjslRyuAKJHK+XcZPlCnmIAAMixz6EefVk=" crossorigin="anonymous"></script>
<script src="./assets/scripts/jquery.min.js"></script>
<script src="./assets/scripts/handlebars.js"></script>
<script src="./assets/scripts/materialize.min.js"></script>
<script src="./assets/scripts/datatables.min.js"></script>
<script src="./assets/scripts/iziModal.min.js"></script>
<script src="./assets/scripts/iziToast.min.js"></script>
<script src="./assets/scripts/tippy.min.js"></script>
<script src="./assets/scripts/progressbar.min.js"></script>
<script src="./assets/scripts/sprintf.min.js"></script>
<script src="./assets/scripts/please-wait.js "></script>
<script src="./assets/scripts/moment.min.js"></script>
<script src="./assets/scripts/datetime-moment.js"></script>
<script src="./assets/scripts/datatables-absolute.js"></script>
<script src="./assets/scripts/jquery.floatThead.min.js"></script>
<script src="./assets/scripts/tablesort.min.js"></script>
<script src="./assets/scripts/tablesort.number.min.js"></script>
<script src="./assets/scripts/jquery.qrcode.min.js"></script>
<script src="./assets/scripts/all.min.js"></script>
<script src="./assets/scripts/Chart.js"></script>
<!-- Insert this line after script imports -->
<script>
if (window.module)
module = window.module;
</script>
</head>
<body>
<!--<script>
document.addEventListener("keydown", function(e) {
if (e.which === 123) {
require('remote').getCurrentWindow().toggleDevTools();
} else if (e.which === 116) {
location.reload();
}
</script>
});
</script>-->
<!-- normal script imports etc -->
<script src="https://cdn.jsdelivr.net/gh/ethereum/web3.js@1.0.0-beta.36/dist/web3.min.js" integrity="sha256-nWBTbvxhJgjslRyuAKJHK+XcZPlCnmIAAMixz6EefVk=" crossorigin="anonymous"></script>
<script src="./assets/scripts/jquery.min.js"></script>
<script src="./assets/scripts/handlebars.js"></script>
<script src="./assets/scripts/materialize.min.js"></script>
<script src="./assets/scripts/datatables.min.js"></script>
<script src="./assets/scripts/iziModal.min.js"></script>
<script src="./assets/scripts/iziToast.min.js"></script>
<script src="./assets/scripts/tippy.min.js"></script>
<script src="./assets/scripts/progressbar.min.js"></script>
<script src="./assets/scripts/sprintf.min.js"></script>
<script src="./assets/scripts/please-wait.js "></script>
<script src="./assets/scripts/moment.min.js"></script>
<script src="./assets/scripts/datetime-moment.js"></script>
<script src="./assets/scripts/datatables-absolute.js"></script>
<script src="./assets/scripts/jquery.floatThead.min.js"></script>
<script src="./assets/scripts/tablesort.min.js"></script>
<script src="./assets/scripts/tablesort.number.min.js"></script>
<script src="./assets/scripts/jquery.qrcode.min.js"></script>
<script src="./assets/scripts/all.min.js"></script>
<script src="./assets/scripts/Chart.js"></script>
<script>
var loading_screen = pleaseWait({
logo: "assets/images/logo.png",
backgroundColor: '#000000',
loadingHtml: "<div class='spinner'><div class='bounce bounce1'></div><div class='bounce bounce2'></div><div class='bounce bounce3'></div></div><div class='loadingText'>Starting the node and loading app, please wait...</div>"
});
<!-- Insert this line after script imports -->
$(document).on("onGethReady", function() {
loading_screen.finish();
});
$(window).on("beforeunload", function() {
EthoBlockchain.closeConnection();
})
</script>
<div class="inner">
<!-- The sidebar -->
<div class="sidebar">
<div class="sidebarIconWrapper iconSelected" id="mainNavBtnWalletsWrapper" data-tippy="Wallets" data-tippy-delay="500">
<a class="sidebarIcon" id="mainNavBtnWallets" href="#">
<i class="fas fa-wallet fa-2x"></i>
</a>
</div>
<div class="sidebarIconWrapper iconSelected" id="mainNavBtnAddressBoookWrapper" data-tippy="Address Book" data-tippy-delay="500">
<a class="sidebarIcon" id="mainNavBtnAddressBoook" href="#">
<i class="far fa-address-book fa-2x"></i>
</a>
</div>
<div class="sidebarIconWrapper" id="mainNavBtnSendWrapper" data-tippy="Send Funds" data-tippy-delay="500">
<a class="sidebarIcon" id="mainNavBtnSend" href="#">
<i class="fas fas fa-share-square fa-2x"></i>
</a>
</div>
<div class="sidebarIconWrapper" id="mainNavBtnTransactionsWrapper" data-tippy="Transactions" data-tippy-delay="500">
<a class="sidebarIcon" id="mainNavBtnTransactions" href="#">
<i class="fas fa-exchange-alt fa-2x"></i>
</a>
</div>
<div class="sidebarIconWrapper" id="mainNavBtnUploadsWrapper" data-tippy="Uploads" data-tippy-delay="500">
<a class="sidebarIcon" id="mainNavBtnUploads" href="#">
<i class="fa fa-cloud-upload-alt fa-2x"></i>
</a>
</div>
<div class="sidebarIconWrapper" id="mainNavBtnMarketsWrapper" data-tippy="Markets" data-tippy-delay="500">
<a class="sidebarIcon" id="mainNavBtnMarkets" href="#">
<i class="fas fa-poll fa-2x"></i>
</a>
</div>
<div class="sidebarIconWrapper" id="mainNavBtnSettingsWrapper" data-tippy="Settings" data-tippy-delay="500">
<a class="sidebarIcon" id="mainNavBtnSettings" href="#">
<i class="fas fa-cog fa-2x"></i>
</a>
</div>
<div id="peerCount">
Peer Count: 0
</div>
</div>
<div id="mainContent"></div>
<div id="syncProgress"></div>
<script>
if (window.module)
module = window.module;
// You can also require other files to run in this process
require('./renderer/send.js');
require('./renderer/utils.js');
require('./renderer/maingui.js');
require('./renderer/syncing.js');
require('./renderer/markets.js');
require('./renderer/uploads.js');
require('./renderer/settings.js');
require('./renderer/wallets.js');
require('./renderer/database.js');
require('./renderer/blockchain.js');
require('./renderer/addressBook.js');
require('./renderer/transactions.js');
require('./renderer/tableTransactions.js');
</script>
</head>
</div>
<body>
<script>
var loading_screen = pleaseWait({logo: "assets/images/logo.png", backgroundColor: '#000000', loadingHtml: "<div class='spinner'><div class='bounce bounce1'></div><div class='bounce bounce2'></div><div class='bounce bounce3'></div></div><div class='loadingText'>Starting the node and loading app, please wait...</div>"});
$(document).on("onGethReady", function () {
loading_screen.finish();
});
$(window).on("beforeunload", function () {
EthoBlockchain.closeConnection();
})
</script>
<div class="inner">
<!-- The sidebar -->
<div class="sidebar">
<div class="sidebarIconWrapper iconSelected" id="mainNavBtnWalletsWrapper" data-tippy="Wallets" data-tippy-delay="500">
<a class="sidebarIcon" id="mainNavBtnWallets" href="#">
<i class="fas fa-wallet fa-2x"></i>
</a>
</div>
<div class="sidebarIconWrapper iconSelected" id="mainNavBtnAddressBoookWrapper" data-tippy="Address Book" data-tippy-delay="500">
<a class="sidebarIcon" id="mainNavBtnAddressBoook" href="#">
<i class="far fa-address-book fa-2x"></i>
</a>
</div>
<div class="sidebarIconWrapper" id="mainNavBtnSendWrapper" data-tippy="Send Funds" data-tippy-delay="500">
<a class="sidebarIcon" id="mainNavBtnSend" href="#">
<i class="fas fas fa-share-square fa-2x"></i>
</a>
</div>
<div class="sidebarIconWrapper" id="mainNavBtnTransactionsWrapper" data-tippy="Transactions" data-tippy-delay="500">
<a class="sidebarIcon" id="mainNavBtnTransactions" href="#">
<i class="fas fa-exchange-alt fa-2x"></i>
</a>
</div>
<div class="sidebarIconWrapper" id="mainNavBtnUploadsWrapper" data-tippy="Uploads" data-tippy-delay="500">
<a class="sidebarIcon" id="mainNavBtnUploads" href="#">
<i class="fa fa-cloud-upload-alt fa-2x"></i>
</a>
</div>
<div class="sidebarIconWrapper" id="mainNavBtnMarketsWrapper" data-tippy="Markets" data-tippy-delay="500">
<a class="sidebarIcon" id="mainNavBtnMarkets" href="#">
<i class="fas fa-poll fa-2x"></i>
</a>
</div>
<div class="sidebarIconWrapper" id="mainNavBtnSettingsWrapper" data-tippy="Settings" data-tippy-delay="500">
<a class="sidebarIcon" id="mainNavBtnSettings" href="#">
<i class="fas fa-cog fa-2x"></i>
</a>
</div>
<div id="peerCount">
Peer Count: 0
</div>
</div>
<div id="mainContent"></div>
<div id="syncProgress"></div>
<script>
// You can also require other files to run in this process
require('./renderer/send.js');
require('./renderer/utils.js');
require('./renderer/maingui.js');
require('./renderer/syncing.js');
require('./renderer/markets.js');
require('./renderer/uploads.js');
require('./renderer/settings.js');
require('./renderer/wallets.js');
require('./renderer/database.js');
require('./renderer/blockchain.js');
require('./renderer/addressBook.js');
require('./renderer/transactions.js');
require('./renderer/tableTransactions.js');
</script>
</div>
<!-- The modal for general error -->
<div id="dlgGeneralError" class="modalDialog" data-izimodal-title="Application Error" data-izimodal-subtitle="Something went wrong, don't kill the fish..." data-izimodal-icon="icon-home">
<div class="modalBody">
<div class="form-group">
<span id="txtGeneralError"></span>
</div>
<button type="button" class="btn btn-etho btn-dialog-confirm" id="btnGeneralErrorOK">OK</button>
</div>
</div>
<!-- The modal for general confirmation -->
<div id="dlgGeneralConfirm" class="modalDialog" data-izimodal-title="Confirmation" data-izimodal-subtitle="" data-izimodal-icon="icon-home">
<div class="modalBody">
<div class="form-group">
<span id="txtGeneralConfirm"></span>
</div>
<button type="button" class="btn btn-etho btn-dialog-cancel" id="btnGeneralConfirmNo">No</button>
<button type="button" class="btn btn-etho btn-dialog-confirm" id="btnGeneralConfirmYes">Yes</button>
</div>
</div>
<!-- The modal for about info -->
<div id="dlgAboutInfo" class="modalDialog" data-izimodal-title="About Ether1 Wallet" data-izimodal-icon="icon-home">
<div class="modalBody">
<div class="aboutInfo">
<div class="infoText" id="aboutInfoWallet">Ether1 Wallet</div>
<div class="infoText" id="aboutInfoGitHub">GitHub:
<a id="urlOpenGitHub" href="https://github.com/taeguscromis/Ether1DesktopWallet">https://github.com/taeguscromis/Ether1DesktopWallet</a>
</div>
<div class="infoText" id="aboutInfoLicence">Made under
<a id="urlOpenLicence" href="https://choosealicense.com/licenses/gpl-3.0">GPL v3.0</a>
licence
</div>
<div class="infoText" id="aboutInfoVersion">Version:
<span id="versionNumber"></span></div>
</div>
<button type="button" class="btn btn-etho btn-dialog-confirm" id="btnAboutInfoClose">Close</button>
</div>
</div>
</body>
<!-- The modal for QR-Code info -->
<div id="dlgShowAddressQRCode" class="modalDialog" data-izimodal-title="Address QR-Code" data-izimodal-subtitle="Scan the QR-Code to get the address..." data-izimodal-icon="icon-home">
<!-- The modal for general error -->
<div id="dlgGeneralError" class="modalDialog" data-izimodal-title="Application Error" data-izimodal-subtitle="Something went wrong, don't kill the fish..." data-izimodal-icon="icon-home">
<div class="modalBody">
<div id="addrQRCode"></div>
<button type="button" class="btn btn-etho btn-dialog-confirm" id="btnScanQRCodeClose">Close</button>
<div class="form-group">
<span id="txtGeneralError"></span>
</div>
<button type="button" class="btn btn-etho btn-dialog-confirm" id="btnGeneralErrorOK">OK</button>
</div>
</div>
<!-- The modal for general confirmation -->
<div id="dlgGeneralConfirm" class="modalDialog" data-izimodal-title="Confirmation" data-izimodal-subtitle="" data-izimodal-icon="icon-home">
<div class="modalBody">
<div class="form-group">
<span id="txtGeneralConfirm"></span>
</div>
<button type="button" class="btn btn-etho btn-dialog-cancel" id="btnGeneralConfirmNo">No</button>
<button type="button" class="btn btn-etho btn-dialog-confirm" id="btnGeneralConfirmYes">Yes</button>
</div>
</div>
<!-- The modal for about info -->
<div id="dlgAboutInfo" class="modalDialog" data-izimodal-title="About Ether1 Wallet" data-izimodal-icon="icon-home">
<div class="modalBody">
<div class="aboutInfo">
<div class="infoText" id="aboutInfoWallet">Ether1 Wallet</div>
<div class="infoText" id="aboutInfoGitHub">GitHub:
<a id="urlOpenGitHub" href="https://github.com/taeguscromis/Ether1DesktopWallet">https://github.com/taeguscromis/Ether1DesktopWallet</a>
</div>
<div class="infoText" id="aboutInfoLicence">Made under
<a id="urlOpenLicence" href="https://choosealicense.com/licenses/gpl-3.0">GPL v3.0</a>
licence
</div>
<div class="infoText" id="aboutInfoVersion">Version:
<span id="versionNumber"></span></div>
</div>
<button type="button" class="btn btn-etho btn-dialog-confirm" id="btnAboutInfoClose">Close</button>
</div>
</div>
</body>
<!-- The modal for QR-Code info -->
<div id="dlgShowAddressQRCode" class="modalDialog" data-izimodal-title="Address QR-Code" data-izimodal-subtitle="Scan the QR-Code to get the address..." data-izimodal-icon="icon-home">
<div class="modalBody">
<div id="addrQRCode"></div>
<button type="button" class="btn btn-etho btn-dialog-confirm" id="btnScanQRCodeClose">Close</button>
</div>
</div>
</html>

3
main.js
View File

@@ -24,6 +24,7 @@ locker.lock().then(function () {
// and load the index.html of the app.
mainWindow.loadFile("index.html");
mainWindow.webContents.openDevTools()
EthoGeth.startGeth();
// Open the DevTools.
@@ -82,4 +83,4 @@ locker.lock().then(function () {
require("./modules/geth.js");
require("./modules/accounts.js");
require("./modules/database.js");
require("./modules/database.js");

2
package.json
View File

@@ -80,4 +80,4 @@
"pull-file-reader": "^1.0.2",
"web3": "^1.2.1"
}
}
}