Skip to content

Commit

Permalink
Merge pull request #2067 from swrh/mvc-example-ejs-to-jade
Browse files Browse the repository at this point in the history
MVC example: EJS -> Jade.
  • Loading branch information
defunctzombie committed Apr 23, 2014
2 parents 5480cb9 + ce17efd commit 29e8cce
Show file tree
Hide file tree
Showing 12 changed files with 45 additions and 54 deletions.
2 changes: 0 additions & 2 deletions examples/mvc/controllers/pet/index.js
Expand Up @@ -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'));
Expand Down
12 changes: 0 additions & 12 deletions examples/mvc/controllers/user/views/edit.html

This file was deleted.

12 changes: 12 additions & 0 deletions examples/mvc/controllers/user/views/edit.jade
@@ -0,0 +1,12 @@
link(rel='stylesheet', href='/style.css')
h1= user.name
form(action='/user/#{user.id}', method='post')
input(type='hidden', name='_method', value='put')
label= 'Name: '
input(type='text', name='user[name]', value='#{user.name}')
input(type='submit', value='Update')

form(action='/user/#{user.id}/pet', method='post')
label= 'Pet: '
input(type='text', name='pet[name]', placeholder='Name')
input(type='submit', value='Add')
8 changes: 0 additions & 8 deletions examples/mvc/controllers/user/views/list.html

This file was deleted.

7 changes: 7 additions & 0 deletions examples/mvc/controllers/user/views/list.jade
@@ -0,0 +1,7 @@
link(rel='stylesheet', href='/style.css')
h1 Users
p Click a user below to view their pets.
ul
each user in users
li
a(href='/user/#{user.id}')= user.name
21 changes: 0 additions & 21 deletions examples/mvc/controllers/user/views/show.html

This file was deleted.

17 changes: 17 additions & 0 deletions 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!
8 changes: 3 additions & 5 deletions examples/mvc/index.js
Expand Up @@ -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');
Expand Down
3 changes: 0 additions & 3 deletions examples/mvc/views/404.html

This file was deleted.

3 changes: 3 additions & 0 deletions 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}
3 changes: 0 additions & 3 deletions examples/mvc/views/5xx.html

This file was deleted.

3 changes: 3 additions & 0 deletions 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!

0 comments on commit 29e8cce

Please sign in to comment.