mrflos/memo
1
0
Fork 0
Code Issues 9 Pull requests Projects Releases Packages Wiki Activity Actions

Allow scrumblr to run on non-root paths successfully

Browse source
This commit is contained in:
Tim Toomey 2015-02-08 21:48:15 -08:00
parent 80a3ce4e52
commit 06fb9b155b
11 changed files with 156 additions and 121 deletions
Download patch file Download diff file Expand all files Collapse all files

39
server.js
View file

@ -7,6 +7,8 @@ var async = require('async');
var sanitizer = require('sanitizer');
var compression = require('compression');
var express = require('express');
var conf = require('./config.js').server;
var ga = require('./config.js').googleanalytics;
/**************
LOCAL INCLUDES
@ -24,27 +26,35 @@ var sids_to_user_names = [];
SETUP EXPRESS
**************/
var app = express();
var router = express.Router();
app.use(compression());
app.use(express.static(__dirname + '/client'));
app.use(conf.baseurl, router);
app.locals.ga = ga.enabled;
app.locals.gaAccount = ga.account;
router.use(express.static(__dirname + '/client'));
var server = require('http').Server(app);
var port = process.argv[2] || 8080;
server.listen(port);
server.listen(conf.port);
console.log('Server running at http://127.0.0.1:' + port + '/');
console.log('Server running at http://127.0.0.1:' + conf.port + '/');
/**************
SETUP Socket.IO
**************/
var io = require('socket.io')(server);
var io = require('socket.io')(server, {
path: conf.baseurl == '/' ? '' : conf.baseurl + "/socket.io"
});
/**************
ROUTES
**************/
app.get('/', function(req, res) {
router.get('/', function(req, res) {
//console.log(req.header('host'));
url = req.header('host');
url = req.header('host') + req.baseUrl;
var connected = io.sockets.connected;
clientsCount = Object.keys(connected).length;
@ -56,16 +66,20 @@ app.get('/', function(req, res) {
});
app.get('/demo', function(req, res) {
router.get('/demo', function(req, res) {
res.render('index.jade', {
pageTitle: 'scrumblr - demo',
demo: true
pageTitle: 'scrumblr - demo',
demo: true,
ga: ga.enabled,
gaAccount: ga.account
});
});
app.get('/:id', function(req, res){
router.get('/:id', function(req, res){
res.render('index.jade', {
pageTitle: ('scrumblr - ' + req.params.id)
pageTitle: ('scrumblr - ' + req.params.id),
ga: ga.enabled,
gaAccount: ga.account
});
});
@ -111,7 +125,6 @@ io.sockets.on('connection', function (client) {
break;
case 'joinRoom':
joinRoom(client, message.data, function(clients) {
client.json.send( { action: 'roomAccept', data: '' } );