diff --git a/examples/mvc/controllers/pet/index.js b/examples/mvc/controllers/pet/index.js index 0702d289ec..c183e51c9e 100644 --- a/examples/mvc/controllers/pet/index.js +++ b/examples/mvc/controllers/pet/index.js @@ -4,8 +4,6 @@ var db = require('../../db'); -exports.engine = 'jade'; - exports.before = function(req, res, next){ var pet = db.pets[req.params.pet_id]; if (!pet) return next(new Error('Pet not found')); diff --git a/examples/mvc/controllers/user/views/edit.html b/examples/mvc/controllers/user/views/edit.html deleted file mode 100644 index f5b9ae9b5c..0000000000 --- a/examples/mvc/controllers/user/views/edit.html +++ /dev/null @@ -1,12 +0,0 @@ - -
Click a user below to view their pets.
-View <%= user.name %>s pets:
-No pets!
-<% } %> \ No newline at end of file diff --git a/examples/mvc/controllers/user/views/show.jade b/examples/mvc/controllers/user/views/show.jade new file mode 100644 index 0000000000..267d3ef7e4 --- /dev/null +++ b/examples/mvc/controllers/user/views/show.jade @@ -0,0 +1,17 @@ +link(rel='stylesheet', href='/style.css') +h1= user.name + ' ' + a(href='/user/#{user.id}/edit') edit + +if (hasMessages) + ul#messages + each msg in messages + li= msg + +if (user.pets.length) + p View #{user.name}'s pets: + ul + each pet in user.pets + li + a(href='/pet/#{pet.id}')= pet.name +else + p No pets! diff --git a/examples/mvc/index.js b/examples/mvc/index.js index 297344b5a2..f228a375e6 100644 --- a/examples/mvc/index.js +++ b/examples/mvc/index.js @@ -13,11 +13,9 @@ var app = module.exports = express(); // settings -// map .renderFile to ".html" files -app.engine('html', require('ejs').renderFile); - -// make ".html" the default -app.set('view engine', 'html'); +// set our default template engine to "jade" +// which prevents the need for extensions +app.set('view engine', 'jade'); // set views for error and 404 pages app.set('views', __dirname + '/views'); diff --git a/examples/mvc/views/404.html b/examples/mvc/views/404.html deleted file mode 100644 index 5710154e15..0000000000 --- a/examples/mvc/views/404.html +++ /dev/null @@ -1,3 +0,0 @@ - -Sorry we can't find <%= url %>
\ No newline at end of file diff --git a/examples/mvc/views/404.jade b/examples/mvc/views/404.jade new file mode 100644 index 0000000000..110c471f1b --- /dev/null +++ b/examples/mvc/views/404.jade @@ -0,0 +1,3 @@ +link(rel='stylesheet', href='/style.css') +h1 404: Not Found +p Sorry we can't find #{url} diff --git a/examples/mvc/views/5xx.html b/examples/mvc/views/5xx.html deleted file mode 100644 index 2d810558dd..0000000000 --- a/examples/mvc/views/5xx.html +++ /dev/null @@ -1,3 +0,0 @@ - -Looks like something blew up!
\ No newline at end of file diff --git a/examples/mvc/views/5xx.jade b/examples/mvc/views/5xx.jade new file mode 100644 index 0000000000..3508b7c0e2 --- /dev/null +++ b/examples/mvc/views/5xx.jade @@ -0,0 +1,3 @@ +link(rel='stylesheet', href='/style.css') +h1 500: Internal Server Error +p Looks like something blew up!