From b0f257d081a2caf55315b8ccbd98ea1d52b9f559 Mon Sep 17 00:00:00 2001 From: Jamie Barton Date: Wed, 8 Mar 2017 14:32:43 +0000 Subject: [PATCH] Removed Jade from view-locals example --- examples/view-locals/index.js | 11 ++++++----- examples/view-locals/layout.jade | 12 ------------ examples/view-locals/user.jade | 8 -------- examples/view-locals/views/index.ejs | 19 +++++++++++++++++++ 4 files changed, 25 insertions(+), 25 deletions(-) delete mode 100644 examples/view-locals/layout.jade delete mode 100644 examples/view-locals/user.jade create mode 100644 examples/view-locals/views/index.ejs diff --git a/examples/view-locals/index.js b/examples/view-locals/index.js index cf347ed38d..d76f61a94a 100644 --- a/examples/view-locals/index.js +++ b/examples/view-locals/index.js @@ -5,9 +5,10 @@ var express = require('../..'); var User = require('./user'); var app = express(); +var path = require('path') -app.set('views', __dirname); -app.set('view engine', 'jade'); +app.set('views', path.join(__dirname, 'views')); +app.set('view engine', 'ejs'); // filter ferrets only @@ -25,7 +26,7 @@ app.get('/', function(req, res, next){ if (err) return next(err); User.all(function(err, users){ if (err) return next(err); - res.render('user', { + res.render('index', { title: 'Users', count: count, users: users.filter(ferrets) @@ -59,7 +60,7 @@ function users(req, res, next) { } app.get('/middleware', count, users, function(req, res, next){ - res.render('user', { + res.render('index', { title: 'Users', count: req.count, users: req.users.filter(ferrets) @@ -101,7 +102,7 @@ app.get('/middleware-locals', count2, users2, function(req, res, next){ // to pass to res.render(). If we have // several routes related to users this // can be a great productivity booster - res.render('user', { title: 'Users' }); + res.render('index', { title: 'Users' }); }); // keep in mind that middleware may be placed anywhere diff --git a/examples/view-locals/layout.jade b/examples/view-locals/layout.jade deleted file mode 100644 index 5616cfaf7c..0000000000 --- a/examples/view-locals/layout.jade +++ /dev/null @@ -1,12 +0,0 @@ -doctype html -html - head - title= title - style. - body { - padding: 50px; - font: 16px Helvetica, Arial; - } - body - h2= title - block content \ No newline at end of file diff --git a/examples/view-locals/user.jade b/examples/view-locals/user.jade deleted file mode 100644 index b07d2b1756..0000000000 --- a/examples/view-locals/user.jade +++ /dev/null @@ -1,8 +0,0 @@ - -extends layout - -block content - for user in users - .user - h3= user.name - p #{user.name} is a #{user.age} year old #{user.species}. \ No newline at end of file diff --git a/examples/view-locals/views/index.ejs b/examples/view-locals/views/index.ejs new file mode 100644 index 0000000000..1cbfc40bc0 --- /dev/null +++ b/examples/view-locals/views/index.ejs @@ -0,0 +1,19 @@ + + + + + <%= title %> + + + +

<%= title %>

+ <% users.forEach(function(user) { %> +
  • <%= user.name %> is a <% user.age %> year old <%= user.species %>
    • + <% }); %> + +