added private public view to profile -- todo : add same for article view

test/data/schemas/article.js

@@ -2,8 +2,7 @@ var Schema = require('mongoose').Schema;
 
 var ArticleSchema = new Schema({
   title: {
-    type: String,
+    type: String
-    unique: true
   },
   body: String,
   author: {

test/data/schemas/user.js

@@ -1,9 +1,9 @@
 var mongoose = require('mongoose');
 
 var UserSchema = new mongoose.Schema({
-  username: {type: String, unique: true},
+  username: {type: String, unique: true, required: true},
   name: String,
-  password: String,
+  password: String
 });
 
 UserSchema.methods.recentArticles = function(callback) {

test/routes/articles.js

@@ -13,7 +13,7 @@ var maxArticlesPerPage = 5;
 
 module.exports = function(app) {
 
-  app.get('/articles', function(req, res, next){
+  app.get('/articles', loggedIn, function(req, res, next){
     var page = req.query.page  && parseInt(req.query.page, 10) || 0;
     async.parallel([
 
@@ -57,7 +57,7 @@ module.exports = function(app) {
     res.render('articles/new', {title: "New Article"});
   });
 
-  app.get('/articles/:title', loadArticle, function(req, res, next){
+  app.get('/articles/:_id', loadArticle, function(req, res, next){
     res.render('articles/article', {title: req.article.title,
       article: req.article});
   });

test/routes/index.js

@@ -3,9 +3,11 @@
  * GET home page.
  */
 
+var loggedIn = require('./middleware/logged_in');
+
 
 module.exports = function(app) {
-	app.get('/', function(req, res){
+	app.get('/', loggedIn, function(req, res){
-		res.render('index', { title: 'Express' })
+		res.render('index', { title: 'Express' });
 	});
 };

test/routes/middleware/logged_in.js

@@ -1,6 +1,7 @@
 function loggedIn(req, res, next) {
   if (! req.session.user) {
-    res.send('Forbidden. Please log in first.', 403);
+    //res.send('Forbidden. Please log in first.', 403);
+    res.redirect('/session/new');
   } else {
     next();
   }

test/routes/middleware/not_logged_in.js

@@ -1,6 +1,6 @@
 function notLoggedIn(req, res, next) {
   if (req.session.user) {
-    res.send('Unauthorized', 401);
+     res.redirect('/users/' + req.session.user.username);
   } else {
     next();
   }

test/routes/session.js

@@ -17,6 +17,7 @@ module.exports = function(app) {
         }
         if (user) {
           req.session.user = user;
+          console.log("req.session.user= " + JSON.stringify(req.session.user));
           res.redirect('/users');
           } else {
           res.redirect('/session/new');
@@ -26,6 +27,6 @@ module.exports = function(app) {
 
   app.del('/session', function(req, res, next) {
       req.session.destroy();
-      res.redirect('/users');
+      res.redirect('/session/new');
   });
 };

test/routes/users.js

@@ -4,13 +4,14 @@
 
 var User = require('../data/models/user');
 var notLoggedIn = require('./middleware/not_logged_in');
+var loggedIn = require('./middleware/logged_in');
 var loadUser = require('./middleware/load_user');
 var restrictUserToSelf = require('./middleware/restrict_user_to_self');
 var maxUsersPerPage = 5;
 
 module.exports = function(app) {
 
-  app.get('/users', function(req, res, next){
+  app.get('/users', loggedIn,  function(req, res, next){
     var page = req.query.page && parseInt(req.query.page, 10) || 0;
 
     User.count(function(err, count) {

test/views/articles/article.jade

@@ -9,7 +9,7 @@ block content
   p
     span Author:
      
-    a(href="/users/" + encodeURIComponent(article.author.username))= article.author.full_name
+    a(href="/users/" + encodeURIComponent(article.author.name))= article.author.name
 
   p
     a(href="/articles") Back to all articles

test/views/articles/list.jade

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

test/views/session/new.jade

@@ -11,4 +11,7 @@ block content
       label(for="password") Password:<br />
       input#password(type="password", name="password")
     p
-      input(type="submit", value="Log in");
+      input(type="submit", value="Log in");
+
+    p
+      a(href="/users/new") Register New User

test/views/session/user.jade

@@ -1,14 +1,12 @@
 - if (session.user)
   p
-    span Hello 
+    span
+     b UserName 
     span= session.user.name
-    span !
+    span
+     b  &nbspUserID 
+    span= session.user._id
   p
     form(method="POST", action="/session")
       input(type="hidden", name="_method", value="DELETE")
-      input(type="submit", value="Log out")
+      input(type="submit", value="Log out")
-- else
-  p
-    a(href="/session/new") Login
-    span  or 
-    a(href="/users/new") Register

test/views/users/profile.jade

@@ -2,8 +2,17 @@ extends ../layout
 block content
   h1= user.name
 
+  - if (session.user)
+    h1 Private View
+  - else
+    h1 Public View
+
   h2 Recent Articles:
-  p!= partial('articles/list', {articles: recentArticles })
+  ul
+  - recentArticles.forEach(function(article) {
+    li
+      a(href="/articles/" + encodeURIComponent(article._id))= article.title
+  - });
 
 
   form(action="/users/" + encodeURIComponent(user.username), method="POST")