From f6bb8d3ebd345c79525b38f5daafc6abdc3bd3cb Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Mon, 8 Dec 2014 03:10:25 -0300 Subject: [PATCH 1/7] hide pin form after signing with a PIN --- js/controllers/home.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/js/controllers/home.js b/js/controllers/home.js index 8db396afe..81a65e3e0 100644 --- a/js/controllers/home.js +++ b/js/controllers/home.js @@ -164,9 +164,7 @@ angular.module('copayApp.controllers').controller('HomeController', function($sc $scope.askForPin = 1; $rootScope.starting = false; $rootScope.hideNavigation = true; - $timeout(function(){ - $rootScope.$digest(); - }); + $rootScope.$digest(); return; } // no mobile From 2f157fe48aeaf9ee37c13d1149fbaf9587731388 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Mon, 8 Dec 2014 03:11:41 -0300 Subject: [PATCH 2/7] short delay after input the last PIN number --- js/services/pinService.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/js/services/pinService.js b/js/services/pinService.js index f320f3a3c..914bdcee8 100644 --- a/js/services/pinService.js +++ b/js/services/pinService.js @@ -1,7 +1,7 @@ 'use strict'; angular.module('copayApp.services') - .factory('pinService', function($rootScope, localstorageService) { + .factory('pinService', function($rootScope, $timeout, localstorageService) { var KEY = 'pinDATA'; var SALT = '4gllotIKguqi0EkIslC0'; @@ -58,7 +58,9 @@ angular.module('copayApp.services') this['_' + name] = newValue; scope.error = null; if (newValue && newValue.length == 4) { - return cb(newValue); + $timeout(function() { + return cb(newValue); + }, 30); } }, enumerable: true, From 25cd9675d854145d26b78810ff0564154e06252c Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Mon, 8 Dec 2014 03:16:51 -0300 Subject: [PATCH 3/7] Unlogged layout fixes. Logo same size in all pages. Back link as button. --- css/src/main.css | 17 ++++++++++------- css/src/mobile.css | 16 ++++++---------- index.html | 2 +- views/createProfile.html | 10 +++++----- views/home.html | 2 +- views/importProfile.html | 14 ++++++++------ views/settings.html | 16 +++++++++------- 7 files changed, 40 insertions(+), 37 deletions(-) diff --git a/css/src/main.css b/css/src/main.css index 4fba88f6a..c1f1c83ab 100644 --- a/css/src/main.css +++ b/css/src/main.css @@ -356,14 +356,10 @@ a:hover { background-color: #F8F8FB; } -.pin-main { - background-color: #2C3E50; -} - .logo-setup { text-align: center; - padding: 2rem 0; - color: #fff; + margin: 0 0 2rem 0; + color: #8597A7; } .box-setup { @@ -375,7 +371,7 @@ a:hover { .box-setup-footer { overflow: hidden; - margin-top: 2rem; + margin-top: 1rem; padding: 1rem 0 0; border-top: 1px solid #425467; font-size: 12px; @@ -1724,6 +1720,11 @@ a.text-warning:hover {color: #FD7262;} color: #fff; } +.home, .settings, .createProfile, .import-profile { + overflow: hidden; + padding: 2rem 0; +} + .tabbable { border: 2px solid #213140; border-radius: 3px; @@ -1793,6 +1794,8 @@ a.text-warning:hover {color: #FD7262;} z-index: 999; padding-top: 20%; text-align: center; + padding-left: 10%; + padding-right: 10%; } .clipo { diff --git a/css/src/mobile.css b/css/src/mobile.css index 9e7729659..5034328b9 100644 --- a/css/src/mobile.css +++ b/css/src/mobile.css @@ -7,12 +7,7 @@ @media (max-width: 1024px) { .logo-setup { - margin: 0; - padding: 1rem 0; - } - - .home, .open, .join, .waiting-copayers, .setup, .import, .settings { - margin-top: 0; + margin: 0 0 1rem 0; } .sidebar { @@ -48,6 +43,11 @@ background: #2C3E50; } + .home, .settings, .createProfile, .import-profile { + overflow: hidden; + padding: 1rem 0; + } + header { height: 45px; line-height: 110%; @@ -197,10 +197,6 @@ .button, button { padding: 1rem 1.2rem 1.0625rem; } - - .home form { - margin-bottom: 1rem; - } form { margin: 0; diff --git a/index.html b/index.html index 441edb926..a859e6a04 100644 --- a/index.html +++ b/index.html @@ -101,7 +101,7 @@ ng-class="{'dni':$root.hideNavigation}" > -
+
diff --git a/views/createProfile.html b/views/createProfile.html index 84a5c83c4..1d79d6622 100644 --- a/views/createProfile.html +++ b/views/createProfile.html @@ -114,16 +114,16 @@
- + Back
- Learn more about this option + + Learn more about this option
-
@@ -155,7 +155,7 @@
- + Back @@ -193,7 +193,7 @@
- + Back diff --git a/views/home.html b/views/home.html index 0b2c47ff0..e0b29f638 100644 --- a/views/home.html +++ b/views/home.html @@ -23,7 +23,7 @@
Copay -
+
diff --git a/views/importProfile.html b/views/importProfile.html index ce54c3362..33dfef2ad 100644 --- a/views/importProfile.html +++ b/views/importProfile.html @@ -14,8 +14,8 @@
-
- Copay +
+ Copay
@@ -60,10 +60,12 @@
- - - Back - +
+ + + Back + +
diff --git a/views/settings.html b/views/settings.html index 23e42351c..d92320ab3 100644 --- a/views/settings.html +++ b/views/settings.html @@ -1,7 +1,7 @@
-
- Copay +
+ Copay

{{title|translate}}

@@ -71,11 +71,13 @@
- - - Back - -
+
+ + + Back + +
+
Reset settings From 6553d43da729b93635515bb4d5bfb36378a87a5e Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Mon, 8 Dec 2014 05:33:12 -0300 Subject: [PATCH 4/7] fix layout when signing with PIN --- views/home.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/views/home.html b/views/home.html index e0b29f638..060c95058 100644 --- a/views/home.html +++ b/views/home.html @@ -78,7 +78,7 @@
-
+

Enter your PIN

From aad053daec893d33b4118a6fc0b264efe3072006 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Mon, 8 Dec 2014 05:34:59 -0300 Subject: [PATCH 5/7] swipe to change pages and swipe to show or hide sidebar menu --- index.html | 5 ++++- js/controllers/index.js | 12 +++++++++++ js/services/go.js | 46 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 62 insertions(+), 1 deletion(-) create mode 100644 js/controllers/index.js diff --git a/index.html b/index.html index a859e6a04..bb651ad55 100644 --- a/index.html +++ b/index.html @@ -20,7 +20,10 @@ - +
Loading... diff --git a/js/controllers/index.js b/js/controllers/index.js new file mode 100644 index 000000000..8a0d4b4ef --- /dev/null +++ b/js/controllers/index.js @@ -0,0 +1,12 @@ +'use strict'; + +angular.module('copayApp.controllers').controller('IndexController', function($scope, go) { + $scope.init = function() { + + }; + + $scope.swipe = function(invert) { + go.swipe(invert); + }; + +}); diff --git a/js/services/go.js b/js/services/go.js index f0a71785d..88492b189 100644 --- a/js/services/go.js +++ b/js/services/go.js @@ -14,6 +14,21 @@ angular.module('copayApp.services').factory('go', function($window, $location) { elem.removeClass('move-left'); }; + var showSidebar = function(invert) { + if (typeof document === 'undefined') + return; + + // hack to hide sidebars and use ng-click (no href=) + var win = angular.element($window); + var elem = angular.element(document.querySelector('#off-canvas-wrap')) + if (invert) { + elem.addClass('move-right'); + } + else { + elem.addClass('move-left'); + } + }; + root.go = function(path) { var parts = path.split('#'); $location.path(parts[0]); @@ -22,5 +37,36 @@ angular.module('copayApp.services').factory('go', function($window, $location) { hideSidebars(); }; + var pages = [ + '/homeWallet', + '/receive', + '/send', + '/history' + ]; + + var sidebarActive = false; + + root.swipe = function(invert) { + var currentPage = $location.path(); + var pageIndex; + if (!sidebarActive) { + pageIndex = invert ? pages.indexOf(currentPage) - 1 : pages.indexOf(currentPage) + 1; + } + else { + pageIndex = pages.indexOf(currentPage); + } + var page = pages[pageIndex]; + + if (pageIndex === -1 || pageIndex === 4) { + sidebarActive = true; + showSidebar(invert); + } + else if (pageIndex >= 0 && pageIndex <= 3) { + var goTo = pages[pageIndex]; + sidebarActive = false; + root.go(goTo); + } + }; + return root; }); From e6f02c904ed6790e2e5025bded89bf73be3a2739 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Mon, 8 Dec 2014 12:45:12 -0300 Subject: [PATCH 6/7] pull sidebars anywhere --- js/services/go.js | 54 +++++++++++++++++------------------------------ 1 file changed, 19 insertions(+), 35 deletions(-) diff --git a/js/services/go.js b/js/services/go.js index 88492b189..ac9d9d85b 100644 --- a/js/services/go.js +++ b/js/services/go.js @@ -14,18 +14,29 @@ angular.module('copayApp.services').factory('go', function($window, $location) { elem.removeClass('move-left'); }; - var showSidebar = function(invert) { + var toggleSidebar = function(invert) { if (typeof document === 'undefined') return; - // hack to hide sidebars and use ng-click (no href=) - var win = angular.element($window); - var elem = angular.element(document.querySelector('#off-canvas-wrap')) + var elem = angular.element(document.querySelector('#off-canvas-wrap')); + var leftbarActive = angular.element(document.getElementsByClassName('move-right')).length; + var rightbarActive = angular.element(document.getElementsByClassName('move-left')).length; + if (invert) { - elem.addClass('move-right'); + if (rightbarActive) { + hideSidebars(); + } + else { + elem.addClass('move-right'); + } } - else { - elem.addClass('move-left'); + else { + if (leftbarActive) { + hideSidebars(); + } + else { + elem.addClass('move-left'); + } } }; @@ -37,35 +48,8 @@ angular.module('copayApp.services').factory('go', function($window, $location) { hideSidebars(); }; - var pages = [ - '/homeWallet', - '/receive', - '/send', - '/history' - ]; - - var sidebarActive = false; - root.swipe = function(invert) { - var currentPage = $location.path(); - var pageIndex; - if (!sidebarActive) { - pageIndex = invert ? pages.indexOf(currentPage) - 1 : pages.indexOf(currentPage) + 1; - } - else { - pageIndex = pages.indexOf(currentPage); - } - var page = pages[pageIndex]; - - if (pageIndex === -1 || pageIndex === 4) { - sidebarActive = true; - showSidebar(invert); - } - else if (pageIndex >= 0 && pageIndex <= 3) { - var goTo = pages[pageIndex]; - sidebarActive = false; - root.go(goTo); - } + toggleSidebar(invert); }; return root; From 2be4600509509678d8705f08feb4fc330078b81c Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Mon, 8 Dec 2014 12:58:05 -0300 Subject: [PATCH 7/7] display a spinner when signing with a PIN --- js/controllers/home.js | 1 + js/services/pinService.js | 2 ++ views/home.html | 4 +++- 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/js/controllers/home.js b/js/controllers/home.js index 81a65e3e0..9a2d99e17 100644 --- a/js/controllers/home.js +++ b/js/controllers/home.js @@ -72,6 +72,7 @@ angular.module('copayApp.controllers').controller('HomeController', function($sc var credentials = pinService.get(pin, function(err, credentials) { if (err || !credentials) { $rootScope.starting = false; + $scope.loading = null; $scope.error = 'Wrong PIN'; return; } diff --git a/js/services/pinService.js b/js/services/pinService.js index 914bdcee8..726a2b4f4 100644 --- a/js/services/pinService.js +++ b/js/services/pinService.js @@ -57,7 +57,9 @@ angular.module('copayApp.services') set: function(newValue) { this['_' + name] = newValue; scope.error = null; + scope.loading = null; if (newValue && newValue.length == 4) { + scope.loading = true; $timeout(function() { return cb(newValue); }, 30); diff --git a/views/home.html b/views/home.html index 060c95058..ceb1f7bcc 100644 --- a/views/home.html +++ b/views/home.html @@ -103,7 +103,9 @@
-