changing ui.router version

js/app.js

@@ -7,21 +7,16 @@ app.config(['$stateProvider', '$urlRouterProvider', 'localStorageServiceProvider
 
   $stateProvider
   .state('splash-page', {
-    url: '/splash-page',
+    data: { 'requiresLogin': false },
-    data: {
-      'requiresLogin': false
-    },
     params: {
       'toState': 'launchpad-home', // default state to proceed to after login
       'toParams': {}
     },
+    url: '/splash-page',
     templateUrl: '/templates/splash-page.html',
   })
   .state('app',{
     url: '/launchpad-',
-    data: {
-      'requiresLogin': true
-    },
     views: {
       'header': {
         templateUrl: '/templates/partials/header.html',
@@ -37,13 +32,15 @@ app.config(['$stateProvider', '$urlRouterProvider', 'localStorageServiceProvider
       'notifications': {
         templateUrl: '/templates/partials/notifications.html'
       }
+    },
+    data: { 'requiresLogin': true },
+    params: {
+      'toState': '',
+      'toParams': {}
     }
   })
   .state('app.home', {
     url: 'home',
-    data: {
-      'requiresLogin': true
-    },
     views: {
       'content@': {
         templateUrl: 'templates/home.html',
@@ -54,9 +51,6 @@ app.config(['$stateProvider', '$urlRouterProvider', 'localStorageServiceProvider
   })
   .state('app.bolt', {
     url: 'bolt',
-    data: {
-      'requiresLogin': true
-    },
     views: {
       'content@': {
         templateUrl: 'templates/bolt.html',
@@ -131,18 +125,30 @@ app.config(['$stateProvider', '$urlRouterProvider', 'localStorageServiceProvider
       }
     }
   });
-}])
+}]);
-.run(['$rootScope', '$state', 'Auth', function($rootScope, $state, Auth) {
+
+app.run(['$rootScope', '$state', 'Auth', function($rootScope, $state, Auth) {
 
   // Change title based on the `data` object in routes
   $rootScope.$on('$stateChangeStart', function(event, toState, toParams, fromState, fromParams) {
-    console.log('things');
+    console.log('toState', toState);
-    // var requiresLogin = toState.data.requiresLogin;
+    console.log('toParams', toParams);
-    //
+    console.log('fromState', fromState);
-    // if (requiresLogin && !LoginService.check()) {
+    console.log('fromParams', fromParams);
-    //   event.preventDefault();
-    //   $state.go('splash-page', {'toState': toState.name, 'toParams': toParams});
-    // }
-  });
 
+    var requiresLogin = toState.data.requiresLogin;
+
+    if (requiresLogin && !Auth.isLoggedIn()) {
+      event.preventDefault();
+      $state.go('splash-page', {'toState': toState.name, 'toParams': toParams});
+    } else {
+      // if ($state.params.toState === undefined && $state.params.toParams === undefined) {
+      //   console.log('set a route');
+      // }
+      console.log('TOSTATE: ',$state.params.toState);
+      console.log('TOPARAMS: ',$state.params.toParams);
+      // $state.go($state.params.toState, $state.params.toParams);
+    }
+
+  });
 }]);

js/controllers/HomeController.js

@@ -1,19 +1,16 @@
-app.controller('HomeController', ['$scope', 'Auth', 'localStorageService', '$location', function ($scope, Auth, localStorageService, $location) {
+app.controller('HomeController', ['$scope', 'Auth', 'localStorageService', '$location', '$rootScope', function ($scope, Auth, localStorageService, $location, $rootScope) {
   var vm = this;
 
   vm.signOut = function () {
     localStorageService.remove('userAuth');
     $location.path('/splash-page');
-  }
+  };
 
   function userAuth() {
     return JSON.parse(localStorageService.get('userAuth'));
   }
 
-  $scope.$watch(Auth.isLoggedIn, function (value, oldValue) {
+
-    if (!value && !oldValue) {
+
-      $location.path('/splash-page');
-    }
-  }, true);
 
 }]);

js/controllers/signInController.js

@@ -1,18 +1,14 @@
-app.controller('SignInController', ['$scope', 'Auth', '$location', 'localStorageService', function ($scope, Auth, $location, localStorageService) {
+app.controller('SignInController', ['$scope', 'Auth', '$location', 'localStorageService', '$rootScope', function ($scope, Auth, $location, localStorageService, $rootScope) {
   var vm = this;
-  vm.signIn = function () {
 
+  vm.signIn = function () {
     var userInfo = {
       email: vm.userAuthEmail
     };
-
     Auth.setUser(userInfo);
-
     var userAuthenticated = function() {
       return localStorageService.set('userAuth', JSON.stringify(userInfo));
     }();
-
-    $location.path('/launchpad-home');
   };
   
 }]);