routing good

Zemke · Jan 18, 2014 · 3acb3cc · 3acb3cc
1 parent 36db1f6
commit 3acb3cc
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 15 deletions.
diff --git a/public/index.html b/public/index.html
@@ -2,6 +2,8 @@
 <html lang="en">
 <head>
 	<meta charset="UTF-8">
+	<base href="/">
+
 	<title>Starter Node and Angular</title>
 
 	<!-- CSS -->
@@ -21,7 +23,11 @@
 		<script src="js/appRoutes.js"></script>
 		<script src="js/app.js"></script>
 </head>
-<body ng-app="sampleApp">
+<body ng-app="sampleApp" ng-controller="NerdController">
+
+	look at me
+
 	<div ng-view></div>
+
 </body>
 </html>
diff --git a/public/js/appRoutes.js b/public/js/appRoutes.js
@@ -1,26 +1,22 @@
-angular.module('appRoutes').config(['$routeProvider', '$locationProvider', function($routeProvider, $locationProvider) {
+angular.module('appRoutes', []).config(['$routeProvider', '$locationProvider', function($routeProvider, $locationProvider) {
 
 	$routeProvider
 
 		// home page
 		.when('/', {
-			templateUrl: 'views/home.html',
-			controller: 'NerdController'
+			templateUrl: 'views/home.html'
 		})
 
 		// sample page 1
 		.when('/sample1', {
-			templateUrl: 'views/sample1.html',
-			controller: 'NerdController'
+			templateUrl: 'views/sample1.html'
 		})
 
 		// sample page 2 (with parameters)
 		.when('/sample2:nerd_id', {
-			templateUrl: 'views/sample2.html',
-			controller: 'NerdController'
+			templateUrl: 'views/sample2.html'
 		});
 
-		// enable html5 history api
-		$locationProvider.html5mode(true);
+	$locationProvider.html5Mode(true);
 
 }]);
diff --git a/public/js/controllers/NerdCtrl.js b/public/js/controllers/NerdCtrl.js
@@ -1,5 +1,6 @@
-angular.module('NerdCtrl').controller('NerdController', ['$scope', function($scope) {
+angular.module('NerdCtrl', []).controller('NerdController', function($scope) {
 
-	$scope.test = 'hello';
+	$scope.test = 'hello';	
+	console.log('fuck');
 
-}]);
+});
diff --git a/public/js/services/NerdService.js b/public/js/services/NerdService.js
@@ -1,5 +1,5 @@
-angular.module('NerdService').factory('Nerd', ['$resource', function($resource) {
+angular.module('NerdService', []).factory('Nerd', ['$resource', function($resource) {
+
 
 
-
 }]);