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

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

File diff suppressed because one or more lines are too long

529
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

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

File diff suppressed because one or more lines are too long

1189
assets/templates/uploads.html
View File

File diff suppressed because it is too large Load Diff

34
index.html
View File

@@ -1,7 +1,7 @@
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<head> <head>
<meta charset="UTF-8"> <meta charset="UTF-8">
<title>Ether-1 Desktop Wallet</title> <title>Ether-1 Desktop Wallet</title>
<link href="https://fonts.googleapis.com/css?family=Roboto" rel="stylesheet"> <link href="https://fonts.googleapis.com/css?family=Roboto" rel="stylesheet">
@@ -53,17 +53,31 @@
if (window.module) if (window.module)
module = window.module; module = window.module;
</script> </script>
</head> </head>
<body>
<!--<script>
document.addEventListener("keydown", function(e) {
if (e.which === 123) {
require('remote').getCurrentWindow().toggleDevTools();
} else if (e.which === 116) {
location.reload();
}
});
</script>-->
<body>
<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>"}); 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 () { $(document).on("onGethReady", function() {
loading_screen.finish(); loading_screen.finish();
}); });
$(window).on("beforeunload", function () { $(window).on("beforeunload", function() {
EthoBlockchain.closeConnection(); EthoBlockchain.closeConnection();
}) })
</script> </script>
@@ -168,14 +182,14 @@
<button type="button" class="btn btn-etho btn-dialog-confirm" id="btnAboutInfoClose">Close</button> <button type="button" class="btn btn-etho btn-dialog-confirm" id="btnAboutInfoClose">Close</button>
</div> </div>
</div> </div>
</body> </body>
<!-- The modal for QR-Code info --> <!-- 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 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 class="modalBody">
<div id="addrQRCode"></div> <div id="addrQRCode"></div>
<button type="button" class="btn btn-etho btn-dialog-confirm" id="btnScanQRCodeClose">Close</button> <button type="button" class="btn btn-etho btn-dialog-confirm" id="btnScanQRCodeClose">Close</button>
</div> </div>
</div> </div>
</html> </html>

1
main.js
View File

@@ -24,6 +24,7 @@ locker.lock().then(function () {
// and load the index.html of the app. // and load the index.html of the app.
mainWindow.loadFile("index.html"); mainWindow.loadFile("index.html");
mainWindow.webContents.openDevTools()
EthoGeth.startGeth(); EthoGeth.startGeth();
// Open the DevTools. // Open the DevTools.