mbeswetherick · vrajpal · Mar 9, 2014 · Mar 9, 2014 · Mar 9, 2014 · Mar 9, 2014
diff --git a/README.md b/README.md
@@ -0,0 +1,2 @@
+### gitMusic
+To start : npm start
diff --git a/app.js b/app.js
@@ -2,23 +2,26 @@ var express = require('express');
 var fs = require('fs');
 var env = process.env.NODE_ENV = process.env.NODE_ENV || 'development';
 var app = express();
-require('./server/router')(app);
 
 app.configure(function(){
-	app.set('views', __dirname + '/views');
-	app.use(express.bodyParser());
-	app.use(express.cookieParser());
-	app.use(express.methodOverride());
-	app.use(express.static(__dirname+ '/public'));
-	app.use(app.router);
-	app.enable('trust proxy');
+  app.use(express.logger());
+  app.use(express.compress());
+  app.use(express.cookieParser());
+  app.use(express.bodyParser());
+  app.use(express.methodOverride());
+  // Load the parts of the app
+  var mongoose = require('mongoose');
+  var schema = require('./server/schema')(mongoose);
+  var db = require('./server/db')(mongoose);
+  var handler = require('./server/handler')(db, schema);
+  require('./server/router')(app, handler, schema);
+  //app.use(app.router);
+  app.use(express.static(__dirname+ '/public'));
+  app.use(express.errorHandler({ dumpExceptions: true, showStack: true }));
+  app.enable('trust proxy');
 });
 
-app.configure('development', function(){
-  app.use(express.errorHandler());
-    app.locals.pretty = true;
-});
 
 var port = 3033;
 app.listen(port);
-console.log( "Running on " + port );
+console.log("Running on " + port);
diff --git a/npm-debug.log b/npm-debug.log
@@ -0,0 +1,29 @@
+0 info it worked if it ends with ok
+1 verbose cli [ 'C:\\Program Files (x86)\\nodejs\\\\node.exe',
+1 verbose cli   'C:\\Program Files (x86)\\nodejs\\node_modules\\npm\\bin\\npm-cli.js',
+1 verbose cli   'install',
+1 verbose cli   'body-parser' ]
+2 info using npm@1.3.2
+3 info using node@v0.10.13
+4 verbose node symlink C:\Program Files (x86)\nodejs\\node.exe
+5 error Error: Invalid name: "GitMusic"
+5 error     at ensureValidName (C:\Program Files (x86)\nodejs\node_modules\npm\node_modules\read-package-json\node_modules\normalize-package-data\lib\fixer.js:281:15)
+5 error     at Object.module.exports.fixNameField (C:\Program Files (x86)\nodejs\node_modules\npm\node_modules\read-package-json\node_modules\normalize-package-data\lib\fixer.js:196:5)
+5 error     at C:\Program Files (x86)\nodejs\node_modules\npm\node_modules\read-package-json\node_modules\normalize-package-data\lib\normalize.js:29:38
+5 error     at Array.forEach (native)
+5 error     at normalize (C:\Program Files (x86)\nodejs\node_modules\npm\node_modules\read-package-json\node_modules\normalize-package-data\lib\normalize.js:28:15)
+5 error     at final (C:\Program Files (x86)\nodejs\node_modules\npm\node_modules\read-package-json\read-json.js:310:33)
+5 error     at then (C:\Program Files (x86)\nodejs\node_modules\npm\node_modules\read-package-json\read-json.js:124:33)
+5 error     at C:\Program Files (x86)\nodejs\node_modules\npm\node_modules\read-package-json\read-json.js:299:40
+5 error     at fs.js:266:14
+5 error     at Object.oncomplete (fs.js:107:15)
+6 error If you need help, you may report this log at:
+6 error     <http://github.com/isaacs/npm/issues>
+6 error or email it to:
+6 error     <npm-@googlegroups.com>
+7 error System Windows_NT 6.1.7601
+8 error command "C:\\Program Files (x86)\\nodejs\\\\node.exe" "C:\\Program Files (x86)\\nodejs\\node_modules\\npm\\bin\\npm-cli.js" "install" "body-parser"
+9 error cwd C:\Users\David\Documents\GitHub\gitMusic
+10 error node -v v0.10.13
+11 error npm -v 1.3.2
+12 verbose exit [ 1, true ]
diff --git a/package.json b/package.json
@@ -6,5 +6,13 @@
         "express": "latest",
         "mongoose" : "latest"
     },
-    "author": "Team Duba"
+    "author": "Team Duba",
+    "scripts": {
+    	"start": "node app.js"
+    },
+    "repository": {
+    	"type": "git",
+    	"url": "https://github.com/mbeswetherick/gitMusic.git"
+    },
+    "license": "BSD"
 }
