diff --git a/app/models/Transaction.js b/app/models/Transaction.js
index e80ab5b..6400789 100644
--- a/app/models/Transaction.js
+++ b/app/models/Transaction.js
@@ -11,9 +11,9 @@ var mongoose = require('mongoose'),
Address = require('bitcore/Address').class(),
networks = require('bitcore/networks'),
util = require('bitcore/util/util'),
- bignum = require('BigNum'),
+ bignum = require('bignum'),
config = require('../../config/config');
-
+
/**
*/
@@ -48,7 +48,7 @@ TransactionSchema.statics.fromId = function(txid, cb) {
TransactionSchema.statics.fromIdWithInfo = function(txid, cb) {
// TODO Should we go to mongoDB first? Now, no extra information is stored at mongo.
-
+
this.fromId(txid, function(err, tx) {
if (err) return cb(err);
diff --git a/app/views/includes/foot.jade b/app/views/includes/foot.jade
index ad48757..2b10e08 100755
--- a/app/views/includes/foot.jade
+++ b/app/views/includes/foot.jade
@@ -10,6 +10,8 @@ script(type='text/javascript', src='/lib/angular/angular.js')
script(type='text/javascript', src='/lib/angular-cookies/angular-cookies.js')
script(type='text/javascript', src='/lib/angular-resource/angular-resource.js')
script(type='text/javascript', src='/lib/angular-route/angular-route.js')
+script(type='text/javascript', src='/lib/qrcode-generator/js/qrcode.js')
+script(type='text/javascript', src='/lib/angular-qrcode/qrcode.js')
//Angular UI
script(type='text/javascript', src='/lib/angular-bootstrap/ui-bootstrap.js')
@@ -33,4 +35,5 @@ script(type='text/javascript', src='/js/controllers/index.js')
script(type='text/javascript', src='/js/controllers/header.js')
script(type='text/javascript', src='/js/controllers/blocks.js')
script(type='text/javascript', src='/js/controllers/transactions.js')
+script(type='text/javascript', src='/js/controllers/address.js')
script(type='text/javascript', src='/js/init.js')
diff --git a/bower.json b/bower.json
index 46be4c5..60f6edb 100644
--- a/bower.json
+++ b/bower.json
@@ -9,6 +9,7 @@
"angular-route": "latest",
"bootstrap": "3.0.3",
"angular-bootstrap": "0.9.0",
- "angular-ui-utils": "0.1.0"
+ "angular-ui-utils": "0.1.0",
+ "angular-qrcode": "latest"
}
-}
\ No newline at end of file
+}
diff --git a/public/js/app.js b/public/js/app.js
index ca50d77..cfc1f8c 100755
--- a/public/js/app.js
+++ b/public/js/app.js
@@ -1,8 +1,9 @@
'use strict';
-angular.module('mystery', ['ngCookies', 'ngResource', 'ngRoute', 'ui.bootstrap', 'ui.route', 'mystery.system', 'mystery.index', 'mystery.blocks', 'mystery.transactions']);
+angular.module('mystery', ['ngCookies', 'ngResource', 'ngRoute', 'ui.bootstrap', 'ui.route', 'mystery.system', 'mystery.index', 'mystery.blocks', 'mystery.transactions', 'monospaced.qrcode', 'mystery.address']);
angular.module('mystery.system', []);
angular.module('mystery.index', []);
angular.module('mystery.blocks', []);
angular.module('mystery.transactions', []);
+angular.module('mystery.address', []);
diff --git a/public/js/config.js b/public/js/config.js
index 905cd7f..c176160 100755
--- a/public/js/config.js
+++ b/public/js/config.js
@@ -19,6 +19,9 @@ angular.module('mystery').config(['$routeProvider',
when('/blocks-date/:blockDate', {
templateUrl: 'views/blocks/list.html'
}).
+ when('/address/:address', {
+ templateUrl: 'views/address.html'
+ }).
otherwise({
redirectTo: '/'
});
diff --git a/public/js/controllers/address.js b/public/js/controllers/address.js
new file mode 100644
index 0000000..e921d98
--- /dev/null
+++ b/public/js/controllers/address.js
@@ -0,0 +1,20 @@
+'use strict';
+
+angular.module('mystery.address').controller('AddressController', ['$scope', function ($scope) {
+
+ //example data
+ $scope.address = '1JmTTDcksW7A6GN7JnxuXkMAXsVN9zmgm1';
+ $scope.hash160 = '77ad7d08aaa9cf489ea4e468eaeb892b85f71e27';
+ $scope.transactions = [
+ {
+ hash: '49a1d01759690476dbeec4a8efd969c09c6d4269ea2d88f4d9d4f098f021413c',
+ time: 1234123445,
+ amount: 0.3
+ },
+ {
+ hash: 'cce948b422a4d485900fb82e64458720eb89f545af3f07ddf7d18660f9f881e9',
+ time: 1234123445,
+ amount: 0.1
+ }
+ ];
+}]);
diff --git a/public/views/address.html b/public/views/address.html
new file mode 100644
index 0000000..45a0149
--- /dev/null
+++ b/public/views/address.html
@@ -0,0 +1,60 @@
+
+
+
+
+
+
+ Address |
+ {{address}} |
+
+
+ Hash160 |
+ {{hash160}} |
+
+
+ Total Output |
+ 1 BTC |
+
+
+ Total Input |
+ 0.2 BTC |
+
+
+ Current balance |
+ 10.2 BTC |
+
+
+
+
+
+
+
+
+
+ Transactions
+ transactions this address relates to
+
+
+
+
+
+ Transaction Hash |
+ Datetime |
+ Transacted amount |
+
+
+
+
+ {{transaction.hash}} |
+ {{transaction.time | date:'medium'}} |
+ {{transaction.amount}} BTC |
+
+
+
+
+
diff --git a/public/views/blocks/list.html b/public/views/blocks/list.html
index 042810e..d831569 100644
--- a/public/views/blocks/list.html
+++ b/public/views/blocks/list.html
@@ -19,7 +19,7 @@
{{block.hash}} |
- {{block.time}} |
+ {{block.time * 1000 | date:'medium'}} |