From 460dadfdd2c3d91d3759542990702362b85703d3 Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Tue, 4 Aug 2015 02:58:20 -0400 Subject: use config.json ; add templates --- .gitignore | 2 ++ config.json.example | 8 ++++++++ package.json | 9 +++++++++ server/index.js | 44 ++++++++++++++++++++++++++++++++++++++++++++ views/pages/index.ejs | 27 +++++++++++++++++++++++++++ views/pages/index.html | 27 --------------------------- views/pages/room.ejs | 27 +++++++++++++++++++++++++++ views/pages/room.html | 27 --------------------------- views/partials/scripts.ejs | 1 + 9 files changed, 118 insertions(+), 54 deletions(-) create mode 100644 config.json.example create mode 100644 views/pages/index.ejs delete mode 100644 views/pages/index.html create mode 100644 views/pages/room.ejs delete mode 100644 views/pages/room.html diff --git a/.gitignore b/.gitignore index 1100c85..8abfdbe 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,5 @@ .#* *.swp node_modules/ +config.json + diff --git a/config.json.example b/config.json.example new file mode 100644 index 0000000..c2f83df --- /dev/null +++ b/config.json.example @@ -0,0 +1,8 @@ +{ + "host": "lvh.me:3000", + "hostName": "lvh.me", + "port": 3000, + "socketPort": 1337, + "databaseHost": "lvh.me", + "env": { "development": 1 } +} diff --git a/package.json b/package.json index 78f97b6..40f428c 100644 --- a/package.json +++ b/package.json @@ -13,7 +13,16 @@ "author": "jules", "license": "LNT", "dependencies": { + "body-parser": "^1.13.3", + "cookie-parser": "^1.3.5", + "ejs": "^2.3.3", "express": "^4.13.3", + "express-error-handler": "^1.0.1", + "express-json": "^1.0.0", + "express-session": "^1.11.3", + "method-override": "^2.3.5", + "morgan": "^1.6.1", + "multer": "^1.0.1", "socket.io": "^1.3.6" } } diff --git a/server/index.js b/server/index.js index e69de29..89ba350 100644 --- a/server/index.js +++ b/server/index.js @@ -0,0 +1,44 @@ +/* jshint node: true */ +var ejs = require('ejs'); +ejs.open = '[['; +ejs.close = ']]'; + +var config = require('../config.json') + +var http = require('http'), + express = require('express'), + bodyParser = require('body-parser'), + multer = require('multer'), + path = require('path'); + +var app = express() +var server + +app.set('port', config.port) +app.set('views', path.join(__dirname, '../views')) +app.set('view engine', 'ejs') +app.use(express.static(path.join(__dirname, '../public'))) +app.use(require('morgan')("combined", {})) +app.use(require("express-json")()) +app.use(require('cookie-parser')()) +// app.use(require('body-parser')()) +// app.use(require('multer')) +app.use(express.query()) +// app.use(require('method-override')()) +// app.set('trust proxy', true) +// if (config.env.development) { +// app.use(require('express-error-handler')) +// } + +app.get("/", function(req,res){ + res.render("pages/index", {}) +}) +app.get("/v/:room", function(req,res){ + res.render("pages/room") +}) + +server = http.createServer(app) +server.listen(app.get('port'), function () { + console.log('asdf-yt server listening on port ' + app.get('port')); +}) + diff --git a/views/pages/index.ejs b/views/pages/index.ejs new file mode 100644 index 0000000..45c6a84 --- /dev/null +++ b/views/pages/index.ejs @@ -0,0 +1,27 @@ + + + +yt-chat + + + + +
+ +
+
+
+ +
+
+ + + + +<% include ../partials/scripts %> + \ No newline at end of file diff --git a/views/pages/index.html b/views/pages/index.html deleted file mode 100644 index ec1f353..0000000 --- a/views/pages/index.html +++ /dev/null @@ -1,27 +0,0 @@ - - -yt-chat - - - - -
- -
-
-
- -
-
- - - - -[[ include ../partials/scripts ]] - \ No newline at end of file diff --git a/views/pages/room.ejs b/views/pages/room.ejs new file mode 100644 index 0000000..ec1f353 --- /dev/null +++ b/views/pages/room.ejs @@ -0,0 +1,27 @@ + + +yt-chat + + + + +
+ +
+
+
+ +
+
+ + + + +[[ include ../partials/scripts ]] + \ No newline at end of file diff --git a/views/pages/room.html b/views/pages/room.html deleted file mode 100644 index ec1f353..0000000 --- a/views/pages/room.html +++ /dev/null @@ -1,27 +0,0 @@ - - -yt-chat - - - - -
- -
-
-
- -
-
- - - - -[[ include ../partials/scripts ]] - \ No newline at end of file diff --git a/views/partials/scripts.ejs b/views/partials/scripts.ejs index 2b69d35..1644c71 100644 --- a/views/partials/scripts.ejs +++ b/views/partials/scripts.ejs @@ -2,6 +2,7 @@ + -- cgit v1.2.3-70-g09d2