RanchiMall/flocore-node
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix url for get transactions

Browse Source
This commit is contained in:
Gustavo Cortez 2014-01-15 10:22:07 -03:00
parent ab635332cc
commit dc6e64f8bc
4 changed files with 42 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/controllers/transactions.js
View File

@ -51,7 +51,11 @@ var getTransaction = function(txid, cb) {
}); });
}; };
exports.getTransactionsByBlock = function(req, res, next, bId) { exports.transactions = function(req, res, next) {
var bId = req.query.block;
var aId = req.query.address;
if (bId) {
Block.fromHashWithInfo(bId, function(err, block) { Block.fromHashWithInfo(bId, function(err, block) {
if (err && !block) { if (err && !block) {
console.log(err); console.log(err);
@ -64,10 +68,8 @@ exports.getTransactionsByBlock = function(req, res, next, bId) {
res.jsonp(results); res.jsonp(results);
}); });
}); });
}; }
else {
exports.getTransactionsByAddress = function(req, res, next, aId) {
var a = Address.new(aId); var a = Address.new(aId);
a.update(function(err) { a.update(function(err) {
@ -82,5 +84,7 @@ exports.getTransactionsByAddress = function(req, res, next, aId) {
res.jsonp(results); res.jsonp(results);
}); });
}); });
}
}; };

8
config/routes.js
View File

@ -19,13 +19,9 @@ module.exports = function(app) {
app.get('/api/tx/:txid', transactions.show); app.get('/api/tx/:txid', transactions.show);
app.param('txid', transactions.transaction); app.param('txid', transactions.transaction);
app.get('/api/txb/:bId', transactions.getTransactionsByBlock); app.get('/api/txs', transactions.transactions);
app.param('bId', transactions.getTransactionsByBlock);
app.get('/api/txa/:aId', transactions.getTransactionsByAddress);
app.param('aId', transactions.getTransactionsByAddress);
// Address routes
var addresses = require('../app/controllers/addresses'); var addresses = require('../app/controllers/addresses');
app.get('/api/addr/:addr', addresses.show); app.get('/api/addr/:addr', addresses.show);
app.param('addr', addresses.address); app.param('addr', addresses.address);

4
public/js/controllers/transactions.js
View File

@ -13,7 +13,7 @@ angular.module('mystery.transactions').controller('transactionsController', ['$s
$scope.byBlock = function(bId) { $scope.byBlock = function(bId) {
TransactionsByBlock.query({ TransactionsByBlock.query({
bId: bId block: bId
}, function(txs) { }, function(txs) {
$scope.txs = txs; $scope.txs = txs;
}); });
@ -21,7 +21,7 @@ angular.module('mystery.transactions').controller('transactionsController', ['$s
$scope.byAddress = function(aId) { $scope.byAddress = function(aId) {
TransactionsByAddress.query({ TransactionsByAddress.query({
aId: aId address: aId
}, function(txs) { }, function(txs) {
$scope.txs = txs; $scope.txs = txs;
}); });

8
public/js/services/transactions.js
View File

@ -21,14 +21,14 @@ angular.module('mystery.transactions').factory('Transaction', ['$resource', func
}]); }]);
angular.module('mystery.transactions').factory('TransactionsByBlock', ['$resource', function($resource) { angular.module('mystery.transactions').factory('TransactionsByBlock', ['$resource', function($resource) {
return $resource('/api/txb/:bId', { return $resource('/api/txs', {
bId: '@bId' block: '@block'
}); });
}]); }]);
angular.module('mystery.transactions').factory('TransactionsByAddress', ['$resource', function($resource) { angular.module('mystery.transactions').factory('TransactionsByAddress', ['$resource', function($resource) {
return $resource('/api/txa/:aId', { return $resource('/api/txs', {
aId: '@aId' address: '@address'
}); });
}]); }]);