autonomic-cooperative/hubl
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' into feature/hubl-2

Browse Source
This commit is contained in:
Jean-Baptiste Pasquier 2020-12-09 14:16:06 +01:00
commit fa2fab3347
No known key found for this signature in database
GPG Key ID: CC04B91B949C163A
9 changed files with 49 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
.gitlab-ci.yml
View File

@ -930,5 +930,41 @@ montpellier:
only:
- master
when: manual
tags:
- deploy
acn:
stage: deployment
environment:
name: acn
url: https://acn.hubl.world
before_script:
- npm ci --cache .npm --prefer-offline --only=production
script:
- echo "$APP_CONFIG_ACN" > config.json
- echo "$SSH_DEPLOY_KEY" | tr -d '\r' > gitlab.key && chmod 600 gitlab.key
- npm run build
- scp -i gitlab.key -o StrictHostKeyChecking=no -r dist/* acn@astral.startinblox.com:~/client/dist/
only:
- master
when: manual
tags:
- deploy
woma:
stage: deployment
environment:
name: woma
url: https://woma.hubl.world
before_script:
- npm ci --cache .npm --prefer-offline --only=production
script:
- echo "$APP_CONFIG_WOMA" > config.json
- echo "$SSH_DEPLOY_KEY" | tr -d '\r' > gitlab.key && chmod 600 gitlab.key
- npm run build
- scp -i gitlab.key -o StrictHostKeyChecking=no -r dist/* woma@astral.startinblox.com:~/client/dist/
only:
- master
when: manual
tags:
- deploy

2
src/components/hubl-reactivity.js
View File

@ -1,4 +1,4 @@
import { store, Sib, StoreMixin } from 'https://cdn.skypack.dev/@startinblox/core@0.13';
import { store, Sib, StoreMixin } from 'https://cdn.skypack.dev/@startinblox/core@0.14';
export const HublReactivity = {
name: 'hubl-reactivity',

2
src/components/hubl-search-users.js
View File

@ -1,4 +1,4 @@
import { widgetFactory } from 'https://cdn.skypack.dev/@startinblox/core@0.13';
import { widgetFactory } from 'https://cdn.skypack.dev/@startinblox/core@0.14';
const HublSearchUsers = widgetFactory(
'hubl-search-users',

2
src/components/hubl-status.js
View File

@ -1,4 +1,4 @@
import { widgetFactory, Helpers } from 'https://cdn.skypack.dev/@startinblox/core@0.13';
import { widgetFactory, Helpers } from 'https://cdn.skypack.dev/@startinblox/core@0.14';
import SlimSelect from 'https://cdn.skypack.dev/slim-select@1.23';
const HublStatus = widgetFactory(

14
src/dependencies.pug
View File

@ -1,13 +1,13 @@
script(type="module" src="https://cdn.skypack.dev/@startinblox/core@0.13" defer)
script(type="module" src="https://cdn.skypack.dev/@startinblox/core@0.14" defer)
//- script(type="module" src="/lib/sib-core/dist/index.js" defer)
script(type="module" src="https://cdn.skypack.dev/@startinblox/oidc@0.11" defer)
script(type="module" src="https://cdn.skypack.dev/@startinblox/oidc@0.12" defer)
//- script(type="module" src="/lib/sib-auth/index.js" defer)
script(type="module" src="https://cdn.skypack.dev/@startinblox/router@0.11" defer)
//- script(type="module" src="/lib/sib-router/src/index.js" defer)
script(type="module" src="https://cdn.skypack.dev/@startinblox/component-notifications@0.8" defer)
script(type="module" src="https://cdn.skypack.dev/@startinblox/component-notifications@0.9" defer)
//- script(type="module" src="/lib/sib-notifications/index.js" defer)
if endpoints.get
@ -22,19 +22,19 @@ if endpoints.get
//- script(type="module" src="/lib/sib-resource/sib-resource.js" defer)
if endpoints.get.joboffers
script(type="module" src="https://cdn.skypack.dev/@startinblox/component-job-board@1.2" defer)
script(type="module" src="https://cdn.skypack.dev/@startinblox/component-job-board@1.3" defer)
//- script(type="module" src="/lib/solid-job-board/dist/index.js" defer)
if endpoints.get.uploads && endpoints.get.skills && endpoints.get.users
script(type="module" src="https://cdn.skypack.dev/@startinblox/component-directory@1.2" defer)
script(type="module" src="https://cdn.skypack.dev/@startinblox/component-directory@1.3" defer)
//- script(type="module" src="/lib/solid-directory/dist/index.js" defer)
if endpoints.get.dashboards
script(type="module" src="https://cdn.skypack.dev/@startinblox/component-dashboard@0.6" defer)
script(type="module" src="https://cdn.skypack.dev/@startinblox/component-dashboard@0.7" defer)
//- script(type="module" src="/lib/solid-dashboard/dist/index.js" defer)
if endpoints.get.users
script(type="module" src="https://cdn.skypack.dev/@startinblox/component-chat@1.4" defer)
script(type="module" src="https://cdn.skypack.dev/@startinblox/component-chat@1.5" defer)
//- script(type="module" src="/lib/solid-xmpp-chat/dist/index.js" defer)
//- DISABLED - please migrate to dev.skypack.dev + upgrade to core@0.13

BIN
src/images/hubl-icon-192.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 32 KiB

After

Width:  |  Height:  |  Size: 16 KiB

BIN
src/images/hubl-icon-512.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 106 KiB

After

Width:  |  Height:  |  Size: 78 KiB

4
src/sw.js
View File

@ -1,4 +1,4 @@
const CACHE_NAME = 'hubl-store';
const CACHE_NAME = 'hubl-store-swfc15';
self.addEventListener('install', function (e) {
self.skipWaiting();
@ -72,7 +72,7 @@ self.addEventListener('fetch', function (event) {
} else {
if (
/unpkg/.test(requestURL.origin) ||
/skypack/.test(request.origin) ||
/skypack/.test(requestURL.origin) ||
/jspm/.test(requestURL.origin) ||
/jsdeliver/.test(requestURL.origin) ||
/cdn/.test(requestURL.origin) ||

2
src/views/partials/admin/page-admin-circles.pug
View File

@ -89,7 +89,7 @@
value-user.username='hubl-workaround-493'
widget-user.username='solid-form-hidden'
submit-button='Rejoindre'
submit-button=''
data-trans='submit-button=circle.list.buttonJoin'
)
hubl-reactivity(data-src=`${endpoints.circles || endpoints.get.circles}` target-src='${value}')