diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index af1a17c..3dbb500 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -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 \ No newline at end of file diff --git a/src/components/hubl-reactivity.js b/src/components/hubl-reactivity.js index 400a4e2..2806781 100644 --- a/src/components/hubl-reactivity.js +++ b/src/components/hubl-reactivity.js @@ -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', diff --git a/src/components/hubl-search-users.js b/src/components/hubl-search-users.js index f8bb618..1891a90 100644 --- a/src/components/hubl-search-users.js +++ b/src/components/hubl-search-users.js @@ -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', diff --git a/src/components/hubl-status.js b/src/components/hubl-status.js index 57296f0..c8647aa 100644 --- a/src/components/hubl-status.js +++ b/src/components/hubl-status.js @@ -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( diff --git a/src/dependencies.pug b/src/dependencies.pug index 3503c9b..77d7281 100644 --- a/src/dependencies.pug +++ b/src/dependencies.pug @@ -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 diff --git a/src/images/hubl-icon-192.png b/src/images/hubl-icon-192.png index efe199b..10d2336 100644 Binary files a/src/images/hubl-icon-192.png and b/src/images/hubl-icon-192.png differ diff --git a/src/images/hubl-icon-512.png b/src/images/hubl-icon-512.png index 3b3e059..e03c3c1 100644 Binary files a/src/images/hubl-icon-512.png and b/src/images/hubl-icon-512.png differ diff --git a/src/sw.js b/src/sw.js index a61d59b..90ed8c9 100644 --- a/src/sw.js +++ b/src/sw.js @@ -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) || diff --git a/src/views/partials/admin/page-admin-circles.pug b/src/views/partials/admin/page-admin-circles.pug index 1fb9257..9d6ab4e 100644 --- a/src/views/partials/admin/page-admin-circles.pug +++ b/src/views/partials/admin/page-admin-circles.pug @@ -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}')