From f1ffcc60b7a8b767cbdd5a3bc0b53721ffce0f52 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Pasquier Date: Mon, 30 Nov 2020 12:09:51 +0000 Subject: [PATCH 01/11] i18n: dahsboard --- src/locales/en.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/locales/en.json b/src/locales/en.json index 2744724..7b06fc0 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -15,12 +15,12 @@ "project": "project", "circle": "circle" }, - "dashboard": "Dahsboard", + "dashboard": "Dashboard", "events": "Events", "gov": "Governance", "resources": "Resources", "jobBoard": "Job offers", - "profileDirectory": "Members directory", + "profileDirectory": "Profiles directory", "projects": "Projects", "circles": "Circles", "messages": "Messages", From 857f620ba14537413268d0d2ea0fa34c9bbef25f Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Pasquier Date: Mon, 30 Nov 2020 14:39:31 +0000 Subject: [PATCH 02/11] feature: native auto-login --- src/header.pug | 2 +- src/scripts/login-element-visibility.js | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/header.pug b/src/header.pug index bee875f..420990c 100644 --- a/src/header.pug +++ b/src/header.pug @@ -41,7 +41,7 @@ button.loggedIn(role='log in' onclick="document.querySelector('sib-auth').login( button.notLoggedIn.mobile-menu-icon.icon-menu#toggleMainMenu -sib-auth(style='display:none!important') +sib-auth(style='display:none!important', auto-login) sib-auth-provider( data-authority=`${authority}` data-id=`${authorityName || "authority"}` diff --git a/src/scripts/login-element-visibility.js b/src/scripts/login-element-visibility.js index 3210e53..689dbb2 100644 --- a/src/scripts/login-element-visibility.js +++ b/src/scripts/login-element-visibility.js @@ -10,8 +10,6 @@ document.addEventListener("DOMContentLoaded", function () { document .querySelector('.loggedIn') .setAttribute("style", "display:none !important"); - } else { - document.querySelector('sib-auth').login(); } }); }); \ No newline at end of file From 2381659e575bb51fbd3f118f79795272fb2ab108 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Pasquier Date: Mon, 30 Nov 2020 16:37:42 +0100 Subject: [PATCH 03/11] feature: enable no-render --- src/index.pug | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/index.pug b/src/index.pug index 8365b4b..c0fce5d 100644 --- a/src/index.pug +++ b/src/index.pug @@ -24,7 +24,7 @@ html(lang="en") nav#main__menu.left-menu.jsLeftMenu include menu-left.pug - main#viewport.content.notLoggedIn + main#viewport.content.notLoggedIn(no-render) if endpoints.dashboards || (endpoints.get && endpoints.get.dashboards) #dashboard(hidden, data-view="dashboard").no-sidebar.with-padding From fd46a2707850a78284361c617e241df31e34f9db Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Pasquier Date: Mon, 30 Nov 2020 17:15:22 +0100 Subject: [PATCH 04/11] fix: avatars --- src/dependencies.pug | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/dependencies.pug b/src/dependencies.pug index d6cec94..a6a4718 100644 --- a/src/dependencies.pug +++ b/src/dependencies.pug @@ -65,6 +65,5 @@ script(data-default-context, type="application/ld+json") | "object": "http://happy-dev.fr/owl/#object", | "author": "http://happy-dev.fr/owl/#author", | "account": "http://happy-dev.fr/owl/#account", - | "jabberID": "foaf:jabberID", - | "picture": "foaf:depiction" + | "jabberID": "foaf:jabberID" | } From 84209c3ff31cfad03179f191413eb9cec6d3aaf7 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Pasquier Date: Mon, 30 Nov 2020 18:10:09 +0100 Subject: [PATCH 05/11] fix: chatbox height --- src/scripts/firefox-scroll.js | 12 ++++++++---- src/styles/layout/user/messages.scss | 5 ++++- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/src/scripts/firefox-scroll.js b/src/scripts/firefox-scroll.js index 5f62468..8f78178 100644 --- a/src/scripts/firefox-scroll.js +++ b/src/scripts/firefox-scroll.js @@ -18,8 +18,10 @@ document.addEventListener("DOMContentLoaded", () => { let viewportChat = Array.from( document.querySelectorAll("#viewport .chat-view") ); + let headerOffset = document.querySelector('#header').offsetHeight; + let intermediateOffset = Array.from(document.querySelectorAll(".content-box__header")).filter(el=>el.offsetParent!==null?el:null)[0].offsetHeight; viewportChat.forEach( - (c) => (c.style.height = "calc(100vh - 106px - 57px - 4px)") + (c) => (c.style.height = "calc(100vh - "+String(headerOffset+intermediateOffset)+"px)") // Firefox keyboard 57px ); } } @@ -33,7 +35,7 @@ document.addEventListener("DOMContentLoaded", () => { clearInterval(isbody); resizeChat(); } - }, 15); + }, 50); window.addEventListener("load", () => { setTimeout(() => { @@ -41,10 +43,12 @@ document.addEventListener("DOMContentLoaded", () => { }, 0); }); + let windowResizing; window.addEventListener("resize", () => { - setTimeout(() => { + windowResizing = setTimeout(() => { + clearInterval(windowResizing); resizeChat(); - }, 0); + }, 50); }); document.addEventListener("navigate", () => { diff --git a/src/styles/layout/user/messages.scss b/src/styles/layout/user/messages.scss index f0ae1ec..db9e071 100644 --- a/src/styles/layout/user/messages.scss +++ b/src/styles/layout/user/messages.scss @@ -9,5 +9,8 @@ } .avatar-text { position: absolute; - top: 2.8rem; + top: 7.5rem; + @include breakpoint(lg) { + top: 2.8rem; + } } \ No newline at end of file From 9b5a12d10edaf6107c0598fba84452d85d4b6649 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Pasquier Date: Mon, 30 Nov 2020 19:04:50 +0100 Subject: [PATCH 06/11] fix: chatbox height --- src/scripts/firefox-scroll.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/scripts/firefox-scroll.js b/src/scripts/firefox-scroll.js index 8f78178..4405aa6 100644 --- a/src/scripts/firefox-scroll.js +++ b/src/scripts/firefox-scroll.js @@ -1,5 +1,6 @@ document.addEventListener("DOMContentLoaded", () => { const resizeChat = () => { + let isMobile = window.innerHeight < 993; let chatBox = Array.from(document.querySelectorAll("solid-xmpp-chat")) .map((el) => el.shadowRoot ? el.shadowRoot.getElementById("conversejs") : false) .filter((el) => el) @@ -21,7 +22,7 @@ document.addEventListener("DOMContentLoaded", () => { let headerOffset = document.querySelector('#header').offsetHeight; let intermediateOffset = Array.from(document.querySelectorAll(".content-box__header")).filter(el=>el.offsetParent!==null?el:null)[0].offsetHeight; viewportChat.forEach( - (c) => (c.style.height = "calc(100vh - "+String(headerOffset+intermediateOffset)+"px)") // Firefox keyboard 57px + (c) => (c.style.height = isMobile ? "calc(100vh - "+String(headerOffset+intermediateOffset)+"px - 57px)" : "calc(100vh - "+String(headerOffset+intermediateOffset)+"px)") ); } } From cc2c1628056459f508a10799c40211ed8c5ff716 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Pasquier Date: Tue, 1 Dec 2020 16:04:47 +0000 Subject: [PATCH 07/11] fix: context for avatar --- src/dependencies.pug | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/dependencies.pug b/src/dependencies.pug index a6a4718..d6cec94 100644 --- a/src/dependencies.pug +++ b/src/dependencies.pug @@ -65,5 +65,6 @@ script(data-default-context, type="application/ld+json") | "object": "http://happy-dev.fr/owl/#object", | "author": "http://happy-dev.fr/owl/#author", | "account": "http://happy-dev.fr/owl/#account", - | "jabberID": "foaf:jabberID" + | "jabberID": "foaf:jabberID", + | "picture": "foaf:depiction" | } From f4ea9ec9caa58415f0a457355c5d23f114ee5596 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Pasquier Date: Mon, 30 Nov 2020 16:37:42 +0100 Subject: [PATCH 08/11] feature: enable no-render --- src/index.pug | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/index.pug b/src/index.pug index 8365b4b..c0fce5d 100644 --- a/src/index.pug +++ b/src/index.pug @@ -24,7 +24,7 @@ html(lang="en") nav#main__menu.left-menu.jsLeftMenu include menu-left.pug - main#viewport.content.notLoggedIn + main#viewport.content.notLoggedIn(no-render) if endpoints.dashboards || (endpoints.get && endpoints.get.dashboards) #dashboard(hidden, data-view="dashboard").no-sidebar.with-padding From 63e64b0ed6ffadb7ecbbcd37b07605d8a20c5ab0 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Pasquier Date: Wed, 2 Dec 2020 10:09:01 +0100 Subject: [PATCH 09/11] fix: no-render --- src/index.pug | 2 +- src/scripts/firefox-scroll.js | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/index.pug b/src/index.pug index 6de9a9e..0fd12f3 100644 --- a/src/index.pug +++ b/src/index.pug @@ -24,7 +24,7 @@ html(lang="en") nav#main__menu.left-menu.jsLeftMenu include menu-left.pug - main#viewport.content.notLoggedIn(no-render) + main#viewport.content.notLoggedIn if endpoints.dashboards || (endpoints.get && endpoints.get.dashboards) #dashboard(hidden, data-view="dashboard").no-sidebar.with-padding diff --git a/src/scripts/firefox-scroll.js b/src/scripts/firefox-scroll.js index 4405aa6..3b9bb18 100644 --- a/src/scripts/firefox-scroll.js +++ b/src/scripts/firefox-scroll.js @@ -1,6 +1,8 @@ document.addEventListener("DOMContentLoaded", () => { const resizeChat = () => { - let isMobile = window.innerHeight < 993; + let isMobile = window.innerWidth < 993; + let isFirefox = navigator.userAgent.toLowerCase().indexOf('firefox') > -1; + let isFirefoxMobile = navigator.platform.toLowerCase().indexOf("mobile") > -1 || navigator.platform.toLowerCase().indexOf("tablet") > -1; let chatBox = Array.from(document.querySelectorAll("solid-xmpp-chat")) .map((el) => el.shadowRoot ? el.shadowRoot.getElementById("conversejs") : false) .filter((el) => el) @@ -19,10 +21,8 @@ document.addEventListener("DOMContentLoaded", () => { let viewportChat = Array.from( document.querySelectorAll("#viewport .chat-view") ); - let headerOffset = document.querySelector('#header').offsetHeight; - let intermediateOffset = Array.from(document.querySelectorAll(".content-box__header")).filter(el=>el.offsetParent!==null?el:null)[0].offsetHeight; viewportChat.forEach( - (c) => (c.style.height = isMobile ? "calc(100vh - "+String(headerOffset+intermediateOffset)+"px - 57px)" : "calc(100vh - "+String(headerOffset+intermediateOffset)+"px)") + (c) => (c.style.height = isMobile ? (isFirefox && isFirefoxMobile) ? "calc(100vh - 106px - 57px)" : "calc(100vh - 106px)" : "calc(100vh - 64px - 83px)") ); } } From 354807c512d83dbb207a5456729f9f8ed61ffb84 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Pasquier Date: Wed, 2 Dec 2020 10:35:21 +0100 Subject: [PATCH 10/11] fix: no-render --- src/components/hubl-reactivity.js | 26 +++++++++++--------------- 1 file changed, 11 insertions(+), 15 deletions(-) diff --git a/src/components/hubl-reactivity.js b/src/components/hubl-reactivity.js index 2dc766c..400a4e2 100644 --- a/src/components/hubl-reactivity.js +++ b/src/components/hubl-reactivity.js @@ -11,21 +11,17 @@ export const HublReactivity = { this.subscribe(); } }, - dataSrc: { - type: String, - default: '', - callback: async function (value) { - this.resourceId = null; - if (this.nestedField) { - const resource = store.get(value) || await store.getData(value, this.context); - const nestedResource = await resource[this.nestedField] - this.resourceId = nestedResource ? nestedResource['@id'] : null; - } else { - this.resourceId = value; - } - this.subscribe(); - } - }, + }, + async fetchData(value) { + this.resourceId = null; + if (this.nestedField) { + const resource = store.get(value) || await store.getData(value, this.context); + const nestedResource = await resource[this.nestedField] + this.resourceId = nestedResource ? nestedResource['@id'] : null; + } else { + this.resourceId = value; + } + this.subscribe(); }, subscribe() { if (this.resourceId && this.targetSrc) { From 1d1f8de324ed83791c793b687e84375a173cc3ed Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Pasquier Date: Thu, 3 Dec 2020 10:58:08 +0000 Subject: [PATCH 11/11] feature: activate sw --- src/scripts/register-sw.js | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/scripts/register-sw.js b/src/scripts/register-sw.js index c479a12..5b375a8 100644 --- a/src/scripts/register-sw.js +++ b/src/scripts/register-sw.js @@ -1,11 +1,11 @@ -// if('serviceWorker' in navigator) { - // var refreshing; - // navigator.serviceWorker.addEventListener('controllerchange', () => { - // if (refreshing) { - // return; - // } - // refreshing = true; - // window.location.reload(); - // }); - // navigator.serviceWorker.register('/sw.js'); -// } \ No newline at end of file +if('serviceWorker' in navigator) { + var refreshing; + navigator.serviceWorker.addEventListener('controllerchange', () => { + if (refreshing) { + return; + } + refreshing = true; + window.location.reload(); + }); + navigator.serviceWorker.register('/sw.js'); +} \ No newline at end of file