diff options
| author | Jules Laplace <jules@okfoc.us> | 2015-08-04 02:58:20 -0400 |
|---|---|---|
| committer | Jules Laplace <jules@okfoc.us> | 2015-08-04 02:58:52 -0400 |
| commit | 460dadfdd2c3d91d3759542990702362b85703d3 (patch) | |
| tree | c4161b3946c0b5198e2754020babe856f73bee00 | |
| parent | 8c263e2141d17c629314d2d95eac82217a20a464 (diff) | |
use config.json ; add templates
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | config.json.example | 8 | ||||
| -rw-r--r-- | package.json | 9 | ||||
| -rw-r--r-- | server/index.js | 44 | ||||
| -rw-r--r-- | views/pages/index.ejs (renamed from views/pages/room.html) | 6 | ||||
| -rw-r--r-- | views/pages/room.ejs (renamed from views/pages/index.html) | 0 | ||||
| -rw-r--r-- | views/partials/scripts.ejs | 1 |
7 files changed, 67 insertions, 3 deletions
@@ -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/room.html b/views/pages/index.ejs index ec1f353..45c6a84 100644 --- a/views/pages/room.html +++ b/views/pages/index.ejs @@ -1,8 +1,8 @@ +<!doctype html> <html> <head> <title>yt-chat</title> -<style> -</style> +<link rel="stylesheet" href="/css/css.css"> </head> <body> @@ -23,5 +23,5 @@ </script> </body> -[[ include ../partials/scripts ]] +<% include ../partials/scripts %> </html>
\ No newline at end of file diff --git a/views/pages/index.html b/views/pages/room.ejs index ec1f353..ec1f353 100644 --- a/views/pages/index.html +++ b/views/pages/room.ejs 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 @@ <script src="js/lib/view.js"></script> <script src="js/lib/formview.js"></script> <script src="js/lib/parser.js"></script> +<script src="js/lib/user.js"></script> <script src="js/app.js"></script> <script type="text/javascript" src="http://www.youtube.com/player_api"></script> |