refresh basilisk connections action added to loading scree, with new html/css/js animation

8 years ago · 0ce8a17f34
10 changed files with 95 additions and 5 deletions
--- a/Files/IgaunaApp-Linux.xml
+++ b/Files/IgaunaApp-Linux.xml
@ -1,7 +1,7 @@
 <project>
    <shortName>IguanaApp</shortName>
    <fullName>iguana</fullName>
-    <version>0.1.3-beta</version>
+    <version>0.1.4.1-beta</version>
    <licenseFile>/Users/satinder/Documents/Github/iguana/LICENSE</licenseFile>
    <leftImage>/Users/satinder/Documents/Github/iguana/assets/installer_imgs/Iguana_installer_wizard_image.png</leftImage>
    <logoImage>/Users/satinder/Documents/Github/iguana/assets/installer_imgs/supernet-iguana-logo.png</logoImage>
--- a/Files/IgaunaApp-OSX.xml
+++ b/Files/IgaunaApp-OSX.xml
@ -1,7 +1,7 @@
 <project>
    <shortName>IguanaApp</shortName>
    <fullName>iguana</fullName>
-    <version>0.1.3-beta</version>
+    <version>0.1.4-beta</version>
    <licenseFile>/Users/satinder/Documents/Github/iguana/LICENSE</licenseFile>
    <leftImage>/Users/satinder/Documents/Github/iguana/assets/installer_imgs/Iguana_installer_wizard_image.png</leftImage>
    <logoImage>/Users/satinder/Documents/Github/iguana/assets/installer_imgs/supernet-iguana-logo.png</logoImage>
--- a/Files/IgaunaApp-Win.xml
+++ b/Files/IgaunaApp-Win.xml
@ -1,7 +1,7 @@
 <project>
    <shortName>IguanaApp</shortName>
    <fullName>iguana</fullName>
-    <version>0.1.3-beta</version>
+    <version>0.1.4-beta</version>
    <licenseFile>/Users/satinder/Documents/Github/iguana/LICENSE</licenseFile>
    <leftImage>/Users/satinder/Documents/Github/iguana/assets/installer_imgs/Iguana_installer_wizard_image.png</leftImage>
    <logoImage>/Users/satinder/Documents/Github/iguana/assets/installer_imgs/supernet-iguana-logo.png</logoImage>
@ -194,6 +194,7 @@
            <program>${system_temp_directory}/vc_redist.x64.exe</program>
            <programArguments>/install /passive</programArguments>
            <progressText>Downloading Visual C++ Redistributable for Visual Studio 2015</progressText>
+            <showMessageOnError>0</showMessageOnError>
        </runProgram>
        <showProgressDialog>
            <title>Downloading files</title>
@ -220,6 +221,7 @@
            <program>${system_temp_directory}/vc_redist.x86.exe</program>
            <programArguments>/install /passive</programArguments>
            <progressText>Downloading Visual C++ Redistributable for Visual Studio 2015</progressText>
+            <showMessageOnError>0</showMessageOnError>
        </runProgram>
    </readyToInstallActionList>
    <postInstallationActionList>
--- a/assets/bin/linux64/komodo-cli
+++ b/assets/bin/linux64/komodo-cli
--- a/assets/bin/linux64/komodod
+++ b/assets/bin/linux64/komodod
--- a/gui/index.html
+++ b/gui/index.html
@ -3,22 +3,29 @@
    <head>
        <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
        <link rel="stylesheet" href="EasyDEX-GUI/assets/global/css/bootstrap.min.css">
+        <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="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;">Starting Wallet. Please wait...</div>
+            <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 id="pulse"></div></div>
        </div>
        <script type="text/javascript">
            $(document).ready( function() {
+                $("#pulse").jRoll({
+                    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...')
                StartIguana();
                
                var portcheck;
@ -28,6 +35,8 @@
                        console.log(check[0])
                        if (check[0] !== 'error') {
                            stopcheck();
+                            $('#loading_status_text').text('Connecting to Basilisk Network...')
+                            EDEX_DEXgetinfoAll()
                            window.close();
                        }
                    },2000);
--- a/gui/jRoll.min.css
+++ b/gui/jRoll.min.css
--- a/gui/jRoll.min.js
+++ b/gui/jRoll.min.js
--- a/gui/loading.gif
+++ b/gui/loading.gif
--- a/gui/loading.js
+++ b/gui/loading.js
@ -52,4 +52,76 @@ function StartIguana() {
            console.log(error);
        }
    });
+}
+
+function EDEX_DEXnotarychains() {
+    var result = [];
+
+    var tmpIguanaRPCAuth = 'tmpIgRPCUser@'+sessionStorage.getItem('IguanaRPCAuth');
+    var ajax_data = {'userpass':tmpIguanaRPCAuth,"agent":"dpow","method":"notarychains"}
+    console.log(ajax_data);
+    $.ajax({
+        async: false,
+        type: 'POST',
+        data: JSON.stringify(ajax_data),
+        url: 'http://127.0.0.1:7778',
+        //dataType: 'text',
+        success: function(data, textStatus, jqXHR) {
+            var AjaxOutputData = JSON.parse(data);
+            //console.log('== EDEX_DEXnotarychains Data OutPut ==');
+            //console.log(AjaxOutputData);
+            result.push(AjaxOutputData);
+        },
+        error: function(xhr, textStatus, error) {
+            console.log(xhr.statusText);
+            if ( xhr.readyState == 0 ) {
+                Iguana_ServiceUnavailable();
+            }
+            console.log(textStatus);
+            console.log(error);
+        }
+    });
+    //console.log(result);
+    return result[0];
+}
+
+
+function EDEX_DEXgetinfoAll() {
+    var result = [];
+
+    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);
+        $.ajax({
+            async: false,
+            type: 'POST',
+            data: JSON.stringify(ajax_data),
+            url: 'http://127.0.0.1:7778',
+            //dataType: 'text',
+            success: function(data, textStatus, jqXHR) {
+                var AjaxOutputData = JSON.parse(data); //Ajax output gets the whole list of unspent coin with addresses
+                //console.log('== EDEX_DEXgetinfoAll Data OutPut ==');
+                console.log(AjaxOutputData);
+                result.push(AjaxOutputData);
+                //if (AjaxOutputData.error === 'less than required responses') {
+                //}
+            },
+            error: function(xhr, textStatus, error) {
+                console.log(xhr.statusText);
+                if ( xhr.readyState == 0 ) {
+                    Iguana_ServiceUnavailable();
+                }
+                console.log(textStatus);
+                console.log(error);
+            }
+        });
+    });
+
+    //console.log(result);
+    return result[0];
 }