time to simplify

Chris Sevilleja · Chris Sevilleja · commit 3fe7f8fc9296 · 2014-01-18T12:41:38.000-08:00
diff --git a/app/models/Nerd.js b/app/models/Nerd.js
diff --git a/public/index.html b/public/index.html
@@ -19,8 +19,11 @@
 	<script src="libs/angular-route/angular-route.min.js"></script>
 
 	<!-- ANGULAR CUSTOM -->
+	<script src="js/controllers/MainCtrl.js"></script>
 	<script src="js/controllers/NerdCtrl.js"></script>
 	<script src="js/services/NerdService.js"></script>
+	<script src="js/controllers/GeekCtrl.js"></script>
+	<script src="js/services/GeekService.js"></script>
 	<script src="js/appRoutes.js"></script>
 	<script src="js/app.js"></script>
 </head>
@@ -34,7 +37,7 @@
 		</div>
 		<ul class="nav navbar-nav">
 			<li><a href="/nerds">Nerds</a></li>
-			<li><a href="/test">Test</a></li>
+			<li><a href="/geeks">Geeks</a></li>
 		</ul>
 	</nav>
 
diff --git a/public/js/app.js b/public/js/app.js
diff --git a/public/js/appRoutes.js b/public/js/appRoutes.js
@@ -4,7 +4,18 @@ angular.module('appRoutes', []).config(['$routeProvider', '$locationProvider', f
 
 		// home page
 		.when('/', {
-			templateUrl: 'views/home.html'
+			templateUrl: 'views/home.html',
+			controller: 'MainController'
+		})
+
+		.when('/nerds', {
+			templateUrl: 'views/nerd.html',
+			controller: 'NerdController'
+		})
+
+		.when('/geeks', {
+			templateUrl: 'views/geek.html',
+			controller: 'GeekController'	
 		});
 
 	$locationProvider.html5Mode(true);
diff --git a/public/js/controllers/GeekCtrl.js b/public/js/controllers/GeekCtrl.js
@@ -0,0 +1,5 @@
+angular.module('GeekCtrl', []).controller('GeekController', function($scope) {
+
+	$scope.tagline = 'The square root of life is pi!';	
+
+});
diff --git a/public/js/controllers/MainCtrl.js b/public/js/controllers/MainCtrl.js
@@ -0,0 +1,5 @@
+angular.module('MainCtrl', []).controller('MainController', function($scope) {
+
+	$scope.tagline = 'To the moon and back!';	
+
+});
diff --git a/public/js/controllers/NerdCtrl.js b/public/js/controllers/NerdCtrl.js
@@ -1,5 +1,5 @@
 angular.module('NerdCtrl', []).controller('NerdController', function($scope) {
 
-	$scope.test = 'hello';	
+	$scope.tagline = 'Nothing beats a pocket protector!';
 
 });
diff --git a/public/js/services/GeekService.js b/public/js/services/GeekService.js
@@ -0,0 +1,5 @@
+angular.module('GeekService', []).factory('Geek', ['$http', function($http) {
+
+	
+
+}]);
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', ['$http', function($http) {
 
+	
 
 }]);
diff --git a/public/views/geek.html b/public/views/geek.html
@@ -0,0 +1,5 @@
+<div class="jumbotron text-center">
+	<h1>Geek City</h1>
+
+	<p>{{ tagline }}</p>
+</div>
diff --git a/public/views/home.html b/public/views/home.html
@@ -1 +1,5 @@
-hello home page
+<div class="jumbotron text-center">
+	<h1>Home Page 4 Life</h1>
+
+	<p>{{ tagline }}</p>
+</div>
diff --git a/public/views/nerd.html b/public/views/nerd.html
@@ -0,0 +1,5 @@
+<div class="jumbotron text-center">
+	<h1>Nerds and Proud</h1>
+
+	<p>{{ tagline }}</p>
+</div>
diff --git a/public/views/sample2.html b/public/views/sample2.html
diff --git a/server.js b/server.js
@@ -9,7 +9,7 @@ var mongoose= require('mongoose');
 var db = require('./config/db');
 
 var port = process.env.PORT || 8080; // set our port
-// mongoose.connect(db.url); // connect to our mongoDB database
+// mongoose.connect(db.url); // connect to our mongoDB database (commented out after you enter in your own credentials)
 
 app.configure(function() {
 	app.use(express.static(__dirname + '/public')); 	// set the static files location /public/img will be /img for users

-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +angular.module('GeekCtrl', []).controller('GeekController', function($scope) {
++
 +	$scope.tagline = 'The square root of life is pi!';
++
 +});