From df1519d6a03346e6f26b21a97fe2c5c09dbe6b67 Mon Sep 17 00:00:00 2001
From: Mohammed Tantawy <6102@ait.nsw.edu.au>
Date: Fri, 8 Feb 2019 11:40:27 +1100
Subject: [PATCH] minor fix

---
 src/assets/scripts/logout/controller.js            | 3 ++-
 src/assets/scripts/nwLogin/controller.js           | 5 +++--
 src/assets/scripts/nwSidebar/sidebar.controller.js | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/assets/scripts/logout/controller.js b/src/assets/scripts/logout/controller.js
index 28f9960..496fa65 100644
--- a/src/assets/scripts/logout/controller.js
+++ b/src/assets/scripts/logout/controller.js
@@ -1,10 +1,11 @@
-const LogoutController = ($scope, LogoutService, $cookies, UserService) => {
+const LogoutController = ($scope, $location, LogoutService, $cookies, UserService) => {
 	$scope.userLogged = false;		
 	
 	$scope.userLogout = async () => {
 		await LogoutService.logoutUserService($scope.user); 
         $cookies.remove('access_token');
 		UserService.loadUser();
+		$location.path('/');
 	}
 };
 
diff --git a/src/assets/scripts/nwLogin/controller.js b/src/assets/scripts/nwLogin/controller.js
index ff09677..d25beeb 100644
--- a/src/assets/scripts/nwLogin/controller.js
+++ b/src/assets/scripts/nwLogin/controller.js
@@ -1,4 +1,4 @@
-const LoginController = ($scope, $cookies, LoginService, UserService) => {
+const LoginController = ($scope, $cookies, $location, LoginService, UserService) => {
 
 	// load the user if already logged in, for all controllers
 	UserService.loadUser();
@@ -11,7 +11,8 @@ const LoginController = ($scope, $cookies, LoginService, UserService) => {
 				// save the cookie and reload the user for all controllers
 				$cookies.put('access_token', result.token);
 				UserService.loadUser();
-
+				$location.path('/');
+				$scope.$apply();
 			} else {
 				alert(result);
 			}
diff --git a/src/assets/scripts/nwSidebar/sidebar.controller.js b/src/assets/scripts/nwSidebar/sidebar.controller.js
index 59429ee..613f2ed 100644
--- a/src/assets/scripts/nwSidebar/sidebar.controller.js
+++ b/src/assets/scripts/nwSidebar/sidebar.controller.js
@@ -1,9 +1,9 @@
 /** @ngInject */
 const SidebarController = ($scope, UserService) => {
+    UserService.loadUser();
     $scope.$on('loadUserSuccess', function (event, user) {
         $scope.user = user;
     });
-
     UserService.loadUser();
 }