diff --git a/css/main.css b/css/main.css index 5b3c7f8c4..fb9e827d2 100644 --- a/css/main.css +++ b/css/main.css @@ -1129,4 +1129,10 @@ a.text-warning:hover {color: #FD7262;} } } +.wide-page { + background-color: #2C3E50; + margin: 10% 0; + padding: 50px; +} + /*-----------------------------------------------------------------*/ diff --git a/js/controllers/home.js b/js/controllers/home.js index 6e5eb489a..2aac5071f 100644 --- a/js/controllers/home.js +++ b/js/controllers/home.js @@ -1,7 +1,10 @@ 'use strict'; angular.module('copayApp.controllers').controller('HomeController', - function($scope, $rootScope, walletFactory, notification) { + function($scope, $rootScope, $location, walletFactory, notification, controllerUtils) { + + controllerUtils.redirIfLogged(); + $scope.loading = false; if ($rootScope.pendingPayment) { notification.info('Login Required', 'Please open wallet to complete payment'); diff --git a/js/controllers/import.js b/js/controllers/import.js index 901945d5c..f978884cd 100644 --- a/js/controllers/import.js +++ b/js/controllers/import.js @@ -1,7 +1,10 @@ 'use strict'; angular.module('copayApp.controllers').controller('ImportController', - function($scope, $rootScope, walletFactory, controllerUtils, Passphrase, notification) { + function($scope, $rootScope, $location, walletFactory, controllerUtils, Passphrase, notification) { + + controllerUtils.redirIfLogged(); + $scope.title = 'Import a backup'; $scope.importStatus = 'Importing wallet - Reading backup...'; diff --git a/js/controllers/join.js b/js/controllers/join.js index 0adba7c7f..41ee28f36 100644 --- a/js/controllers/join.js +++ b/js/controllers/join.js @@ -2,6 +2,7 @@ angular.module('copayApp.controllers').controller('JoinController', function($scope, $rootScope, $timeout, walletFactory, controllerUtils, Passphrase, notification) { + controllerUtils.redirIfLogged(); $rootScope.fromSetup = false; $scope.loading = false; diff --git a/js/controllers/open.js b/js/controllers/open.js index bd67232ad..ccf0ebb92 100644 --- a/js/controllers/open.js +++ b/js/controllers/open.js @@ -1,7 +1,9 @@ 'use strict'; angular.module('copayApp.controllers').controller('OpenController', - function($scope, $rootScope, walletFactory, controllerUtils, Passphrase, notification) { + function($scope, $rootScope, $location, walletFactory, controllerUtils, Passphrase, notification) { + controllerUtils.redirIfLogged(); + var cmp = function(o1, o2) { var v1 = o1.show.toLowerCase(), v2 = o2.show.toLowerCase(); diff --git a/js/controllers/settings.js b/js/controllers/settings.js index 60d1749d1..36ffa144e 100644 --- a/js/controllers/settings.js +++ b/js/controllers/settings.js @@ -2,6 +2,8 @@ angular.module('copayApp.controllers').controller('SettingsController', function($scope, $rootScope, $window, $location) { + + controllerUtils.redirIfLogged(); $scope.title = 'Settings'; $scope.networkName = config.networkName; $scope.insightHost = config.blockchain.host; diff --git a/js/controllers/setup.js b/js/controllers/setup.js index babeca501..ee9d48d33 100644 --- a/js/controllers/setup.js +++ b/js/controllers/setup.js @@ -34,6 +34,7 @@ var valid_pairs = { angular.module('copayApp.controllers').controller('SetupController', function($scope, $rootScope, $location, $timeout, walletFactory, controllerUtils, Passphrase, backupService, notification) { + controllerUtils.redirIfLogged(); $rootScope.fromSetup = true; $rootScope.videoInfo = {}; diff --git a/js/services/controllerUtils.js b/js/services/controllerUtils.js index 9480fe74f..50c51c4af 100644 --- a/js/services/controllerUtils.js +++ b/js/services/controllerUtils.js @@ -14,6 +14,13 @@ angular.module('copayApp.services') return vi.muted; }; + root.redirIfLogged = function() { + var w = $rootScope.wallet; + if (w) { + $location.path('addresses'); + } + }; + root.logout = function() { Socket.removeAllListeners(); diff --git a/views/errors/404.html b/views/errors/404.html index d75d4b922..1af47d530 100644 --- a/views/errors/404.html +++ b/views/errors/404.html @@ -1,7 +1,9 @@ -
- Copay +
+
+ Copay +
+

404

+

Page not found

+

go back...

-

404

-

Page not found

-

go back...

diff --git a/views/unsupported.html b/views/unsupported.html index 073e5d4b2..bde86f717 100644 --- a/views/unsupported.html +++ b/views/unsupported.html @@ -1,15 +1,18 @@ -
- Copay -
-
-

Browser unsupported

-

- Copay uses webRTC for peer-to-peer communications, - but your browser does not support it. - Please use - a current version of Google Chrome, Mozilla Firefox, or Opera. -

+
+
+ Copay +
+
+

Browser unsupported

+

+ Copay uses webRTC for peer-to-peer communications, + but your browser does not support it. + Please use + a current version of Google Chrome, Mozilla Firefox, or Opera. +

+ + For more information + on supported browsers please check http://www.webrtc.org/ +

+
- For more information - on supported browsers please check http://www.webrtc.org/ -

diff --git a/views/uri-payment.html b/views/uri-payment.html index 6c488ee8d..64390d478 100644 --- a/views/uri-payment.html +++ b/views/uri-payment.html @@ -1,4 +1,4 @@ -

+

Preparing payment...