diff --git a/bower.json b/bower.json index a0cd34687..f40475f67 100644 --- a/bower.json +++ b/bower.json @@ -9,6 +9,7 @@ "angular": "~1.2.x", "angular-bootstrap": "~0.10.0", "angular-route": "~1.2.14", + "angular-qrcode": "~3.1.0", "peerjs": "~0.3.8", "angular-mocks": "~1.2.14", "mocha": "~1.18.2", diff --git a/index.html b/index.html index 07f3eea59..73ae7eadf 100644 --- a/index.html +++ b/index.html @@ -33,27 +33,105 @@ + - - - + + + + + + + + + + + + - diff --git a/js/app.js b/js/app.js index 840cb0bd9..40fb1f1d2 100644 --- a/js/app.js +++ b/js/app.js @@ -7,7 +7,8 @@ angular.module('cosign',[ 'cosign.home', 'cosign.transactions', 'cosign.send', - 'cosign.backup' + 'cosign.backup', + 'monospaced.qrcode' ]); angular.module('cosign.header', []); diff --git a/js/controllers/home.js b/js/controllers/home.js index 6d1c5ff34..1f87ab2a2 100644 --- a/js/controllers/home.js +++ b/js/controllers/home.js @@ -3,4 +3,9 @@ angular.module('cosign.home').controller('HomeController', function($scope, $rootScope, $location) { $scope.title = 'Home'; + + $scope.addrs = [ + { addrStr: 'n3zUqNR7Bbbc4zJhPVj1vG2Lx66K3Xhzvb'}, + { addrStr: 'my9wnLwwUrwpNfEgSrWY62ymEGf1edKf4J'} + ]; }); diff --git a/js/controllers/transactions.js b/js/controllers/transactions.js index f8dcc9f6a..18cbe1333 100644 --- a/js/controllers/transactions.js +++ b/js/controllers/transactions.js @@ -3,4 +3,30 @@ angular.module('cosign.transactions').controller('TransactionsController', function($scope, $rootScope, $location) { $scope.title = 'Transactions'; + + $scope.txsinput = [ + { + fromAddr: "n3zUqNR7Bbbc4zJhPVj1vG2Lx66K3Xhzvb", + toAddr: "msvv2mDfE298s7boXwALq4Dqv77K3TWRZ1", + amount: 23.9982 + }, + { + fromAddr: "my9wnLwwUrwpNfEgSrWY62ymEGf1edKf4J", + toAddr: "monCusNiDuptf68rtr58hEjKpJt6cW6zwS", + amount: 2.22 + } + ]; + + $scope.txsoutput = [ + { + fromAddr: "n3zUqNR7Bbbc4zJhPVj1vG2Lx66K3Xhzvb", + toAddr: "msvv2mDfE298s7boXwALq4Dqv77K3TWRZ1", + amount: 23.9982 + }, + { + fromAddr: "my9wnLwwUrwpNfEgSrWY62ymEGf1edKf4J", + toAddr: "monCusNiDuptf68rtr58hEjKpJt6cW6zwS", + amount: 2.22 + } + ]; });