From 2b976e812c37e3c9a2b660b292b42dc482e3df4d Mon Sep 17 00:00:00 2001 From: Matias Alejo Garcia Date: Thu, 11 Aug 2016 17:38:27 -0300 Subject: [PATCH] tabs! --- public/views/includes/menu.html | 2 + public/views/tab-home.html | 9 ++++ public/views/tab-receive.html | 5 ++ public/views/tab-send.html | 5 ++ public/views/tab-settings.html | 6 +++ public/views/tabs.html | 29 +++++++++++ public/views/walletHome.html | 14 +++++- src/js/routes.js | 89 +++++++++++++++++++++------------ 8 files changed, 126 insertions(+), 33 deletions(-) create mode 100644 public/views/tab-home.html create mode 100644 public/views/tab-receive.html create mode 100644 public/views/tab-send.html create mode 100644 public/views/tab-settings.html create mode 100644 public/views/tabs.html diff --git a/public/views/includes/menu.html b/public/views/includes/menu.html index c13a44156..78c46b155 100644 --- a/public/views/includes/menu.html +++ b/public/views/includes/menu.html @@ -8,3 +8,5 @@ + + diff --git a/public/views/tab-home.html b/public/views/tab-home.html new file mode 100644 index 000000000..96443e504 --- /dev/null +++ b/public/views/tab-home.html @@ -0,0 +1,9 @@ + +< + +

Welcome to Home

+

+ This is the Ionic starter for tabs-based apps. For other starters and ready-made templates, check out the Ionic Market. +

+ + p> diff --git a/public/views/tab-receive.html b/public/views/tab-receive.html new file mode 100644 index 000000000..40380bc47 --- /dev/null +++ b/public/views/tab-receive.html @@ -0,0 +1,5 @@ + + +

Welcome to Receive

+
+
diff --git a/public/views/tab-send.html b/public/views/tab-send.html new file mode 100644 index 000000000..9d59c5b8c --- /dev/null +++ b/public/views/tab-send.html @@ -0,0 +1,5 @@ + + +

Welcome to Send

+
+
diff --git a/public/views/tab-settings.html b/public/views/tab-settings.html new file mode 100644 index 000000000..cc4f21e3f --- /dev/null +++ b/public/views/tab-settings.html @@ -0,0 +1,6 @@ + + + +

Welcome to Settings

