diff --git a/js/app.js b/js/app.js index 2b48113..64662f0 100644 --- a/js/app.js +++ b/js/app.js @@ -11,10 +11,12 @@ app.config(['$stateProvider', '$urlRouterProvider', 'localStorageServiceProvider data: { requiresLogin: false }, url: '/splash-page', templateUrl: '/templates/splash-page.html', + controller: 'loginCtrl as vm' }) .state('app',{ data: { requiresLogin: true }, url: '/', + controller: 'loginCtrl as vm', views: { 'header': { templateUrl: '/templates/partials/header.html', diff --git a/js/controllers/bolt-controller.js b/js/controllers/bolt-controller.js index fa8f59c..4e5b423 100644 --- a/js/controllers/bolt-controller.js +++ b/js/controllers/bolt-controller.js @@ -1,10 +1,6 @@ app.controller('boltCtrl', [ '$scope', 'Auth', function($scope, Auth) { - + var vm = this; - vm.userName = function(profile){ - profile = Auth.getProfile(); - return profile.email; - }; }]); diff --git a/js/controllers/login-controller.js b/js/controllers/login-controller.js index 7f64d81..bcca67c 100644 --- a/js/controllers/login-controller.js +++ b/js/controllers/login-controller.js @@ -123,14 +123,9 @@ app.controller('loginCtrl', [ vm.setIssuer(vm.defaultIssuer); vm.getSession = function() { - console.log('asdf'); return Auth.select(Auth.session); }; - $scope.$watch('vm.session', function (newValue, oldValue) { - vm.session = newValue; - }); - vm.initListLoggedInProfiles = function () { vm.activeProfiles = Auth.getActiveSessions(); }; @@ -157,5 +152,4 @@ app.controller('loginCtrl', [ }); }; - }]); diff --git a/templates/home.html b/templates/home.html index 66aed66..fdd98aa 100644 --- a/templates/home.html +++ b/templates/home.html @@ -1,13 +1,7 @@ -
- - - - -