keep user object around after login

7 files changed, 21 insertions, 5 deletions

diff --git a/StoneIsland/www/index.html b/StoneIsland/www/index.html
index 1e2f47c8..e300683f 100644
--- a/StoneIsland/www/index.html
+++ b/StoneIsland/www/index.html
@@ -330,8 +330,8 @@
             <span>GENDER</span>
             <select name="Gender">
               <option value="NONE">Gender</option>
-              <option value="M">Male</option>
-              <option value="F">Female</option>
+              <option value="U">Male</option>
+              <option value="D">Female</option>
             </select>
           </div>
           <h2>PASSWORD</h2>
diff --git a/StoneIsland/www/js/lib/account/AccountView.js b/StoneIsland/www/js/lib/account/AccountView.js
index 8f53b27f..c72a2a40 100644
--- a/StoneIsland/www/js/lib/account/AccountView.js
+++ b/StoneIsland/www/js/lib/account/AccountView.js
@@ -36,6 +36,7 @@ var AccountView = View.extend({
     $("#nav .login").hide()
     $("#nav .account, #nav .logout").show()
   },
+  
   logged_out: function(){
     $("#nav .login").show()
     $("#nav .account, #nav .logout").hide()
diff --git a/StoneIsland/www/js/lib/auth/LoginView.js b/StoneIsland/www/js/lib/auth/LoginView.js
index 86cf7159..701a6a36 100644
--- a/StoneIsland/www/js/lib/auth/LoginView.js
+++ b/StoneIsland/www/js/lib/auth/LoginView.js
@@ -32,6 +32,7 @@ var LoginView = FormView.extend({
   },
   
   success: function(data){
+    // console.log(data)
     app.account.logged_in()
   },
   
diff --git a/StoneIsland/www/js/lib/auth/LogoutView.js b/StoneIsland/www/js/lib/auth/LogoutView.js
index feb264dd..735c0242 100644
--- a/StoneIsland/www/js/lib/auth/LogoutView.js
+++ b/StoneIsland/www/js/lib/auth/LogoutView.js
@@ -8,7 +8,8 @@ var LogoutView = View.extend({
   show: function(){
     document.body.className = "logout"
     app.footer.hide()
-    app.account.log_out()
+    app.account.logged_out()
+    auth.clear_user()
   },
   
 })
\ No newline at end of file
diff --git a/StoneIsland/www/js/lib/auth/SignupView.js b/StoneIsland/www/js/lib/auth/SignupView.js
index 367bd356..0fccc06d 100644
--- a/StoneIsland/www/js/lib/auth/SignupView.js
+++ b/StoneIsland/www/js/lib/auth/SignupView.js
@@ -3,6 +3,7 @@ var SignupView = FormView.extend({
   el: "#signup",
   
   action: sdk.account.signup,
+  last_data: null,
   
   events: {
     "click .privacy-msg": "privacy_link",
@@ -47,6 +48,8 @@ var SignupView = FormView.extend({
     
     delete data.DataProfiling2
     delete data.ConfirmEmail
+    
+    this.last_data = data
     console.log(data)
   },
   
@@ -63,6 +66,10 @@ var SignupView = FormView.extend({
   
   success: function(data){
     console.log('success', data)
+    auth.user = auth.user || {}
+    auth.user.name = this.last_data.Name
+    auth.user.surname = this.last_data.Surname
+    auth.user.email = this.last_data.Email
     app.account.logged_in()
   },
   
diff --git a/StoneIsland/www/js/lib/nav/NavView.js b/StoneIsland/www/js/lib/nav/NavView.js
index 55865abb..f6705e51 100644
--- a/StoneIsland/www/js/lib/nav/NavView.js
+++ b/StoneIsland/www/js/lib/nav/NavView.js
@@ -11,6 +11,7 @@ var NavView = View.extend({
     "click .archive": "archive",
     
     "click .login": "login",
+    "click .logout": "logout",
     "click .account": "account",
     "click .faq": "faq",
     "click .search": "search",
@@ -79,6 +80,11 @@ var NavView = View.extend({
     auth.last_view = app.view
     app.router.go("account/login")
   },
+  logout: function(){
+    this.hide()
+    auth.last_view = app.view
+    app.router.go("account/logout")
+  },
   account: function(){
     this.el.className = "account"
   },
diff --git a/StoneIsland/www/js/sdk/account.js b/StoneIsland/www/js/sdk/account.js
index a1678139..4121bf9a 100644
--- a/StoneIsland/www/js/sdk/account.js
+++ b/StoneIsland/www/js/sdk/account.js
@@ -35,8 +35,8 @@ sdk.account = (function(){
       },
       data: JSON.stringify( opt.data ),
       success: function(data){
-        // console.log(data)
-        auth.user_id = data['UserFull']['UserId']
+        auth.user = data['UserFull']
+        auth.user_id = data['UserFull']['idUser']
         auth.access_token = data['UserFull']['AccessToken']
         
         auth.set_user(user_id, access_token)