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

update: conflict resolved

Browse Source
This commit is contained in:
gaelle morin
2020-09-23 16:53:54 +02:00
parent e7a416b2f9 1a6345a2e3
commit 1d8c2887c2
4 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,6 +1,6 @@
import { store } from 'https://unpkg.com/@startinblox/core@beta';
import { Sib } from "https://unpkg.com/@startinblox/core@beta/dist/libs/Sib.js";
import { StoreMixin } from "https://unpkg.com/@startinblox/core@beta/dist/mixins/storeMixin.js";
import { store } from 'https://unpkg.com/@startinblox/core@0.12';
import { Sib } from "https://unpkg.com/@startinblox/core@0.12/dist/libs/Sib.js";
import { StoreMixin } from "https://unpkg.com/@startinblox/core@0.12/dist/mixins/storeMixin.js";
export const HublReactivity = {
name: 'hubl-reactivity',

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

@ -1,4 +1,4 @@
import { widgetFactory } from 'https://unpkg.com/@startinblox/core@beta/dist/widgets/widget-factory.js';
import { widgetFactory } from 'https://unpkg.com/@startinblox/core@0.12/dist/widgets/widget-factory.js';
const HublSearchUsers = widgetFactory(
'hubl-search-users',

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

@ -1,5 +1,5 @@
import { widgetFactory } from 'https://unpkg.com/@startinblox/core@beta/dist/widgets/widget-factory.js';
import { importCSS } from 'https://unpkg.com/@startinblox/core@beta/dist/libs/helpers.js';
import { widgetFactory } from 'https://unpkg.com/@startinblox/core@0.12/dist/widgets/widget-factory.js';
import { importCSS } from 'https://unpkg.com/@startinblox/core@0.12/dist/libs/helpers.js';
import SlimSelect from 'https://dev.jspm.io/slim-select@1.23';
const HublStatus = widgetFactory(

22
src/dependencies.pug
View File

@ -2,16 +2,16 @@ script(type="module" src="/components/hubl-search-users.js" defer)
script(type="module" src="/components/hubl-status.js" defer)
script(type="module" src="/components/hubl-reactivity.js" defer)
script(type="module" src="https://unpkg.com/@startinblox/core@beta" defer)
script(type="module" src="https://unpkg.com/@startinblox/core@0.12" defer)
//- script(type="module" src="/lib/sib-core/dist/index.js" defer)
script(type="module" src="https://unpkg.com/@startinblox/oidc" defer)
script(type="module" src="https://unpkg.com/@startinblox/oidc@0.10" defer)
//- script(type="module" src="/lib/sib-auth/index.js" defer)
script(type="module" src="https://unpkg.com/@startinblox/router" defer)
script(type="module" src="https://unpkg.com/@startinblox/router@0.9" defer)
//- script(type="module" src="/lib/sib-router/src/index.js" defer)
script(type="module" src="https://unpkg.com/@startinblox/component-notifications@beta" defer)
//- script(type="module" src="https://unpkg.com/@startinblox/component-notifications@beta" defer)
//- script(type="module" src="/lib/sib-notifications/index.js" defer)
if endpoints.events || (endpoints.get && endpoints.get.events)
@ -19,20 +19,20 @@ if endpoints.events || (endpoints.get && endpoints.get.events)
//- script(type="module" src="/lib/sib-event/sib-event.js" defer)
if endpoints.joboffers || (endpoints.get && endpoints.get.joboffers)
//- script(type="module" src="https://unpkg.com/@startinblox/component-job-board@beta" defer)
script(type="module" src="/lib/solid-job-board/dist/index.js" defer)
script(type="module" src="https://unpkg.com/@startinblox/component-job-board@0.7" defer)
//- script(type="module" src="/lib/solid-job-board/dist/index.js" defer)
if (endpoints.uploads || (endpoints.get && endpoints.get.uploads)) && (endpoints.skills || (endpoints.get && endpoints.get.skills)) && (endpoints.users || (endpoints.get && endpoints.get.users))
//- script(type="module" src="https://unpkg.com/@startinblox/component-directory@beta" defer)
script(type="module" src="/lib/solid-directory/dist/index.js" defer)
script(type="module" src="https://unpkg.com/@startinblox/component-directory@0.8" defer)
//- script(type="module" src="/lib/solid-directory/dist/index.js" defer)
if endpoints.dashboards || (endpoints.get && endpoints.get.dashboards)
script(type="module" src="https://unpkg.com/@startinblox/component-dashboard@beta" defer)
script(type="module" src="https://unpkg.com/@startinblox/component-dashboard@0.5" defer)
//- script(type="module" src="/lib/solid-dashboard/dist/index.js" defer)
if endpoints.users || (endpoints.get && endpoints.get.users)
//- script(type="module" src="https://unpkg.com/@startinblox/component-chat@beta" defer)
script(type="module" src="/lib/solid-xmpp-chat/dist/index.js" defer)
script(type="module" src="https://unpkg.com/@startinblox/component-chat@1.1" defer)
//- script(type="module" src="/lib/solid-xmpp-chat/dist/index.js" defer)
script(src="/scripts/index.js" defer)