From ecf8ad81d2592eceb8e1f163a7f7bac0fda90876 Mon Sep 17 00:00:00 2001 From: Sylvain Lehmann Date: Fri, 9 Apr 2021 17:02:13 +0000 Subject: [PATCH 1/2] update : migrate solid polls to V2 --- README.md | 5 ++++- src/dependencies.pug | 11 +++++------ src/index.pug | 8 ++++---- src/views/page-polls.pug | 16 ++++++++-------- 4 files changed, 21 insertions(+), 19 deletions(-) diff --git a/README.md b/README.md index 5ab7d75..7e690ce 100644 --- a/README.md +++ b/README.md @@ -478,7 +478,10 @@ On `config.json`: "type": "polls", "endpoints": { "get": "http://server.url/polls/", - "post": "http://server.url/polls/" + "post": "http://server.url/polls/", + "pollRangeTags": "http://server.url/tags/", + "pollRangeCircles": "http://server.url/circles/", + "uploads": "http://server.url/upload/" } } ``` diff --git a/src/dependencies.pug b/src/dependencies.pug index d530a0f..8c4b512 100644 --- a/src/dependencies.pug +++ b/src/dependencies.pug @@ -23,8 +23,8 @@ if componentSet.has("events") //- script(type="module", src="/lib/solid-event/solid-event.js", defer) //- Disabled - Not in core@0.16 -//- if componentSet.has("events") || componentSet.has("polls") || componentSet.has("resources") - script(type="module" src="https://cdn.skypack.dev/@startinblox/component-conversation@0.9" defer) +if componentSet.has("events") || componentSet.has("polls") || componentSet.has("resources") + script(type="module" src="https://cdn.skypack.dev/@startinblox/component-conversation@0.10" defer) if componentSet.has("jobBoard") script(type="module" src="https://cdn.skypack.dev/@startinblox/component-job-board@5.0" defer) @@ -34,10 +34,9 @@ if componentSet.has("notification") script(type="module" src="https://cdn.skypack.dev/@startinblox/component-notifications@0.12" defer) //- script(type="module" src="/lib/sib-notifications/index.js" defer) -//- Disabled - Not in core@0.16 -//- if componentSet.has("polls") -//- script(type="module" src="https://cdn.skypack.dev/@startinblox/component-poll@1.2" defer) -//- //- script(type="module" src="/lib/sib-polls-component/index.js" defer) +if componentSet.has("polls") + script(type="module" src="https://cdn.skypack.dev/@startinblox/component-poll@2.1" defer) + //script(type="module" src="/lib/solid-poll/index.js" defer) if componentSet.has("profileDirectory") script(type="module" src="https://cdn.skypack.dev/@startinblox/component-directory@5.1" defer) diff --git a/src/index.pug b/src/index.pug index 33a02d5..cf814ba 100644 --- a/src/index.pug +++ b/src/index.pug @@ -133,7 +133,7 @@ html(lang="en") include views/page-job-board.pug if component.type == "polls" - .with-sidebar + .scrollbar-content include views/page-polls.pug if component.type == "projects" @@ -178,7 +178,7 @@ html(lang="en") if component.type == "lang" hubl-lang( - hidden + hidden lang=component.parameters.name file=component.parameters.file ) @@ -217,12 +217,12 @@ html(lang="en") div div div - div#something-goes-wrong(hidden) + div#something-goes-wrong(hidden) br span(data-trans="errors.somethingGoesWrong") span   a(data-trans='errors.reload' href='/') - + if client.i18n hubl-fallback-lang( hidden diff --git a/src/views/page-polls.pug b/src/views/page-polls.pug index 6f36cec..1a4ef23 100644 --- a/src/views/page-polls.pug +++ b/src/views/page-polls.pug @@ -1,8 +1,8 @@ -.views-container - solid-poll( - data-src=`${component.endpoints.get}` - range-base-polls=`${component.endpoints.pollRangeBase}` - upload-dir=`${component.endpoints.uploads}` - id-prefix='default' - uniq=component.uniq - ) \ No newline at end of file +solid-poll( + data-src=component.endpoints.get + data-dest=component.endpoints.post + range-tags=component.endpoints.pollRangeTags + range-circles=component.endpoints.pollRangeCircles + upload-dir=component.endpoints.uploads + uniq=component.uniq +) From 9371f5d46fb9119df895e881493d02b36044e272 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Pasquier Date: Tue, 13 Apr 2021 12:11:49 +0200 Subject: [PATCH 2/2] fix: solid-event#36 --- README.md | 6 ++++-- src/dependencies.pug | 8 +++++++- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 7e690ce..0a13f8f 100644 --- a/README.md +++ b/README.md @@ -267,7 +267,8 @@ Eg.: "get": "http://server.url/events/", "post": "http://server.url/events/", "typeevents": "http://server.url/typeevents/", - "postTypeevents": "http://server.url/typeevents/" + "postTypeevents": "http://server.url/typeevents/", + "uploads": "http://server.url/upload/" } } ] @@ -335,7 +336,8 @@ Module declaration, on `config.json`: "get": "http://server.url/events/", "post": "http://server.url/events/", "typeevents": "http://server.url/typeevents/", - "postTypeevents": "http://server.url/typeevents/" + "postTypeevents": "http://server.url/typeevents/", + "uploads": "http://server.url/upload/" } } ``` diff --git a/src/dependencies.pug b/src/dependencies.pug index 8c4b512..99b97a2 100644 --- a/src/dependencies.pug +++ b/src/dependencies.pug @@ -4,7 +4,13 @@ script(type="module" src="https://cdn.skypack.dev/@startinblox/core@0.16" 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) -- const componentSet = new Set(components.map(c=>c.type)); +- + const componentSet = new Set(components.map(c=>c.type)); + components.map(c => { + if(c.extensions) { + c.extensions.forEach(e => componentSet.add(e.type)); + } + }); if componentSet.has("autoLogin") || componentSet.has("registering") script(type="module" src="https://cdn.skypack.dev/@startinblox/oidc@0.14" defer)