diff --git a/js/app.js b/js/app.js index e6e332d..beea3cd 100644 --- a/js/app.js +++ b/js/app.js @@ -33,7 +33,9 @@ app.config(['$stateProvider', '$urlRouterProvider', 'localStorageServiceProvider templateUrl: '/templates/home.html' }, 'notifications': { - templateUrl: '/templates/partials/notifications.html' + templateUrl: '/templates/partials/notifications.html', + controller: 'HomeController', + controllerAs: 'vm' } }, }) diff --git a/js/controllers/HomeController.js b/js/controllers/HomeController.js index 02d23a2..d0949ce 100644 --- a/js/controllers/HomeController.js +++ b/js/controllers/HomeController.js @@ -6,11 +6,13 @@ app.controller('HomeController', ['$scope', 'Auth', 'localStorageService', '$loc $location.path('/splash-page'); }; - function userAuth() { - return JSON.parse(localStorageService.get('userAuth')); - } + vm.userName = function(profile){ + profile = Auth.getProfile(); + return profile.email; + }; + console.log('worked:', vm.userName()); }]); diff --git a/js/controllers/signInController.js b/js/controllers/signInController.js index df01901..6094e27 100644 --- a/js/controllers/signInController.js +++ b/js/controllers/signInController.js @@ -11,5 +11,4 @@ app.controller('SignInController', ['$scope', 'Auth', '$location', 'localStorage }(); }; - }]); diff --git a/js/services/auth.js b/js/services/auth.js index 3d8280a..f89dda4 100644 --- a/js/services/auth.js +++ b/js/services/auth.js @@ -2,10 +2,10 @@ app.factory('Auth', ['localStorageService', '$location', function(localStorageSe var user; return{ - setUser : function(currentUser){ + setUser: function(currentUser){ user = currentUser; - console.log("%c" + redirectedURL, "color: red; font-size: 72px;"); + // console.log("%c" + redirectedURL, "color: red; font-size: 72px;"); if (redirectedURL === '/splash-page') { $location.path('/launchpad-home'); @@ -13,9 +13,13 @@ app.factory('Auth', ['localStorageService', '$location', function(localStorageSe $location.path('/launchpad-' + redirectedURL); } }, - isLoggedIn : function(){ + isLoggedIn: function(){ user = JSON.parse(localStorageService.get('userAuth')); return (user) ? user : false; + }, + getProfile: function(profile) { + profile = user; + return profile; } }; }]); diff --git a/templates/partials/header.html b/templates/partials/header.html index ee9110b..8f26528 100644 --- a/templates/partials/header.html +++ b/templates/partials/header.html @@ -19,7 +19,7 @@