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

feature: conflict with master resolved

Browse Source
This commit is contained in:
gaelle morin 2020-12-23 16:03:03 +01:00
commit 500758eebb
No known key found for this signature in database
GPG Key ID: 028426702B95CF9C
6 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
internal/assets.js
View File

@ -2,7 +2,7 @@ const HTMLAsset = require('parcel-bundler/lib/assets/HTMLAsset')
function shouldIgnore (file) { function shouldIgnore (file) {
// Ignore img(src="${...}") on pug & keep the components folder pristine // Ignore img(src="${...}") on pug & keep the components folder pristine
return /\${.+}/.test(file) || /components/.test(file) || /\/lib\/solid-/.test(file); return /\${.+}/.test(file) || /components/.test(file) || /\/lib\/solid-/.test(file) || /\/lib\/sib-/.test(file);
} }
class SkipStartinbloxWidgetAsset extends HTMLAsset { class SkipStartinbloxWidgetAsset extends HTMLAsset {

18
src/dependencies.pug
View File

@ -11,14 +11,12 @@ script(type="module" src="https://cdn.skypack.dev/@startinblox/component-notific
//- script(type="module" src="/lib/sib-notifications/index.js" defer) //- script(type="module" src="/lib/sib-notifications/index.js" defer)
if endpoints.get if endpoints.get
//- DISABLED - please migrate to dev.skypack.dev + upgrade to core@0.13 if endpoints.get.events && endpoints.get.typeevents
//- if endpoints.get.events && endpoints.get.typeevents script(type="module" src="https://cdn.skypack.dev/@startinblox/component-event@1.4" defer)
//- script(type="module" src="https://cdn.skypack.dev/@startinblox/component-event@1.2" defer)
//- script(type="module" src="/lib/sib-event-component/sib-event.js" defer) //- script(type="module" src="/lib/sib-event-component/sib-event.js" defer)
//- DISABLED - please migrate to dev.skypack.dev + upgrade to core@0.13 if endpoints.get.resources && endpoints.get.resourceskeywords && endpoints.get.resourcestypes
//- if endpoints.get.resources && endpoints.get.resourceskeywords && endpoints.get.resourcestypes script(type="module" src="https://cdn.skypack.dev/@startinblox/component-resource@1.2" defer)
//- script(type="module" src="https://cdn.skypack.dev/@startinblox/component-resource@1.0" defer)
//- script(type="module" src="/lib/sib-resource/sib-resource.js" defer) //- script(type="module" src="/lib/sib-resource/sib-resource.js" defer)
if endpoints.get.joboffers if endpoints.get.joboffers
@ -37,7 +35,9 @@ if endpoints.get
script(type="module" src="https://cdn.skypack.dev/@startinblox/component-chat@1.7" defer) script(type="module" src="https://cdn.skypack.dev/@startinblox/component-chat@1.7" defer)
//- script(type="module" src="/lib/solid-xmpp-chat/dist/index.js" 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 if endpoints.get.polls
//- if endpoints.get.polls script(type="module" src="https://cdn.skypack.dev/@startinblox/component-poll@1.2" defer)
//- script(type="module" src="https://cdn.skypack.dev/@startinblox/component-poll@1.0" defer)
//- script(type="module" src="/lib/sib-polls-component/index.js" defer) //- script(type="module" src="/lib/sib-polls-component/index.js" defer)
if endpoints.get.polls || endpoints.get.events || endpoints.get.resources
script(type="module" src="https://cdn.skypack.dev/@startinblox/component-conversation@0.8" defer)

2
src/index.pug
View File

@ -14,7 +14,7 @@ html(lang="en")
link(rel="icon" type="image/webp" href="./images/favicon.webp") link(rel="icon" type="image/webp" href="./images/favicon.webp")
link(rel="preconnect" href="https://fonts.gstatic.com") link(rel="preconnect" href="https://fonts.gstatic.com")
link(rel="stylesheet" href="https://fonts.googleapis.com/css2?family=Open+Sans&display=swap") link(rel="stylesheet" href="https://fonts.googleapis.com/css2?family=Open+Sans:ital,wght@0,300;0,400;0,600;0,700;0,800;1,300;1,400;1,600;1,700;1,800&display=swap")
link(rel='stylesheet', href='/styles/index.scss') link(rel='stylesheet', href='/styles/index.scss')

2
src/locales/en.json
View File

@ -9,7 +9,7 @@
}, },
"menuLeft": { "menuLeft": {
"emptyCircleProject": { "emptyCircleProject": {
"notPartOf": "You're not part of", "notPartOf": "You're not part of any",
"createNew": "To create a new one, you can go in the", "createNew": "To create a new one, you can go in the",
"adminPanel": "administration panel", "adminPanel": "administration panel",
"project": "project", "project": "project",

1
src/views/page-polls.pug
View File

@ -3,4 +3,5 @@
data-src=`${endpoints.polls || (endpoints.get && endpoints.get.polls)}` data-src=`${endpoints.polls || (endpoints.get && endpoints.get.polls)}`
range-base-polls=`${endpoints.pollRangeBase || (endpoints.get && endpoints.get.pollRangeBase)}` range-base-polls=`${endpoints.pollRangeBase || (endpoints.get && endpoints.get.pollRangeBase)}`
upload-dir=`${endpoints.uploads || (endpoints.get && endpoints.get.uploads)}` upload-dir=`${endpoints.uploads || (endpoints.get && endpoints.get.uploads)}`
id-prefix='default'
) )

10
src/views/page-resources.pug
View File

@ -1,8 +1,8 @@
.views-container .views-container
solid-resource(data-src=`${endpoints.resources || (endpoints.get && endpoints.get.resources)}` solid-resource(data-src=`${endpoints.resources || (endpoints.get && endpoints.get.resources)}`
range-resource-type=`${endpoints.resourcestypes || (endpoints.get && endpoints.get.resourcestypes)}` range-resource-type=`${endpoints.resourcestypes || (endpoints.get && endpoints.get.resourcestypes)}`
range-resource-keyword=`${endpoints.resourceskeywords || (endpoints.get && endpoints.get.resourceskeywords)}` range-resource-keyword=`${endpoints.resourceskeywords || (endpoints.get && endpoints.get.resourceskeywords)}`
range-resource-circle=`${endpoints.circles || (endpoints.get && endpoints.get.circles)}` range-resource-circle=`${endpoints.circles || (endpoints.get && endpoints.get.circles)}`
upload-dir=`${endpoints.uploads || (endpoints.get && endpoints.get.uploads)}` upload-dir=`${endpoints.uploads || (endpoints.get && endpoints.get.uploads)}`
id-prefix='default' id-prefix='default'
) )