diff --git a/.gitlab/issue_templates/bug.md b/.gitlab/issue_templates/bug.md index e796cd3..89008f5 100644 --- a/.gitlab/issue_templates/bug.md +++ b/.gitlab/issue_templates/bug.md @@ -1,28 +1,24 @@ -/label ~BUG +# What's happening? -### What's happening? +Describe in a few words what's happening -*Describe in a few words what's happening* +## Steps to reproduce -### Steps to reproduce - -*How one can reproduce the issue - this is very important* +How one can reproduce the issue - this is very important 1. Step 1 2. Step 2 3. Step 3 -### Relevant logs and/or screenshots +## Relevant logs and/or screenshots -*If possible, please add a screenshot.* +If possible, please add a screenshot. -### Your Environment +## Your Environment (Include relevant details about the environment you experienced the bug in) * Browser name and version: * Operating System and version (desktop or mobile): - - - +/label ~BUG diff --git a/.gitlab/issue_templates/feature.md b/.gitlab/issue_templates/feature.md index 3f8fa19..f954430 100644 --- a/.gitlab/issue_templates/feature.md +++ b/.gitlab/issue_templates/feature.md @@ -1,16 +1,12 @@ -## What needs to be done? - -/label ~Feature request - +# What needs to be done ## Technical details -*Are there any technical details worth mentioning?* - +Are there any technical details worth mentioning? ## Test cases -*Describe here the tests needed in order to validate this feature* +Describe here the tests needed in order to validate this feature 1. Step 1 2. Step 2 @@ -20,3 +16,5 @@ 1. Link to user story in wiki 2. other related Gitlab issues + +/label ~Feature request diff --git a/.gitlab/issue_templates/new_instance.md b/.gitlab/issue_templates/new_instance.md index a93fe19..2cf64a0 100644 --- a/.gitlab/issue_templates/new_instance.md +++ b/.gitlab/issue_templates/new_instance.md @@ -1,40 +1,16 @@ -/label ~"New Instance" - -# Please fill all these info: +# Please fill all these info ## General info -- Name of the instance: -- Domain: - -## Settings: - -- Does the instance allow people to sign up? **Yes / No** -- Does the instance want new people to get a welcome email? **Yes / No** - -## Federation: - -- Which current instance should see this new instance data? **Please provide the info module by module and include the instance itself.** -- Do those current instances agree to share their public data with this new instance? **Yes / No** - -Example: - -- *Instance G is the new kid in town* -- *Instance G wants to only see their dashboard, but want to access the circles of A, B, C, D, E & F.* -- *Instance G wants to be able to chat with users from A, B, C, D, E & F.* -- *Instance G wants to be able to see A and B job offers* - -Let's say every instances agree to this scenario, the issue should describe the following: - -- Dashboard: G -- Circles: A, B, C, D, E, F & G -- Job offers: A, B, F, G -- Users: A, B, C, D, E, F & G -- Profile directory: A, B, C, D, E, F & G -- G agrees that any new instance can see their public data. +- Name of the instance: +- Domain: .hubl.world ## Cosmetics -- Logo: -- Favicon: -- 4 Colors: \ No newline at end of file +- Logo: + +- Favicon: + +- 4 Colors: + +/label ~"New Instance" diff --git a/.gitlab/merge_request_templates/checklist_before_merging.md b/.gitlab/merge_request_templates/checklist_before_merging.md index edd506b..c92dfae 100644 --- a/.gitlab/merge_request_templates/checklist_before_merging.md +++ b/.gitlab/merge_request_templates/checklist_before_merging.md @@ -1,4 +1,4 @@ -## Checklist +# Checklist - ## Time spent - diff --git a/README.md b/README.md index 1f78d8d..d673fd9 100644 --- a/README.md +++ b/README.md @@ -108,8 +108,8 @@ On `config.json`: ```json "clientName": "Hubl", - "clientFavicon": "/images/favicon.png", - "clientLogo": "/images/logo.png", + "clientFavicon": "/images/favicon.webp", + "clientLogo": "/images/logo.webp", "clientLogoHeight": "32px", "clientCSS": "/path/to/custom.css", "authorityName": "djangoldp-server-name" diff --git a/src/dependencies.pug b/src/dependencies.pug index a6682f5..ebf5a55 100644 --- a/src/dependencies.pug +++ b/src/dependencies.pug @@ -36,7 +36,7 @@ if (endpoints.uploads || (endpoints.get && endpoints.get.uploads)) && (endpoints //- script(type="module" src="/lib/solid-directory/dist/index.js" defer) if endpoints.dashboards || (endpoints.get && endpoints.get.dashboards) - script(type="module" src="https://cdn.skypack.dev/@startinblox/component-dashboard@0.5" defer) + script(type="module" src="https://cdn.skypack.dev/@startinblox/component-dashboard@0.6" defer) //- script(type="module" src="/lib/solid-dashboard/dist/index.js" defer) if endpoints.users || (endpoints.get && endpoints.get.users) diff --git a/src/header.pug b/src/header.pug index 49b663d..bee875f 100644 --- a/src/header.pug +++ b/src/header.pug @@ -1,7 +1,7 @@ .header-left .logo solid-link(next='dashboard') - img(src=`${clientLogo || '/images/logo.png'}` style=`max-height:${clientLogoHeight || '32px'}`) + img(src=`${clientLogo || '/images/logo.webp'}` style=`max-height:${clientLogoHeight || '74px'}`) span.beta-tag(data-trans='header.beta') diff --git a/src/images/favicon.png b/src/images/favicon.png deleted file mode 100644 index e715278..0000000 Binary files a/src/images/favicon.png and /dev/null differ diff --git a/src/images/favicon.webp b/src/images/favicon.webp new file mode 100644 index 0000000..d16fe68 Binary files /dev/null and b/src/images/favicon.webp differ diff --git a/src/images/logo.png b/src/images/logo.png deleted file mode 100644 index ea256f2..0000000 Binary files a/src/images/logo.png and /dev/null differ diff --git a/src/images/logo.webp b/src/images/logo.webp new file mode 100644 index 0000000..a7f0c09 Binary files /dev/null and b/src/images/logo.webp differ diff --git a/src/index.pug b/src/index.pug index 1a5d095..8365b4b 100644 --- a/src/index.pug +++ b/src/index.pug @@ -9,7 +9,7 @@ html(lang="en") if clientFavicon link(rel="icon" type="image/png" href=`${clientFavicon}`) else - link(rel="icon" type="image/png" href="/images/favicon.png") + link(rel="icon" type="image/webp" href="/images/favicon.webp") include dependencies.pug if clientCSS link(rel='stylesheet', href=`${clientCSS}`) diff --git a/src/scripts/register-sw.js b/src/scripts/register-sw.js index 5b375a8..c479a12 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 diff --git a/src/styles/base/header.scss b/src/styles/base/header.scss index eca9ca6..cbc0b8f 100644 --- a/src/styles/base/header.scss +++ b/src/styles/base/header.scss @@ -47,8 +47,8 @@ border-radius: 3px; background: var(--color-primary); color: var(--color-white); - position: absolute; - top: -9px; + position: fixed; + top: 12px; left: 267px; } } diff --git a/src/sw.js b/src/sw.js index a3f8d5f..a61d59b 100644 --- a/src/sw.js +++ b/src/sw.js @@ -1,4 +1,4 @@ -const CACHE_NAME = 'hubl-store-dev'; +const CACHE_NAME = 'hubl-store'; self.addEventListener('install', function (e) { self.skipWaiting();