diff options
| author | Camil Staps | 2015-05-13 09:45:54 +0200 |
|---|---|---|
| committer | Camil Staps | 2015-05-13 09:45:54 +0200 |
| commit | e7f88122ace11130d566e57461f14e383917f5a8 (patch) | |
| tree | 93e60698f0c1ecb5abde680a9a9b5dd16f5db02b | |
| parent | Save user's email in cookie (diff) | |
Show login email if logged in
| -rw-r--r-- | src/include/foot.jade | 4 | ||||
| -rw-r--r-- | src/include/layout-main.jade | 4 | ||||
| -rw-r--r-- | src/js/BotleaguesCallback.js | 3 | ||||
| -rw-r--r-- | src/js/main.js | 16 |
4 files changed, 23 insertions, 4 deletions
diff --git a/src/include/foot.jade b/src/include/foot.jade index 1e383f2..4c8a7a1 100644 --- a/src/include/foot.jade +++ b/src/include/foot.jade @@ -2,4 +2,6 @@ script(src='/assets/js/script.js', type='text/javascript') script(src='/assets/js/Botleagues.js', type='text/javascript') script(src='/assets/js/BotleaguesCallback.js', type='text/javascript') script(src='/assets/js/BotleaguesFrontend.js', type='text/javascript') -script(src='/assets/js/forms.js', type='text/javascript')
\ No newline at end of file + +script(src='/assets/js/forms.js', type='text/javascript') +script(src='/assets/js/main.js', type='text/javascript')
\ No newline at end of file diff --git a/src/include/layout-main.jade b/src/include/layout-main.jade index fac12f2..164a7b2 100644 --- a/src/include/layout-main.jade +++ b/src/include/layout-main.jade @@ -12,13 +12,13 @@ html(lang="en") -var menu = { 'Home': '/', 'About': '/about', 'Contact': '/contact' }; .header.clearfix - nav: ul.nav.nav-pills.pull-right + nav: ul.nav.nav-pills.pull-right#nav each val, key in menu if selected === val li.active(role='presentation'): a(href=val,title=key)= key else li(role='presentation'): a(href=val,title=key)= key - li(role='presentation'): a.btn-botleagues-login(href='#',title='Login') Login + li.login-link(role='presentation'): a.btn-botleagues-login(href='#',title='Login') Login h3 Botleagues #messages diff --git a/src/js/BotleaguesCallback.js b/src/js/BotleaguesCallback.js index 3e7e512..ea837fd 100644 --- a/src/js/BotleaguesCallback.js +++ b/src/js/BotleaguesCallback.js @@ -39,7 +39,8 @@ BotleaguesCallback.login = function(data) { }); $.cookie(BotleaguesFrontend.cookie_login_user_id, data.user_token.userId); $.cookie(BotleaguesFrontend.cookie_login_token, data.user_token.token); - $.cookie(BotleaguesFrontend.cookie_login_valid_till, Date.parse(data.user_token.valid_till)); + $.cookie(BotleaguesFrontend.cookie_login_valid_till, + (new Date()).getTime() + Date.parse(data.user_token.valid_till) - Date.parse(data.user_token.updated_at)); } else { BotleaguesFrontend.error({ message: data.error ? data.error : "Could not login." diff --git a/src/js/main.js b/src/js/main.js new file mode 100644 index 0000000..04b5c6f --- /dev/null +++ b/src/js/main.js @@ -0,0 +1,16 @@ +$(document).ready(function(){ + + // Show profile link instead of login if user is logged in + var email = $.cookie(BotleaguesFrontend.cookie_login_email); + console.log(email); + if (typeof email != 'undefined' && $.cookie(BotleaguesFrontend.cookie_login_valid_till) > (new Date()).getTime()) { + $('#nav .login-link').remove(); + $('<li>').append( + $('<a>') + .attr('role', 'presentation') + .attr('title', 'User profile') + .attr('href', '/profile') + .text(email)) + .appendTo($('#nav')); + } +});
\ No newline at end of file |