diff --git a/public/README.md b/public/README.md
@@ -0,0 +1 @@
+### Front-End
diff --git a/public/assets/errors/404.html b/public/assets/errors/404.html
@@ -0,0 +1,23 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+
+  <head>
+    <style>
+
+      div {
+        text-align:center;
+        margin-top: 400px;
+      }
+    </style>
+  </head>
+
+  <body>
+
+    <div>
+      <img src="404.png" alt='you are lost'/>
+    </div>
+
+
+  </body>
+
+</html>
diff --git a/public/assets/errors/404.png b/public/assets/errors/404.png
diff --git a/public/assets/errors/500.html b/public/assets/errors/500.html
@@ -0,0 +1,23 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+
+  <head>
+    <style>
+
+      div {
+        text-align:center;
+        margin-top: 400px;
+      }
+    </style>
+  </head>
+
+  <body>
+
+    <div>
+      <img src="500.png" alt='planets crash, stars die. all in due time'/>
+    </div>
+
+
+  </body>
+
+</html>
diff --git a/public/assets/errors/500.png b/public/assets/errors/500.png
diff --git a/public/assets/key.png b/public/assets/key.png
diff --git a/public/assets/signup.png b/public/assets/signup.png
diff --git a/index.html → public/index.html b/index.html → public/index.html
@@ -40,19 +40,19 @@
 	    <script type="text/template" id="hello_template">
 		    <p><%- name %></p>
 		  </script>
-	    <script src="public/js/lib/underscore.js"></script>
-        <script src="public/js/lib/jquery.js"></script>
-        <script src="public/js/lib/backbone.js"></script>
-	    <script src="public/js/models/User.js"></script>
-	    <script src="public/js/collections/Users.js"></script>
-	    <script src="public/js/views/App.js"></script>
-	    <script src="public/js/views/UserView.js"></script>
-	    <script src="public/js/views/SignupView.js"></script>
-	    <script src="public/js/views/AboutView.js"></script>
-	    <link href="public/css/git.css" type="text/css" rel="stylesheet">
-	    <script src="public/js/Router.js"></script>
-	    <script src="public/js/initialize.js"></script>
+	    <script src="js/lib/underscore.js"></script>
+        <script src="js/lib/jquery.js"></script>
+        <script src="js/lib/backbone.js"></script>
+	    <script src="js/models/User.js"></script>
+	    <script src="js/collections/Users.js"></script>
+	    <script src="js/views/App.js"></script>
+	    <script src="js/views/UserView.js"></script>
+	    <script src="js/views/SignupView.js"></script>
+	    <script src="js/views/AboutView.js"></script>
+	    <link href="css/git.css" type="text/css" rel="stylesheet">
+	    <script src="js/Router.js"></script>
+	    <script src="js/initialize.js"></script>
 
 	</body>
 
-</html>
+</html>
diff --git a/public/js/lib/jquery-2.0.2.min.map b/public/js/lib/jquery-2.0.2.min.map
diff --git a/server/README.md b/server/README.md
@@ -0,0 +1,12 @@
+### Back-End
+
+#### Routes that are done
+
+#### Routes that need testing / being worked on
+
+/api/user/:id
+/api/signup
+
+#### Next routes being worked on
+
+/api/login
diff --git a/server/db.js b/server/db.js
@@ -1,4 +1,14 @@
-// Db stuff goes here
-var schema = require('./schema')
+module.exports = function(mongoose) {
 
+	mongoose.connect('mongodb://gitmusic:duba@ds033599.mongolab.com:33599/gitmusic');
+	var db = mongoose.connection;
+	db.on('error', function() {
+		console.log('connection error: mongodb test');
+	});
+	db.once('open', function() {
+		console.log('connected to mongodb successfully');
+	});
+
+	return {};
+};
 
diff --git a/server/handler.js b/server/handler.js
@@ -1,7 +1,43 @@
-var db = require('./db');
-
-module.exports = function (db) {
+module.exports = function (db, schema) {
+// Models
+var User = schema.User;
 
 	return {
+		api: function(req, res) {
+			res.json({Api : "I am working homie!"});
+		},
+		getUser: function(req, res) {
+			return User.findById(req.params.id, function(err, user) {
+				if(!err) {
+					return res.json(user);
+				} else {
+					return res.json({Api: "could not find user"});
+				}
+			});
+		},
+		uploadSong: function(req, res) {
+			res.json({Song: "Uploaded!"});
+		},
+		getLogin: function(req, res) {
+			res.json({User: "fuck dude, no login for you"});
+		},
+		postSignup: function(req, res) {
+			res.type('application/json');
+			console.log(req.body.username);
+			var newUser = new User({
+				username: req.body.username,
+				password: req.body.password,
+				firstName: '',
+				lastName: '',
+				email: req.body.email
+			});
+			newUser.save(function (err) {
+				if(!err) {
+					res.json(201, {Signup: "user created successfully"});
+				} else {
+					res.json({Signup: "user not created bro"});
+				}
+			});
+		}
 	};
 };
diff --git a/server/router.js b/server/router.js
@@ -1,5 +1,13 @@
-var handler = require('./handler');
+module.exports = function(app, handler, schema) {
+
+	app.get('/api', handler.api);
 
-module.exports = function(app) {
+	app.get('/api/user/:id', handler.getUser);
 
-}
+	app.post('/api/upload', handler.uploadSong);
+
+	app.get('/api/login,', handler.getLogin);
+
+	app.post('/api/signup', handler.postSignup);
+
+};