Vytvořena stránka uživatele

app.coffee

@@ -67,6 +67,9 @@ app.configure 'development', ->
 
 app.get '/', routes.index
 
+app.get '/user', routes.user
+app.post '/user/password', routes.user_password
+
 app.get '/course/:courseName', routes.course
 
 app.get '/sandbox', routes.sandbox

progma/passport.coffee

@@ -71,8 +71,10 @@ exports.localAuth = ->
 
         # Check password.
         shasum = crypto.createHash 'sha1'
+        shasum.update "" + user.salt
         shasum.update password
-        if shasum.digest('hex') != user.password
+        hash = shasum.digest('hex')
+        if hash != user.password
           return done null, false, { message: 'Invalid password' }
 
         # Return user profile.

public/courses/turtle1/course.json

@@ -1,4 +1,5 @@
 {
+    "readableName": "Želvička",
     "mediaRoot": "/media/turtle1/",
     "lectures": [
         {

public/courses/turtle1b/course.json

@@ -1,4 +1,5 @@
 {
+    "readableName": "Želvička",
     "mediaRoot": "/media/turtle1b/",
     "lectures": [
         {

public/courses/turtle2/course.json

@@ -1,4 +1,5 @@
 {
+    "readableName": "3D Želvička",
     "mediaRoot": "/media/turtle2/",
     "lectures": [
         {

public/less/course.less

@@ -292,3 +292,8 @@
     height: 32px;
     background-color: @filmStock;
 }
+
+.affix {
+    top: 70px;
+    width: 170px;
+}

routes/index.coffee

@@ -1,6 +1,9 @@
 crypto = require('crypto')
 settings = require('../progma/settings')
+users = require('../progma/users')
 db = require('../progma/mongo').db
+fs = require('fs')
+
 userCodeCollection = db.collection('userCode')
 
 
@@ -92,6 +95,50 @@ exports.login = (req, res) ->
     user: req.user
     errors: req.flash 'error'
 
+exports.user = (req, res) ->
+  lectures = {}
+  for courseName of req.user.lecturesDone
+    file = fs.readFileSync('public/courses/' + courseName + '/course.json')
+    course = JSON.parse(file)
+
+    lectures[courseName] = {readableName: course['readableName'], list: []}
+
+    for lectureName of course['lectures']
+      lecture = course['lectures'][lectureName]
+      lectures[courseName]['list'].push({
+        name: lecture['name']
+        readableName: lecture['readableName']
+        done: lecture['name'] in req.user.lecturesDone[courseName]
+      })
+
+  console.log(lectures)
+
+  res.render 'user',
+    title: 'User'
+    page: 'user'
+    user: req.user
+    lectures: lectures
+    errors: req.flash 'error'
+
+exports.user_password = (req, res) ->
+  if req.user?
+    old_password = req.body.old_password
+    new_password = req.body.new_password
+    confirm = req.body.confirm_new_password
+
+    users.checkPassword req.user.id, old_password, (err, correct) ->
+      if correct
+        users.getUser req.user.id, (err, user) ->
+          # Create salt and password
+          user.salt = new Date().getTime()
+          user.password = users.hashPassword(user.salt, new_password)
+          users.updateUser user, ->
+            res.redirect '/user'
+      else
+        res.redirect 'back'
+  else
+    res.redirect 'back'
+
 exports.get_register = (req, res) ->
   res.render 'register',
     title: 'Registration'
@@ -115,15 +162,19 @@ exports.post_register = (req, res, next, passport) ->
       req.flash 'error', 'User already exists.'
       return res.redirect '/login'
 
+    salt = new Date().getTime()
     # Compute password hash.
     shasum = crypto.createHash 'sha1'
+    shasum.update "" + salt
     shasum.update req.body.password
+    hash = shasum.digest('hex')
 
     # Create new user profile.
     new_user =
       id: username
+      salt: salt
       displayName: req.body.username
-      password: shasum.digest 'hex'
+      password: hash
 
     # Insert new user to database.
     db.collection('users').save new_user, (err, result) ->

views/layout.jade

@@ -45,7 +45,7 @@ html(lang="en")
 
             if user
               ul.nav.pull-right
-                li: a(href="/account") #{user.displayName}
+                li: a(href="/user") #{user.displayName}
                 li: a(href="/logout") logout
             else
               ul.nav.pull-right

views/user.jade

@@ -0,0 +1,63 @@
+extends layout
+
+block body
+  section
+    .page-header
+      h1 Detaily uživatele
+    .row
+      .span2
+        div(data-spy="affix", data-offset-top="100")
+          ul.nav.nav-tabs.nav-stacked#side-menu
+            li
+              a(href="#progress") Splněné kurzy
+            li
+              a(href="#settings") Změna nastavení
+
+      .span10
+        .row
+          .span4
+            h2#progress Splněné kurzy
+        .row
+          .span10
+            each val, key in lectures
+              .span3
+                h3 #{val.readableName}
+                ul(style="list-style: none")
+                  each lecture, name in val['list']
+                    if lecture['done']
+                      li
+                        i.icon-check
+                        a(href="/course/#{key}##{lecture.name}") #{lecture.readableName}
+                    else
+                      li
+                        i.icon-check-empty
+                        a(href="/course/#{key}##{lecture.name}") #{lecture.readableName}
+        hr
+        .row
+          .span4
+            h2#settings Změna nastavení
+        .row
+          .span4
+            form.well(action="/user/password", method="post")
+              fieldset
+                .control-group
+                  label.control-label(for="old_password") Staré heslo:
+                  .controls
+                    input(style="height: 35px; box-sizing:border-box; width: 100%;",
+                          type="password",
+                          name="old_password")
+                .control-group
+                  label.control-label(for="new_password") Nové heslo:
+                  .controls
+                    input(style="height: 35px; box-sizing:border-box; width: 100%;",
+                          type="password",
+                          name="new_password")
+                .control-group
+                  label.control-label(for="new_password") Potvrdit nové heslo:
+                  .controls
+                    input(style="height: 35px; box-sizing:border-box; width: 100%;",
+                          type="password",
+                          name="confirm_new_password")
+                .control-group
+                  .controls
+                    button.btn.btn-large.btn-primary(type="submit") Odeslat