update status shows on loading screen for basilisk network refresh

8 years ago · 4195d5df7f
3 changed files with 52 additions and 10 deletions
--- a/gui/bluebird.min.js
+++ b/gui/bluebird.min.js
--- a/gui/index.html
+++ b/gui/index.html
@ -6,13 +6,17 @@
        <link rel="stylesheet" href="jRoll.min.css">
        <script>if (typeof module === 'object') {window.module = module; module = undefined;}</script>
        <script type="text/javascript" src="EasyDEX-GUI/assets/global/vendor/jquery/jquery.min.js"></script>
+        <script type="text/javascript" src="bluebird.min.js"></script>
        <script type="text/javascript" src="loading.js"></script>
        <script type="text/javascript" src="jRoll.min.js"></script>
        <script>if (window.module) module = window.module;</script>
    </head>
    <body>
        <div style="text-align: center;">
-            <div style="/*background-image: url('loading.gif'); background-repeat: no-repeat; background-position: center;*/ height: 200px; width: 400px; position: absolute; top: 0; bottom: 0; left: 0; right: 0; margin: auto;"><span id="loading_status_text">Starting Wallet. Please wait...</span><br>
+            <div style="/*background-image: url('loading.gif'); background-repeat: no-repeat; background-position: center;*/ height: 240px; width: 400px; position: absolute; top: 0; bottom: 0; left: 0; right: 0; margin: auto;">
+            <span id="loading_status_text">Starting Wallet. Please wait...</span><br>
+            <span id="loading_sub_status_text"></span><br>
+            <span id="loading_sub_status_output_text"></span>
            <div id="pulse"></div></div>
        </div>
        <script type="text/javascript">
@ -21,8 +25,6 @@
                    radius: 100,
                    animation: "pulse"
                });
-                //var check = Iguana_activehandle();
-                //console.log(check[0]) // here I invoke the checking function
                const remote = require('electron').remote;
                var window = remote.getCurrentWindow();
                $('#loading_status_text').text('Starting Iguana daemon...')
@ -37,7 +39,7 @@
                            stopcheck();
                            $('#loading_status_text').text('Connecting to Basilisk Network...')
                            EDEX_DEXgetinfoAll()
-                            window.close();
+                            //window.close();
                        }
                    },2000);
                }
--- a/gui/loading.js
+++ b/gui/loading.js
@ -88,17 +88,19 @@ function EDEX_DEXnotarychains() {

 function EDEX_DEXgetinfoAll() {
    var result = [];
+    var ajax_data = '';
+    var tmpIguanaRPCAuth = 'tmpIgRPCUser@'+sessionStorage.getItem('IguanaRPCAuth');

    var get_dex_notarychains = EDEX_DEXnotarychains();
    console.log(get_dex_notarychains.length)
    
    $.each(get_dex_notarychains, function( coin_index, coin_value ) {
        console.log(coin_index + ': ' + coin_value);
-        var tmpIguanaRPCAuth = 'tmpIgRPCUser@'+sessionStorage.getItem('IguanaRPCAuth');
        var ajax_data = {'userpass':tmpIguanaRPCAuth,"agent":"dex","method":"getinfo","symbol":coin_value}
-        //console.log(ajax_data);
+        console.log('==> ajax_data')
+        console.log(ajax_data);
        $.ajax({
-            async: false,
+            //async: false,
            type: 'POST',
            data: JSON.stringify(ajax_data),
            url: 'http://127.0.0.1:7778',
@ -108,13 +110,20 @@ function EDEX_DEXgetinfoAll() {
                //console.log('== EDEX_DEXgetinfoAll Data OutPut ==');
                console.log(AjaxOutputData);
                result.push(AjaxOutputData);
-                //if (AjaxOutputData.error === 'less than required responses') {
-                //}
+                var tmp_index = parseInt(coin_index) + 1
+                $('#loading_sub_status_text').text('Connection status... ' + tmp_index + '/' + get_dex_notarychains.length + ': ' + coin_value)
+                if (AjaxOutputData.error === 'less than required responses') {
+                    $('#loading_sub_status_output_text').text('Output: ' + AjaxOutputData.error)
+                } else {
+                    $('#loading_sub_status_output_text').text('Output: Connected')
+                }
+                if ( tmp_index == 50 ) {
+                    window.close();
+                }
            },
            error: function(xhr, textStatus, error) {
                console.log(xhr.statusText);
                if ( xhr.readyState == 0 ) {
-                    Iguana_ServiceUnavailable();
                }
                console.log(textStatus);
                console.log(error);