From ebabce99820fcbfddd6e946d7f51eb816fbbe0a4 Mon Sep 17 00:00:00 2001
From: TJ Holowaychuk <tj@vision-media.ca>
Date: Tue, 17 Apr 2012 20:26:09 -0700
Subject: [PATCH] Fixed route-loading example

---
 examples/route-loading/{app.js => index.js}  |  3 +--
 examples/route-loading/routes/user.js        |  4 +---
 examples/route-loading/views/index.jade      | 12 ++++++++----
 examples/route-loading/views/layout.jade     |  2 +-
 examples/route-loading/views/user/add.jade   | 14 +++++++++-----
 examples/route-loading/views/user/index.jade | 16 ++++++++++------
 examples/route-loading/views/user/list.jade  | 15 ++++++++++-----
 7 files changed, 40 insertions(+), 26 deletions(-)
 rename examples/route-loading/{app.js => index.js} (85%)

diff --git a/examples/route-loading/app.js b/examples/route-loading/index.js
similarity index 85%
rename from examples/route-loading/app.js
rename to examples/route-loading/index.js
index ea82f53888..8d9db06fae 100644
--- a/examples/route-loading/app.js
+++ b/examples/route-loading/index.js
@@ -4,8 +4,7 @@
  */
 
 var express = require('../../lib/express')
-  , redis = require('redis')
-  , app = express.createServer()
+  , app = express()
   , db = { users: [] };
 
 app.set('views', __dirname + '/views');
diff --git a/examples/route-loading/routes/user.js b/examples/route-loading/routes/user.js
index ccffe79010..6fe8572763 100644
--- a/examples/route-loading/routes/user.js
+++ b/examples/route-loading/routes/user.js
@@ -1,6 +1,4 @@
 
-app.redirect('user list', '/users');
-
 app.get('/users', function(req, res){
   res.render('user/list', { users: db.users });
 });
@@ -12,7 +10,7 @@ app.get('/user/add', function(req, res){
 app.post('/user', function(req, res){
   var user = req.body.user;
   db.users.push(user);
-  res.redirect('user list');
+  res.redirect('/users');
 });
 
 app.get('/user/:id', function(req, res){
diff --git a/examples/route-loading/views/index.jade b/examples/route-loading/views/index.jade
index 5c5aefdb32..5cb3d68bbc 100644
--- a/examples/route-loading/views/index.jade
+++ b/examples/route-loading/views/index.jade
@@ -1,4 +1,8 @@
-h2 Route sharing example
-ul
-  li: a(href='/user/add') Add user
-  li: a(href='/users') User list
\ No newline at end of file
+
+extends layout
+
+block content
+  h2 Route sharing example
+  ul
+    li: a(href='/user/add') Add user
+    li: a(href='/users') User list
diff --git a/examples/route-loading/views/layout.jade b/examples/route-loading/views/layout.jade
index ce544b66c5..48cf220ca2 100644
--- a/examples/route-loading/views/layout.jade
+++ b/examples/route-loading/views/layout.jade
@@ -8,4 +8,4 @@ html
         font: 14px/1.5 solid helvetica, arial, sans-serif;
       }
   body
-    #content!= body
\ No newline at end of file
+    block content
\ No newline at end of file
diff --git a/examples/route-loading/views/user/add.jade b/examples/route-loading/views/user/add.jade
index 0253b5a294..f0ecfce9c1 100644
--- a/examples/route-loading/views/user/add.jade
+++ b/examples/route-loading/views/user/add.jade
@@ -1,5 +1,9 @@
-h2 Add a user
-form(action='/user', method='post')
-  p: input(type='text', name='user[name]', placeholder='Username')
-  p: input(type='text', name='user[email]', placeholder='Email')
-  p: input(type='submit', value='Add')
\ No newline at end of file
+
+extends ../layout
+
+block content
+  h2 Add a user
+  form(action='/user', method='post')
+    p: input(type='text', name='user[name]', placeholder='Username')
+    p: input(type='text', name='user[email]', placeholder='Email')
+    p: input(type='submit', value='Add')
\ No newline at end of file
diff --git a/examples/route-loading/views/user/index.jade b/examples/route-loading/views/user/index.jade
index 99f4be89e1..b911a49ecb 100644
--- a/examples/route-loading/views/user/index.jade
+++ b/examples/route-loading/views/user/index.jade
@@ -1,6 +1,10 @@
-h1= user.name
-table
-  tbody
-    tr
-      td Email
-      td= user.email
\ No newline at end of file
+
+extends ../layout
+
+block content
+  h1= user.name
+  table
+    tbody
+      tr
+        td Email
+        td= user.email
\ No newline at end of file
diff --git a/examples/route-loading/views/user/list.jade b/examples/route-loading/views/user/list.jade
index 0c7df01163..8109db0592 100644
--- a/examples/route-loading/views/user/list.jade
+++ b/examples/route-loading/views/user/list.jade
@@ -1,5 +1,10 @@
-h1 Users
-- if (users.length)
-  != partial('user', users)
-- else
-  p No users, head over to <a href='/user/add'>/user/add</a> to create one.
\ No newline at end of file
+
+extends ../layout
+
+block content
+  h1 Users
+  if users.length
+    for user in users
+      include index
+  else
+    p No users, head over to <a href='/user/add'>/user/add</a> to create one.
\ No newline at end of file