From 0c0e11aad3a47672902b7bb0c5684338cb109313 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Tue, 2 Dec 2014 16:16:31 -0300 Subject: [PATCH 01/20] Pin flow --- js/controllers/home.js | 95 ++++++++++++++++++++++++++++++++------- js/services/pinService.js | 38 ++++++++++++++++ views/home.html | 70 +++++++++++++++++++++++++++-- 3 files changed, 183 insertions(+), 20 deletions(-) create mode 100644 js/services/pinService.js diff --git a/js/controllers/home.js b/js/controllers/home.js index df4c43ab5..c459cb545 100644 --- a/js/controllers/home.js +++ b/js/controllers/home.js @@ -1,28 +1,52 @@ 'use strict'; -angular.module('copayApp.controllers').controller('HomeController', function($scope, $rootScope, $location, $timeout, notification, identityService, Compatibility) { - // This is only for backwards compat, insight api should link to #!/confirmed directly - if (getParam('confirmed')) { - var hashIndex = window.location.href.indexOf('/?'); - window.location = window.location.href.substr(0, hashIndex) + '#!/confirmed'; - return; - } +angular.module('copayApp.controllers').controller('HomeController', function($scope, $rootScope, $location, $timeout, notification, identityService, Compatibility, pinService) { + $scope.init = function() { + // This is only for backwards compat, insight api should link to #!/confirmed directly + if (getParam('confirmed')) { + var hashIndex = window.location.href.indexOf('/?'); + window.location = window.location.href.substr(0, hashIndex) + '#!/confirmed'; + return; + } - if ($rootScope.fromEmailConfirmation) { - $scope.confirmedEmail = true; - $rootScope.fromEmailConfirmation = false; - } + if ($rootScope.fromEmailConfirmation) { + $scope.confirmedEmail = true; + $rootScope.fromEmailConfirmation = false; + } + Compatibility.check($scope); + $scope.hasPin = pinService.check(); + }; + + Object.defineProperty($scope, + "pin", { + get: function() { + return this._pin; + }, + set: function(newValue) { + console.log('[home.js:26]',newValue, this._pin); //TODO + this._pin = newValue; + if (newValue && newValue.length == 4) { + console.log('[home.js:26] INGRESANDO AUTOMATICAMENTE',newValue); //TODO + $scope.openPin(newValue); + } + if (!newValue) { + $scope.error = null; + } + }, + enumerable: true, + configurable: true + }); - Compatibility.check($scope); $scope.done = function() { + $scope.hasPin = pinService.check(); $rootScope.starting = false; $rootScope.$digest(); }; - $scope.$on("$destroy", function(){ + $scope.$on("$destroy", function() { var iden = $rootScope.iden; if (iden) { iden.removeListener('newWallet', $scope.done ); @@ -30,20 +54,57 @@ angular.module('copayApp.controllers').controller('HomeController', function($sc } }); - - $scope.openProfile = function(form) { + $scope.openWithPin = function(form) { $scope.confirmedEmail = false; if (form && form.$invalid) { $scope.error = 'Please enter the required fields'; return; } + $scope.openPin(pin); + }; + + $scope.openPin = function(pin) { + var credentials = pinService.get(parseInt(pin)); + if (!credentials) { + $scope.error = 'Wrong PIN'; + return; + } + $rootScope.starting = true; - identityService.open(form.email.$modelValue, form.password.$modelValue, function(err, iden) { - if (err) { + $scope.open(credentials.email, credentials.password); + }; + + $scope.createPin = function(form) { + if (form) { + pinService.save(form.repeatpin.$modelValue, $scope.email, $scope.password); + } + $scope.open($scope.email, $scope.password); + }; + + $scope.openWithCredentials = function(form) { + $scope.confirmedEmail = false; + if (form && form.$invalid) { + $scope.error = 'Please enter the required fields'; + return; + } + if (!$scope.hasPin) { + $scope.email = form.email.$modelValue; + $scope.password = form.password.$modelValue; + $scope.setPin = true; + return; + } + $scope.open(form.email.$modelValue, form.password.$modelValue); + }; + + $scope.open = function(email, password) { + $rootScope.starting = true; + identityService.open(email, password, function(err, iden) { + if (err) { $rootScope.starting = false; copay.logger.warn(err); if ((err.toString() || '').match('PNOTFOUND')) { $scope.error = 'Invalid email or password'; + pinService.clear(); } else if ((err.toString() || '').match('Connection')) { $scope.error = 'Could not connect to Insight Server'; } else if ((err.toString() || '').match('Unable')) { diff --git a/js/services/pinService.js b/js/services/pinService.js new file mode 100644 index 000000000..b6d30192c --- /dev/null +++ b/js/services/pinService.js @@ -0,0 +1,38 @@ +'use strict'; + +angular.module('copayApp.services') + .factory('pinService', function($rootScope) { + var root = {}; + var storage = { + pinData: { + pin: 1234, + credentials: { + email: '4@queparece', + password: '1', + } + } + }; + root.check = function() { + return storage.pinData ? true : false; + }; + root.get = function(pin) { + var storedPin = storage.pinData.pin; + if (storedPin !== pin) + return; + + return storage.pinData.credentials; + }; + root.save = function(pin, email, password) { + storage.pinData = { + pin: pin, + credentials: { + email: email, + password: password + } + }; + }; + root.clear = function(){ + delete storage['pinData']; + }; + return root; + }); diff --git a/views/home.html b/views/home.html index 7cae7c3eb..5c7fcff60 100644 --- a/views/home.html +++ b/views/home.html @@ -1,4 +1,4 @@ -
+
-
+
+

Set your PIN number

+
+
+ + +
+
+ + +
+ +

+ + {{'Pin must match'|translate}} +

+ + +
+
+ + Skip + + +
+
+ +
+

Enter your PIN number

+
+

+ + {{error|translate}} +

+
+ + +
+ + +
+
+ + + Logout + +
+
+ + +

Sign in to Copay

-
+

@@ -71,6 +134,7 @@ Sign in

+
From 65512bf1c20e4429a308954f3306658e9ea990ae Mon Sep 17 00:00:00 2001 From: Matias Alejo Garcia Date: Tue, 2 Dec 2014 22:38:33 -0300 Subject: [PATCH 02/20] add crypto to pinService and tests --- js/controllers/home.js | 73 +++++++++++++++++------------- js/services/pinService.js | 68 +++++++++++++++++----------- js/util/crypto.js | 10 ++-- test/unit/services/servicesSpec.js | 42 +++++++++++++++++ 4 files changed, 130 insertions(+), 63 deletions(-) diff --git a/js/controllers/home.js b/js/controllers/home.js index c459cb545..b3d804f85 100644 --- a/js/controllers/home.js +++ b/js/controllers/home.js @@ -15,7 +15,9 @@ angular.module('copayApp.controllers').controller('HomeController', function($sc $rootScope.fromEmailConfirmation = false; } Compatibility.check($scope); - $scope.hasPin = pinService.check(); + pinService.check(function(err, value) { + $scope.hasPin = value; + }); }; Object.defineProperty($scope, @@ -23,24 +25,21 @@ angular.module('copayApp.controllers').controller('HomeController', function($sc get: function() { return this._pin; }, - set: function(newValue) { - console.log('[home.js:26]',newValue, this._pin); //TODO - this._pin = newValue; - if (newValue && newValue.length == 4) { - console.log('[home.js:26] INGRESANDO AUTOMATICAMENTE',newValue); //TODO - $scope.openPin(newValue); - } - if (!newValue) { - $scope.error = null; - } - }, - enumerable: true, - configurable: true + set: function(newValue) { + this._pin = newValue; + if (newValue && newValue.length == 4) { + $scope.openPin(newValue); + } + if (!newValue) { + $scope.error = null; + } + }, + enumerable: true, + configurable: true }); $scope.done = function() { - $scope.hasPin = pinService.check(); $rootScope.starting = false; $rootScope.$digest(); }; @@ -49,8 +48,8 @@ angular.module('copayApp.controllers').controller('HomeController', function($sc $scope.$on("$destroy", function() { var iden = $rootScope.iden; if (iden) { - iden.removeListener('newWallet', $scope.done ); - iden.removeListener('noWallets', $scope.done ); + iden.removeListener('newWallet', $scope.done); + iden.removeListener('noWallets', $scope.done); } }); @@ -60,25 +59,26 @@ angular.module('copayApp.controllers').controller('HomeController', function($sc $scope.error = 'Please enter the required fields'; return; } - $scope.openPin(pin); + $scope.openPin(pin); }; $scope.openPin = function(pin) { - var credentials = pinService.get(parseInt(pin)); - if (!credentials) { - $scope.error = 'Wrong PIN'; - return; - } - - $rootScope.starting = true; - $scope.open(credentials.email, credentials.password); + var credentials = pinService.get(pin, function(err, credentials) { + if (err || !credentials) { + $scope.error = 'Wrong PIN'; + return; + } + $rootScope.starting = true; + $scope.open(credentials.email, credentials.password); + }); }; $scope.createPin = function(form) { - if (form) { - pinService.save(form.repeatpin.$modelValue, $scope.email, $scope.password); - } - $scope.open($scope.email, $scope.password); + if (!form) return; + + pinService.save(form.repeatpin.$modelValue, $scope.email, $scope.password, function(err) { + $scope.open($scope.email, $scope.password); + }); }; $scope.openWithCredentials = function(form) { @@ -96,6 +96,15 @@ angular.module('copayApp.controllers').controller('HomeController', function($sc $scope.open(form.email.$modelValue, form.password.$modelValue); }; + + $scope.pinLogout = function() { + pinService.clear(function() { + copay.logger.debug('PIN erased'); + $scope.hasPin = null; + $scope.$digest(); + }); + }; + $scope.open = function(email, password) { $rootScope.starting = true; identityService.open(email, password, function(err, iden) { @@ -104,7 +113,9 @@ angular.module('copayApp.controllers').controller('HomeController', function($sc copay.logger.warn(err); if ((err.toString() || '').match('PNOTFOUND')) { $scope.error = 'Invalid email or password'; - pinService.clear(); + pinService.clear(function() { + copay.logger.debug('PIN erased'); + }); } else if ((err.toString() || '').match('Connection')) { $scope.error = 'Could not connect to Insight Server'; } else if ((err.toString() || '').match('Unable')) { diff --git a/js/services/pinService.js b/js/services/pinService.js index b6d30192c..a104d61fc 100644 --- a/js/services/pinService.js +++ b/js/services/pinService.js @@ -1,38 +1,52 @@ 'use strict'; angular.module('copayApp.services') - .factory('pinService', function($rootScope) { - var root = {}; - var storage = { - pinData: { - pin: 1234, - credentials: { - email: '4@queparece', - password: '1', - } - } - }; - root.check = function() { - return storage.pinData ? true : false; - }; - root.get = function(pin) { - var storedPin = storage.pinData.pin; - if (storedPin !== pin) - return; + .factory('pinService', function($rootScope, localstorageService) { - return storage.pinData.credentials; + var KEY = 'pinDATA'; + var SALT = '4gllotIKguqi0EkIslC0'; + var ITER = 2000; + + var ls = localstorageService; + var root = {}; + + root.check = function(cb) { + ls.getItem(KEY, function(err, value) { + return cb(err, value ? true : false); + }); }; - root.save = function(pin, email, password) { - storage.pinData = { - pin: pin, - credentials: { - email: email, - password: password + + root.get = function(pin, cb) { + ls.getItem(KEY, function(err, value) { + if (!value) return cb(null); + var enc = value; + var data = copay.crypto.decrypt('' + parseInt(pin), enc); + var err = new Error('Could not decrypt'); + if (data) { + var obj; + try { + obj = JSON.parse(data); + err = null; + } catch (e) {}; } + return cb(err, obj); + }); + }; + + root.save = function(pin, email, password, cb) { + var credentials = { + email: email, + password: password, }; + var enc = copay.crypto.encrypt('' + parseInt(pin), credentials, SALT, ITER); + ls.setItem(KEY, enc, function(err) { + return cb(err); + }); }; - root.clear = function(){ - delete storage['pinData']; + + root.clear = function(cb) { + ls.removeItem(KEY, cb); }; + return root; }); diff --git a/js/util/crypto.js b/js/util/crypto.js index cb438ea18..72679f18f 100644 --- a/js/util/crypto.js +++ b/js/util/crypto.js @@ -59,22 +59,22 @@ module.exports = { /** * Encrypts symmetrically using a passphrase */ - encrypt: function(key, message) { + encrypt: function(key, message, salt, iter) { if (!_.isString(message)) { message = JSON.stringify(message); } - sjcl.json.defaults.salt = defaultSalt; - sjcl.json.defaults.iter = defaultIterations; + sjcl.json.defaults.salt = salt || defaultSalt; + sjcl.json.defaults.iter = iter || defaultIterations; return sjcl.encrypt(key, message); }, /** * Decrypts symmetrically using a passphrase */ - decrypt: function(key, cyphertext) { + decrypt: function(key, sjclEncryptedJson) { var output = {}; try { - return sjcl.decrypt(key, cyphertext); + return sjcl.decrypt(key, sjclEncryptedJson); } catch (e) { log.info('Decryption failed due to error: ' + e.message); return null; diff --git a/test/unit/services/servicesSpec.js b/test/unit/services/servicesSpec.js index f468f5917..a448187ce 100644 --- a/test/unit/services/servicesSpec.js +++ b/test/unit/services/servicesSpec.js @@ -102,6 +102,48 @@ describe("Angular services", function() { })); }); + describe("Unit: identityService Service", function() { + it('should contain a identityService service', inject(function(identityService) { + expect(identityService).not.to.equal(null); + })); + }); + + describe("Unit: pinService", function() { + it('should contain a pinService service', inject(function(pinService) { + expect(pinService).not.to.equal(null); + })); + it('should be able to check -> save -> get -> clear -> check', function(done) { + inject(function(pinService) { + pinService.save('123', 'user', 'pass', function(err) { + pinService.check(function(err, value) { + should.not.exist(err); + value.should.equal(true); + pinService.get('123', function(err, data) { + should.not.exist(err); + data.email.should.be.equal('user'); + data.password.should.be.equal('pass'); + pinService.clear(function(err) { + should.not.exist(err); + pinService.check(function(err, value) { + should.not.exist(err); + value.should.equal(false); + done(); + }); + }); + }); + }); + }) + }) + }); + }); + + describe("Unit: localstorageService", function() { + it('should contain a localstorageService service', inject(function(localstorageService) { + expect(localstorageService).not.to.equal(null); + })); + }); + + describe("Unit: Backup Service", function() { it('should contain a backup service', inject(function(backupService) { expect(backupService).not.to.equal(null); From 047ba06d4202f5c96cb17276ec78f8cb55734f53 Mon Sep 17 00:00:00 2001 From: Matias Alejo Garcia Date: Tue, 2 Dec 2014 23:30:44 -0300 Subject: [PATCH 03/20] fix signout --- js/controllers/head.js | 3 --- js/controllers/home.js | 5 +++++ js/controllers/sidebar.js | 3 ++- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/js/controllers/head.js b/js/controllers/head.js index cf2be5a91..899d445b1 100644 --- a/js/controllers/head.js +++ b/js/controllers/head.js @@ -64,8 +64,5 @@ angular.module('copayApp.controllers').controller('HeadController', function($sc $rootScope.$watch('title', function(newTitle, oldTitle) { $scope.title = newTitle; }); - $rootScope.$on('signout', function() { - $scope.signout(); - }); } }); diff --git a/js/controllers/home.js b/js/controllers/home.js index b3d804f85..153ee30f1 100644 --- a/js/controllers/home.js +++ b/js/controllers/home.js @@ -14,6 +14,11 @@ angular.module('copayApp.controllers').controller('HomeController', function($sc $scope.confirmedEmail = true; $rootScope.fromEmailConfirmation = false; } + + if($rootScope.iden) { + identityService.goWalletHome(); + } + Compatibility.check($scope); pinService.check(function(err, value) { $scope.hasPin = value; diff --git a/js/controllers/sidebar.js b/js/controllers/sidebar.js index a6f7533ae..6dadb4057 100644 --- a/js/controllers/sidebar.js +++ b/js/controllers/sidebar.js @@ -25,7 +25,8 @@ angular.module('copayApp.controllers').controller('SidebarController', function( }]; $scope.signout = function() { - $scope.$emit('signout'); + $rootScope.signingOut = true; + identityService.signout(); }; $scope.isActive = function(item) { From 5c6640be23cdc7ac56a6c91298b02740c06854b4 Mon Sep 17 00:00:00 2001 From: Matias Alejo Garcia Date: Tue, 2 Dec 2014 23:39:34 -0300 Subject: [PATCH 04/20] fix top balance --- index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.html b/index.html index 902a9655e..4a4911c6a 100644 --- a/index.html +++ b/index.html @@ -66,7 +66,7 @@ - {{totalBalance || 0|noFractionNumber}} {{$root.wallet.settings.unitName}} + {{$root.wallet.balanceInfo.totalBalance || 0}} {{$root.wallet.settings.unitName}} From 583b8314ec3f0357c032ca173bc3cb969d761770 Mon Sep 17 00:00:00 2001 From: Matias Alejo Garcia Date: Tue, 2 Dec 2014 23:51:37 -0300 Subject: [PATCH 05/20] add bind once to address list. rm balance from qr modal --- views/modals/qr-address.html | 8 -------- views/receive.html | 8 ++++---- views/send.html | 4 ++-- 3 files changed, 6 insertions(+), 14 deletions(-) diff --git a/views/modals/qr-address.html b/views/modals/qr-address.html index d52da6d03..449e1b41e 100644 --- a/views/modals/qr-address.html +++ b/views/modals/qr-address.html @@ -8,14 +8,6 @@ ({{label}}) -

- - - - - {{address.balance || 0}} {{$root.wallet.settings.unitName}} - -

× diff --git a/views/receive.html b/views/receive.html index a07a964c7..e593d4627 100644 --- a/views/receive.html +++ b/views/receive.html @@ -14,8 +14,8 @@
- - change + + change
@@ -34,8 +34,8 @@
- - change + + change
diff --git a/views/send.html b/views/send.html index 5804b0027..b9552528e 100644 --- a/views/send.html +++ b/views/send.html @@ -217,9 +217,9 @@ ng-repeat="(addr, info) in $root.wallet.addressBook" ng-class="{'addressbook-disabled': info.hidden}"> {{info.label}} - {{addr}} + {{::addr}} {{$root.wallet.publicKeyRing.nicknameForCopayer(info.copayerId)}} - + Date: Wed, 3 Dec 2014 00:30:44 -0300 Subject: [PATCH 06/20] signout/lock text --- index.html | 1 - js/controllers/sidebar.js | 11 ++++++----- js/models/Identity.js | 10 +++++----- views/includes/sidebar-mobile.html | 7 +++++-- 4 files changed, 16 insertions(+), 13 deletions(-) diff --git a/index.html b/index.html index 4a4911c6a..c49a154fb 100644 --- a/index.html +++ b/index.html @@ -34,7 +34,6 @@
 
 
- Logging Out
diff --git a/js/controllers/sidebar.js b/js/controllers/sidebar.js index 6dadb4057..3485558fd 100644 --- a/js/controllers/sidebar.js +++ b/js/controllers/sidebar.js @@ -1,6 +1,6 @@ 'use strict'; -angular.module('copayApp.controllers').controller('SidebarController', function($scope, $rootScope, $location, $timeout, identityService) { +angular.module('copayApp.controllers').controller('SidebarController', function($scope, $rootScope, $location, $timeout, identityService, pinService) { $scope.menu = [{ 'title': 'Home', @@ -48,7 +48,7 @@ angular.module('copayApp.controllers').controller('SidebarController', function( $scope.init = function() { // This should be called only once. - + // focused wallet change if ($rootScope.wallet) { $rootScope.$watch('wallet', function() { @@ -73,16 +73,17 @@ angular.module('copayApp.controllers').controller('SidebarController', function( if (newWid && $rootScope.iden.getWalletById(newWid)) { identityService.setFocusedWallet(newWid); } else { - copay.logger.debug('No wallets'); + copay.logger.debug('No wallets'); identityService.noFocusedWallet(newWid); } } $scope.walletSelection = false; $scope.setWallets(); }); - + pinService.check(function(err, value) { + $scope.hasPin = value; + }); } - }; $scope.setWallets = function() { diff --git a/js/models/Identity.js b/js/models/Identity.js index 3799e329f..e215412fa 100644 --- a/js/models/Identity.js +++ b/js/models/Identity.js @@ -355,17 +355,17 @@ Identity.prototype.remove = function(opts, cb) { }; Identity.prototype._cleanUp = function() { - // NOP + _.each(this.wallets, function(w){ + w.close(); + }); }; /** * @desc Closes the wallet and disconnects all services */ Identity.prototype.close = function() { - var self = this; - self.store({}, function(err) { - self.emitAndKeepAlive('closed'); - }); + this._cleanUp(); + this.emitAndKeepAlive('closed'); }; diff --git a/views/includes/sidebar-mobile.html b/views/includes/sidebar-mobile.html index 2a89ab52c..fcc61cf56 100644 --- a/views/includes/sidebar-mobile.html +++ b/views/includes/sidebar-mobile.html @@ -1,4 +1,4 @@ -
+
@@ -101,7 +101,10 @@
  • {{'Close'|translate}} + ng-click="signout()"> + {{'Close'|translate}} + {{'Lock'|translate}} +
    • From 33e0bf80a6ceedd58a96533dad5542e67660c07f Mon Sep 17 00:00:00 2001 From: Matias Alejo Garcia Date: Wed, 3 Dec 2014 00:36:44 -0300 Subject: [PATCH 07/20] lock also in header --- js/controllers/head.js | 8 +++++++- views/includes/head.html | 5 ++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/js/controllers/head.js b/js/controllers/head.js index 899d445b1..375efc91e 100644 --- a/js/controllers/head.js +++ b/js/controllers/head.js @@ -1,6 +1,6 @@ 'use strict'; -angular.module('copayApp.controllers').controller('HeadController', function($scope, $rootScope, $filter, $timeout, notification, identityService, balanceService) { +angular.module('copayApp.controllers').controller('HeadController', function($scope, $rootScope, $filter, $timeout, notification, identityService, balanceService, pinService) { $scope.username = $rootScope.iden.getName(); $scope.hoverMenu = false; @@ -39,7 +39,13 @@ angular.module('copayApp.controllers').controller('HeadController', function($sc window.onbeforeunload = undefined; }); + // TODO put this on init() if ($rootScope.wallet) { + pinService.check(function(err, value) { + $scope.hasPin = value; + }); + + $scope.$on('$idleStart', function() { }); $scope.$on('$idleWarn', function(a, countdown) { diff --git a/views/includes/head.html b/views/includes/head.html index 68736f757..de6fb38d0 100644 --- a/views/includes/head.html +++ b/views/includes/head.html @@ -39,7 +39,10 @@ {{'Profile'|translate}} [ Needs Backup ]
  • - {{'Close'|translate}}
    • + {{'Close'|translate}} + {{'Lock'|translate}} + +
    From 51028178ed5b677e7a0c6f8c17a5cb87e94a209a Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Wed, 3 Dec 2014 03:03:16 -0300 Subject: [PATCH 08/20] Autofocus and show the second PIN input automatically. Hide submit button. Allow only numbers --- js/controllers/home.js | 39 ++++++++++++++++++++++ js/directives.js | 12 ++++++- views/home.html | 73 ++++++++++++++++++++++++++---------------- 3 files changed, 96 insertions(+), 28 deletions(-) diff --git a/js/controllers/home.js b/js/controllers/home.js index 153ee30f1..6a4d3a2f1 100644 --- a/js/controllers/home.js +++ b/js/controllers/home.js @@ -43,6 +43,45 @@ angular.module('copayApp.controllers').controller('HomeController', function($sc configurable: true }); + Object.defineProperty($scope, + "newpin", { + get: function() { + return this._newpin; + }, + set: function(newValue) { + this._newpin = newValue; + if (newValue && newValue.length == 4) { + // next input + $scope.$$childTail.secondPin = true; + } + }, + enumerable: true, + configurable: true + }); + + Object.defineProperty($scope, + "repeatpin", { + get: function() { + return this._repeatpin; + }, + set: function(newValue) { + this._repeatpin = newValue; + if (newValue && newValue.length == 4) { + if ($scope.$$childTail._newpin === newValue) { + // save and submit + $scope.createPin($scope.$$childTail.setPinForm); + } + else { + $scope.error = 'Pin must match!'; + } + } + if (!newValue) { + $scope.error = null; + } + }, + enumerable: true, + configurable: true + }); $scope.done = function() { $rootScope.starting = false; diff --git a/js/directives.js b/js/directives.js index ac823cdb1..993357694 100644 --- a/js/directives.js +++ b/js/directives.js @@ -286,10 +286,20 @@ angular.module('copayApp.directives') link: function(_scope, _element) { $timeout(function() { _element[0].focus(); - }, 0); + }); } }; }) + .directive('showFocus', function($timeout) { + return function(scope, element, attrs) { + scope.$watch(attrs.showFocus, + function (newValue) { + $timeout(function() { + newValue && element[0].focus(); + }); + },true); + }; + }) .directive('match', function() { return { require: 'ngModel', diff --git a/views/home.html b/views/home.html index 5c7fcff60..5d75090da 100644 --- a/views/home.html +++ b/views/home.html @@ -47,62 +47,81 @@ creating your profile
    -
    +

    Set your PIN number

    +
    +
    + +
    + + {{error|translate}} + +
    +
    -
    - + + ng-pattern="/^[0-9]{1,4}$/" + placeholder="Pin number" name="newpin" required show-focus="!secondPin">
    -
    +
    + ng-pattern="/^[0-9]{1,4}$/" + placeholder="Repeat pin number" name="repeatpin" required show-focus="secondPin">
    -

    - - {{'Pin must match'|translate}} -

    - - -
    - - Skip - - +
    +
    + + Cancel + + +
    +
    + + Skip + + +

    Enter your PIN number

    -

    - - {{error|translate}} -

    +
    +
    + +
    + + {{error|translate}} + +
    +
    -
    -
    - +
    + Logout From 7a41c288e899aba0fe57b74ca520c295148f23c9 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Wed, 3 Dec 2014 03:13:41 -0300 Subject: [PATCH 09/20] fix digest error --- js/controllers/home.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/js/controllers/home.js b/js/controllers/home.js index 6a4d3a2f1..4b8993537 100644 --- a/js/controllers/home.js +++ b/js/controllers/home.js @@ -1,6 +1,6 @@ 'use strict'; -angular.module('copayApp.controllers').controller('HomeController', function($scope, $rootScope, $location, $timeout, notification, identityService, Compatibility, pinService) { +angular.module('copayApp.controllers').controller('HomeController', function($scope, $rootScope, $location, $timeout, notification, identityService, Compatibility, pinService, applicationService) { $scope.init = function() { // This is only for backwards compat, insight api should link to #!/confirmed directly @@ -145,7 +145,7 @@ angular.module('copayApp.controllers').controller('HomeController', function($sc pinService.clear(function() { copay.logger.debug('PIN erased'); $scope.hasPin = null; - $scope.$digest(); + applicationService.reload(); }); }; From 2681cd6178ff054eef47fba398d3cf5ddf1d9237 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Wed, 3 Dec 2014 03:35:45 -0300 Subject: [PATCH 10/20] Display PIN form only on mobile devices --- js/controllers/home.js | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/js/controllers/home.js b/js/controllers/home.js index 4b8993537..8993040b0 100644 --- a/js/controllers/home.js +++ b/js/controllers/home.js @@ -1,6 +1,6 @@ 'use strict'; -angular.module('copayApp.controllers').controller('HomeController', function($scope, $rootScope, $location, $timeout, notification, identityService, Compatibility, pinService, applicationService) { +angular.module('copayApp.controllers').controller('HomeController', function($scope, $rootScope, $location, $timeout, notification, identityService, Compatibility, pinService, applicationService, isMobile) { $scope.init = function() { // This is only for backwards compat, insight api should link to #!/confirmed directly @@ -20,9 +20,11 @@ angular.module('copayApp.controllers').controller('HomeController', function($sc } Compatibility.check($scope); - pinService.check(function(err, value) { - $scope.hasPin = value; - }); + if (isMobile.any()) { + pinService.check(function(err, value) { + $scope.hasPin = value; + }); + } }; Object.defineProperty($scope, @@ -131,7 +133,7 @@ angular.module('copayApp.controllers').controller('HomeController', function($sc $scope.error = 'Please enter the required fields'; return; } - if (!$scope.hasPin) { + if (isMobile.any() && !$scope.hasPin) { $scope.email = form.email.$modelValue; $scope.password = form.password.$modelValue; $scope.setPin = true; From e3f2a71a53067d98ebf822b82660929a2ff9c584 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Wed, 3 Dec 2014 03:55:23 -0300 Subject: [PATCH 11/20] Mobile: when select a wallet, hide the list of them --- views/includes/sidebar-mobile.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/views/includes/sidebar-mobile.html b/views/includes/sidebar-mobile.html index fcc61cf56..cac6a24c3 100644 --- a/views/includes/sidebar-mobile.html +++ b/views/includes/sidebar-mobile.html @@ -40,16 +40,16 @@ {{'Create new wallet' | translate }}
    -
      +
      • + ng-if="item.id != $root.wallet.id" + ng-click="toggleWalletSelection(); switchWallet(item.id)">
        {{(item.name || item.id) | limitTo: 1}}
        - +
        [ {{item.requiredCopayers}} of {{item.totalCopayers}} ]
        From d3128137ce5d8478737fa5daf0443bee996f8d4d Mon Sep 17 00:00:00 2001 From: Matias Alejo Garcia Date: Wed, 3 Dec 2014 12:40:13 -0300 Subject: [PATCH 12/20] pin fixes --- css/src/main.css | 1 + index.html | 6 ++- js/controllers/head.js | 15 ++---- js/controllers/home.js | 75 +++++++++++++++++++++--------- js/controllers/sidebar.js | 5 +- views/home.html | 31 ++++++------ views/includes/head.html | 9 ++-- views/includes/sidebar-mobile.html | 12 ++--- 8 files changed, 90 insertions(+), 64 deletions(-) diff --git a/css/src/main.css b/css/src/main.css index 6492dcc03..0a23f2899 100644 --- a/css/src/main.css +++ b/css/src/main.css @@ -548,6 +548,7 @@ a.button-setup { } .dn {display: none;} +.dni {display: none !important;} .pr {position: relative;} .pa {position: absolute;} .m0 {margin: 0;} diff --git a/index.html b/index.html index c49a154fb..6e180ceda 100644 --- a/index.html +++ b/index.html @@ -56,7 +56,7 @@ -
        + ng-if="$root.iden" + ng-class="{'dni':$root.hideNavigation}" + >
        diff --git a/js/controllers/head.js b/js/controllers/head.js index 375efc91e..58ff90dbc 100644 --- a/js/controllers/head.js +++ b/js/controllers/head.js @@ -1,6 +1,6 @@ 'use strict'; -angular.module('copayApp.controllers').controller('HeadController', function($scope, $rootScope, $filter, $timeout, notification, identityService, balanceService, pinService) { +angular.module('copayApp.controllers').controller('HeadController', function($scope, $rootScope, $filter, $timeout, notification, identityService, balanceService) { $scope.username = $rootScope.iden.getName(); $scope.hoverMenu = false; @@ -39,15 +39,10 @@ angular.module('copayApp.controllers').controller('HeadController', function($sc window.onbeforeunload = undefined; }); - // TODO put this on init() - if ($rootScope.wallet) { - pinService.check(function(err, value) { - $scope.hasPin = value; - }); + $scope.init = function() { + if (!$rootScope.wallet) return; - - $scope.$on('$idleStart', function() { - }); + $scope.$on('$idleStart', function() {}); $scope.$on('$idleWarn', function(a, countdown) { $rootScope.countdown = countdown; $rootScope.sessionExpired = true; @@ -70,5 +65,5 @@ angular.module('copayApp.controllers').controller('HeadController', function($sc $rootScope.$watch('title', function(newTitle, oldTitle) { $scope.title = newTitle; }); - } + }; }); diff --git a/js/controllers/home.js b/js/controllers/home.js index 8993040b0..1aa4a7a00 100644 --- a/js/controllers/home.js +++ b/js/controllers/home.js @@ -2,6 +2,9 @@ angular.module('copayApp.controllers').controller('HomeController', function($scope, $rootScope, $location, $timeout, notification, identityService, Compatibility, pinService, applicationService, isMobile) { + + var _credentials; + $scope.init = function() { // This is only for backwards compat, insight api should link to #!/confirmed directly if (getParam('confirmed')) { @@ -15,16 +18,14 @@ angular.module('copayApp.controllers').controller('HomeController', function($sc $rootScope.fromEmailConfirmation = false; } - if($rootScope.iden) { + if ($rootScope.iden) { identityService.goWalletHome(); } Compatibility.check($scope); - if (isMobile.any()) { - pinService.check(function(err, value) { - $scope.hasPin = value; - }); - } + pinService.check(function(err, value) { + $rootScope.hasPin = value; + }); }; Object.defineProperty($scope, @@ -72,9 +73,8 @@ angular.module('copayApp.controllers').controller('HomeController', function($sc if ($scope.$$childTail._newpin === newValue) { // save and submit $scope.createPin($scope.$$childTail.setPinForm); - } - else { - $scope.error = 'Pin must match!'; + } else { + $scope.error = 'Entered PINs were not equal. Try again'; } } if (!newValue) { @@ -119,11 +119,28 @@ angular.module('copayApp.controllers').controller('HomeController', function($sc }); }; + + $scope.openWallets = function() { + preconditions.checkState($rootScope.iden); + var iden = $rootScope.iden; + + $rootScope.hideNavigation = false; + $rootScope.starting = true; + iden.on('newWallet', $scope.done); + iden.on('noWallets', $scope.done); + iden.openWallets(); + }; + $scope.createPin = function(form) { if (!form) return; + preconditions.checkState($rootScope.iden); + preconditions.checkState(_credentials && _credentials.email); - pinService.save(form.repeatpin.$modelValue, $scope.email, $scope.password, function(err) { - $scope.open($scope.email, $scope.password); + pinService.save(form.repeatpin.$modelValue, _credentials.email, _credentials.password, function(err) { + _credentials.password = ''; + _credentials = null; + $rootScope.hasPin = true; + $scope.openWallets(); }); }; @@ -133,12 +150,7 @@ angular.module('copayApp.controllers').controller('HomeController', function($sc $scope.error = 'Please enter the required fields'; return; } - if (isMobile.any() && !$scope.hasPin) { - $scope.email = form.email.$modelValue; - $scope.password = form.password.$modelValue; - $scope.setPin = true; - return; - } + $scope.open(form.email.$modelValue, form.password.$modelValue); }; @@ -146,7 +158,7 @@ angular.module('copayApp.controllers').controller('HomeController', function($sc $scope.pinLogout = function() { pinService.clear(function() { copay.logger.debug('PIN erased'); - $scope.hasPin = null; + delete $rootScope['hasPin']; applicationService.reload(); }); }; @@ -169,13 +181,32 @@ angular.module('copayApp.controllers').controller('HomeController', function($sc } else { $scope.error = 'Unknown error'; } - return $scope.done(); + $rootScope.starting = false; + $rootScope.$digest(); + return; } + // Open successfully? if (iden) { - iden.on('newWallet', $scope.done); - iden.on('noWallets', $scope.done); - iden.openWallets(); + + // mobile + //if (isMobile.any() && !$rootScope.hasPin) { + if (true && !$rootScope.hasPin) { + $scope.done(); + _credentials = { + email: email, + password: password, + }; + $scope.askForPin = true; + $rootScope.starting = false; + $rootScope.hideNavigation = true; + $rootScope.$digest(); + return; + } + // no mobile + else { + $scope.openWallets(); + } } }); } diff --git a/js/controllers/sidebar.js b/js/controllers/sidebar.js index 3485558fd..45631e725 100644 --- a/js/controllers/sidebar.js +++ b/js/controllers/sidebar.js @@ -1,6 +1,6 @@ 'use strict'; -angular.module('copayApp.controllers').controller('SidebarController', function($scope, $rootScope, $location, $timeout, identityService, pinService) { +angular.module('copayApp.controllers').controller('SidebarController', function($scope, $rootScope, $location, $timeout, identityService) { $scope.menu = [{ 'title': 'Home', @@ -80,9 +80,6 @@ angular.module('copayApp.controllers').controller('SidebarController', function( $scope.walletSelection = false; $scope.setWallets(); }); - pinService.check(function(err, value) { - $scope.hasPin = value; - }); } }; diff --git a/views/home.html b/views/home.html index 5d75090da..30f22b489 100644 --- a/views/home.html +++ b/views/home.html @@ -13,7 +13,7 @@
    -
    +
    Copay
    @@ -47,8 +47,10 @@ creating your profile
    -
    -

    Set your PIN number

    +
    +

    Set up a PIN ?

    +

    Enter a 4-digit number for easier access from this device +

    @@ -63,14 +65,14 @@ + placeholder="PIN" name="newpin" required show-focus="!secondPin">
    + placeholder="Confirm your PIN" name="repeatpin" required show-focus="secondPin">
    @@ -80,23 +82,22 @@
    -
    - - Cancel - +
    + + Skip
    - - Skip - + + OK
    +
    -
    -

    Enter your PIN number

    +
    +

    Enter your PIN

    @@ -129,7 +130,7 @@
    -
    +

    Sign in to Copay

    {{$root.title}} - + @@ -14,8 +14,7 @@ -
    +
    @@ -39,8 +38,8 @@ {{'Profile'|translate}} [ Needs Backup ]
  • - {{'Close'|translate}} - {{'Lock'|translate}} + {{'Close'|translate}} + {{'Lock'|translate}}
    • diff --git a/views/includes/sidebar-mobile.html b/views/includes/sidebar-mobile.html index cac6a24c3..afafd2577 100644 --- a/views/includes/sidebar-mobile.html +++ b/views/includes/sidebar-mobile.html @@ -1,6 +1,6 @@
    -
    +
    {{$root.wallet.getName() | limitTo: 1}}
    @@ -95,15 +95,15 @@ {{'Import a wallet' | translate }} -
  • - - {{'Settings' | translate }} +
  • + + {{'Wallet Settings' | translate }}
  • - {{'Close'|translate}} - {{'Lock'|translate}} + {{'Close'|translate}} + {{'Lock'|translate}}
    • From 362767130756550e210e22e5a943ba117654524f Mon Sep 17 00:00:00 2001 From: Matias Alejo Garcia Date: Wed, 3 Dec 2014 13:44:55 -0300 Subject: [PATCH 13/20] add makePinInput --- js/controllers/home.js | 81 +++++++++++---------------------------- js/services/pinService.js | 19 +++++++++ views/home.html | 10 ++--- 3 files changed, 46 insertions(+), 64 deletions(-) diff --git a/js/controllers/home.js b/js/controllers/home.js index 1aa4a7a00..eff98ae3f 100644 --- a/js/controllers/home.js +++ b/js/controllers/home.js @@ -3,7 +3,7 @@ angular.module('copayApp.controllers').controller('HomeController', function($scope, $rootScope, $location, $timeout, notification, identityService, Compatibility, pinService, applicationService, isMobile) { - var _credentials; + var _credentials, _firstpin; $scope.init = function() { // This is only for backwards compat, insight api should link to #!/confirmed directly @@ -28,62 +28,24 @@ angular.module('copayApp.controllers').controller('HomeController', function($sc }); }; - Object.defineProperty($scope, - "pin", { - get: function() { - return this._pin; - }, - set: function(newValue) { - this._pin = newValue; - if (newValue && newValue.length == 4) { - $scope.openPin(newValue); - } - if (!newValue) { - $scope.error = null; - } - }, - enumerable: true, - configurable: true - }); + pinService.makePinInput($scope, 'pin', function(newValue) { + $scope.openPin(newValue); + }); - Object.defineProperty($scope, - "newpin", { - get: function() { - return this._newpin; - }, - set: function(newValue) { - this._newpin = newValue; - if (newValue && newValue.length == 4) { - // next input - $scope.$$childTail.secondPin = true; - } - }, - enumerable: true, - configurable: true - }); + pinService.makePinInput($scope, 'newpin', function(newValue) { + _firstpin = newValue; + $scope.askForPin = 2; + }); - Object.defineProperty($scope, - "repeatpin", { - get: function() { - return this._repeatpin; - }, - set: function(newValue) { - this._repeatpin = newValue; - if (newValue && newValue.length == 4) { - if ($scope.$$childTail._newpin === newValue) { - // save and submit - $scope.createPin($scope.$$childTail.setPinForm); - } else { - $scope.error = 'Entered PINs were not equal. Try again'; - } - } - if (!newValue) { - $scope.error = null; - } - }, - enumerable: true, - configurable: true - }); + pinService.makePinInput($scope, 'repeatpin', function(newValue) { + if (newValue === _firstpin) { + _firstpin = null; + $scope.createPin(newValue); + } else { + _firstpin = null; + $scope.error = 'Entered PINs were not equal. Try again'; + } + }); $scope.done = function() { $rootScope.starting = false; @@ -131,14 +93,15 @@ angular.module('copayApp.controllers').controller('HomeController', function($sc iden.openWallets(); }; - $scope.createPin = function(form) { - if (!form) return; + $scope.createPin = function(pin) { + preconditions.checkArgument(pin); preconditions.checkState($rootScope.iden); preconditions.checkState(_credentials && _credentials.email); - pinService.save(form.repeatpin.$modelValue, _credentials.email, _credentials.password, function(err) { + pinService.save(pin, _credentials.email, _credentials.password, function(err) { _credentials.password = ''; _credentials = null; + $scope.askForPin = 0; $rootScope.hasPin = true; $scope.openWallets(); }); @@ -197,7 +160,7 @@ angular.module('copayApp.controllers').controller('HomeController', function($sc email: email, password: password, }; - $scope.askForPin = true; + $scope.askForPin = 1; $rootScope.starting = false; $rootScope.hideNavigation = true; $rootScope.$digest(); diff --git a/js/services/pinService.js b/js/services/pinService.js index a104d61fc..c5562029a 100644 --- a/js/services/pinService.js +++ b/js/services/pinService.js @@ -48,5 +48,24 @@ angular.module('copayApp.services') ls.removeItem(KEY, cb); }; + + root.makePinInput = function(scope, name, cb) { + Object.defineProperty(scope, name, { + get: function() { + return this['_' + name]; + }, + set: function(newValue) { + this['_' + name] = newValue; + scope.error = null; + if (newValue && newValue.length == 4) { + return cb(newValue); + } + }, + enumerable: true, + configurable: true + }); + }; + + return root; }); diff --git a/views/home.html b/views/home.html index 30f22b489..ab213bd7a 100644 --- a/views/home.html +++ b/views/home.html @@ -47,7 +47,7 @@ creating your profile
    -
    +

    Set up a PIN ?

    Enter a 4-digit number for easier access from this device @@ -61,18 +61,18 @@

    -
    +
    + placeholder="PIN" name="newpin" required show-focus="askForPin == 1">
    -
    +
    + placeholder="Confirm your PIN" name="repeatpin" required show-focus="askForPin == 2">
    From 2f6e28f5e74f910f2e18586abc82eef167cbb8fd Mon Sep 17 00:00:00 2001 From: Matias Alejo Garcia Date: Wed, 3 Dec 2014 13:53:07 -0300 Subject: [PATCH 14/20] add faskclick --- Gruntfile.js | 1 + bower.json | 1 + js/routes.js | 1 + 3 files changed, 3 insertions(+) diff --git a/Gruntfile.js b/Gruntfile.js index 097f9689c..7deb818a3 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -118,6 +118,7 @@ module.exports = function(grunt) { 'lib/lodash/dist/lodash.js', 'lib/bitcore.js', 'lib/file-saver/FileSaver.js', + 'lib/fastclick/lib/fastclick.js', 'lib/socket.io-client/socket.io.js', 'lib/sjcl.js', 'lib/qrcode-decoder-js/lib/qrcode-decoder.min.js' diff --git a/bower.json b/bower.json index 719abb2ff..b3065ef29 100644 --- a/bower.json +++ b/bower.json @@ -24,6 +24,7 @@ "angular-load": "0.2.0", "lodash": "~2.4.1", "angular-gravatar": "*", + "fastclick": "*", "angular-touch": "~1.3.0" }, "resolutions": { diff --git a/js/routes.js b/js/routes.js index 12d8b93f2..1277e27fd 100644 --- a/js/routes.js +++ b/js/routes.js @@ -111,6 +111,7 @@ angular $keepaliveProvider.interval(30); // in seconds }) .run(function($rootScope, $location, $idle, gettextCatalog, uriHandler) { + FastClick.attach(document.body); gettextCatalog.currentLanguage = config.defaultLanguage; // not for mobileApp if (!window.cordova) { From 1d7e9dda938516d3b58170627f836aeced8e6f6a Mon Sep 17 00:00:00 2001 From: Matias Alejo Garcia Date: Wed, 3 Dec 2014 16:01:22 -0300 Subject: [PATCH 15/20] pin in create --- js/controllers/createProfile.js | 106 +++++++++++++++++++++++++++----- js/controllers/home.js | 25 +++++--- js/services/identityService.js | 35 +++++++---- views/createProfile.html | 89 ++++++++++++++++++++------- views/home.html | 4 +- 5 files changed, 201 insertions(+), 58 deletions(-) diff --git a/js/controllers/createProfile.js b/js/controllers/createProfile.js index 7fdacb716..bec21edd2 100644 --- a/js/controllers/createProfile.js +++ b/js/controllers/createProfile.js @@ -1,23 +1,80 @@ 'use strict'; -angular.module('copayApp.controllers').controller('CreateProfileController', function($scope, $rootScope, $location, $timeout, notification, pluginManager, identityService) { - identityService.goWalletHome(); +angular.module('copayApp.controllers').controller('CreateProfileController', function($scope, $rootScope, $location, $timeout, notification, pluginManager, identityService, pinService) { + + var _credentials, _firstpin; + + $scope.init = function() { + identityService.goWalletHome(); + + pinService.makePinInput($scope, 'newpin', function(newValue) { + _firstpin = newValue; + $scope.askForPin = 2; + }); + + pinService.makePinInput($scope, 'repeatpin', function(newValue) { + if (newValue === _firstpin) { + _firstpin = null; + $scope.createPin(newValue); + } else { + $scope.askForPin = 1; + _firstpin = null; + + $scope.setPinForm.newpin.$setViewValue(''); + $scope.setPinForm.newpin.$render(); + $scope.setPinForm.repeatpin.$setViewValue(''); + $scope.setPinForm.repeatpin.$render(); + $scope.setPinForm.$setPristine(); + + $scope.error = 'Entered PINs were not equal. Try again'; + } + }); + }; + + + $scope.createPin = function(pin) { + preconditions.checkArgument(pin); + preconditions.checkState($rootScope.iden); + preconditions.checkState(_credentials && _credentials.email); + + pinService.save(pin, _credentials.email, _credentials.password, function(err) { + _credentials.password = ''; + _credentials = null; + $scope.askForPin = 0; + $rootScope.hasPin = true; + $scope.createDefaultWallet(); + }); + }; + + $scope.createDefaultWallet = function() { + $rootScope.hideNavigation = false; + identityService.createDefaultWallet(function(err) { + $scope.askForPin =0 ; + $scope.loading = false; + + if (err) { + var msg = err.toString(); + $scope.error = msg; + } + }); + }; $scope.createProfile = function(form) { + $rootScope.hideNavigation = false; if (form && form.$invalid) { - $scope.error('Error', 'Please enter the required fields'); + $scope.error = 'Please enter the required fields'; return; } - $rootScope.starting = true; - identityService.create( - form.email.$modelValue, form.password.$modelValue, function(err) { - $rootScope.starting = false; - if (err) { - var msg = err.toString(); - if (msg.indexOf('EEXIST')>=0 || msg.indexOf('BADC')>=0 ) { - msg = 'This profile already exists' - } - $timeout(function() { + $scope.loading = true; + identityService.create(form.email.$modelValue, form.password.$modelValue, function(err) { + $scope.loading = false; + + if (err) { + var msg = err.toString(); + if (msg.indexOf('EEXIST') >= 0 || msg.indexOf('BADC') >= 0) { + msg = 'This profile already exists' + } + $timeout(function() { form.email.$setViewValue(''); form.email.$render(); form.password.$setViewValue(''); @@ -27,7 +84,28 @@ angular.module('copayApp.controllers').controller('CreateProfileController', fun form.$setPristine(); $scope.error = msg; },1); - } + $scope.error = msg; + } else { + $scope.error = null; + // mobile + //if (isMobile.any()) { + if (true) { + _credentials = { + email: form.email.$modelValue, + password: form.password.$modelValue, + }; + $scope.askForPin = 1; + $rootScope.hideNavigation = true; + $timeout(function() { + $rootScope.$digest(); + }, 1); + + console.log('[createProfile.js.70]'); //TODO + return; + } else { + $scope.createDefaultWallet(); + } + } }); } }); diff --git a/js/controllers/home.js b/js/controllers/home.js index eff98ae3f..a18aa733a 100644 --- a/js/controllers/home.js +++ b/js/controllers/home.js @@ -29,7 +29,7 @@ angular.module('copayApp.controllers').controller('HomeController', function($sc }; pinService.makePinInput($scope, 'pin', function(newValue) { - $scope.openPin(newValue); + $scope.openWithPin(newValue); }); pinService.makePinInput($scope, 'newpin', function(newValue) { @@ -39,11 +39,18 @@ angular.module('copayApp.controllers').controller('HomeController', function($sc pinService.makePinInput($scope, 'repeatpin', function(newValue) { if (newValue === _firstpin) { - _firstpin = null; + _firstpin = null; $scope.createPin(newValue); } else { - _firstpin = null; + _firstpin = null; $scope.error = 'Entered PINs were not equal. Try again'; + $scope.askForPin = 1; + + $scope.setPinForm.newpin.$setViewValue(''); + $scope.setPinForm.newpin.$render(); + $scope.setPinForm.repeatpin.$setViewValue(''); + $scope.setPinForm.repeatpin.$render(); + $scope.setPinForm.$setPristine(); } }); @@ -61,16 +68,14 @@ angular.module('copayApp.controllers').controller('HomeController', function($sc } }); - $scope.openWithPin = function(form) { - $scope.confirmedEmail = false; - if (form && form.$invalid) { + + $scope.openWithPin = function(pin) { + + if (!pin) { $scope.error = 'Please enter the required fields'; return; } - $scope.openPin(pin); - }; - $scope.openPin = function(pin) { var credentials = pinService.get(pin, function(err, credentials) { if (err || !credentials) { $scope.error = 'Wrong PIN'; @@ -108,7 +113,6 @@ angular.module('copayApp.controllers').controller('HomeController', function($sc }; $scope.openWithCredentials = function(form) { - $scope.confirmedEmail = false; if (form && form.$invalid) { $scope.error = 'Please enter the required fields'; return; @@ -151,6 +155,7 @@ angular.module('copayApp.controllers').controller('HomeController', function($sc // Open successfully? if (iden) { + $scope.confirmedEmail = false; // mobile //if (isMobile.any() && !$rootScope.hasPin) { diff --git a/js/services/identityService.js b/js/services/identityService.js index 182e7162e..7f84a50e4 100644 --- a/js/services/identityService.js +++ b/js/services/identityService.js @@ -3,6 +3,11 @@ angular.module('copayApp.services') .factory('identityService', function($rootScope, $location, $timeout, $filter, pluginManager, notification, pendingTxsService, balanceService, applicationService) { notification.enableHtml5Mode(); // for chrome: if support, enable it + // TODO: + // * remove iden from rootScope + // * remove wallet from rootScope + // * create walletService + var root = {}; root.check = function(scope) { copay.Identity.checkIfExistsAny({ @@ -22,6 +27,7 @@ angular.module('copayApp.services') }); }; + // TODO should be on 'walletService' root.goWalletHome = function() { var w = $rootScope.wallet; if (w) { @@ -49,23 +55,30 @@ angular.module('copayApp.services') failIfExists: true, }, function(err, iden) { +console.log('[identityService.js.57]'); //TODO if (err) return cb(err); preconditions.checkState(iden); root.bind(iden); - var walletOptions = { - nickname: iden.fullName, - networkName: config.networkName, - requiredCopayers: 1, - totalCopayers: 1, - password: iden.password, - name: 'My wallet', - }; - iden.createWallet(walletOptions, function(err, wallet) { - return cb(err); - }); +console.log('[identityService.js.62]'); //TODO + return cb(null); }); + }; + root.createDefaultWallet = function(cb) { + var iden = $rootScope.iden; + + var walletOptions = { + nickname: iden.fullName, + networkName: config.networkName, + requiredCopayers: 1, + totalCopayers: 1, + password: iden.password, + name: 'My wallet', + }; + iden.createWallet(walletOptions, function(err, wallet) { + return cb(err); + }); }; root.setServerStatus = function(headers) { diff --git a/views/createProfile.html b/views/createProfile.html index 5e9bd3d52..5a55bafe0 100644 --- a/views/createProfile.html +++ b/views/createProfile.html @@ -1,28 +1,36 @@ -
    +
    -
    +
    Copay
    -
    +

    Create Profile

    -
    +
    {{error|translate}} @@ -32,19 +40,18 @@ - Not valid + Not valid
    - +
    - @@ -54,23 +61,19 @@ - {{'Passwords must match'|translate}} + {{'Passwords must match'|translate}} + !profileForm.repeatpassword.$invalid">
    - +
    -
    @@ -89,6 +92,50 @@
    + +
    +
    +

    Set up a PIN ?

    +

    Enter a 4-digit number for easier access from this device + +

    +
    + +
    + + {{error|translate}} + +
    + +
    +
    + + +
    +
    + + +
    + + +
    +
    +
    + + Skip + +
    +
    + + OK + +
    + +
    +
    +
    diff --git a/views/home.html b/views/home.html index ab213bd7a..c8a5f1830 100644 --- a/views/home.html +++ b/views/home.html @@ -98,7 +98,7 @@

    Enter your PIN

    -
    +
    @@ -116,7 +116,7 @@
    - From 5329d030f838aca0248c9c91efca81abdd8f9917 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Wed, 3 Dec 2014 17:09:59 -0300 Subject: [PATCH 16/20] Fix buttons. Remove console.logs. isMobile active!! --- js/controllers/createProfile.js | 6 ++-- js/controllers/home.js | 19 +++++----- js/services/identityService.js | 2 -- views/createProfile.html | 49 +++++++++++++------------ views/home.html | 64 +++++++++++++++++---------------- 5 files changed, 68 insertions(+), 72 deletions(-) diff --git a/js/controllers/createProfile.js b/js/controllers/createProfile.js index bec21edd2..3ee1f0a22 100644 --- a/js/controllers/createProfile.js +++ b/js/controllers/createProfile.js @@ -86,10 +86,9 @@ angular.module('copayApp.controllers').controller('CreateProfileController', fun },1); $scope.error = msg; } else { - $scope.error = null; + $scope.error = null; // mobile - //if (isMobile.any()) { - if (true) { + if (isMobile.any()) { _credentials = { email: form.email.$modelValue, password: form.password.$modelValue, @@ -100,7 +99,6 @@ angular.module('copayApp.controllers').controller('CreateProfileController', fun $rootScope.$digest(); }, 1); - console.log('[createProfile.js.70]'); //TODO return; } else { $scope.createDefaultWallet(); diff --git a/js/controllers/home.js b/js/controllers/home.js index a18aa733a..8752fc501 100644 --- a/js/controllers/home.js +++ b/js/controllers/home.js @@ -41,16 +41,15 @@ angular.module('copayApp.controllers').controller('HomeController', function($sc if (newValue === _firstpin) { _firstpin = null; $scope.createPin(newValue); - } else { + } else { + $scope.$$childTail.setPinForm.newpin.$setViewValue(''); + $scope.$$childTail.setPinForm.newpin.$render(); + $scope.$$childTail.setPinForm.repeatpin.$setViewValue(''); + $scope.$$childTail.setPinForm.repeatpin.$render(); + _firstpin = null; - $scope.error = 'Entered PINs were not equal. Try again'; $scope.askForPin = 1; - - $scope.setPinForm.newpin.$setViewValue(''); - $scope.setPinForm.newpin.$render(); - $scope.setPinForm.repeatpin.$setViewValue(''); - $scope.setPinForm.repeatpin.$render(); - $scope.setPinForm.$setPristine(); + $scope.error = 'Entered PINs were not equal. Try again'; } }); @@ -155,11 +154,11 @@ angular.module('copayApp.controllers').controller('HomeController', function($sc // Open successfully? if (iden) { + $scope.error = null; $scope.confirmedEmail = false; // mobile - //if (isMobile.any() && !$rootScope.hasPin) { - if (true && !$rootScope.hasPin) { + if (isMobile.any() && !$rootScope.hasPin) { $scope.done(); _credentials = { email: email, diff --git a/js/services/identityService.js b/js/services/identityService.js index 7f84a50e4..202609dba 100644 --- a/js/services/identityService.js +++ b/js/services/identityService.js @@ -55,12 +55,10 @@ angular.module('copayApp.services') failIfExists: true, }, function(err, iden) { -console.log('[identityService.js.57]'); //TODO if (err) return cb(err); preconditions.checkState(iden); root.bind(iden); -console.log('[identityService.js.62]'); //TODO return cb(null); }); }; diff --git a/views/createProfile.html b/views/createProfile.html index 5a55bafe0..dd87c2cef 100644 --- a/views/createProfile.html +++ b/views/createProfile.html @@ -96,44 +96,43 @@

    Set up a PIN ?

    -

    Enter a 4-digit number for easier access from this device +

    Enter a 4-digit number for easier access from this device

    -
    -
    - -
    - +
    +
    + +
    + {{error|translate}} +
    + + +
    + + +
    +
    + +
    - -
    - - -
    -
    - - -
    - - -
    -
    +
    Skip
    - - OK - +
    -
    + + +
    diff --git a/views/home.html b/views/home.html index c8a5f1830..6a9bb97c3 100644 --- a/views/home.html +++ b/views/home.html @@ -49,7 +49,7 @@

    Set up a PIN ?

    -

    Enter a 4-digit number for easier access from this device +

    Enter a 4-digit number for easier access from this device

    @@ -60,7 +60,7 @@
    -
    +
    - -
    -
    -
    - - Skip - +
    +
    + + Skip + +
    +
    + +
    -
    - - OK - -
    - -
    + + +
    @@ -115,18 +113,22 @@ placeholder="Pin number" name="pin" required auto-focus>
    - - - -
    - - - Logout - -
    + +
    +
    + + + Logout + +
    +
    + +
    +
    +
    From 4bfb12c94a94144e0d79999a5a2c90e27e5786c8 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Wed, 3 Dec 2014 17:28:09 -0300 Subject: [PATCH 17/20] fix karma --- karma.conf.js | 1 + 1 file changed, 1 insertion(+) diff --git a/karma.conf.js b/karma.conf.js index a194c5a3a..f21500c65 100644 --- a/karma.conf.js +++ b/karma.conf.js @@ -36,6 +36,7 @@ module.exports = function(config) { 'lib/inherits/inherits.js', 'lib/lodash/dist/lodash.js', 'lib/file-saver/FileSaver.js', + 'lib/fastclick/lib/fastclick.js', 'lib/socket.io-client/socket.io.js', 'lib/sjcl.js', 'lib/qrcode-decoder-js/lib/qrcode-decoder.min.js', From 3e5c13f339e75d407766c1a980b2800b1b72e78b Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Wed, 3 Dec 2014 20:52:30 -0300 Subject: [PATCH 18/20] remove fastclick --- Gruntfile.js | 1 - js/routes.js | 1 - 2 files changed, 2 deletions(-) diff --git a/Gruntfile.js b/Gruntfile.js index 7deb818a3..097f9689c 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -118,7 +118,6 @@ module.exports = function(grunt) { 'lib/lodash/dist/lodash.js', 'lib/bitcore.js', 'lib/file-saver/FileSaver.js', - 'lib/fastclick/lib/fastclick.js', 'lib/socket.io-client/socket.io.js', 'lib/sjcl.js', 'lib/qrcode-decoder-js/lib/qrcode-decoder.min.js' diff --git a/js/routes.js b/js/routes.js index 1277e27fd..12d8b93f2 100644 --- a/js/routes.js +++ b/js/routes.js @@ -111,7 +111,6 @@ angular $keepaliveProvider.interval(30); // in seconds }) .run(function($rootScope, $location, $idle, gettextCatalog, uriHandler) { - FastClick.attach(document.body); gettextCatalog.currentLanguage = config.defaultLanguage; // not for mobileApp if (!window.cordova) { From 19187a57c7f4f442b6c683549ca7835f144d9da2 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Wed, 3 Dec 2014 20:53:49 -0300 Subject: [PATCH 19/20] bottom bar uses ngTouch --- js/controllers/sidebar.js | 4 ++++ views/includes/bottombar-mobile.html | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/js/controllers/sidebar.js b/js/controllers/sidebar.js index 45631e725..1a50154ac 100644 --- a/js/controllers/sidebar.js +++ b/js/controllers/sidebar.js @@ -24,6 +24,10 @@ angular.module('copayApp.controllers').controller('SidebarController', function( 'link': 'more' }]; + $scope.go = function (path) { + $location.path(path); + }; + $scope.signout = function() { $rootScope.signingOut = true; identityService.signout(); diff --git a/views/includes/bottombar-mobile.html b/views/includes/bottombar-mobile.html index aa7925920..4393bcdcc 100644 --- a/views/includes/bottombar-mobile.html +++ b/views/includes/bottombar-mobile.html @@ -1,6 +1,6 @@
    -
    - +
    +
    {{item.title}} From 603a934d142953f5b8daba6d60ee867959681a7a Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Wed, 3 Dec 2014 20:55:24 -0300 Subject: [PATCH 20/20] remove fast click from karma.conf --- karma.conf.js | 1 - 1 file changed, 1 deletion(-) diff --git a/karma.conf.js b/karma.conf.js index f21500c65..a194c5a3a 100644 --- a/karma.conf.js +++ b/karma.conf.js @@ -36,7 +36,6 @@ module.exports = function(config) { 'lib/inherits/inherits.js', 'lib/lodash/dist/lodash.js', 'lib/file-saver/FileSaver.js', - 'lib/fastclick/lib/fastclick.js', 'lib/socket.io-client/socket.io.js', 'lib/sjcl.js', 'lib/qrcode-decoder-js/lib/qrcode-decoder.min.js',