reset password, login page, start on people/edit

models/http.js

@@ -7,12 +7,13 @@
 
 var http = require('http'),
     parse = require('url').parse,
-    queryString = require('querystring')
+    queryString = require('querystring'),
+    sys = require('sys')
 
 function merge(a, b) {
   var ret = {};
   for (var k in a) ret[k] = a[k];
-  for (var k in a) ret[k] = b[k];
+  for (var k in b) ret[k] = b[k];
   return ret;
 }
 

nodeko.coffee

@@ -189,13 +189,29 @@ get '/teams/:teamId/invite/:personId', ->
             # TODO flash "Sent a new invitation to $@person.email"
             @redirect '/teams/' + team.id()
 
-# # # # edit person
-# # # get '/people/:id/edit', ->
-# # #   Person.first @req.param('id'), (error, person) =>
-# # #     @ensurePermitted person, =>
-# # #       @person: person
-# # #       @render 'people/edit.html.haml'
-# # # 
+# edit person
+get '/people/:id/edit', ->
+  Person.first @req.param('id'), (error, person) =>
+    @ensurePermitted person, =>
+      @person = person
+      @render 'people/edit.html.haml'
+
+# sign in
+get '/login', ->
+  @person = new Person()
+  @render 'login.html.haml'
+
+# reset password
+post '/reset_password', ->
+  Person.first { email: @req.param('email') }, (error, person) =>
+    # TODO assumes xhr
+    unless person?
+      @res.send 'Email not found', 404
+    else
+      person.resetPassword =>
+        @res.send 'OK', 200
+
+
 # # # # update person
 # # # app.put '/people/:id', ->
 # # #   Person.first @req.param('id'), (error, person) =>
@@ -211,10 +227,6 @@ get '/teams/:teamId/invite/:personId', ->
 # # #       person.save (error, resp) =>
 # # #         @redirectToTeam person
 # # # 
-# # # # sign in
-# # # get '/login', ->
-# # #   @person: new Person()
-# # #   @render 'login.html.haml'
 # # # 
 # # # app.post '/login', ->
 # # #   Person.login @req.params.post, (error, person) =>
@@ -240,16 +252,6 @@ get '/teams/:teamId/invite/:personId', ->
 # # #   @logout =>
 # # #     @redirect '/'
 # # # 
-# # # # reset password
-# # # app.post '/reset_password', ->
-# # #   Person.first { email: @req.param('email') }, (error, person) =>
-# # #     # TODO assumes xhr
-# # #     unless person?
-# # #       @respond 404, 'Email not found'
-# # #     else
-# # #       person.resetPassword =>
-# # #         @respond 200, 'OK'
-# # # 
 # # # get '/*.js', (file) ->
 # # #   try
 # # #     @render "${file}.js.coffee", { layout: false }

views/login.html.haml

@@ -1,17 +1,17 @@
 %h1.ribbon Sign in
 
-!= this.partial('errors.html.haml')
+!= partial('errors.html.haml', { locals: { ctx: ctx } })
 
 %form{ method: 'POST', action: 'login' }
-  %input{ type: 'hidden', name: 'return_to', value: this.param('return_to') }
+  %input{ type: 'hidden', name: 'return_to', value: ctx.req.param('return_to') }
   %p
     %label{ for: 'email' } Email
     %br
-    %input{ type: 'email', name: 'email', id: 'email', value: this.person.email || this.param('email'), autofocus: true }
+    %input{ type: 'email', name: 'email', id: 'email', value: ctx.person.email || ctx.req.param('email'), autofocus: true }
   %p
     %label{ for: 'password' } Password
     %br
-    %input{ type: 'password', name: 'password', id: 'password', value: this.param('password') }
+    %input{ type: 'password', name: 'password', id: 'password', value: ctx.req.param('password') }
   %p
     %input{ type: 'checkbox', name: 'remember', id: 'remember', checked: true }
     %label{ for: 'remember' } Stay logged in

views/reset_password.html.haml

@@ -1,6 +1,6 @@
 %h1 Forgot your password?
 
-!= this.partial('errors.html.haml')
+!= partial('errors.html.haml', { locals: { ctx: ctx } })
 
 %form.reset_password{ method: 'POST', action: 'reset_password' }
   %p