better login

config/app.js

@@ -1,9 +1,10 @@
 var express = require('express')
-  , auth = require('mongoose-auth')
   , assets = require('connect-assetmanager')
-  , io = require('socket.io')
-  , env = require('./env')
+  , auth = require('mongoose-auth')
   , coffee = require('coffee-script')
+  , cookieSession = require('connect-cookie-session')
+  , env = require('./env')
+  , io = require('socket.io')
   , mongoose = require('mongoose')
   , port = env.port
   , secrets = env.secrets;
@@ -33,7 +34,7 @@ app.configure(function() {
   app.use(express.cookieParser());
   app.use(express.bodyParser());
   app.use(express.methodOverride());
-  app.use(express.session({ secret: secrets.session }));
+  app.use(cookieSession({ secret: secrets.session }));
   app.use(assets({
     js: {
       route: /\/javascripts\/all\.js/,
@@ -77,7 +78,9 @@ app.configure('production', function() {
   app.set('view options', { scope: { development: false }});
 });
 
+// helpers
 auth.helpExpress(app);
+require('../helpers')(app);
 
 app.listen(port);
 app.ws = io.listen(app); // socket.io

controllers/people.coffee

@@ -0,0 +1,29 @@
+app = require '../config/app'
+Person = app.db.model 'Person'
+
+# index
+app.get '/people', (req, res) ->
+  Person.find (err, people) ->
+    res.render2 'people', people: people
+
+# show
+app.get '/people/:id', (req, res, next) ->
+  Person.findById req.params.id, (err, person) ->
+    return next '404' unless person
+    res.render2 'people/show', person: person
+
+# edit
+app.get '/people/:id/edit', (req, res, next) ->
+  Person.findById req.params.id, (err, person) ->
+    return next '404' unless person
+    res.render2 'people/edit', person: person
+
+# update
+app.put '/people/:id', (req, res) ->
+  Person.findById req.params.id, (err, person) ->
+    _.extend person, req.body
+    person.save (err) ->
+      if err
+        res.render2 'people/edit', person: person, errors: err.errors
+      else
+        res.redirect "/people/#{person.id}"

helpers/index.coffee

@@ -0,0 +1,4 @@
+module.exports = (app) ->
+  app.helpers
+    gravatar_url: (person, size = 30) ->
+      "http://gravatar.com/avatar/#{person.github.gravatarId}?s=#{size}"

package.json

@@ -22,6 +22,7 @@
     "coffee-script": "1.1.1",
     "connect": "1.4.3",
     "connect-assetmanager": "0.0.20",
+    "connect-cookie-session": "0.0.1",
     "express": "2.4.2",
     "jade": "0.11.0",
     "markdown": "0.2.1",

public/javascripts/application.js

@@ -274,7 +274,7 @@ $(function() {
       arguments: [ pos ]
     }));
 
-    $window.scrollLeft(left).scrollTop(top)
+    //$window.scrollLeft(left).scrollTop(top)
   }
   nko.goTo = function goTo(selector) {
     var page = $(selector)
@@ -479,8 +479,8 @@ $(function() {
   //// page specific stuff
 
   $('#page.index-index').each(function() {
-    new nko.Thing({ name: 'streetlamp', pos: new nko.Vector(-10, 100) });
-    new nko.Thing({ name: 'livetree', pos: new nko.Vector(-80, 30) });
+    new nko.Thing({ name: 'streetlamp', pos: new nko.Vector(-10, 160) });
+    new nko.Thing({ name: 'livetree', pos: new nko.Vector(-80, 120) });
 
     new nko.Thing({ name: 'livetree', pos: new nko.Vector(-60, 870) });
     new nko.Thing({ name: 'deadtree', pos: new nko.Vector(0, 900) });

public/stylesheets/application.styl

@@ -51,11 +51,18 @@ button, a.button
 p
   line-height 150%
 
+img.avatar
+  vertical-align middle
+  margin-right 5px
+  border-radius 3px
+
 aside
   display block
   float right
   width 260px
-  margin-top 50px
+  margin-top 20px
+  .login
+    text-align center
   table.important-dates
     width 100%
     border-collapse collapse
@@ -89,7 +96,7 @@ aside
 #page
   position relative
   width 900px
-  margin 100px auto 0
+  margin 30px auto 0
   text-align left
   #inner
     background-color hsla(0, 0%, 100%, 0.6)
@@ -98,7 +105,7 @@ aside
     box-shadow 0 0 5px hsla(0, 0%, 0%, 0.1)
     z-index 10000
     position relative
-    padding 10px
+    padding 10px 20px
     width 580px
 
 .thing

server.js

@@ -1,8 +1,10 @@
 require('coffee-script');
 
-[ 'index',
-  'teams',
+[
+  'index',
+  'people',
   'redirect',
+  'teams',
   'websocket'
 ].forEach(function(controller) {
   require('./controllers/' + controller);

views/layout.jade

@@ -13,7 +13,10 @@ html
       aside
         .login
           - if (user)
-            = user.github.login
+            img.avatar( src: gravatar_url(user) )
+            a( href: '/people/' + user.id )= user.github.login
+            |  |
+            a( href: '/logout' ) Sign out
           - else
             a.button( href: '/auth/github' ) Sign in
 

views/people/show.jade

@@ -0,0 +1,3 @@
+h1
+  img.avatar( src: gravatar_url(person, 80) )
+  = person.github.login