From 3e14cb91a4c72ca2baeb768d3ce3a03a4ae375dc Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Pasquier Date: Wed, 19 Feb 2020 17:03:47 +0100 Subject: [PATCH] update: redirect to login and hide page on logged out --- src/header.pug | 6 +++--- src/index.pug | 5 +++-- src/scripts/index.js | 4 +++- src/styles/base/header.scss | 4 ---- src/styles/base/main.scss | 4 ++++ 5 files changed, 13 insertions(+), 10 deletions(-) diff --git a/src/header.pug b/src/header.pug index 2ad85fa..ef56755 100644 --- a/src/header.pug +++ b/src/header.pug @@ -7,7 +7,7 @@ //- i#search-icon.icon-magnifier(aria-hidden='true') //- i#close-search-icon.icon-close(aria-hidden='true') -sib-notifications( +sib-notifications.notLoggedIn( nested-field="inbox" bind-user ) @@ -33,11 +33,11 @@ details#user-controls.notLoggedIn sib-link(next='admin') Admin button(role='log out' onclick="document.querySelector('sib-auth').logout();") Log out -button(role='log in' onclick="document.querySelector('sib-auth').login();") Login +button.loggedIn(role='log in' onclick="document.querySelector('sib-auth').login();") Login button.notLoggedIn.mobile-menu-icon.icon-menu#toggleMainMenu -sib-auth +sib-auth(style='display:none!important') sib-auth-provider( data-authority=`${authority}` data-id=`${authorityName || "authority"}` diff --git a/src/index.pug b/src/index.pug index 2df531e..0eae9a5 100644 --- a/src/index.pug +++ b/src/index.pug @@ -13,7 +13,8 @@ html(lang="en") body header#header(role='banner') include header.pug - main + + main.notLoggedIn include menu-left.pug div#viewport @@ -42,4 +43,4 @@ html(lang="en") include page-events.pug #admin(hidden).with-sidebar - include page-admin.pug + include page-admin.pug \ No newline at end of file diff --git a/src/scripts/index.js b/src/scripts/index.js index ecbafe8..8a86883 100644 --- a/src/scripts/index.js +++ b/src/scripts/index.js @@ -214,7 +214,7 @@ document.addEventListener("DOMContentLoaded", function(event) { .forEach(el => (el.style.visibility = "visible")); // Hide login button if already logged document - .querySelector('button[role="log in"]') + .querySelector('.loggedIn') .setAttribute("style", "display:none !important"); document.querySelectorAll('sib-display, sib-form').forEach(element => { // Set current user id on set-user-id of sib-display @@ -228,6 +228,8 @@ document.addEventListener("DOMContentLoaded", function(event) { "display:none !important" ); // Hide Join button } + } else { + document.querySelector('sib-auth').login(); } }) .catch(error => console.log(error)); diff --git a/src/styles/base/header.scss b/src/styles/base/header.scss index 850e1da..b330266 100644 --- a/src/styles/base/header.scss +++ b/src/styles/base/header.scss @@ -56,10 +56,6 @@ } } - .notLoggedIn { - visibility: hidden; - } - sib-notifications { @include breakpoint(sm) { diff --git a/src/styles/base/main.scss b/src/styles/base/main.scss index 4aae4ef..5de1804 100644 --- a/src/styles/base/main.scss +++ b/src/styles/base/main.scss @@ -35,6 +35,10 @@ $breakpoints: (phone: 480px, backface-visibility: hidden; /*will-change: overflow;*/ } + + .notLoggedIn { + visibility: hidden; + } } /* Add scrollbar to the left and right menu, and to the content */