Skip to content

Commit

Permalink
Merge branch 'master' of github.com:nko2/random-bytes
Browse files Browse the repository at this point in the history
  • Loading branch information
Matthew Tovbin committed Aug 27, 2011
2 parents 1eea699 + a047303 commit 5bb2508
Show file tree
Hide file tree
Showing 10 changed files with 607 additions and 57 deletions.
22 changes: 20 additions & 2 deletions app.js
Expand Up @@ -5,7 +5,8 @@
require('nko')('tjR85kBUiEdHVXGx');

var express = require('express');
var app = module.exports = express.createServer();

var app = module.exports = express.createServer(), io = require('socket.io').listen(app);

// Configuration

Expand All @@ -31,9 +32,26 @@ app.configure('production', function(){

app.get('/', function(req, res){
res.render('index', {
title: 'Express'
title: 'Random Bytes'
});
});

app.get('/donate',function(req, res){
res.render('donate', {
title:"Donation"
});
});

app.listen(3000);


io.sockets.on('connection', function (socket) {
console.log("socket started");
console.log(socket.id);
socket.emit('work', {});
socket.on('done', function (data) {
console.log("done");
socket.emit('work', {});
});
});
console.log("Express server listening on port %d in %s mode", app.address().port, app.settings.env);
45 changes: 0 additions & 45 deletions lib/mongod.js

This file was deleted.

9 changes: 5 additions & 4 deletions package.json
@@ -1,5 +1,4 @@
{
"name":"gridjs",
{ "name":"gridjs",
"version":"0.0.1",
"private": true,
"dependencies":{
Expand All @@ -10,6 +9,8 @@
"stylus": ">= 0.0.1",
"jade": ">= 0.0.1",
"express-mongoose": "0.0.2",
"mongoose" : "2.0.2"
"mongoose" : "2.0.2",
"socket.io":"*"
}
}
}

Binary file added public/images/img01.jpg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
33 changes: 33 additions & 0 deletions public/javascripts/donation.js
@@ -0,0 +1,33 @@
$(document).ready(function(){
var socket = io.connect('http://localhost');
var paused = false;
$("#pause").click(function(){
if (paused){
socket.emit('done', { my: 'data' })
$(this).html("pause");
}
else{
$(this).html("resume");
}
paused=!paused


});
socket.on('work', function (data) {
console.log("working!!");
$("#status").html("<p>working!!</p>");
$("#status").toggleClass("working idle")
setTimeout(function(){
console.log("done!!");
$("#status").html("<p>idle!!</p>");
$("#status").toggleClass("working idle")
if (!paused){
socket.emit('done', { my: 'data' });
}
},5000
);
});



});
18 changes: 18 additions & 0 deletions public/javascripts/jquery-1.6.2.min.js

Large diffs are not rendered by default.

0 comments on commit 5bb2508

Please sign in to comment.