Small improvments on login/logout button (header)

Leonardo Merlin
1 parent 366359fc
Showing 2 changed files with 35 additions and 8 deletions Show diff stats
js/main.js
sass/style.sass
@@ -206,7 +206,7 @@ define([&#39;handlebars&#39;, &#39;fastclick&#39;, &#39;handlebars_helpers&#39;], function(Handlebars, F
           var requireLoginContainer = loginButton.closest('.require-login-container');
           if(logged_in) {
-            $('.logout').show();
+            Main.showLogout();
             if(token){
               Main.private_token = token;
             }
@@ -228,7 +228,7 @@ define([&#39;handlebars&#39;, &#39;fastclick&#39;, &#39;handlebars_helpers&#39;], function(Handlebars, F
           } else {
             requireLoginContainer.find('.require-login').hide();
             requireLoginContainer.find('.login-container').show();
-            $('.logout').hide();
+            Main.showLogin();
           }
         },
         guid: function() {
@@ -577,6 +577,25 @@ define([&#39;handlebars&#39;, &#39;fastclick&#39;, &#39;handlebars_helpers&#39;], function(Handlebars, F
             successPanel.remove();
           }, timeout);
         },
+        setUser: function(user){
+          this.user = user;
+        },
+        getUser: function(){
+          return this.user;
+        },
+        showLogin: function(){
+          $('.entrar').show();
+          $('.logout').hide();
+        },
+        showLogout: function(){
+          $('.entrar').hide();
+          var name = '';
+          if(this.user){
+            name = this.user.person.name + ' | ';
+          }
+          $('.logout').text(name + 'Sair');
+          $('.logout').show();
+        },
       responseToText: function(responseJSONmessage){
         var o = JSON.parse(responseJSONmessage);
         var msg = "";
@@ -786,10 +805,14 @@ define([&#39;handlebars&#39;, &#39;fastclick&#39;, &#39;handlebars_helpers&#39;], function(Handlebars, F
     if($.cookie('_dialoga_session')) {
       var url = host + '/api/v1/users/me?private_token=' + $.cookie('_dialoga_session');
-      $.getJSON(url).done(function( /*data*/ ) {
+      $.getJSON(url).done(function( data ) {
         logged_in = true;
         Main.private_token = $.cookie('_dialoga_session');
-        setTimeout(function(){ $('.logout').show(); }, 2000);
+
+        if(data && data.user){
+          Main.setUser(data.user);
+          Main.showLogout();
+        }
       });
     }
@@ -909,8 +932,7 @@ define([&#39;handlebars&#39;, &#39;fastclick&#39;, &#39;handlebars_helpers&#39;], function(Handlebars, F
       $.removeCookie('votedProposals');
       $.removeCookie('*');
       logged_in = false;
-      $('.logout').hide();
-      $('.entrar').show();
+      Main.showLogin();
       location.reload();
       e.preventDefault();
     });
@@ -645,8 +645,13 @@ h1
     padding: 2px 10px
   .entrar
     background: url(images/icons/icon-user.png) no-repeat 20px 50%
-    border-left: 1px solid #bcbcbc
-    margin-left: 20px
+    // border-left: 1px solid #bcbcbc
+    // margin-left: 20px
+    padding-left: 40px
+  .logout
+    background: url(images/icons/icon-user.png) no-repeat 20px 50%
+    // border-left: 1px solid #bcbcbc
+    // margin-left: 20px
     padding-left: 40px
 .login,.signup
   text-align: left