diff --git a/examples/express_example/app.js b/examples/express_example/app.js index fc87cb8..654ac54 100644 --- a/examples/express_example/app.js +++ b/examples/express_example/app.js @@ -1,44 +1,41 @@ -var express = require('express'); - -var app = express.createServer(); - -// Configuration - -app.set('views', __dirname + '/views'); -app.set('view engine', 'ejs'); - - +var port = 8080; +var express = require('express'); +var app = express.createServer(); +var server = app.listen(port); +console.log("Express server listening on port " + port); + +// App Configuration +app.configure(function(){ + app.use(express.methodOverride()); + app.use(express.bodyParser()); + app.use(express.static(__dirname + '/public')); + app.set('views', __dirname + '/views'); + app.set('view engine', 'jade'); +}); // Routes - app.get('/', function(req, res){ - res.render('index', {locals: { - title: 'NowJS + Express Example' - }}); + res.render('index', { + 'title': 'NowJS + Express Example' + }); }); app.get('/chat', function(req, res){ - res.render('chat', {locals: { + res.render('chat', { title: 'NowJS + Express Example' - }}); + }); }); -app.listen(8080); -console.log("Express server listening on port %d", app.address().port); - - // NowJS component -var nowjs = require("now"); -var everyone = nowjs.initialize(app); - +var nowjs = require("now"); +var everyone = nowjs.initialize(server); nowjs.on('connect', function(){ - console.log("Joined: " + this.now.name); + console.log("Joined: " + this.now.name); }); - nowjs.on('disconnect', function(){ - console.log("Left: " + this.now.name); + console.log("Left: " + this.now.name); }); everyone.now.distributeMessage = function(message){ diff --git a/examples/express_example/package.json b/examples/express_example/package.json index b108a0c..49cd025 100644 --- a/examples/express_example/package.json +++ b/examples/express_example/package.json @@ -1,7 +1,7 @@ { "name": "nowjs-express-example", - "version": "0.0.2", - "author": "ericz (Eric Zhang) ", + "version": "0.0.3", + "author": "mdesign83 (Karoly Marton) ", "description": "This is an example of an embedded chat window added to any site.", "keywords": [ "nowjs", @@ -9,9 +9,9 @@ "example" ], "dependencies" : { - "now" : ">=0.7", - "express" : ">=2.4", - "ejs" : ">=0.5" + "now" : ">=0.8.1", + "express" : ">=3.0.0", + "jade" : ">=0.26.3" }, "engine": { "node": ">=0.4" diff --git a/examples/express_example/public/javascript/chat.js b/examples/express_example/public/javascript/chat.js new file mode 100644 index 0000000..8031622 --- /dev/null +++ b/examples/express_example/public/javascript/chat.js @@ -0,0 +1,15 @@ +$(document).ready(function(){ + + now.receiveMessage = function(name, message){ + $("#messages").append("
" + name + ": " + message); + } + + $("#send-button").click(function(){ + now.distributeMessage($("#text-input").val()); + $("#text-input").val(""); + $("#text-input").focus(); + }); + + now.name = prompt("What's your name?", ""); + +}); \ No newline at end of file diff --git a/examples/express_example/public/javascript/index.js b/examples/express_example/public/javascript/index.js new file mode 100644 index 0000000..043555c --- /dev/null +++ b/examples/express_example/public/javascript/index.js @@ -0,0 +1,6 @@ +$(document).ready(function() { +$('#chat').click(function(e) { + e.preventDefault(); + $('').appendTo('#floater'); + }); +}); \ No newline at end of file diff --git a/examples/express_example/views/chat.ejs b/examples/express_example/views/chat.ejs deleted file mode 100644 index 0b88b9f..0000000 --- a/examples/express_example/views/chat.ejs +++ /dev/null @@ -1,33 +0,0 @@ -

Chat Window

-
-
- - -
- - \ No newline at end of file diff --git a/examples/express_example/views/chat.jade b/examples/express_example/views/chat.jade new file mode 100644 index 0000000..97eddf3 --- /dev/null +++ b/examples/express_example/views/chat.jade @@ -0,0 +1,8 @@ +extends layout +block content + h2 Chat Window + div(id='messages') + div(style='position: absolute; bottom: 25;) + input(type='text', id='text-input') + input(type='button', value='Send', id='send-button') + script(src='/javascript/chat.js') \ No newline at end of file diff --git a/examples/express_example/views/header.jade b/examples/express_example/views/header.jade new file mode 100644 index 0000000..0d1d1ed --- /dev/null +++ b/examples/express_example/views/header.jade @@ -0,0 +1,4 @@ +head + title NowJS+Express+Jade Example + script(type="text/javascript", src="http://ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js") + script(type="text/javascript", src="/nowjs/now.js") \ No newline at end of file diff --git a/examples/express_example/views/index.ejs b/examples/express_example/views/index.ejs deleted file mode 100644 index 9b662bf..0000000 --- a/examples/express_example/views/index.ejs +++ /dev/null @@ -1,12 +0,0 @@ -

<%= title %>

-

Welcome to <%= title %>

-

This is an example of an embedded chat window added to any site. Chat with us

-
- \ No newline at end of file diff --git a/examples/express_example/views/index.jade b/examples/express_example/views/index.jade new file mode 100644 index 0000000..389b3d7 --- /dev/null +++ b/examples/express_example/views/index.jade @@ -0,0 +1,8 @@ +extends layout +block content + h1 test + p welcome + p This is an example of an embedded chat window added to any site. + a(href='#', id='chat') Chat with us + div(id='floater', style='position: absolute; right: 0; top:0; width:25%; height:100%;') + script(src='/javascript/index.js') \ No newline at end of file diff --git a/examples/express_example/views/layout.ejs b/examples/express_example/views/layout.ejs deleted file mode 100644 index abd10c9..0000000 --- a/examples/express_example/views/layout.ejs +++ /dev/null @@ -1,11 +0,0 @@ - - - - <%= title %> - - - - - <%- body %> - - \ No newline at end of file diff --git a/examples/express_example/views/layout.jade b/examples/express_example/views/layout.jade new file mode 100644 index 0000000..614d674 --- /dev/null +++ b/examples/express_example/views/layout.jade @@ -0,0 +1,5 @@ +!!! 5 +html + include header + body + block content \ No newline at end of file