anders/Wallet
1
0
Fork 0
Code Issues Projects Releases Packages Wiki Activity

better signin page

Browse source
This commit is contained in:
Matias Alejo Garcia 2014-04-17 12:37:10 -03:00
commit e28be27bf3
3 changed files with 36 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

55
index.html
View file

@ -64,17 +64,6 @@
Connecting to wallet... Connecting to wallet...
</div> </div>
<div ng-show="!loading"> <div ng-show="!loading">
<div class="row">
<div class="large-6 columns">
<h3>Open a Existing Wallet</h3>
<select class="form-control" ng-model="selectedWalletId" ng-options="walletId for walletId in listWalletIds()">
</select>
</div>
<div class="large-3 columns">
<button class="button primary expand round" type="button" ng-click="open(selectedWalletId)">Open</button>
</div>
</div>
<hr>
<div class="row"> <div class="row">
<div class="large-6 columns"> <div class="large-6 columns">
<h3>Join a Network Wallet</h3> <h3>Join a Network Wallet</h3>
@ -85,14 +74,35 @@
</div> </div>
</div> </div>
<hr> <hr>
<div class="row"> <div ng-show="walletIds.length === 0">
<div class="large-6 columns"> <div class="row">
<h3>Create a New Wallet</h3> <div class="large-6 columns">
</div> <h3>Create a New Wallet</h3>
<div class="large-3 columns"> </div>
<button class="button secondary expand round" ng-click="create()">Create</button> <div class="large-3 columns">
<button class="button secondary expand round" ng-click="create()">Create</button>
</div>
</div> </div>
</div> </div>
<div ng-show="walletIds.length>0">
<div class="row">
<div class="large-6 columns">
<h3>Open a Existing Wallet</h3>
<select class="form-control" ng-model="selectedWalletId" ng-options="walletId for walletId in walletIds">
</select>
</div>
<div class="large-3 columns">
<button class="button primary expand round" type="button" ng-click="open(selectedWalletId)">Open</button>
</div>
</div>
<div class="row">
<div class="text-center">
<a ng-click="create()">Or create a new wallet</a>
</div>
</div>
</div>
<hr>
</div> </div>
</div> </div>
</script> </script>
@ -127,6 +137,11 @@
</button> </button>
</div> </div>
</div> </div>
<div class="row">
<div class="text-center">
<a href="#signin">Go back</a>
</div>
</div>
</div> </div>
</div> </div>
</script> </script>
@ -152,11 +167,11 @@
</ul> </ul>
</div> </div>
<div class="large-6 columns p70l"> <div class="large-6 columns p70l">
<h3 class="panel-title">Copayers ({{$root.wallet.network.connectedPeers.length}}/{{$root.wallet.publicKeyRing.requiredCopayers}})</h3> <h3 class="panel-title">Online Copayers: {{$root.wallet.network.connectedPeers.length}}</h3>
<ul class="no-bullet"> <ul class="no-bullet">
<li class="panel" ng-repeat="copayer in $root.wallet.network.connectedPeers"> <li class="panel" ng-repeat="copayer in $root.wallet.network.connectedPeers">
<span ng-if="copayer == $root.peerId"> You ({{$root.peerId}})<i class="fi-check size-24"></i></span> <span ng-if="copayer == $root.wallet.network.peerId"> You ({{copayer}})<i class="fi-check size-24"></i></span>
<span ng-if="copayer != $root.peerId">{{copayer}}</span> <span ng-if="copayer !== $root.wallet.network.peerId">{{copayer}}</span>
<span> <span>
<i class="fi-check size-16 panel-sign right p5h br100"></i> <i class="fi-check size-16 panel-sign right p5h br100"></i>
</span> </span>

7
js/controllers/signin.js
View file

@ -9,11 +9,8 @@ angular.module('copay.signin').controller('SigninController',
// $rootScope.peerId = peerData ? peerData.peerId : null; // $rootScope.peerId = peerData ? peerData.peerId : null;
$scope.loading = false; $scope.loading = false;
$scope.selectedWalletId = false; $scope.walletIds = walletFactory.getWalletIds();
$scope.selectedWalletId = $scope.walletIds?$scope.walletIds.shift():null;
$scope.listWalletIds = function() {
return walletFactory.getWalletIds();
};
$scope.create = function() { $scope.create = function() {
$location.path('setup'); $location.path('setup');

1
js/models/core/WalletFactory.js
View file

@ -156,7 +156,6 @@ WalletFactory.prototype.openRemote = function(peedId) {
opts.totalCopayers = totalCopayers; opts.totalCopayers = totalCopayers;
var w = new Wallet(opts); var w = new Wallet(opts);
w.store(); w.store();
this.addWalletId(w.id);
return w; return w;
}; };