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

import on splash

Browse source
This commit is contained in:
Matias Alejo Garcia 2015-05-13 11:58:19 -03:00
commit 51ad7d83dc
12 changed files with 28 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

7
public/views/add.html
View file

@ -29,13 +29,6 @@
<span translate>Import wallet </span>
</a>
</li>
<li>
<a title="Import wallet" ng-click="$root.go('importLegacy')">
<i class="fi-archive plus-fixed circle"></i>
<i class="icon-arrow-right3 size-18 right m20t"></i>
<span translate>Import from Copay Beta 0.9</span>
</a>
</li>
</ul>
</div>

6
public/views/import.html
View file

@ -54,6 +54,12 @@
Import backup
</button>
</form>
<a class="m20t button outline light-gray expand" ng-click="$root.go('importLegacy')" translate>
Importing Backup from Copay v0.9? Click here
</a>
</div>
</div>
</div>

8
public/views/importLegacy.html
View file

@ -1,18 +1,13 @@
<div
class="topbar-container"
ng-include="'views/includes/topbar.html'"
ng-init="titleSection='Import legacy wallet'; goBackToState = 'add'; noColor = true">
ng-init="titleSection='Import legacy wallet'; goBackToState = 'import'; noColor = true">
</div>
<div class="content p20v" ng-controller="importLegacyController as importLegacy">
<div class="row m20t">
<div class="large-5 large-centered medium-7 medium-centered columns">
<div class="logo-setup show-for-large-up">
<img src="img/logo-negative.svg" alt="Copay" width="100">
<div ng-include="'views/includes/version.html'"></div>
</div>
<div>
<div ng-show="importLegacy.importing">
<h1 class="m20b animated infinite flash" translate>Importing...</h1>
@ -78,6 +73,5 @@
</div>
</div>
</div>

4
public/views/splash/1.html → public/views/splash.html
View file

@ -22,10 +22,12 @@
<div class="rect4"></div>
<div class="rect5"></div>
</div>
<span translate>Creating Wallet...</span>
<span translate>Creating Profile...</span>
</div>
</div>
<div class="row columns start-button" ng-show="!creatingProfile">
<button ng-click="create()" class="button black expand radius size-12 text-spacing" translate> GET STARTED </button>
<p class="text-gray m5b size-12" translate>Already have a wallet?</p>
<button ng-click="create(true)" class="outline dark-gray tiny" translate>Import backup </button>
</div>
</div>

3
public/views/splash/2.html
View file

@ -1,3 +0,0 @@
<div class="tour">
<img ng-click="$root.go('splash.four')" class="m15t" src="img/tour2.png" alt="tour1" width="90%">
</div>

3
public/views/splash/3.html
View file

@ -1,3 +0,0 @@
<div class="tour">
<img ng-click="$root.go('splash.four')" class="m15t" src="img/tour3.png" alt="tour1" width="90%">
</div>

3
public/views/splash/4.html
View file

@ -1,3 +0,0 @@
<div class="tour">
<img ng-click="$root.go('walletHome')" class="m15t" src="img/tour4.png" alt="tour1" width="90%">
</div>

15
public/views/splash/5.html
View file

@ -1,15 +0,0 @@
<div class="tour">
<img ng-click="$root.go('splash.finish')" class="m15t" src="img/tour5.png" alt="tour1" width="90%">
</div>
<div class="row tour5">
<div class="small-6 columns">
<button class="button outline light-gray radius expand">
SKIP
</button>
</div>
<div class="small-6 columns">
<button class="black radius expand">
SET A PIN
</button>
</div>
</div>

2
src/js/controllers/index.js
View file

@ -721,7 +721,7 @@ angular.module('copayApp.controllers').controller('indexController', function($r
self.noFocusedWallet = true;
self.isComplete = null;
self.walletName = null;
go.addWallet();
go.path('import');
});
});

5
src/js/models/profile.js
View file

@ -14,17 +14,20 @@ Profile.create = function(opts) {
var x = new Profile();
x.createdOn = Date.now();
x.credentials = opts.credentials;
x.credentials = opts.credentials || [];
return x;
};
Profile.fromObj = function(obj) {
var x = new Profile();
x.createdOn = obj.createdOn;
x.credentials = obj.credentials;
if (x.credentials[0] && typeof x.credentials[0] != 'object')
throw ("credentials should be an object");
return x;
};

10
src/js/routes.js
View file

@ -68,23 +68,23 @@ angular
needProfile: false,
views: {
'main': {
templateUrl: 'views/splash/1.html',
templateUrl: 'views/splash.html',
controller: function($scope, $timeout, $log, profileService, go) {
if (profileService.profile) {
go.walletHome();
}
$scope.create = function() {
$scope.create = function(noWallet) {
$scope.creatingProfile = true;
profileService.create(function(err) {
profileService.create({noWallet: noWallet}, function(err) {
if (err) {
$scope.creatingProfile = false;
$log.warn(err);
$scope.error = err;
$scope.$apply();
$timeout(function() {
$scope.create();
$scope.create(noWallet);
}, 3000);
}
});
@ -384,7 +384,7 @@ angular
create: 12,
join: 12,
import: 12,
importLegacy: 12
importLegacy: 13
};

14
src/js/services/profileService.js
View file

@ -157,9 +157,13 @@ angular.module('copayApp.services')
});
};
root._createNewProfile = function(cb) {
var walletClient = bwcService.getClient();
root._createNewProfile = function(opts, cb) {
if (opts.noWallet) {
return cb(null, Profile.create());
}
var walletClient = bwcService.getClient();
walletClient.createWallet('Personal Wallet', 'me', 1, 1, {
network: 'livenet'
}, function(err) {
@ -276,13 +280,11 @@ angular.module('copayApp.services')
});
};
root.create = function(cb) {
root.create = function(opts, cb) {
$log.info('Creating profile');
configService.get(function(err) {
root.applyConfig();
root._createNewProfile(function(err, p) {
root._createNewProfile(opts, function(err, p) {
if (err) return cb(err);
root.bindProfile(p, function(err) {