diff --git a/web/app.js b/web/app.js index 34f9f7f..35a15d2 100644 --- a/web/app.js +++ b/web/app.js @@ -17,7 +17,11 @@ angular.module('webApp', [ 'app.network', 'app.addressNetwork', 'app.sankey', - 'app.dateAnalysis' + 'app.dateAnalysis', + 'app.blocks', + 'app.txs', + 'app.addresses', + 'app.beta' ]). config(['$locationProvider', '$routeProvider', function($locationProvider, $routeProvider) { $locationProvider.hashPrefix('!'); diff --git a/web/css/bootstrapMaterialDarkOverwrite.css b/web/css/bootstrapMaterialDarkOverwrite.css index 87f4e1f..4713bdc 100644 --- a/web/css/bootstrapMaterialDarkOverwrite.css +++ b/web/css/bootstrapMaterialDarkOverwrite.css @@ -4,6 +4,9 @@ body { background: #424242!important; } +a { + color: #9575CD!important; +} .panel-heading { border-radius: 0px!important; } @@ -25,7 +28,7 @@ body { color: #ffffff!important; } .list-group-item a { - color: #512DA8!important; + color: #9575CD!important; } .list-group-item-text { color: #9575CD!important; diff --git a/web/css/style.css b/web/css/style.css index e3a3690..c9b595a 100644 --- a/web/css/style.css +++ b/web/css/style.css @@ -32,7 +32,7 @@ /* sidebar */ .o_sidebar a { - color: white; + color: white!important; padding: 10px; } diff --git a/web/index.html b/web/index.html index 9e0b767..fbc6c6a 100644 --- a/web/index.html +++ b/web/index.html @@ -83,6 +83,10 @@ + + + + diff --git a/web/views/addresses/addresses.html b/web/views/addresses/addresses.html new file mode 100644 index 0000000..a6a7ddc --- /dev/null +++ b/web/views/addresses/addresses.html @@ -0,0 +1,16 @@ +
+
+
+
+

Last addresses used

+
+
+
+
+ {{address.hash}} +
+
+
+
+
+
diff --git a/web/views/addresses/addresses.js b/web/views/addresses/addresses.js new file mode 100644 index 0000000..42fe3fc --- /dev/null +++ b/web/views/addresses/addresses.js @@ -0,0 +1,24 @@ +'use strict'; + +angular.module('app.addresses', ['ngRoute']) + + .config(['$routeProvider', function($routeProvider) { + $routeProvider.when('/addresses', { + templateUrl: 'views/addresses/addresses.html', + controller: 'AddressesCtrl' + }); + }]) + + .controller('AddressesCtrl', function($scope, $http) { + + //last addr + $scope.addresses = []; + $http.get(urlapi + 'lastaddr') + .then(function(data, status, headers, config) { + console.log(data); + $scope.addresses = data.data; + }, function(data, status, headers, config) { + console.log('data error'); + }); + + }); diff --git a/web/views/beta/beta.html b/web/views/beta/beta.html new file mode 100644 index 0000000..f591d8c --- /dev/null +++ b/web/views/beta/beta.html @@ -0,0 +1,11 @@ +
+
+ + Network + + + Sankey Diagram + + Known addresses +
+
diff --git a/web/views/beta/beta.js b/web/views/beta/beta.js new file mode 100644 index 0000000..6a88dd0 --- /dev/null +++ b/web/views/beta/beta.js @@ -0,0 +1,14 @@ +'use strict'; + +angular.module('app.beta', ['ngRoute']) + + .config(['$routeProvider', function($routeProvider) { + $routeProvider.when('/beta', { + templateUrl: 'views/beta/beta.html', + controller: 'BetaCtrl' + }); + }]) + + .controller('BetaCtrl', function($scope, $http, $routeParams) { + + }); diff --git a/web/views/blocks/blocks.html b/web/views/blocks/blocks.html new file mode 100644 index 0000000..94a0789 --- /dev/null +++ b/web/views/blocks/blocks.html @@ -0,0 +1,51 @@ +
+
+
+
+

Last Tx with amount

+
+
+ + + + + + + + + + + + + + + + + +
BlockHeightTxidInputOutput
+ + {{tx.blockheight}} + + + + {{tx.txid}} + + +
+ + {{vin.address}} + + :{{vin.amount}} +
+ 		+
+ + {{vout.address}} + + :{{vout.value}} +
+
+
+
+
+
diff --git a/web/views/blocks/blocks.js b/web/views/blocks/blocks.js new file mode 100644 index 0000000..e25cada --- /dev/null +++ b/web/views/blocks/blocks.js @@ -0,0 +1,24 @@ +'use strict'; + +angular.module('app.blocks', ['ngRoute']) + + .config(['$routeProvider', function($routeProvider) { + $routeProvider.when('/blocks', { + templateUrl: 'views/blocks/blocks.html', + controller: 'BlocksCtrl' + }); + }]) + + .controller('BlocksCtrl', function($scope, $http) { + + //last tx + $scope.txs = []; + $http.get(urlapi + 'lasttx') + .then(function(data, status, headers, config) { + console.log(data); + $scope.txs = data.data; + }, function(data, status, headers, config) { + console.log('data error'); + }); + + }); diff --git a/web/views/sidebar.html b/web/views/sidebar.html index b0bbaf5..17f706a 100644 --- a/web/views/sidebar.html +++ b/web/views/sidebar.html @@ -11,28 +11,33 @@
  • - - Network + + Address Network
  • - - Address Network + + Date Analysis
  • - - Sankey diagram + + Blocks
  • - - Date Analysis + + Transactions + +
    • +
  • + + Addresses
  • - - Timeline + + Beta
  • diff --git a/web/views/tx/tx.html b/web/views/tx/tx.html index 15d3859..9f9767b 100644 --- a/web/views/tx/tx.html +++ b/web/views/tx/tx.html @@ -6,6 +6,7 @@
    + BlockHeight: {{tx.blockheight}} diff --git a/web/views/txs/txs.html b/web/views/txs/txs.html new file mode 100644 index 0000000..94a0789 --- /dev/null +++ b/web/views/txs/txs.html @@ -0,0 +1,51 @@ +
    +
    +
    +
    +

    Last Tx with amount

    +
    +
    +
    + + + + + + + + + + + + + + + + +
    BlockHeightTxidInputOutput
    + + {{tx.blockheight}} + + + + {{tx.txid}} + + +
    + + {{vin.address}} + + :{{vin.amount}} +
    +     		+
    + + {{vout.address}} + + :{{vout.value}} +
    +
    +
    +
    + + diff --git a/web/views/txs/txs.js b/web/views/txs/txs.js new file mode 100644 index 0000000..1d68303 --- /dev/null +++ b/web/views/txs/txs.js @@ -0,0 +1,24 @@ +'use strict'; + +angular.module('app.txs', ['ngRoute']) + + .config(['$routeProvider', function($routeProvider) { + $routeProvider.when('/txs', { + templateUrl: 'views/txs/txs.html', + controller: 'TxsCtrl' + }); + }]) + + .controller('TxsCtrl', function($scope, $http) { + + //last tx + $scope.txs = []; + $http.get(urlapi + 'lasttx') + .then(function(data, status, headers, config) { + console.log(data); + $scope.txs = data.data; + }, function(data, status, headers, config) { + console.log('data error'); + }); + + });