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

Merge branch 'dpo/switch-to-skypack' into feature/resource-component

Browse Source
This commit is contained in:
Benoit Alessandroni 2020-12-04 12:20:58 +01:00
commit 9d63d822c9
8 changed files with 47 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/dependencies.pug
View File

@ -1,6 +1,5 @@
script(src="https://browser.sentry-cdn.com/5.25.0/bundle.tracing.min.js" defer) //- script(src="https://browser.sentry-cdn.com/5.25.0/bundle.tracing.min.js" defer)
//- script(type="module" src="/components/sentry.js" defer)
script(type="module" src="/components/sentry.js" defer)
script(type="module" src="/components/hubl-search-users.js" defer) 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-status.js" defer)
script(type="module" src="/components/hubl-reactivity.js" defer) script(type="module" src="/components/hubl-reactivity.js" defer)
@ -17,14 +16,16 @@ script(type="module" src="https://cdn.skypack.dev/@startinblox/router@0.11" defe
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.8" defer)
//- script(type="module" src="/lib/sib-notifications/index.js" defer) //- script(type="module" src="/lib/sib-notifications/index.js" defer)
//- DISABLED - please migrate to dev.skypack.dev + upgrade to core@0.13 if (endpoints.events || (endpoints.get && endpoints.get.events)) && (endpoints.typeevents || (endpoints.get && endpoints.get.typeevents))
//- if (endpoints.events || (endpoints.get && endpoints.get.events)) && (endpoints.typeevents || (endpoints.get && endpoints.get.typeevents)) script(type="module" src="https://cdn.skypack.dev/@startinblox/component-event@1.3" 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.polls || (endpoints.get && endpoints.get.polls)
//- if (endpoints.resources || (endpoints.get && endpoints.get.resources)) && (endpoints.resourceskeywords || (endpoints.get && endpoints.get.resourceskeywords)) && (endpoints.resourcestypes || (endpoints.get && endpoints.get.resourcestypes)) script(type="module" src="https://cdn.skypack.dev/@startinblox/component-conversation@0.6" defer)
//- script(type="module" src="https://cdn.skypack.dev/@startinblox/component-resource@1.0" defer) //- script(type="module" src="/lib/sib-conversation/sib-conversation.js" defer)
if (endpoints.resources || (endpoints.get && endpoints.get.resources)) && (endpoints.resourceskeywords || (endpoints.get && endpoints.get.resourceskeywords)) && (endpoints.resourcestypes || (endpoints.get && endpoints.get.resourcestypes))
script(type="module" src="https://cdn.skypack.dev/@startinblox/component-resource@1.1" 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.joboffers || (endpoints.get && endpoints.get.joboffers) if endpoints.joboffers || (endpoints.get && endpoints.get.joboffers)
@ -43,9 +44,8 @@ if endpoints.users || (endpoints.get && 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.4" 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.polls || (endpoints.get && endpoints.get.polls)
//- if endpoints.polls || (endpoints.get && endpoints.get.polls) script(type="module" src="https://cdn.skypack.dev/@startinblox/component-poll@1.1" 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)
//- swal2 does not work with skypack //- swal2 does not work with skypack

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/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/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'
) )

22
src/scripts/register-sw.js
View File

@ -1,11 +1,11 @@
// if('serviceWorker' in navigator) { if('serviceWorker' in navigator) {
// var refreshing; var refreshing;
// navigator.serviceWorker.addEventListener('controllerchange', () => { navigator.serviceWorker.addEventListener('controllerchange', () => {
// if (refreshing) { if (refreshing) {
// return; return;
// } }
// refreshing = true; refreshing = true;
// window.location.reload(); window.location.reload();
// }); });
// navigator.serviceWorker.register('/sw.js'); navigator.serviceWorker.register('/sw.js');
// } }

14
src/styles/layout/events/events.scss
View File

@ -58,7 +58,7 @@ solid-event section {
padding: 5px 20px; padding: 5px 20px;
color: var(--color-primary); color: var(--color-primary);
} }
.headline h2 { .headline h1 {
float: left; float: left;
margin-top: 35px; margin-top: 35px;
color: var(--color-primary); color: var(--color-primary);
@ -103,7 +103,7 @@ solid-event section {
[name="infotext"] { [name="infotext"] {
text-align: left; text-align: left;
} }
[name="name"] { .event-title[name="name"] {
font-family: "RefrigeratorDelxW01Bold"; font-family: "RefrigeratorDelxW01Bold";
font-size: 3.2rem; font-size: 3.2rem;
line-height: 3.8rem; line-height: 3.8rem;
@ -144,11 +144,11 @@ solid-event section {
} }
.newevent input[type="submit"], .newevent input[type="submit"],
.newtype input[type="submit"], .newtype input[type="submit"],
button { // button {
width: max-content; // width: max-content;
padding: 5px 20px; // padding: 5px 20px;
background-color: #3C3F57; // background-color: #3C3F57;
} // }
.newevent input[type="file"] { .newevent input[type="file"] {
background-color: transparent; background-color: transparent;
} }

4
src/styles/layout/polls/polls.scss
View File

@ -11,10 +11,12 @@ solid-poll > div {
#default-pollListing, #circles-pollListing { #default-pollListing, #circles-pollListing {
margin: auto; margin: auto;
.headline { .headline {
h2 { h1 {
font-family: "RefrigeratorDelxW01Bold"; font-family: "RefrigeratorDelxW01Bold";
font-size: 2.4rem; font-size: 2.4rem;
text-transform: none;
color: var(--color-primary); color: var(--color-primary);
text-transform: none;
float: left; float: left;
margin-top: 5px; margin-top: 5px;
} }

11
src/styles/layout/resources/resources.scss
View File

@ -5,7 +5,7 @@
font-weight: 400; font-weight: 400;
color: var(--content-font-color); color: var(--content-font-color);
solid-resource { solid-resource {
solid-display div { .listresources solid-display div {
max-width: 1110px; max-width: 1110px;
solid-display { solid-display {
margin: 0 0 20px 40px; margin: 0 0 20px 40px;
@ -40,7 +40,7 @@
} }
} }
.listresources { .listresources {
.headline h2 { .headline h1 {
float: left; float: left;
margin-top: 5px; margin-top: 5px;
color: var(--color-primary); color: var(--color-primary);
@ -63,7 +63,7 @@
color: var(--color-primary); color: var(--color-primary);
} }
solid-display solid-display { solid-display solid-display {
[name="name"] { .resource-title {
font-family: "RefrigeratorDelxW01Bold"; font-family: "RefrigeratorDelxW01Bold";
color: var(--color-primary); color: var(--color-primary);
} }
@ -77,11 +77,14 @@
left: 0; left: 0;
} }
} }
solid-multiple > solid-display > div > solid-display {
margin: 0;
}
} }
} }
.resourcedetail { .resourcedetail {
background-color: transparent; background-color: transparent;
[name="name"] { .resource-title {
font-family: "RefrigeratorDelxW01Bold"; font-family: "RefrigeratorDelxW01Bold";
font-size: 3.2rem; font-size: 3.2rem;
line-height: 3.8rem; line-height: 3.8rem;