Download as
Browse Code »

Commit d9681acbe17f17dcddaeaff643e365bc4c9c88cc

Authored by Victor Costa
1 parent 2e188a0c
Exists in master and in 38 other branches activities_block, angular2, btn-new-post, cleaning-the-house, cosmetic_changes_people_and_communities_block, coverage, edit-blocks, edit-header-footer, env-tags-block, forgot_password, header_and_footer, helpers-evolution, layout_support, list_articles_on_blog, loading-indicator-component, login_modal, login_modal_improve, person_info_block, production, profile-article-resolvers, profile-blocks-sass, profile-view, profile_description_block_component, profile_page_improvements, profile_search, recent-activities, remove-article-confirmation, responsive-fixes, seo, signup_page, skin-small-change, staging, tags-block, theme-skin-yellow, translations, typescript, updated_signup_page, users_profile_page

Move navbar controller to the main state

Showing 5 changed files with 31 additions and 8 deletions   Show diff stats
src/app/components/navbar/navbar.directive.js
  Diff comments   View file @d9681ac
@@ -21,7 +21,7 @@ @@ -21,7 +21,7 @@
21 return directive; 21 return directive;
22 22
23 /** @ngInject */ 23 /** @ngInject */
24 - function NavbarController(moment, $modal, AuthService, Session, $scope, AUTH_EVENTS) { 24 + function NavbarController(moment, $modal, AuthService, Session, $scope, $state, AUTH_EVENTS) {
25 var vm = this; 25 var vm = this;
26 26
27 // "vm.creation" is avaible by directive option "bindToController: true" 27 // "vm.creation" is avaible by directive option "bindToController: true"
@@ -39,17 +39,20 @@ @@ -39,17 +39,20 @@
39 }; 39 };
40 vm.logout = function() { 40 vm.logout = function() {
41 AuthService.logout(); 41 AuthService.logout();
  42 + $state.go($state.current, {}, {reload: true}); //TODO move to auth
42 }; 43 };
43 $scope.$on(AUTH_EVENTS.loginSuccess, function() { 44 $scope.$on(AUTH_EVENTS.loginSuccess, function() {
44 if(vm.modalInstance) { 45 if(vm.modalInstance) {
45 vm.modalInstance.close(); 46 vm.modalInstance.close();
46 vm.modalInstance = null; 47 vm.modalInstance = null;
47 } 48 }
48 - vm.currentUser = Session.getCurrentUser(); 49 + $state.go($state.current, {}, {reload: true}); //TODO move to auth
49 }); 50 });
50 $scope.$on(AUTH_EVENTS.logoutSuccess, function() { 51 $scope.$on(AUTH_EVENTS.logoutSuccess, function() {
51 vm.currentUser = Session.getCurrentUser(); 52 vm.currentUser = Session.getCurrentUser();
52 }); 53 });
  54 +
  55 + if(!vm.currentUser) vm.openLogin();
53 } 56 }
54 } 57 }
55 58
src/app/index.route.js
  Diff comments   View file @d9681ac
@@ -9,10 +9,10 @@ @@ -9,10 +9,10 @@
9 $urlRouterProvider.when('/profile/:profile', '/:profile'); 9 $urlRouterProvider.when('/profile/:profile', '/:profile');
10 10
11 $stateProvider 11 $stateProvider
12 - .state('profile', {  
13 - url: '/:profile',  
14 - templateUrl: 'app/profile/profile.html',  
15 - controller: 'ProfileController', 12 + .state('main', {
  13 + url: '/',
  14 + templateUrl: 'app/main/main.html',
  15 + controller: 'MainController',
16 controllerAs: 'vm', 16 controllerAs: 'vm',
17 resolve: { 17 resolve: {
18 currentUser: function(AuthService) { 18 currentUser: function(AuthService) {
@@ -20,7 +20,13 @@ @@ -20,7 +20,13 @@
20 } 20 }
21 } 21 }
22 }) 22 })
23 - .state('profile.page', { 23 + .state('main.profile', {
  24 + url: ':profile',
  25 + templateUrl: 'app/profile/profile.html',
  26 + controller: 'ProfileController',
  27 + controllerAs: 'vm'
  28 + })
  29 + .state('main.profile.page', {
24 url: '/{page:.*}', 30 url: '/{page:.*}',
25 templateUrl: 'app/content-viewer/page.html', 31 templateUrl: 'app/content-viewer/page.html',
26 controller: 'ContentViewerController', 32 controller: 'ContentViewerController',
src/app/main/main.controller.js 0 → 100644
  Diff comments   View file @d9681ac
@@ -0,0 +1,13 @@ @@ -0,0 +1,13 @@
  1 +(function() {
  2 + 'use strict';
  3 +
  4 + angular
  5 + .module('angular')
  6 + .controller('MainController', MainController);
  7 +
  8 +
  9 + /** @ngInject */
  10 + function MainController() {
  11 +
  12 + }
  13 +})();
src/app/main/main.html 0 → 100644
  Diff comments   View file @d9681ac
@@ -0,0 +1,2 @@ @@ -0,0 +1,2 @@
  1 +<acme-navbar></acme-navbar>
  2 +<div ui-view></div>
src/index.html
  Diff comments   View file @d9681ac
@@ -25,7 +25,6 @@ @@ -25,7 +25,6 @@
25 <p class="browsehappy">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p> 25 <p class="browsehappy">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
26 <![endif]--> 26 <![endif]-->
27 27
28 - <acme-navbar></acme-navbar>  
29 <div ui-view></div> 28 <div ui-view></div>
30 29
31 <!-- build:js(src) scripts/vendor.js --> 30 <!-- build:js(src) scripts/vendor.js -->