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

onboarding allow push notifications

Browse source
This commit is contained in:
Gabriel Bazán 2016-08-29 11:56:31 -03:00
commit effbd098a6
8 changed files with 36 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

4
public/views/onboarding/collectEmail.html
View file

@ -1,7 +1,7 @@
<ion-view ng-controller="collectEmailController" ng-init="init()">
<ion-view ng-controller="collectEmailController">
<ion-nav-bar class="bar-stable">
<ion-nav-buttons side="secondary">
<button class="button no-border" href ui-sref="onboarding.notifications">
<button class="button no-border" ng-click="skip()">
Skip
</button>
</ion-nav-buttons>

2
public/views/onboarding/notifications.html
View file

@ -1,5 +1,5 @@
<ion-view>
<ion-content ng-controller="notificationsController" >
<ion-content ng-controller="notificationsController">
<div class="text-center">
<h1 translate>
Push Notifications

2
src/js/controllers/onboarding/backupRequest.js
View file

@ -1,6 +1,6 @@
'use strict';
angular.module('copayApp.controllers').controller('backupRequestController', function($rootScope, $scope, $state, $ionicPopup, $stateParams, profileService, walletService) {
angular.module('copayApp.controllers').controller('backupRequestController', function($scope, $state, $ionicPopup) {
$scope.openPopup = function() {
var backupLaterPopup = $ionicPopup.show({

2
src/js/controllers/onboarding/backupWarning.js
View file

@ -1,6 +1,6 @@
'use strict';
angular.module('copayApp.controllers').controller('backupWarningController', function($rootScope, $scope, $state, $ionicPopup, $stateParams, profileService, walletService) {
angular.module('copayApp.controllers').controller('backupWarningController', function($scope, $state, $ionicPopup, profileService) {
$scope.openPopup = function() {
var backupWarningPopup = $ionicPopup.show({

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

@ -1,6 +1,11 @@
'use strict';
angular.module('copayApp.controllers').controller('collectEmailController', function($rootScope, $scope, $state, $stateParams, $timeout, $ionicModal, profileService, walletService) {
angular.module('copayApp.controllers').controller('collectEmailController', function($scope, $state, $stateParams, profileService, walletService, platformInfo) {
$scope.skip = function() {
if (!platformInfo.isCordova) $state.go('onboarding.backupRequest');
else $state.go('onboarding.notifications');
}
$scope.save = function(form) {
var wallet = profileService.getWallet($stateParams.walletId);
@ -10,7 +15,8 @@ angular.module('copayApp.controllers').controller('collectEmailController', func
email: email,
}, function(err) {
if (err) $log.warn(err);
$state.go('onboarding.notifications');
if (!platformInfo.isCordova) $state.go('onboarding.backupRequest');
else $state.go('onboarding.notifications');
});
};

6
src/js/controllers/onboarding/notifications.js
View file

@ -1,11 +1,9 @@
'use strict';
angular.module('copayApp.controllers').controller('notificationsController', function($scope, $state, platformInfo) {
if (!platformInfo.isCordova) $state.go('onboarding.backupRequest');
angular.module('copayApp.controllers').controller('notificationsController', function($scope, $state, profileService) {
$scope.allowNotif = function() {
// T O D O
profileService.pushNotificationsInit();
$state.go('onboarding.backupRequest');
}

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

@ -1,6 +1,6 @@
'use strict';
angular.module('copayApp.controllers').controller('tourController',
function($scope, $stateParams, $state, $log, $timeout, ongoingProcess, storageService, profileService) {
function($scope, $state, $log, $timeout, ongoingProcess, profileService) {
$scope.init = function() {

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

@ -17,8 +17,12 @@ angular.module('copayApp.services')
root.profile = null;
Object.defineProperty(root, "focusedClient", {
get: function () { throw "focusedClient is not used any more" },
set: function () { throw "focusedClient is not used any more" }
get: function() {
throw "focusedClient is not used any more"
},
set: function() {
throw "focusedClient is not used any more"
}
});
@ -206,9 +210,6 @@ angular.module('copayApp.services')
}
bindWallets(function() {
if (usePushNotifications)
root.pushNotificationsInit();
root.isBound = true;
lodash.each(root._queue, function(x) {
@ -224,6 +225,8 @@ angular.module('copayApp.services')
if (!val) {
return cb(new Error('NONAGREEDDISCLAIMER: Non agreed disclaimer'));
}
if (usePushNotifications)
root.pushNotificationsInit();
$rootScope.$emit('disclaimerAccepted');
return cb();
});
@ -716,10 +719,11 @@ angular.module('copayApp.services')
ret = lodash.filter(ret, function(w) {
return w.isComplete();
});
} else {
}
} else {}
return lodash.sortBy(ret, [ function(x) { return x.isComplete(); }, 'createdOn']);
return lodash.sortBy(ret, [function(x) {
return x.isComplete();
}, 'createdOn']);
};
return root;