Skip to content

Commit 0cc6c32

Browse files
committed
renamed repo, updated README and package.json, and removed websocket code from the server side
1 parent 7047ae5 commit 0cc6c32

File tree

3 files changed

+3
-27
lines changed

3 files changed

+3
-27
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
Websocket chat using cenrifuge, sockJS, and generator-marionette.
1+
Websocket chat using cenrifuge, sockJS, and backbone-marionette.

package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,8 @@
2828
"grunt-contrib-watch": "~0.4.4",
2929
"webdriverjs": "~0.7.9-a",
3030
"chai": "~1.7.2",
31-
"mocha": "~1.12.0"
31+
"mocha": "~1.12.0",
32+
"express": "~3.2.6"
3233
},
3334
"author": "David Obrite"
3435
}

server/app.js

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -4,30 +4,14 @@
44
var express = require('express');
55
var http = require('http');
66
var path = require('path');
7-
var async = require('async');
8-
var hbs = require('express-hbs');
9-
10-
var io = require('socket.io');
11-
12-
var bone = require('bone.io');
13-
14-
bone.set('io.options', {
15-
server: io
16-
});
177

188
// init
199
var app = express();
2010
var server = http.createServer(app);
2111

22-
// attach websocket server to app server
23-
io = io.listen(server);
24-
2512
app.configure(function(){
2613
console.log('port %s', process.env.PORT);
2714
app.set('port', process.env.PORT || 3000);
28-
29-
app.set('view engine', 'handlebars');
30-
app.set('views', __dirname + '../app/scripts/views');
3115
});
3216

3317
// set logging
@@ -50,12 +34,3 @@ server.listen(app.get('port'), function () {
5034
console.log('Express App started!');
5135
});
5236

53-
//socket io handlers
54-
io.sockets.on('connection', function (socket) {
55-
socket.broadcast.emit('join', {msg: 'someone has joined.'});
56-
57-
socket.on('chatMessage', function (data) {
58-
console.log(data);
59-
io.sockets.emit('chatMessage', data);
60-
});
61-
});

0 commit comments

Comments
 (0)