added mongodb and config

Zemke · Jan 18, 2014 · 0d07272 · 0d07272
1 parent 3acb3cc
commit 0d07272
Show file tree

Hide file tree

Showing 7 changed files with 34 additions and 11 deletions.
diff --git a/config/db.js b/config/db.js
@@ -0,0 +1,3 @@
+module.exports = {
+	url : 'mongodb://<user>:<pass>@mongo.onmodulus.net:27017/uw45mypu'
+}
diff --git a/package.json b/package.json
@@ -2,6 +2,7 @@
   "name": "starter-node-angular",
   "main": "server.js",
   "dependencies": {
-    "express": "latest"
+    "express": "latest",
+    "mongoose": "latest"
   }
 }
diff --git a/public/css/style.css b/public/css/style.css
@@ -0,0 +1 @@
+body { padding-top:30px; }
diff --git a/public/index.html b/public/index.html
@@ -3,13 +3,14 @@
 <head>
 	<meta charset="UTF-8">
 	<base href="/">
-	
+
 	<title>Starter Node and Angular</title>
 
 	<!-- CSS -->
 	<link rel="stylesheet" href="libs/bootstrap/dist/css/bootstrap.min.css">
 	<link rel="stylesheet" href="libs/font-awesome/css/font-awesome.min.css">
 	<link rel="stylesheet" href="libs/animate.css/animate.min.css">
+	<link rel="stylesheet" href="css/style.css"> <!-- custom styles -->
 
 	<!-- JS -->
 	<script src="libs/jquery/jquery.min.js"></script>
@@ -24,10 +25,22 @@
 		<script src="js/app.js"></script>
 </head>
 <body ng-app="sampleApp" ng-controller="NerdController">
+<div class="container">
+
+	<!-- HEADER -->
+	<nav class="navbar navbar-inverse">
+		<div class="navbar-header">
+			<a class="navbar-brand" href="/">Stencil: Node and Angular</a>
+		</div>
+		<ul class="nav navbar-nav">
+			<li><a href="/nerds">Nerds</a></li>
+			<li><a href="/test">Test</a></li>
+		</ul>
+	</nav>
 
-	look at me
-
+	<!-- ANGULAR DYNAMIC CONTENT -->
 	<div ng-view></div>
 
+</div>
 </body>
 </html>
diff --git a/public/js/appRoutes.js b/public/js/appRoutes.js
@@ -8,13 +8,13 @@ angular.module('appRoutes', []).config(['$routeProvider', '$locationProvider', f
 		})
 
 		// sample page 1
-		.when('/sample1', {
-			templateUrl: 'views/sample1.html'
+		.when('/nerds', {
+			templateUrl: 'views/nerd.html'
 		})
 
 		// sample page 2 (with parameters)
-		.when('/sample2:nerd_id', {
-			templateUrl: 'views/sample2.html'
+		.when('/test:name', {
+			templateUrl: 'views/nerd.html'
 		});
 
 	$locationProvider.html5Mode(true);

diff --git a/public/js/controllers/NerdCtrl.js b/public/js/controllers/NerdCtrl.js
@@ -1,6 +1,5 @@
 angular.module('NerdCtrl', []).controller('NerdController', function($scope) {
 
 	$scope.test = 'hello';	
-	console.log('fuck');
 
 });
diff --git a/server.js b/server.js
@@ -1,9 +1,15 @@
 // modules =================================================
 var express = require('express');
 var app     = express();
+var mongoose= require('mongoose');
 
 // configuration ===========================================
-var port = process.env.PORT || 8080;
+
+// config files
+var db = require('./config/db');
+
+var port = process.env.PORT || 8080; // set our port
+// mongoose.connect(db.url); // connect to our mongoDB database
 
 app.configure(function() {
 	app.use(express.static(__dirname + '/public')); 	// set the static files location /public/img will be /img for users
@@ -13,7 +19,7 @@ app.configure(function() {
 });
 
 // routes ==================================================
-require('./app/routes')(app);
+require('./app/routes')(app); // pass our application into our routes
 
 // start app ===============================================
 app.listen(port);