upgraded to express 3.x, converted jade templates, and worked out array notation for articles/exercises

test/views/articles/article.jade

@@ -1,13 +1,15 @@
-h1= article.title
+extends ../layout
+block content
+  h1= article.title
 
-div!= article.body
+  div!= article.body
 
-hr
+  hr
 
-p
-  span Author:
-   
-  a(href="/users/" + encodeURIComponent(article.author.username))= article.author.full_name
+  p
+    span Author:
+     
+    a(href="/users/" + encodeURIComponent(article.author.username))= article.author.full_name
 
-p
-  a(href="/articles") Back to all articles
+  p
+    a(href="/articles") Back to all articles

test/views/articles/index.jade

@@ -1,15 +1,23 @@
-h1 Articles
+extends ../layout
 
-p
-  a(href="/articles/new") Create new article
+block content
+  h1 Articles
 
-p!= partial('articles/list', {articles: articles})
+  p
+    a(href="/articles/new") Create new article
+  p
+    a(href="/users") List Users
+  p
+    a(href="/articles") List Articles
 
-- if (page > 0) {
-  a(href="?page=" + (page - 1)) Previous
-   
-- }
 
-- if (! lastPage) {
-  a(href="?page=" + (page + 1)) Next
-- }
+  include list
+
+  - if (page > 0) {
+    a(href="?page=" + (page - 1)) Previous
+     
+  - }
+
+  - if (! lastPage) {
+    a(href="?page=" + (page + 1)) Next
+  - }

test/views/articles/list.jade

@@ -1,5 +1,8 @@
-ul
-  - articles.forEach(function(article) {
-    li
-      a(href="/articles/" + encodeURIComponent(article.title))= article.title
-  - });
+extends ../layout
+
+block content
+  ul
+    - articles.forEach(function(article) {
+      li
+        a(href="/articles/" + encodeURIComponent(article.title))= article.title
+    - });

test/views/articles/new.jade

@@ -1,11 +1,49 @@
-h1 New Article
+extends ../layout
 
-form(method="POST", action="/articles")
-  p
-    label(for="title") Title<br />
-    input#title(name="title")
-  p
-    label(for="body") Body<br />
-    textarea#body(name="body")
-  p
-    input(type="submit", value="Create")
+block content
+  h1 New Article
+
+  form(method="POST", action="/articles")
+    p
+      label(for="title") UserID<br />
+      input#title(name="User_ID")
+    p
+      label(for="body") Date<br />
+      textarea#body(name="Date")
+    p
+      label(for="element") element[0][exerciseID]<br />
+      textarea(class='element[0]', name="element[0][exerciseID]")
+    p
+      label(for="element") element[0][split][1][reps]<br />
+      textarea(class='element[1]', name="element[0][split][0][reps]")
+    p
+      label(for="element") element[0][split][1][weight]<br />
+      textarea(class='element[1]', name="element[0][split][0][weight]")
+    p
+      label(for="element") element[0]split[2][reps]<br />
+      textarea(class='element[1]', name="element[0][split][1][reps]")
+    p
+      label(for="element") element[0].split[2][weight]<br />
+      textarea(class='element[1]', name="element[0][split][1][weight]")
+
+
+
+    p
+      label(for="element") element[1][exerciseID]<br />
+      textarea(class='element[1]', name="element[1][exerciseID]")
+    p
+      label(for="element") element[1][split][1][reps]<br />
+      textarea(class='element[1]', name="element[1][split][0][reps]")
+    p
+      label(for="element") element[1][split][1][weight]<br />
+      textarea(class='element[1]', name="element[1][split][0][weight]")
+    p
+      label(for="element") element[1]split[2][reps]<br />
+      textarea(class='element[1]', name="element[1][split][1][reps]")
+    p
+      label(for="element") element[1].split[2][weight]<br />
+      textarea(class='element[1]', name="element[1][split][1][weight]")
+
+
+    p
+      input(type="submit", value="Create")

test/views/index.jade

@@ -1,7 +1,10 @@
-h1= title
-p Welcome to #{title}
+extends ./layout
 
-p
-  a(href="/users") List Users
-p
-  a(href="/articles") List Articles
+block content
+  h1= title
+  p Welcome to #{title}
+
+  p
+    a(href="/users") List Users
+  p
+    a(href="/articles") List Articles

