From 7d192a343096f0800493380b1d3e9f6dcb77aef3 Mon Sep 17 00:00:00 2001 From: trainerbill Date: Thu, 19 Feb 2015 15:50:33 -0600 Subject: [PATCH 1/4] Update app(js).js Added authorize param to check if user is admin --- app/templates/client/app/app(js).js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/app/templates/client/app/app(js).js b/app/templates/client/app/app(js).js index eef485d7c..dd128f0f5 100644 --- a/app/templates/client/app/app(js).js +++ b/app/templates/client/app/app(js).js @@ -50,6 +50,11 @@ angular.module('<%= scriptAppName %>', [<%= angularModules %>]) if (next.authenticate && !loggedIn) { $location.path('/login'); } + if (next.authorize) { + if(next.authorize === 'admin' && !Auth.isAdmin()) { + $location.path('/'); + } + } }); }); - })<% } %>; \ No newline at end of file + })<% } %>; From e8f2e73615ea6c77997d02481c1b8181b0e47f78 Mon Sep 17 00:00:00 2001 From: trainerbill Date: Thu, 19 Feb 2015 15:55:09 -0600 Subject: [PATCH 2/4] Update admin(js).js added authorize for admin state --- app/templates/client/app/admin(auth)/admin(js).js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/templates/client/app/admin(auth)/admin(js).js b/app/templates/client/app/admin(auth)/admin(js).js index 270e8a974..c9257b1d7 100644 --- a/app/templates/client/app/admin(auth)/admin(js).js +++ b/app/templates/client/app/admin(auth)/admin(js).js @@ -12,6 +12,7 @@ angular.module('<%= scriptAppName %>') .state('admin', { url: '/admin', templateUrl: 'app/admin/admin.html', - controller: 'AdminCtrl' + controller: 'AdminCtrl', + authorize: 'admin' }); - });<% } %> \ No newline at end of file + });<% } %> From a413ee84900a314406fa26b1e46e1836e54bee0c Mon Sep 17 00:00:00 2001 From: trainerbill Date: Mon, 4 May 2015 10:29:33 -0500 Subject: [PATCH 3/4] Allow Navbar to highlight on nested routes Changed isActive to look for indexOf if route is not /. Allows the navbar to highlight correctly for nesed routes. /admin/account etc. --- .../client/components/navbar/navbar.controller(js).js | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/app/templates/client/components/navbar/navbar.controller(js).js b/app/templates/client/components/navbar/navbar.controller(js).js index 4ce9dbcb5..198e0c9d1 100644 --- a/app/templates/client/components/navbar/navbar.controller(js).js +++ b/app/templates/client/components/navbar/navbar.controller(js).js @@ -18,6 +18,13 @@ angular.module('<%= scriptAppName %>') };<% } %> $scope.isActive = function(route) { - return route === $location.path(); + $scope.isActive = function(route) { + if (route !== '/') { + return -1 !== $location.path().indexOf(route); + } + else { + return route === $location.path(); + } }; - }); \ No newline at end of file + }; + }); From bf21cfeab779e7eea81f397c2dde3c227b435e79 Mon Sep 17 00:00:00 2001 From: trainerbill Date: Mon, 4 May 2015 10:33:12 -0500 Subject: [PATCH 4/4] Update --- app/templates/client/components/navbar/navbar.controller(js).js | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/templates/client/components/navbar/navbar.controller(js).js b/app/templates/client/components/navbar/navbar.controller(js).js index 198e0c9d1..6a30a4537 100644 --- a/app/templates/client/components/navbar/navbar.controller(js).js +++ b/app/templates/client/components/navbar/navbar.controller(js).js @@ -18,7 +18,6 @@ angular.module('<%= scriptAppName %>') };<% } %> $scope.isActive = function(route) { - $scope.isActive = function(route) { if (route !== '/') { return -1 !== $location.path().indexOf(route); } @@ -26,5 +25,4 @@ angular.module('<%= scriptAppName %>') return route === $location.path(); } }; - }; });