From a12b071b5eb561f029b7ea855e66b5905a14c09b Mon Sep 17 00:00:00 2001
From: Scott Persinger <scottpersinger@gmail.com>
Date: Mon, 29 Sep 2014 16:46:49 -0700
Subject: [PATCH] Moved server.js up to root

---
 server/package.json => package.json |  4 ++--
 server/server.js => server.js       | 16 ++++++++--------
 2 files changed, 10 insertions(+), 10 deletions(-)
 rename server/package.json => package.json (89%)
 rename server/server.js => server.js (87%)

diff --git a/server/package.json b/package.json
similarity index 89%
rename from server/package.json
rename to package.json
index 7d9feab..9f2d76b 100644
--- a/server/package.json
+++ b/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "mobileclips",
+  "name": "quizlive",
   "version": "1.0.0",
   "description": "",
   "main": "server.js",
@@ -8,7 +8,7 @@
     "bookshelf": "^0.7.7",
     "express": "^4.9.5",
     "knex": "^0.6.22",
-    "method-override": "^1.1.0",
+    "method-override": "^2.2.0",
     "node-uuid": "^1.4.1",
     "passport": "^0.2.1",
     "passport-local": "^1.0.0",
diff --git a/server/server.js b/server.js
similarity index 87%
rename from server/server.js
rename to server.js
index 217e01e..4f42bc7 100644
--- a/server/server.js
+++ b/server.js
@@ -1,5 +1,5 @@
 var http           = require('http'),
-    config         = require('./config'),
+    config         = require('./server/config'),
     express        = require('express'),
     bodyParser     = require('body-parser'),
     methodOverride = require('method-override'),
@@ -7,10 +7,10 @@ var http           = require('http'),
     path           = require('path'),
     knex           = require('knex')(config.knex_options),
     bookshelf      = require('bookshelf')(knex),
-    models         = require('./models')(bookshelf),
-    notifier       = require('./notifier'),
-    restful        = require('./bookshelf_rest'),
-    auth           = require('./auth')(models)
+    models         = require('./server/models')(bookshelf),
+    notifier       = require('./server/notifier'),
+    restful        = require('./server/bookshelf_rest'),
+    auth           = require('./server/auth')(models)
     ;
 
 /********************* APP SETUP *****************************/
@@ -30,9 +30,9 @@ logger = {
 
 app.use(bodyParser());
 app.use(methodOverride());
-app.use(express.static(path.join(__dirname, '../client')));
-app.use(express.static(path.join(__dirname, '../admin')));
-app.use(express.static(path.join(__dirname, './pages')));
+app.use(express.static(path.join(__dirname, 'client/')));
+app.use(express.static(path.join(__dirname, 'admin/')));
+app.use(express.static(path.join(__dirname, 'server/pages')));
 
 // Logging
 app.use(function(req, res, next){