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

Toast Implementation (WIP) #33

Browse Source
This commit is contained in:
FallenGravity
2019-10-19 22:35:04 +02:00
parent 3ced57fdee
commit 5bf58eb645
2 changed files with 31 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
index.html
View File

@@ -18,7 +18,7 @@
<link rel="stylesheet" href="./assets/styles/buttons.css">
<link rel="stylesheet" href="./assets/styles/style.css">
<link rel="stylesheet" href="./assets/styles/forms.css">
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/semantic-ui@2.4.2/dist/components/button.css">
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/fomantic-ui@2.7.8/dist/components/transition.min.css">
<!-- Insert this line above script imports -->
<script>
if (typeof module === 'object') {
@@ -50,9 +50,7 @@
<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 src="https://cdn.jsdelivr.net/npm/semantic-ui@2.4.2/dist/semantic.min.js"></script>
<!-- ethoFS Js -->
<!--<script src="assets/dashboard/plugins/bootstrap-select/js/bootstrap-select.js"></script>-->
<script src="https://cdn.jsdelivr.net/npm/fomantic-ui@2.7.8/dist/semantic.min.js"></script>
<script src="assets/dashboard/plugins/jquery-slimscroll/jquery.slimscroll.js"></script>
<script src="assets/dashboard/plugins/node-waves/waves.js"></script>
<script src="assets/dashboard/plugins/jquery-countto/jquery.countTo.js"></script>

42
renderer/syncing.js
View File

@@ -1,6 +1,9 @@
// In renderer process (web page).
const {ipcRenderer} = require("electron");
const {
ipcRenderer
} = require("electron");
var web3;
// Set the provider you want from Web3.providers
SyncProgress = new ProgressBar.Line("#syncProgress", {
strokeWidth: 6,
@@ -34,8 +37,8 @@ SyncProgress = new ProgressBar.Line("#syncProgress", {
SyncProgress.setText("Waiting for blockchain, please wait...");
isFullySynced = false;
var peerCountInterval = setInterval(function () {
web3Local.eth.net.getPeerCount(function (error, count) {
var peerCountInterval = setInterval(function() {
web3Local.eth.net.getPeerCount(function(error, count) {
$("#peerCount").html(vsprintf("Peer Count: %d", [count]));
});
}, 5000);
@@ -44,20 +47,26 @@ function StartSyncProcess() {
var alreadyCatchedUp = false;
var nodeSyncInterval = null;
var subscription = web3Local.eth.subscribe("syncing", function (error, sync) {
var subscription = web3Local.eth.subscribe("syncing", function(error, sync) {
if (!error) {
if (!sync) {
if (nodeSyncInterval) {
clearInterval(nodeSyncInterval);
}
nodeSyncInterval = setInterval(function () {
web3Local.eth.getBlock("latest", function (error, localBlock) {
nodeSyncInterval = setInterval(function() {
web3Local.eth.getBlock("latest", function(error, localBlock) {
if (!error) {
if (localBlock.number > 0) {
if (!EthoTransactions.getIsSyncing()) {
SyncProgress.animate(1);
SyncProgress.setText(vsprintf("%d/%d (100%%)", [localBlock.number, localBlock.number]));
(function($, _M) {
M.toast({
html: 'Your Node is still syncing please do not attempt to use the wallet.',
displayLength: 10000
});
}(jQuery, M));
}
if (alreadyCatchedUp == false) {
@@ -73,6 +82,12 @@ function StartSyncProcess() {
// signal that the sync is complete
$(document).trigger("onSyncComplete");
(function($, _M) {
M.toast({
html: 'Your Node is fully synced and operational.',
displayLength: 40000
});
}(jQuery, M));
}
}
} else {
@@ -84,7 +99,7 @@ function StartSyncProcess() {
} else {
EthoMainGUI.showGeneralError(error);
}
}).on("data", function (sync) {
}).on("data", function(sync) {
if (sync && sync.HighestBlock > 0) {
SyncProgress.animate(sync.CurrentBlock / sync.HighestBlock);
SyncProgress.setText(vsprintf("%d/%d (%d%%)", [
@@ -93,10 +108,11 @@ function StartSyncProcess() {
Math.floor(sync.CurrentBlock / sync.HighestBlock * 100)
]));
}
}).on("changed", function (isSyncing) {
}).on("changed", function(isSyncing) {
if (isSyncing) {
nodeSyncInterval = setInterval(function () {
web3Local.eth.isSyncing(function (error, sync) {
nodeSyncInterval = setInterval(function() {
web3Local.eth.isSyncing(function(error, sync) {
if (!error && sync) {
SyncProgress.animate(sync.currentBlock / sync.highestBlock);
SyncProgress.setText(vsprintf("%d/%d (%d%%)", [
@@ -117,11 +133,11 @@ function StartSyncProcess() {
});
}
var InitWeb3 = setInterval(function () {
var InitWeb3 = setInterval(function() {
try {
web3Local = new Web3(new Web3.providers.WebsocketProvider("ws://localhost:8546"));
web3Local.eth.net.isListening(function (error, success) {
web3Local.eth.net.isListening(function(error, success) {
if (!error) {
$(document).trigger("onGethReady");
clearInterval(InitWeb3);