BTCPrivate
/
copay
mirror of https://github.com/BTCPrivate/copay.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #1064 from cmgustavo/feature/01-setup 

add steps to creation process
This commit is contained in:
Matias Alejo Garcia 2014-08-06 18:45:26 -03:00
parent 0ca9bbe86b c588d97fc3
commit 8e2802e1e7
5 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
js/controllers/join.js
View File

@ -2,6 +2,7 @@
angular.module('copayApp.controllers').controller('JoinController',
function($scope, $rootScope, $timeout, walletFactory, controllerUtils, Passphrase, notification) {
$rootScope.fromSetup = false;
$scope.loading = false;
// QR code Scanner

1
js/controllers/open.js
View File

@ -7,6 +7,7 @@ angular.module('copayApp.controllers').controller('OpenController',
v2 = o2.show.toLowerCase();
return v1 > v2 ? 1 : (v1 < v2) ? -1 : 0;
};
$rootScope.fromSetup = false;
$scope.loading = false;
$scope.wallets = walletFactory.getWallets().sort(cmp);
$scope.selectedWalletId = walletFactory.storage.getLastOpened() || ($scope.wallets[0] && $scope.wallets[0].id);

1
js/controllers/setup.js
View File

@ -35,6 +35,7 @@ var valid_pairs = {
angular.module('copayApp.controllers').controller('SetupController',
function($scope, $rootScope, $location, $timeout, walletFactory, controllerUtils, Passphrase, backupService, notification) {
$rootScope.fromSetup = true;
$rootScope.videoInfo = {};
$scope.loading = false;
$scope.walletPassword = $rootScope.walletPassword;

1
views/copayers.html
View File

@ -8,6 +8,7 @@
<div class="large-8 columns line-dashed-setup-v">
<div class="box-setup oh">
<div ng-if="!$root.wallet.publicKeyRing.isComplete()">
<img ng-if="$root.fromSetup" class="right m15t" src="../img/step-3.svg" alt="Step 3">
<h1 class="text-primary line-sidebar-b">Waiting copayers</h1>
<h3>Share this secret with your other copayers</h3>
<div class="panel">

2
views/setup.html
View File

@ -12,6 +12,8 @@
</div>
<div class="large-8 columns line-dashed-setup-v">
<div class="box-setup oh">
<img ng-if="!isSetupWalletPage" class="right m15t" src="../img/step-1.svg" alt="Step 1">
<img ng-if="isSetupWalletPage" class="right m15t" src="../img/step-2.svg" alt="Step 2">
<h1 class="text-secondary line-sidebar-b">Create new wallet</h1>
<label ng-show="!isSetupWalletPage">Wallet name
<input type="text" placeholder="Family vacation funds" class="form-control" ng-model="walletName">