diff --git a/goBlockchainDataAnalysis b/goBlockchainDataAnalysis index a6b9017..50e4f87 100755 Binary files a/goBlockchainDataAnalysis and b/goBlockchainDataAnalysis differ diff --git a/web/app.js b/web/app.js index 8b27851..d1f024b 100644 --- a/web/app.js +++ b/web/app.js @@ -8,6 +8,7 @@ angular.module('webApp', [ 'ngRoute', 'ngMessages', 'angularBootstrapMaterial', + 'angular-svg-round-progressbar', 'app.navbar', 'app.main', 'app.network', diff --git a/web/bower.json b/web/bower.json index 7ebcd36..2ae49b9 100644 --- a/web/bower.json +++ b/web/bower.json @@ -14,6 +14,7 @@ "angular-bootstrap": "^2.5.0", "angular-messages": "^1.6.5", "components-font-awesome": "^4.7.0", - "sankeyjs": "^1.2.2" + "sankeyjs": "^1.2.2", + "angular-svg-round-progressbar": "0.4.8" } } diff --git a/web/index.html b/web/index.html index fa15f55..d5c29f2 100644 --- a/web/index.html +++ b/web/index.html @@ -24,13 +24,14 @@ --> - -
+
+ +
@@ -52,6 +53,9 @@ + + + diff --git a/web/views/main/main.html b/web/views/main/main.html index 54149ac..7edcb75 100644 --- a/web/views/main/main.html +++ b/web/views/main/main.html @@ -1,104 +1,135 @@
-
-
-
-

{{stats.realblockcount}}/{{stats.blockcount}} Blocks with content

-
-
-
-
+
+
+
+

{{stats.realblockcount}}/{{stats.blockcount}} Blocks with content

+
+
+
-
-
-
-

{{stats.txcount}} Txs

-
-
-
-
+
+
+
+
+

{{stats.txcount}} Txs

+
+
+
-
-
-
-

{{stats.addrcount}} Addr

-
-
-
-
+
+
+
+
+

{{stats.addrcount}} Addr

+
+
+
-
-
-
-

300-500 Min-Max Block Size

-
-
-
-
-
+
+
+
+
+ {{current}}/{{max}} +
+
+
+
+
+
+ {{current}}/{{max}} +
+
-
-
-
-

Last addresses used

-
-
-
-
-

{{address.hash}}

-
-
-
-
- -
-
-
-
-

Last 24 hours Tx/Hour +
+
+
+

Last 24 hours Tx/Hour View more

-
-
- - -
-
-
-
-

Last 7 days Tx/Hour - View more

-
-
- +
+
+ -
+
+ +
+
+

Tx/Day Last 7 Days

+
+
+ + +
-
-
-
-

Tx/Day Last 7 Days

-
-
- - -
-
+
+
+
+
+

Last 7 days Tx/Hour + View more

+
+
+ + +
+

-
-
-
-

Last Tx with amount

-
-
- - - - - - - - - - - - - - - - - - - - -
BlockHeightFromToAmount
{{tx.blockheight}}{{tx.from}}{{tx.to}}{{tx.label}}View
-
-
+ + + BlockHeight + From + To + Amount + + + + + + {{tx.blockheight}} + {{tx.from}} + {{tx.to}} + {{tx.amount}} + View + + + +
+
diff --git a/web/views/main/main.js b/web/views/main/main.js index 6d0931c..d6c1c5e 100644 --- a/web/views/main/main.js +++ b/web/views/main/main.js @@ -11,6 +11,8 @@ angular.module('app.main', ['ngRoute']) .controller('MainCtrl', function($scope, $http) { $scope.stats = []; + $scope.current=0; + $scope.max=100; $scope.blockProgress={ "width": "0%" }; @@ -22,11 +24,12 @@ angular.module('app.main', ['ngRoute']) $scope.blockProgress={ "width": tantpercent+"%" }; + $scope.current=80; }, function(data, status, headers, config) { console.log('data error'); }); - - + + //last addr $scope.addresses = []; $http.get(urlapi + 'lastaddr') diff --git a/web/views/sidebar.html b/web/views/sidebar.html index f92c19d..32dceac 100644 --- a/web/views/sidebar.html +++ b/web/views/sidebar.html @@ -1,5 +1,10 @@ -
+