+
+
diff --git a/public/views/tabs.html b/public/views/tabs.html new file mode 100644 index 000000000..410caac17 --- /dev/null +++ b/public/views/tabs.html @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/public/views/walletHome.html b/public/views/walletHome.html index 6cadc8828..91e2c217e 100644 --- a/public/views/walletHome.html +++ b/public/views/walletHome.html @@ -519,4 +519,16 @@
-
+
+
+ +
+
diff --git a/src/js/routes.js b/src/js/routes.js index f26417545..ab8f649a5 100644 --- a/src/js/routes.js +++ b/src/js/routes.js @@ -95,7 +95,6 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr }) .state('walletHome', { url: '/', - walletShouldBeComplete: true, needProfile: true, views: { 'main': { @@ -103,7 +102,57 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr }, } }) - .state('unsupported', { + .state('tabs', { + url: '/tabs', + needProfile: true, + abstract: true, + views: { + 'main': { + templateUrl: 'views/tabs.html', + }, + } + }) + .state('tabs.home', { + url: '/home', + needProfile: true, + views: { + 'tab-home': { + templateUrl: 'views/tab-home.html', + }, + } + }) + .state('tabs.receive', { + url: '/receive', + needProfile: true, + views: { + 'tab-receive': { + templateUrl: 'views/tab-receive.html', + }, + } + }) + .state('tabs.send', { + url: '/send', + needProfile: true, + views: { + 'tab-send': { + templateUrl: 'views/tab-send.html', + }, + } + }) + .state('tabs.settings', { + url: '/settings', + needProfile: true, + views: { + 'tab-settings': { + templateUrl: 'views/tab-settings.html', + }, + } + }) + + + + + .state('unsupported', { url: '/unsupported', needProfile: false, views: { @@ -171,7 +220,6 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr .state('preferences', { url: '/preferences', templateUrl: 'views/preferences.html', - walletShouldBeComplete: true, needProfile: true, views: { 'main': { @@ -219,7 +267,6 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr }) .state('glidera', { url: '/glidera', - walletShouldBeComplete: true, needProfile: true, views: { 'main': { @@ -229,7 +276,6 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr }) .state('buyGlidera', { url: '/buy', - walletShouldBeComplete: true, needProfile: true, views: { 'main': { @@ -239,7 +285,6 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr }) .state('sellGlidera', { url: '/sell', - walletShouldBeComplete: true, needProfile: true, views: { 'main': { @@ -249,7 +294,6 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr }) .state('preferencesGlidera', { url: '/preferencesGlidera', - walletShouldBeComplete: true, needProfile: true, views: { 'main': { @@ -259,7 +303,6 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr }) .state('bitpayCard', { url: '/bitpay-card', - walletShouldBeComplete: true, needProfile: true, views: { 'main': { @@ -269,7 +312,6 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr }) .state('preferencesBitpayCard', { url: '/preferences-bitpay-card', - walletShouldBeComplete: true, needProfile: true, views: { 'main': { @@ -279,7 +321,6 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr }) .state('coinbase', { url: '/coinbase', - walletShouldBeComplete: true, needProfile: true, views: { 'main': { @@ -289,7 +330,6 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr }) .state('preferencesCoinbase', { url: '/preferencesCoinbase', - walletShouldBeComplete: true, needProfile: true, views: { 'main': { @@ -308,7 +348,6 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr }) .state('buyCoinbase', { url: '/buycoinbase', - walletShouldBeComplete: true, needProfile: true, views: { 'main': { @@ -318,7 +357,6 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr }) .state('sellCoinbase', { url: '/sellcoinbase', - walletShouldBeComplete: true, needProfile: true, views: { 'main': { @@ -342,7 +380,6 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr }) .state('amazon', { url: '/amazon', - walletShouldBeComplete: true, needProfile: true, views: { 'main': { @@ -352,7 +389,6 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr }) .state('buyAmazon', { url: '/buyamazon', - walletShouldBeComplete: true, needProfile: true, views: { 'main': { @@ -363,7 +399,6 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr .state('preferencesAdvanced', { url: '/preferencesAdvanced', templateUrl: 'views/preferencesAdvanced.html', - walletShouldBeComplete: true, needProfile: true, views: { 'main': { @@ -374,7 +409,6 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr .state('preferencesColor', { url: '/preferencesColor', templateUrl: 'views/preferencesColor.html', - walletShouldBeComplete: true, needProfile: true, views: { 'main': { @@ -395,7 +429,6 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr .state('preferencesAlias', { url: '/preferencesAlias', templateUrl: 'views/preferencesAlias.html', - walletShouldBeComplete: true, needProfile: true, views: { 'main': { @@ -407,7 +440,6 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr .state('preferencesEmail', { url: '/preferencesEmail', templateUrl: 'views/preferencesEmail.html', - walletShouldBeComplete: true, needProfile: true, views: { 'main': { @@ -419,7 +451,6 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr .state('preferencesBwsUrl', { url: '/preferencesBwsUrl', templateUrl: 'views/preferencesBwsUrl.html', - walletShouldBeComplete: true, needProfile: true, views: { 'main': { @@ -431,7 +462,6 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr .state('preferencesHistory', { url: '/preferencesHistory', templateUrl: 'views/preferencesHistory.html', - walletShouldBeComplete: true, needProfile: true, views: { 'main': { @@ -443,7 +473,6 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr .state('deleteWords', { url: '/deleteWords', templateUrl: 'views/preferencesDeleteWords.html', - walletShouldBeComplete: true, needProfile: true, views: { 'main': { @@ -454,7 +483,6 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr .state('delete', { url: '/delete', templateUrl: 'views/preferencesDeleteWallet.html', - walletShouldBeComplete: true, needProfile: true, views: { 'main': { @@ -464,7 +492,6 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr }) .state('information', { url: '/information', - walletShouldBeComplete: true, needProfile: true, views: { 'main': { @@ -495,7 +522,6 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr .state('export', { url: '/export', templateUrl: 'views/export.html', - walletShouldBeComplete: true, needProfile: true, views: { 'main': { @@ -506,7 +532,6 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr .state('paperWallet', { url: '/paperWallet', templateUrl: 'views/paperWallet.html', - walletShouldBeComplete: true, needProfile: true, views: { 'main': { @@ -517,7 +542,6 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr .state('backup', { url: '/backup', templateUrl: 'views/backup.html', - walletShouldBeComplete: true, needProfile: true, views: { 'main': { @@ -701,11 +725,12 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr $state.transitionTo(toState.name || toState, toParams); } }); - } else { - if (profileService.focusedClient && !profileService.focusedClient.isComplete() && toState.walletShouldBeComplete) { - - $state.transitionTo('copayers'); - } } + // else { + // if (profileService.focusedClient && !profileService.focusedClient.isComplete() && toState.walletShouldBeComplete) { + // + // $state.transitionTo('copayers'); + // } + // } }); });