From e269fd87567ab7ee25a8a47d11937470339a0305 Mon Sep 17 00:00:00 2001
From: David Baldwynn <polydaic_mac@Davids-MacBook-Air.local>
Date: Wed, 27 Apr 2016 18:40:51 -0700
Subject: [PATCH] fixed routing errors

---
 public/application.js                            |  8 ++++----
 .../core/controllers/header.client.controller.js |  6 +++---
 .../modules/forms/config/forms.client.config.js  | 16 +++-------------
 .../modules/forms/config/forms.client.routes.js  |  6 +++---
 4 files changed, 13 insertions(+), 23 deletions(-)

diff --git a/public/application.js b/public/application.js
index 516a868e..bcea4aea 100755
--- a/public/application.js
+++ b/public/application.js
@@ -43,13 +43,13 @@ angular.module(ApplicationConfiguration.applicationModuleName).run(['$rootScope'
 				$state.go('listForms'); // go to listForms page
         		}
         	}
-	        //Redirect to 'home' route if user is not authenticated
+	        //Redirect to 'signup' route if user is not authenticated
         	else if(toState.name !== 'access_denied' && !Auth.isAuthenticated() && toState.name !== 'submitForm'){
-        		console.log('go to home');
+        		console.log('go to signup');
         		event.preventDefault(); // stop current execution
-        		$state.go('home'); // go to listForms page
+        		$state.go('signup'); // go to listForms page
         	}
-	        
+
 	    });
 
     }
diff --git a/public/modules/core/controllers/header.client.controller.js b/public/modules/core/controllers/header.client.controller.js
index 77e01283..120b43e3 100755
--- a/public/modules/core/controllers/header.client.controller.js
+++ b/public/modules/core/controllers/header.client.controller.js
@@ -17,8 +17,8 @@ angular.module('core').controller('HeaderController', ['$rootScope', '$scope', '
 				Auth.logout();
 				Auth.ensureHasCurrentUser(User);
 				$scope.user = $rootScope.user = null;
-				$state.go('home');
-			}, 
+				$state.go('listForms');
+			},
 			function(reason) {
 			  	console.log('Logout Failed: ' + reason);
 			});
@@ -41,4 +41,4 @@ angular.module('core').controller('HeaderController', ['$rootScope', '$scope', '
 		});
 
 	}
-]);
\ No newline at end of file
+]);
diff --git a/public/modules/forms/config/forms.client.config.js b/public/modules/forms/config/forms.client.config.js
index 6c6b36b7..ed15ac88 100644
--- a/public/modules/forms/config/forms.client.config.js
+++ b/public/modules/forms/config/forms.client.config.js
@@ -6,21 +6,11 @@ angular.module('forms').run(['Menus',
 		// Set top bar menu items
 		Menus.addMenuItem('topbar', 'My Forms', 'forms', '', '/forms', false);
 	}
-])
-/*.filter('highlight', function() {
-    function escapeRegexp(queryToEscape) {
-        return ('' + queryToEscape).replace(/([.?*+^$[\]\\(){}|-])/g, '\\$1');
-    }
-
-    return function(matchItem, query) {
-        return query && matchItem ? ('' + matchItem).replace(new RegExp(escapeRegexp(query), 'gi'), '<span class="ui-select-highlight">$&</span>') : matchItem;
-    };
-})*/
-.filter('formValidity',
+]).filter('formValidity',
     function(){
         return function(formObj){
         	if(formObj && formObj.form_fields && formObj.visible_form_fields){
-        		
+
 				//get keys
 				var formKeys = Object.keys(formObj);
 
@@ -42,7 +32,7 @@ angular.module('forms').run(['Menus',
 			return 0;
         };
 }).config(['$provide', function ($provide){
-    $provide.decorator('accordionDirective', function($delegate) { 
+    $provide.decorator('accordionDirective', function($delegate) {
         var directive = $delegate[0];
         directive.replace = true;
         return $delegate;
diff --git a/public/modules/forms/config/forms.client.routes.js b/public/modules/forms/config/forms.client.routes.js
index 0729a3f9..f4da84dc 100644
--- a/public/modules/forms/config/forms.client.routes.js
+++ b/public/modules/forms/config/forms.client.routes.js
@@ -15,13 +15,13 @@ angular.module('forms').config([
 			url: '/forms/:formId',
 			templateUrl: 'modules/forms/views/submit-form.client.view.html',
 			data: {
-				hideNav: true,
+				hideNav: true
 			},
 			resolve: {
 				Forms: 'Forms',
 		        myForm: function (Forms, $stateParams) {
 		            return Forms.get({formId: $stateParams.formId}).$promise;
-		        },
+		        }
 			},
 			controller: 'SubmitFormController',
             controllerAs: 'ctrl'
@@ -35,7 +35,7 @@ angular.module('forms').config([
 				Forms: 'Forms',
 		        myForm: function (Forms, $stateParams) {
 		            return Forms.get({formId: $stateParams.formId}).$promise;
-		        },
+		        }
 			},
 			controller: 'AdminFormController'
 		}).state('viewForm.configure', {