Merge branch 'master' of github.com:bitpay/insight into feature/realtime-sync-info
Conflicts: public/views/footer.html
This commit is contained in:
commit
2d176a6431
|
@ -52,8 +52,12 @@ var getTransaction = function(txid, cb) {
|
|||
*/
|
||||
exports.list = function(req, res, next) {
|
||||
var bId = req.query.block;
|
||||
var aId = req.query.address;
|
||||
var limit = req.query.limit || 1000;
|
||||
var addrStr = req.query.address;
|
||||
var page = req.query.pageNum;
|
||||
var pageLength = 20;
|
||||
var pagesTotal = 1;
|
||||
var txLength;
|
||||
var txs;
|
||||
|
||||
if (bId) {
|
||||
Block.fromHashWithInfo(bId, function(err, block) {
|
||||
|
@ -63,14 +67,28 @@ exports.list = function(req, res, next) {
|
|||
return next();
|
||||
}
|
||||
|
||||
async.mapSeries(block.info.tx, getTransaction,
|
||||
txLength = block.info.tx.length;
|
||||
|
||||
if (page) {
|
||||
var spliceInit = page * pageLength;
|
||||
txs = block.info.tx.splice(spliceInit, pageLength);
|
||||
pagesTotal = Math.ceil(txLength / pageLength);
|
||||
}
|
||||
else {
|
||||
txs = block.info.tx;
|
||||
}
|
||||
|
||||
async.mapSeries(txs, getTransaction,
|
||||
function(err, results) {
|
||||
res.jsonp(results);
|
||||
res.jsonp({
|
||||
pagesTotal: pagesTotal,
|
||||
txs: results
|
||||
});
|
||||
});
|
||||
});
|
||||
}
|
||||
else if (aId) {
|
||||
var a = Address.new(aId);
|
||||
else if (addrStr) {
|
||||
var a = Address.new(addrStr);
|
||||
|
||||
a.update(function(err) {
|
||||
if (err && !a.totalReceivedSat) {
|
||||
|
@ -79,23 +97,25 @@ exports.list = function(req, res, next) {
|
|||
return next();
|
||||
}
|
||||
|
||||
async.mapSeries(a.transactions, getTransaction,
|
||||
txLength = a.transactions.length;
|
||||
|
||||
if (page) {
|
||||
var spliceInit = page * pageLength;
|
||||
txs = a.transactions.splice(spliceInit, pageLength);
|
||||
pagesTotal = Math.ceil(txLength / pageLength);
|
||||
}
|
||||
else {
|
||||
txs = a.transactions;
|
||||
}
|
||||
|
||||
async.mapSeries(txs, getTransaction,
|
||||
function(err, results) {
|
||||
res.jsonp(results);
|
||||
res.jsonp({
|
||||
pagesTotal: pagesTotal,
|
||||
txs: results
|
||||
});
|
||||
});
|
||||
});
|
||||
}
|
||||
else {
|
||||
Transaction
|
||||
.find()
|
||||
.limit(limit)
|
||||
.sort('-time')
|
||||
.exec(function(err, txs) {
|
||||
if (err) {
|
||||
res.status(500).send(err);
|
||||
} else {
|
||||
res.jsonp(txs);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
};
|
||||
|
|
|
@ -38,6 +38,7 @@ h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6 {
|
|||
.m20h {margin: 0 20px;}
|
||||
.m5v {margin: 5px 0;}
|
||||
.m20v {margin: 20px 0;}
|
||||
.m10v {margin: 10px 0;}
|
||||
.m50v {margin: 50px 0;}
|
||||
.m10b {margin-bottom: 10px;}
|
||||
|
||||
|
@ -119,6 +120,7 @@ h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6 {
|
|||
}
|
||||
|
||||
.col-gray {
|
||||
width: 267px;
|
||||
background-color: #F4F4F4;
|
||||
padding: 15px;
|
||||
margin-top: 21px;
|
||||
|
|
|
@ -3,12 +3,16 @@
|
|||
angular.module('insight.transactions').controller('transactionsController',
|
||||
function ($scope, $rootScope, $routeParams, $location, Global, Transaction, TransactionsByBlock, TransactionsByAddress, get_socket) {
|
||||
$scope.global = Global;
|
||||
$scope.loading = false;
|
||||
$scope.loadedBy = null;
|
||||
|
||||
var pageNum = 0;
|
||||
var pagesTotal = 1;
|
||||
|
||||
$scope.findThis = function() {
|
||||
$scope.findTx($routeParams.txId);
|
||||
};
|
||||
|
||||
|
||||
$scope.aggregateItems = function(items) {
|
||||
var l = items.length;
|
||||
|
||||
|
@ -16,12 +20,12 @@ angular.module('insight.transactions').controller('transactionsController',
|
|||
var tmp = {};
|
||||
var u=0;
|
||||
// TODO multiple output address
|
||||
//
|
||||
//
|
||||
for(var i=0; i < l; i++) {
|
||||
|
||||
var notAddr = false;
|
||||
|
||||
// non standard input
|
||||
// non standard input
|
||||
if (items[i].scriptSig && !items[i].addr) {
|
||||
items[i].addr = 'Unparsed address [' + u++ + ']';
|
||||
items[i].notAddr = true;
|
||||
|
@ -57,7 +61,6 @@ angular.module('insight.transactions').controller('transactionsController',
|
|||
return (ret);
|
||||
};
|
||||
|
||||
|
||||
$scope.processTX = function(tx) {
|
||||
tx.vinSimple = $scope.aggregateItems(tx.vin);
|
||||
tx.voutSimple = $scope.aggregateItems(tx.vout);
|
||||
|
@ -84,27 +87,54 @@ angular.module('insight.transactions').controller('transactionsController',
|
|||
});
|
||||
};
|
||||
|
||||
$scope.byBlock = function(bId) {
|
||||
TransactionsByBlock.query({
|
||||
block: bId
|
||||
}, function(txs) {
|
||||
angular.forEach(txs, function(tx) {
|
||||
$scope.processTX(tx);
|
||||
});
|
||||
$scope.txs = txs;
|
||||
$scope.byBlock = function() {
|
||||
TransactionsByBlock.get({
|
||||
block: $routeParams.blockHash,
|
||||
pageNum: pageNum
|
||||
}, function(data) {
|
||||
$scope.paginate(data);
|
||||
});
|
||||
};
|
||||
|
||||
$scope.byAddress = function(aId) {
|
||||
TransactionsByAddress.query({
|
||||
address: aId
|
||||
}, function(txs) {
|
||||
angular.forEach(txs, function(tx) {
|
||||
$scope.processTX(tx);
|
||||
});
|
||||
$scope.txs = txs;
|
||||
$scope.byAddress = function () {
|
||||
TransactionsByAddress.get({
|
||||
address: $routeParams.addrStr,
|
||||
pageNum: pageNum
|
||||
}, function(data) {
|
||||
$scope.paginate(data);
|
||||
});
|
||||
};
|
||||
|
||||
$scope.paginate = function (data) {
|
||||
$scope.loading = false;
|
||||
|
||||
pagesTotal = data.pagesTotal;
|
||||
pageNum += 1;
|
||||
|
||||
data.txs.forEach(function(tx) {
|
||||
$scope.processTX(tx);
|
||||
$scope.txs.push(tx);
|
||||
});
|
||||
};
|
||||
|
||||
$scope.load = function(from) {
|
||||
$scope.loadedBy = from;
|
||||
$scope.loadMore();
|
||||
};
|
||||
|
||||
$scope.loadMore = function() {
|
||||
if (pageNum < pagesTotal && !$scope.loading) {
|
||||
$scope.loading = true;
|
||||
|
||||
if ($scope.loadedBy === 'address') {
|
||||
$scope.byAddress();
|
||||
}
|
||||
else {
|
||||
$scope.byBlock();
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
var socket = get_socket($scope);
|
||||
socket.on('atx', function(tx) {
|
||||
console.log('atx '+tx.txid);
|
||||
|
|
|
@ -1 +1,25 @@
|
|||
'use strict';
|
||||
'use strict';
|
||||
|
||||
angular.module('insight.address').directive('whenScrolled', ['$window', function($window) {
|
||||
return {
|
||||
link: function(scope, elm, attr) {
|
||||
var pageHeight, clientHeight, scrollPos;
|
||||
$window = angular.element($window);
|
||||
|
||||
var handler = function() {
|
||||
pageHeight = window.document.documentElement.scrollHeight;
|
||||
clientHeight = window.document.documentElement.clientHeight;
|
||||
scrollPos = window.pageYOffset;
|
||||
|
||||
if (pageHeight - (scrollPos + clientHeight) === 0) {
|
||||
scope.$apply(attr.whenScrolled);
|
||||
}
|
||||
};
|
||||
|
||||
$window.on('scroll', handler);
|
||||
scope.$on('$destroy', function() {
|
||||
return $window.off('scroll', handler);
|
||||
});
|
||||
}
|
||||
};
|
||||
}]);
|
||||
|
|
|
@ -1,45 +1,44 @@
|
|||
<section data-ng-controller="AddressController" data-ng-init="findOne()">
|
||||
<div class="page-header">
|
||||
<h1>
|
||||
Address
|
||||
<small>Addresses are identifiers which you use to send bitcoins to another person.</small>
|
||||
</h1>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col-lg-9">
|
||||
<table class="table table-striped">
|
||||
<tbody>
|
||||
<tr>
|
||||
<td>Address</td>
|
||||
<td><a href="/#!/address/{{address.addrStr}}">{{address.addrStr}}</a></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Total Received</td>
|
||||
<td>{{address.totalReceived}} BTC</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Total Sent</td>
|
||||
<td>{{address.totalSent}} BTC</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Final Balance</td>
|
||||
<td>{{address.balance}} BTC</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>No. Transactions</td>
|
||||
<td>{{address.txApperances}}</td>
|
||||
</tr>
|
||||
<div class="col-md-3">
|
||||
<div class="bs-sidebar hidden-print affix col-gray">
|
||||
<div class="text-center m10v">
|
||||
<qrcode size="200" data="{{address.addrStr}}"></qrcode>
|
||||
<h4><span class="glyphicon glyphicon-qrcode"></span> Address</h4>
|
||||
<a class="ellipsis" href="/#!/address/{{address.addrStr}}">{{address.addrStr}}</a>
|
||||
</div>
|
||||
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
<div class="col-lg-3">
|
||||
<qrcode size="200" data="{{address.addrStr}}"></qrcode>
|
||||
</div>
|
||||
</div>
|
||||
<div class="m50v">
|
||||
<h4>Summary</h4>
|
||||
<table class="table">
|
||||
<tbody>
|
||||
<tr>
|
||||
<td class="small">Total Received</td>
|
||||
<td class="address ellipsis text-right">{{address.totalReceived}} BTC</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="small">Total Sent</td>
|
||||
<td class="address ellipsis text-right">{{address.totalSent}} BTC</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="small">Final Balance</td>
|
||||
<td class="address ellipsis text-right">{{address.balance}} BTC</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="small">No. Transactions</td>
|
||||
<td class="address ellipsis text-right">{{address.txApperances}}</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</div> <!-- END OF TRANSACTIONS TABLE -->
|
||||
</div>
|
||||
</div> <!-- END OF COL-MD-3 -->
|
||||
|
||||
<div data-ng-controller="transactionsController" data-ng-init="byAddress(params.addrStr)">
|
||||
<h2>Transactions <small>Transactions contained within this block</small></h2>
|
||||
<div data-ng-include src="'/views/transaction/list.html'"></div>
|
||||
</div>
|
||||
<div class="col-md-9">
|
||||
<div data-ng-controller="transactionsController" data-ng-init="load('address')">
|
||||
<h2>Transactions <small>Transactions contained within this block</small></h2>
|
||||
<div data-ng-include src="'/views/transaction/list.html'" when-scrolled="loadMore()"></div>
|
||||
</div>
|
||||
</div>
|
||||
</div> <!-- END OF ROW -->
|
||||
</section>
|
||||
|
|
|
@ -8,33 +8,32 @@
|
|||
</div>
|
||||
<h1 data-ng-if="block">Block #{{ block.height }}</h1>
|
||||
</div>
|
||||
|
||||
<div class="m50v" data-ng-show="!tx.isCoinBase">
|
||||
<h4>Hashes</h4>
|
||||
<table class="table">
|
||||
<tbody>
|
||||
<tr>
|
||||
<td> <small>Hash </small></td>
|
||||
<td class="small"> Hash </td>
|
||||
<td><a class="address ellipsis" href="/#!/block/{{block.hash}}">{{block.hash}}</a></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><small> Previous Block</small></td>
|
||||
<td class="small"> Previous Block</td>
|
||||
<td><a class="address ellipsis" href="/#!/block/{{block.previousblockhash}}">{{block.previousblockhash}}</a></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><small> Next Block</small></td>
|
||||
<td class="small"> Next Block</td>
|
||||
<td><a class="address ellipsis" href="/#!/block/{{block.nextblockhash}}">{{block.nextblockhash}}</a></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><small> Merkle Root</small></td>
|
||||
<td class="small">Merkle Root</td>
|
||||
<td> <p class="address ellipsis"> {{block.merkleroot}} </p> </td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
</div> <!-- END OF TRANSACTIONS TABLE -->
|
||||
|
||||
</div>
|
||||
</div> <!-- END OF COL-GRAY -->
|
||||
</div> <!-- END OF COL-GRAY -->
|
||||
|
||||
<div class="col-md-9">
|
||||
<h3>Summary</h3>
|
||||
|
@ -85,9 +84,9 @@
|
|||
</div>
|
||||
</div><!-- END OF ROW -->
|
||||
|
||||
<div data-ng-controller="transactionsController" data-ng-init="byBlock(params.blockHash)">
|
||||
<div data-ng-controller="transactionsController" data-ng-init="load('block')">
|
||||
<h2>Transactions <small >Transactions contained within this block</small></h2>
|
||||
<div data-ng-include src="'/views/transaction/list.html'"></div>
|
||||
<div data-ng-include src="'/views/transaction/list.html'" when-scrolled="loadMore()"></div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
@ -1,6 +1,3 @@
|
|||
<div>
|
||||
<div class="container">
|
||||
<p class="text-center text-muted"><a href="/">Insight</a></p>
|
||||
</div>
|
||||
<div class="container">
|
||||
<p class="text-center text-muted"><a href="/">Insight</a></p>
|
||||
</div>
|
||||
|
||||
|
|
|
@ -1,9 +1,9 @@
|
|||
<div class="panel panel-default" data-ng-show="!txs.length">
|
||||
<div class="panel-body">
|
||||
Loading...
|
||||
</div>
|
||||
</div>
|
||||
<div class="alert alert-warning" data-ng-show="txs.length && !txs[0].txid">There are not transactions</div>
|
||||
<div class="block-tx fader" data-ng-show="txs && txs[0].txid" data-ng-repeat="tx in txs">
|
||||
<div data-ng-include src="'/views/transaction/tx.html'"></div>
|
||||
</div>
|
||||
<div class="panel panel-default" data-ng-show="!txs.length || loading">
|
||||
<div class="panel-body">
|
||||
Loading...
|
||||
</div>
|
||||
</div>
|
||||
|
|
Loading…
Reference in New Issue