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

Adds collect email view to the onboarding process

Browse source
This commit is contained in:
Gustavo Maximiliano Cortez 2017-04-27 12:03:32 -03:00
commit 1959f8fa8b
No known key found for this signature in database
GPG key ID: 15EDAD8D9F2EB1AF
5 changed files with 49 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

25
src/js/controllers/onboarding/collectEmail.js
View file

@ -1,27 +1,23 @@
'use strict';
angular.module('copayApp.controllers').controller('collectEmailController', function($scope, $state, $timeout, $stateParams, $ionicConfig, profileService, configService, walletService) {
angular.module('copayApp.controllers').controller('collectEmailController', function($scope, $state, $timeout, profileService, configService, walletService) {
$scope.$on("$ionicView.beforeLeave", function() {
$ionicConfig.views.swipeBackEnabled(true);
});
$scope.$on("$ionicView.enter", function() {
$ionicConfig.views.swipeBackEnabled(false);
});
var wallet = profileService.getWallet($stateParams.walletId);
var walletId = wallet.credentials.walletId;
var wallet, walletId;
$scope.data = {};
$scope.data.accept = false;
$scope.$on("$ionicView.beforeEnter", function(event, data) {
walletId = data.stateParams.walletId;
wallet = profileService.getWallet(walletId);
$scope.data.accept = true;
});
$scope.save = function() {
var opts = {
emailFor: {}
};
opts.emailFor[walletId] = $scope.email;
opts.emailFor[walletId] = $scope.data.email;
walletService.updateRemotePreferences(wallet, {
email: $scope.email,
email: $scope.data.email,
}, function(err) {
if (err) $log.warn(err);
configService.set(opts, function(err) {
@ -40,7 +36,6 @@ angular.module('copayApp.controllers').controller('collectEmailController', func
$scope.confirm = function(emailForm) {
if (emailForm.$invalid) return;
$scope.confirmation = true;
$scope.email = emailForm.email.$modelValue;
};
$scope.cancel = function() {

7
src/js/controllers/onboarding/tour.js
View file

@ -62,9 +62,16 @@ angular.module('copayApp.controllers').controller('tourController',
ongoingProcess.set('creatingWallet', false);
var wallet = walletClient;
var walletId = wallet.credentials.walletId;
$state.go('onboarding.collectEmail', {
walletId: walletId
});
/*
$state.go('onboarding.backupRequest', {
walletId: walletId
});
*/
});
}, 300);
};

27
src/sass/views/onboarding/onboard-collect-email.scss
View file

@ -44,7 +44,7 @@ $relish-success: 1.3s;
color: $v-dark-gray;
font-size: 1.2rem;
font-weight: bold;
margin: 3rem 0 1rem;
margin: 2rem 0 1rem;
}
.prompt {
margin: 1rem 1.5rem;
@ -62,7 +62,6 @@ $relish-success: 1.3s;
#collect-email {
opacity: 1;
background: #fff;
height: 25rem;
animation-name: topBottom;
animation-iteration-count: 1;
animation-timing-function: ease-in;
@ -80,7 +79,23 @@ $relish-success: 1.3s;
margin: 0 auto;
}
#collect-email-confirm {
p.confirm {
margin: 2rem 0;
color: $v-mid-gray;
}
p.user-email {
color: $v-dark-gray;
margin-bottom: 2rem;
}
.row, .col {
padding: 0;
}
.button {
padding: 0.5rem;
margin-bottom: 0;
}
}
#news-updates {
padding-top: 0;
@ -97,13 +112,13 @@ $relish-success: 1.3s;
border-width: 2px;
padding: 12px;
position: relative;
right: 5px;
bottom: 5px;
right: 2px;
bottom: 2px;
}
.checkbox input:checked:after,
input:checked + .checkbox-icon:after {
border-color: $v-onboarding-checkbox-on-border;
top: 4px;
top: 8px;
left: 6px;
}
.item-content {