From 8b91bd4d69feb35c9140107db812b4e1db644f77 Mon Sep 17 00:00:00 2001 From: Jon Lambson Date: Fri, 11 Aug 2017 15:37:06 -0600 Subject: [PATCH] fixing routes --- js/app.js | 22 +++++++++++----------- js/services/auth.js | 4 ++-- templates/dns.html | 2 +- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/js/app.js b/js/app.js index aa8188b..d671d4b 100644 --- a/js/app.js +++ b/js/app.js @@ -7,19 +7,9 @@ app.config(['$stateProvider', '$urlRouterProvider', 'localStorageServiceProvider $urlRouterProvider.otherwise('/splash-page'); $stateProvider - .state('splash-page', { - data: { 'requiresLogin': false }, - params: { - // 'toState': 'launchpad-home', - 'toParams': { - } - }, - url: '/splash-page', - templateUrl: '/templates/splash-page.html', - }) .state('app',{ data: { 'requiresLogin': true }, - url: '/launchpad-', + url: '/', views: { 'header': { templateUrl: '/templates/partials/header.html', @@ -34,6 +24,16 @@ app.config(['$stateProvider', '$urlRouterProvider', 'localStorageServiceProvider } } }) + .state('splash-page', { + data: { 'requiresLogin': false }, + params: { + // 'toState': 'home', + 'toParams': { + } + }, + url: '/splash-page', + templateUrl: '/templates/splash-page.html', + }) .state('app.home', { url: 'home', views: { diff --git a/js/services/auth.js b/js/services/auth.js index f89dda4..3660bb5 100644 --- a/js/services/auth.js +++ b/js/services/auth.js @@ -8,9 +8,9 @@ app.factory('Auth', ['localStorageService', '$location', function(localStorageSe // console.log("%c" + redirectedURL, "color: red; font-size: 72px;"); if (redirectedURL === '/splash-page') { - $location.path('/launchpad-home'); + $location.path('/home'); } else { - $location.path('/launchpad-' + redirectedURL); + $location.path('/' + redirectedURL); } }, isLoggedIn: function(){ diff --git a/templates/dns.html b/templates/dns.html index 7a387db..231dabd 100644 --- a/templates/dns.html +++ b/templates/dns.html @@ -4,7 +4,7 @@

Advanced Features Ahead


This space is intended for
people that need more functionality
than the average bear


- I'd like to go home, please

+ I'd like to go home, please

I don't care, let me through