Skip to content

Commit

Permalink
Upgrades for express 3.x
Browse files Browse the repository at this point in the history
  • Loading branch information
nathanbowser committed Oct 4, 2012
1 parent d1c1a93 commit 3e41dc7
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 17 deletions.
4 changes: 2 additions & 2 deletions lib/http/index.js
Expand Up @@ -13,7 +13,7 @@ var express = require('express');


// setup // setup


var app = express.createServer() var app = express()
, provides = require('./middleware/provides') , provides = require('./middleware/provides')
, stylus = require('stylus') , stylus = require('stylus')
, routes = require('./routes') , routes = require('./routes')
Expand All @@ -39,7 +39,7 @@ app.set('view options', { doctype: 'html' });
app.set('view engine', 'jade'); app.set('view engine', 'jade');
app.set('views', __dirname + '/views'); app.set('views', __dirname + '/views');
app.set('title', 'Kue'); app.set('title', 'Kue');
app.helpers({ inspect: util.inspect }); app.locals({ inspect: util.inspect })


// middleware // middleware


Expand Down
17 changes: 10 additions & 7 deletions lib/http/views/job/list.jade
@@ -1,10 +1,13 @@
h1 #{state} extends ../layout


script block body
o(function(){ h1 #{state}
init('#{state}');
});


script
o(function(){
init('#{state}');
});


#jobs
#loading: canvas(width=50, height=50) #jobs
#loading: canvas(width=50, height=50)
17 changes: 10 additions & 7 deletions lib/http/views/layout.jade
Expand Up @@ -12,12 +12,15 @@ html
script(src='./javascripts/search.js') script(src='./javascripts/search.js')
script(src='./javascripts/main.js') script(src='./javascripts/main.js')
body body
!= partial('menu') include _menu
#actions #actions
!= partial('search') include _search
!= partial('filter') include _filter
!= partial('sort') include _sort
#content!= body #content
script(type='text/template')#job-template!= partial('job') block body
script(type='text/template')#row-template!= partial('row') script(type='text/template')#job-template
include _job
script(type='text/template')#row-template
include _row
#error #error
2 changes: 1 addition & 1 deletion package.json
Expand Up @@ -6,7 +6,7 @@
, "author": "TJ Holowaychuk <tj@learnboost.com>" , "author": "TJ Holowaychuk <tj@learnboost.com>"
, "dependencies": { , "dependencies": {
"redis": "0.7.2" "redis": "0.7.2"
, "express": "2.5.11" , "express": "3.0.0rc5"
, "jade": "0.26.3" , "jade": "0.26.3"
, "stylus": "0.27.2" , "stylus": "0.27.2"
, "nib": "0.5.0" , "nib": "0.5.0"
Expand Down

0 comments on commit 3e41dc7

Please sign in to comment.