test/views/layout.jade

@@ -1,8 +1,10 @@
-!!!
+!!! 5
 html
   head
-    title= title
-    link(rel='stylesheet', href='/stylesheets/style.css')
+    title Title2
+    link(rel='stylesheet', '/stylesheets/style.css')
+    block scripts
   body
-    header!= partial('session/user')
-    section#main!= body
+    include session/user
+    block content
+

test/views/session/new.jade

@@ -1,11 +1,14 @@
-h1 Log in
+extends ../layout
 
-form(method="POST", action="/session")
-  p
-    label(for="username") User name:<br />
-    input#username(name="username")
-  p
-    label(for="password") Password:<br />
-    input#password(type="password", name="password")
-  p
-    input(type="submit", value="Log in");
+block content
+  h1 Log in
+
+  form(method="POST", action="/session")
+    p
+      label(for="username") User name:<br />
+      input#username(name="username")
+    p
+      label(for="password") Password:<br />
+      input#password(type="password", name="password")
+    p
+      input(type="submit", value="Log in");

test/views/session/user.jade

@@ -1,5 +1,4 @@
-- if (session.user) {
-
+- if (session.user)
   p
     span Hello 
     span= session.user.name
@@ -8,12 +7,8 @@
     form(method="POST", action="/session")
       input(type="hidden", name="_method", value="DELETE")
       input(type="submit", value="Log out")
-
-- } else {
-
+- else
   p
     a(href="/session/new") Login
     span  or 
-    a(href="/users/new") Register
-
-- }
+    a(href="/users/new") Register

test/views/users/index.jade

@@ -1,21 +1,29 @@
-h1 Users
+extends ../layout
 
-p
-  a(href="/users/new") Create new profile
-p
-  a(href="/articles/new") Create new article
+block content
+  h1 Users
 
-ul
-  - users.forEach(function(user) {
-    li
-      a(href="/users/" + encodeURIComponent(user.username))= user.name
-  - });
+  p
+    a(href="/users/new") Create new profile
+  p
+    a(href="/articles/new") Create new article
 
-- if (page > 0) {
-  a(href="?page=" + (page - 1)) Previous
-   
-- }
+  p
+    a(href="/users") List Users
+  p
+    a(href="/articles") List Articles
 
-- if (! lastPage) {
-  a(href="?page=" + (page + 1)) Next
-- }
+  ul
+    - users.forEach(function(user) {
+      li
+        a(href="/users/" + encodeURIComponent(user.username))= user.name
+    - });
+
+  - if (page > 0) {
+    a(href="?page=" + (page - 1)) Previous
+     
+  - }
+
+  - if (! lastPage) {
+    a(href="?page=" + (page + 1)) Next
+  - }

test/views/users/new.jade

@@ -1,14 +1,16 @@
-h1 New User
+extends ../layout
+block content
+  h1 New User
 
-form(method="POST", action="/users")
-  p
-    label(for="username") Username<br />
-    input#username(name="username")
-  p
-    label(for="name") Name<br />
-    input#name(name="name")
-  p
-    label(for="password") Password<br />
-    input#password(type="password", name="password")
-  p
-    input(type="submit", value="Create")
+  form(method="POST", action="/users")
+    p
+      label(for="username") Username<br />
+      input#username(name="username")
+    p
+      label(for="name") Name<br />
+      input#name(name="name")
+    p
+      label(for="password") Password<br />
+      input#password(type="password", name="password")
+    p
+      input(type="submit", value="Create")

test/views/users/profile.jade

@@ -1,11 +1,13 @@
-h1= user.name
+extends ../layout
+block content
+  h1= user.name
 
-h2 Recent Articles:
-p!= partial('articles/list', {articles: recentArticles })
+  h2 Recent Articles:
+  p!= partial('articles/list', {articles: recentArticles })
 
 
-form(action="/users/" + encodeURIComponent(user.username), method="POST")
-  input(name="_method", type="hidden", value="DELETE")
-  input(type="submit", value="Delete")
+  form(action="/users/" + encodeURIComponent(user.username), method="POST")
+    input(name="_method", type="hidden", value="DELETE")
+    input(type="submit", value="Delete")
 
-a(href="/users/") Back to Userlist 
+  a(href="/users/") Back to Userlist