Moved server.js up to root

jefffederman · Sep 29, 2014 · a12b071 · a12b071
1 parent 971823f
commit a12b071
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/server/package.json → package.json b/server/package.json → 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 → server.js b/server/server.js → server.js
@@ -1,16 +1,16 @@
 var http           = require('http'),
-    config         = require('./config'),
+    config         = require('./server/config'),
     express        = require('express'),
     bodyParser     = require('body-parser'),
     methodOverride = require('method-override'),
     passport       = require('passport')
     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){