Skip to content

Commit

Permalink
added socketio
Browse files Browse the repository at this point in the history
  • Loading branch information
tareq jobayere committed Dec 22, 2013
1 parent 812c343 commit 0832332
Show file tree
Hide file tree
Showing 5 changed files with 140 additions and 9 deletions.
51 changes: 49 additions & 2 deletions app.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ var config = require('./config/config')[env],

var app = express();


var server = http.createServer(app);


// db connect
Expand Down Expand Up @@ -95,12 +95,59 @@ env.express(app);
// });




// socket io



var io = require("socket.io").listen(server)

io.sockets.on('connection', function (socket) {
socket.emit('news', { hello: 'world' });
});

// Send current time to all connected clients
function sendTime() {
io.sockets.emit('time', { time: new Date().toJSON() });
}

// Send current time every 10 secs
setInterval(sendTime, 10000);

// Emit welcome message on connection
io.sockets.on('connection', function(socket) {
socket.emit('welcome', { message: 'Welcome!' });

socket.on('i am client', console.log);


socket.on('message', function(data) {
socket.broadcast.send(data);
});


})














// bootstrap routes
require('./config/routes')(app,cont,passport);



http.createServer(app).listen(app.get('port'), function(){
server.listen(app.get('port'), function(){
console.log("Express server listening on port " + app.get('port'));
});

Expand Down
65 changes: 62 additions & 3 deletions app/views/base.html
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<link rel="stylesheet" href="/css/bootstrap-theme.min.css">
<link rel="stylesheet" href="/css/style.css" />


<script src="/socket.io/socket.io.js"></script>
<title>{% block title %}{% endblock %} Wolverine js </title>
{% endblock %}
</head>
Expand Down Expand Up @@ -54,8 +54,67 @@
</div>

</div>
<script type="text/javascript" src="http://code.jquery.com/jquery-latest.min.js"></script>
<script src="/js/bootstrap.min.js"></script>
<script type="text/javascript" src="http://code.jquery.com/jquery-latest.min.js"></script>
<!-- <script src="/js/bootstrap.min.js"></script> -->
<script>

(function($){
// write code here

console.log('working');
var socket = io.connect('http://127.0.0.1:3000');

console.log(socket);
socket.on('news', function (data) {
console.log(data);
});



socket.on('welcome', function(data) {
$('#messages').append('<li>' + data.message + '</li>');

socket.emit('i am client', {data: 'foo!'});
});
socket.on('time', function(data) {
console.log(data);
$('#messages').append('<li>' + data.time + '</li>');
});
socket.on('error', function() { console.error(arguments) });
socket.on('message', function() { console.log(arguments) });




var content = $('#simple-content');
socket.on('connect', function() {
$('#simple-form').css('display', 'block');
content.append($('<p>').text('Connected'));
});

socket.on('message', function(msg) {
content.append($('<p>').text(msg)
.append($('<em>').text(' from server')));
});

$('#simple-form').submit(function(e) {
e.preventDefault();
var textObj = $('#simple-text');
var msg = textObj.val();
textObj.val('');
content.append($('<p>').text(msg)
.append($('<em>').text(' from me')));
socket.send(msg);
});



})(jQuery);


</script>


</body>

</html>
27 changes: 24 additions & 3 deletions app/views/home.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,39 @@ <h1>Home page</h1>



<input type="button" value="connect" id="simple-connect" class="connect">
<div id="simple-content" class="textbox">


</div>

<form id="simple-form" style="display: block;"><input type="text" id="simple-text">
<input type="submit" value="Submit">
</form>


{% for post in posts %}
<h4> {{post.title}} </h4>
<!-- <h4> {{post.title}} </h4> -->

<br>

{{post.body}}
<!-- {{post.body}} -->



{% endfor %}


<script type="text/javascript">



</script>




{% endblock %}




3 changes: 3 additions & 0 deletions app/views/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@ <h1>Index</h1>

</p>
</center>

<ul id='messages'></ul>

{% endblock %}


3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@
"connect-flash":"*",
"passport":"*",
"passport-local":"*",
"nodemon":"*"
"nodemon":"*",
"socket.io":"*"

}
}

0 comments on commit 0832332

Please sign in to comment.