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

Merge branch 'cleanup-optimise-perfs' into 'staging'

Browse Source 
Cleanup & optimise perfs

Closes #292 and #388

See merge request startinblox/applications/sib-app!115
This commit is contained in:
Jean-Baptiste Pasquier 2020-02-24 14:13:26 +00:00
commit dd94f4370b
35 changed files with 245 additions and 227 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
config.sample.federated.json
View File

@ -6,6 +6,7 @@
"clientLogoHeight": "32px", "clientLogoHeight": "32px",
"clientCSS": "/path/to/custom.css", "clientCSS": "/path/to/custom.css",
"authorityName": "djangoldp-server-name", "authorityName": "djangoldp-server-name",
"publicDirectory": false,
"endpoints": { "endpoints": {
"get": { "get": {
"circles": "http://localhost:8000/circles/", "circles": "http://localhost:8000/circles/",

1
config.sample.json
View File

@ -6,6 +6,7 @@
"clientLogoHeight": "32px", "clientLogoHeight": "32px",
"clientCSS": "/path/to/custom.css", "clientCSS": "/path/to/custom.css",
"authorityName": "djangoldp-server-name", "authorityName": "djangoldp-server-name",
"publicDirectory": false,
"endpoints": { "endpoints": {
"circles": "http://localhost:8000/circles/", "circles": "http://localhost:8000/circles/",
"projects": "http://localhost:8000/projects/", "projects": "http://localhost:8000/projects/",

47
src/dependencies.pug
View File

@ -1,24 +1,33 @@
script(type="module" src="https://unpkg.com/@startinblox/oidc@0.8")
script(src="/scripts/index.js") script(src="/scripts/index.js")
//- local //- Scripts - use add `"libLocal" = true` on config.json to use your local `lib` folder
//- script(type="module" src="/lib/sib-router/src/index.js") if libLocal
//- script(type="module" src="/lib/sib-chat/sib-chat.js") script(type="module" src="/lib/sib-oidc/index.js")
//- script(type="module" src="/lib/sib-notifications/sib-notifications.js") script(type="module" src="/lib/sib-router/src/index.js")
//- script(type="module" src="/lib/sib-event/sib-event.js") script(type="module" src="/lib/sib-notifications/index.js")
//- script(type="module" src="/lib/sib-conversation/sib-conversation.js") if endpoints.users || (endpoints.get && endpoints.get.users)
//- script(type="module" src="/lib/sib-directory/sib-directory.js") script(type="module" src="/lib/sib-chat/sib-chat.js")
//- script(type="module" src="/lib/sib-job-board/sib-job-board.js") if endpoints.events || (endpoints.get && endpoints.get.events)
script(type="module" src="/lib/sib-event/sib-event.js")
//- CDN if endpoints.joboffers || (endpoints.get && endpoints.get.joboffers)
script(type="module" src="https://unpkg.com/@startinblox/core@0.9") script(type="module" src="/lib/sib-job-board/sib-job-board.js")
script(type="module" src="https://unpkg.com/@startinblox/router@0.7") script(type="module" src="/lib/sib-conversation/sib-conversation.js")
script(type="module" src="https://unpkg.com/@startinblox/component-chat@0.4") if publicDirectory && (endpoints.users || (endpoints.get && endpoints.get.users))
script(type="module" src="https://unpkg.com/@startinblox/component-notifications@0.3") script(type="module" src="/lib/sib-directory/sib-directory.js")
script(type="module" src="https://unpkg.com/@startinblox/component-event@0.1") else
//- script(type="module" src="https://unpkg.com/@startinblox/component-conversation@0.3") script(type="module" src="https://unpkg.com/@startinblox/oidc@0.8")
//- script(type="module" src="https://unpkg.com/@startinblox/component-directory@0.3") script(type="module" src="https://unpkg.com/@startinblox/core@0.9")
//- script(type="module" src="https://unpkg.com/@startinblox/component-job-board@0.3") script(type="module" src="https://unpkg.com/@startinblox/router@0.7")
script(type="module" src="https://unpkg.com/@startinblox/component-notifications@0.3")
if endpoints.users || (endpoints.get && endpoints.get.users)
script(type="module" src="https://unpkg.com/@startinblox/component-chat@0.4")
if endpoints.events || (endpoints.get && endpoints.get.events)
script(type="module" src="https://unpkg.com/@startinblox/component-event@0.1")
if endpoints.joboffers || (endpoints.get && endpoints.get.joboffers)
script(type="module" src="https://unpkg.com/@startinblox/component-job-board@0.3")
script(type="module" src="https://unpkg.com/@startinblox/component-conversation@0.3")
if publicDirectory && (endpoints.users || (endpoints.get && endpoints.get.users))
script(type="module" src="https://unpkg.com/@startinblox/component-directory@0.3")
//- Stylesheets //- Stylesheets
link(rel='stylesheet', href='/styles/index.css') link(rel='stylesheet', href='/styles/index.css')

17
src/header.pug
View File

@ -7,7 +7,7 @@
//- i#search-icon.icon-magnifier(aria-hidden='true') //- i#search-icon.icon-magnifier(aria-hidden='true')
//- i#close-search-icon.icon-close(aria-hidden='true') //- i#close-search-icon.icon-close(aria-hidden='true')
sib-notifications( sib-notifications.notLoggedIn(
nested-field="inbox" nested-field="inbox"
bind-user bind-user
) )
@ -22,13 +22,22 @@ details#user-controls.notLoggedIn
bind-user bind-user
) )
#user-controls__panel #user-controls__panel
include page-user-panel.pug nav(role="user's functionalities menu")
ul
if publicDirectory && (endpoints.users || (endpoints.get && endpoints.get.users))
li
sib-link(next='my-profile') My profile
//-li
sib-link(next='user-settings') Settings
li
sib-link(next='admin') Admin
button(role='log out' onclick="document.querySelector('sib-auth').logout();") Log out
button(role='log in' onclick="document.querySelector('sib-auth').login();") Login button.loggedIn(role='log in' onclick="document.querySelector('sib-auth').login();") Login
button.notLoggedIn.mobile-menu-icon.icon-menu#toggleMainMenu button.notLoggedIn.mobile-menu-icon.icon-menu#toggleMainMenu
sib-auth sib-auth(style='display:none!important')
sib-auth-provider( sib-auth-provider(
data-authority=`${authority}` data-authority=`${authority}`
data-id=`${authorityName || "authority"}` data-id=`${authorityName || "authority"}`

24
src/index.pug
View File

@ -13,23 +13,18 @@ html(lang="en")
body body
header#header(role='banner') header#header(role='banner')
include header.pug include header.pug
main
main.notLoggedIn
include menu-left.pug include menu-left.pug
div#viewport div#viewport
//- #members(hidden).no-sidebar if publicDirectory && (endpoints.users || (endpoints.get && endpoints.get.users))
//- include page-members-directory.pug #members(hidden).no-sidebar
include page-directory.pug
//- #job-offers(hidden).no-sidebar if endpoints.joboffers || (endpoints.get && endpoints.get.joboffers)
//- include page-job-offers.pug #job-offers(hidden).no-sidebar
include page-job-offers.pug
//- #job-offer-create(hidden).no-sidebar
//- sib-link(class="backlink", next="job-offers") Back
//- include page-job-offer-create.pug
//- #job-offer-edit(hidden).no-sidebar
//- sib-link(class="backlink", next="job-offers") Back
//- include page-job-offer-edit.pug
if endpoints.projects || (endpoints.get && endpoints.get.projects) if endpoints.projects || (endpoints.get && endpoints.get.projects)
#project(hidden).with-sidebar #project(hidden).with-sidebar
@ -49,6 +44,3 @@ html(lang="en")
#admin(hidden).with-sidebar #admin(hidden).with-sidebar
include page-admin.pug include page-admin.pug
//- #my-profile(hidden).no-sidebar
//- include page-user-profile.pug

70
src/menu-left.pug
View File

@ -7,18 +7,40 @@ sib-widget(name='hd-create')
p.create You are not part of any ${value} yet. To create a new one, you can go to the p.create You are not part of any ${value} yet. To create a new one, you can go to the
sib-link(next='admin') administration panel sib-link(next='admin') administration panel
sib-widget(name='menu-fix-url-circle')
template
sib-display(
data-src='${value}'
fields='name, badge'
value-badge='${value}'
widget-badge='hd-counter'
widget-name='sib-display-div'
)
sib-widget(name='menu-fix-url-project')
template
sib-display(
data-src='${value}'
fields='project(customer.name, name), badge'
class-name='project-name'
class-customer.name='project-customer'
value-badge='${value}'
widget-badge='hd-counter'
widget-name='sib-display-div'
)
nav#main__menu.jsLeftMenu nav#main__menu.jsLeftMenu
sib-router#navbar-router(default-route='members') sib-router#navbar-router(default-route='members')
//- sib-route.menu(name='members') if publicDirectory && (endpoints.users || (endpoints.get && endpoints.get.users))
//- div.menu-label Members sib-route.menu(name='members')
//- div.menu-icon.icon-people div.menu-label Members
//- div.divider div.menu-icon.icon-people
//- sib-route.menu(name='job-offers', rdf-type='hd:joboffer') div.divider
//- div.menu-label Job offers if endpoints.joboffers || (endpoints.get && endpoints.get.joboffers)
//- div.menu-icon.icon-briefcase sib-route.menu(name='job-offers', rdf-type='hd:joboffer')
//- sib-route(name='job-offer-create', hidden) div.menu-label Job offers
//- sib-route(name='job-offer-edit', use-id, hidden) div.menu-icon.icon-briefcase
//- div.divider div.divider
if endpoints.events || (endpoints.get && endpoints.get.events) if endpoints.events || (endpoints.get && endpoints.get.events)
sib-route.menu(name='events') sib-route.menu(name='events')
div.menu-label Events div.menu-label Events
@ -35,20 +57,13 @@ nav#main__menu.jsLeftMenu
sib-route(name='project', rdf-type='hd:project', use-id='', hidden) sib-route(name='project', rdf-type='hd:project', use-id='', hidden)
div.sub-menu.menu-notification div.sub-menu.menu-notification
sib-display.project-tab( sib-display.project-tab(
data-src=`${endpoints.projects || (endpoints.get && endpoints.get.projects)}` bind-user
fields='project(customer.name, name), badge' nested-field='projects'
class-customer.name='project-customer' fields='project'
class-name='project-name'
empty-widget='hd-create' empty-widget='hd-create'
empty-value='project' empty-value='project'
search-fields='team' widget-project='menu-fix-url-project'
search-widget-team='sib-form-hidden' order-by='project.customer.name'
search-value-team='-'
hd-inherit-user-id='search-value-team'
hd-inherit-widgets
widget-badge='hd-counter'
action-badge='badge'
order-by='customer.name'
next='project' next='project'
) )
div.divider div.divider
@ -62,22 +77,13 @@ nav#main__menu.jsLeftMenu
div.menu-icon.icon-folder-alt div.menu-icon.icon-folder-alt
sib-route(name='circle', rdf-type='hd:circle', use-id='', hidden) sib-route(name='circle', rdf-type='hd:circle', use-id='', hidden)
div.sub-menu.menu-notification div.sub-menu.menu-notification
sib-widget(name='menu-circle-fix-url')
template
sib-display(
data-src='${value}'
fields='name, badge'
value-badge='${value}'
widget-badge='hd-counter'
widget-name='sib-display-div'
)
sib-display( sib-display(
bind-user bind-user
nested-field='circles' nested-field='circles'
fields='circle' fields='circle'
empty-widget='hd-create' empty-widget='hd-create'
empty-value='circle' empty-value='circle'
widget-circle='menu-circle-fix-url' widget-circle='menu-fix-url-circle'
order-by='circle.name' order-by='circle.name'
next='circle' next='circle'
) )

12
src/page-admin.pug
View File

@ -1,18 +1,20 @@
.views-container.sidebar-is-closed .views-container.sidebar-is-closed
if endpoints.circles || (endpoints.get && endpoints.get.circles) if endpoints.circles || (endpoints.get && endpoints.get.circles)
#admin-circles(hidden) #admin-circles(hidden)
include page-admin-circles.pug include views/admin/page-admin-circles.pug
if endpoints.projects || (endpoints.get && endpoints.get.projects) if endpoints.projects || (endpoints.get && endpoints.get.projects)
#admin-projects(hidden) #admin-projects(hidden)
include page-admin-projects.pug include views/admin/page-admin-projects.pug
//- #admin-users(hidden) if publicDirectory && (endpoints.users || (endpoints.get && endpoints.get.users))
include page-admin-users.pug #admin-users(hidden)
include views/admin/page-admin-users.pug
nav.jsRightMenu(role='navigation') nav.jsRightMenu(role='navigation')
sib-router(default-route='admin-circles') sib-router(default-route='admin-circles')
ul ul
li.jsOffsiteToggle li.jsOffsiteToggle
a Fold menu a Fold menu
//- sib-route(name='admin-users') if publicDirectory && (endpoints.users || (endpoints.get && endpoints.get.users))
sib-route(name='admin-users')
li li
a Users a Users
if endpoints.circles || (endpoints.get && endpoints.get.circles) if endpoints.circles || (endpoints.get && endpoints.get.circles)

4
src/page-circle.pug
View File

@ -13,9 +13,9 @@
div.content-box__info div.content-box__info
sib-ac-checker(permission='acl:Read', bind-resources) sib-ac-checker(permission='acl:Read', bind-resources)
#circle-chat(hidden) #circle-chat(hidden)
include page-circle-chat.pug include views/circle/page-circle-chat.pug
#circle-information(hidden) #circle-information(hidden)
include page-circle-profile.pug include views/circle/page-circle-profile.pug
nav.jsRightMenu(role='navigation') nav.jsRightMenu(role='navigation')
sib-router(default-route='circle-chat') sib-router(default-route='circle-chat')

1
src/page-members-directory.pug → src/page-directory.pug
View File

@ -3,4 +3,3 @@ sib-directory(
range-groups=`${endpoints.groups || endpoints.get.groups}`, range-groups=`${endpoints.groups || endpoints.get.groups}`,
range-skills=`${endpoints.skills || endpoints.get.skills}` range-skills=`${endpoints.skills || endpoints.get.skills}`
) )

17
src/page-job-offers.pug
View File

@ -1,4 +1,6 @@
.job-offers__container .content-box.full-width
#job-offer-board
.job-offers__container
sib-job-board( sib-job-board(
data-src=`${endpoints.joboffers || endpoints.get.joboffers}`, data-src=`${endpoints.joboffers || endpoints.get.joboffers}`,
range-skills=`${endpoints.skills || endpoints.get.skills}` range-skills=`${endpoints.skills || endpoints.get.skills}`
@ -8,3 +10,16 @@
sib-link(next="job-offer-create").plus-button sib-link(next="job-offer-create").plus-button
div.icon-plus div.icon-plus
div Post a new offer div Post a new offer
#job-offer-create(hidden)
sib-link(class="backlink", next="job-offers") Back
include views/job-offer/page-job-offer-create.pug
#job-offer-edit(hidden)
sib-link(class="backlink", next="job-offers") Back
include views/job-offer/page-job-offer-edit.pug
sib-router(default-route='job-offer-board')
sib-route(name='job-offer-board')
sib-route(name='job-offer-create')
sib-route(name='job-offer-edit')

4
src/page-project.pug
View File

@ -19,9 +19,9 @@
div.content-box__info div.content-box__info
sib-ac-checker(permission='acl:Read', bind-resources) sib-ac-checker(permission='acl:Read', bind-resources)
#project-chat(hidden) #project-chat(hidden)
include page-project-chat.pug include views/project/page-project-chat.pug
#project-information(hidden) #project-information(hidden)
include page-project-profile.pug include views/project/page-project-profile.pug
dialog(id='project-contributions-help').modal dialog(id='project-contributions-help').modal
sib-link(next='project-profile') sib-link(next='project-profile')

9
src/page-user-panel.pug
View File

@ -1,9 +0,0 @@
nav(role="user's functionalities menu")
ul
//- li
//- sib-link(next='my-profile') My profile
//-li
sib-link(next='user-settings') Settings
li
sib-link(next='admin') Admin
button(role='log out' onclick="document.querySelector('sib-auth').logout();") Log out

60
src/scripts/index.js
View File

@ -1,52 +1,47 @@
function recursiveAdaptWidgets(prefix, element, user) { function applyAdapt(prefix, sibDisplay, user) {
//- This function is a workaround for the currently unworking populate
//- Feel free to see examples on page-circles-
element.querySelectorAll("[" + prefix + "-user-id]").forEach(el => {
el.setAttribute(el.getAttribute(prefix + "-user-id"), user["@id"]);
});
if (element != document) {
//- Allow to bind-user on selected attribute //- Allow to bind-user on selected attribute
if (element.getAttribute(prefix + "-user-id")) { if (sibDisplay.getAttribute(prefix + "-user-id")) {
element.setAttribute( sibDisplay.setAttribute(
element.getAttribute(prefix + "-user-id"), sibDisplay.getAttribute(prefix + "-user-id"),
user["@id"] user["@id"]
); );
} }
//- Allow to set data-src to a children sib-form //- Allow to set data-src to a children sib-form
if (element.getAttribute(prefix + "-bind-resources")) { if (sibDisplay.getAttribute(prefix + "-bind-resources")) {
let form = element.querySelector( let form = sibDisplay.querySelector(
element.getAttribute(prefix + "-bind-resources") + " sib-form" sibDisplay.getAttribute(prefix + "-bind-resources") + " sib-form"
); );
if (form) { if (form) {
form.setAttribute( form.setAttribute(
"data-src", "data-src",
element.component.resourceId.replace("members/", "") sibDisplay.component.resourceId.replace("members/", "")
); );
} }
} }
//- Allow to put user on a targetted search field //- Allow to put user on a targetted search field
if (element.getAttribute(prefix + "-bind-user2input")) { if (sibDisplay.getAttribute(prefix + "-bind-user2input")) {
element.querySelector( sibDisplay.querySelector(
element.getAttribute(prefix + "-bind-user2input") sibDisplay.getAttribute(prefix + "-bind-user2input")
).value = user["@id"]; ).value = user["@id"];
} }
}
//- In case your sib-display use a multiple, you have to target sub-sib-display auto-generated function recursiveAdaptWidgets(prefix, element, user) {
if (element.getAttribute(prefix + "-widgets-multiple") !== null) {
element.querySelectorAll("div > sib-display").forEach(el => { element.addEventListener("populate", () => {
el.setAttribute(prefix + "-widgets", "");
//- This function is a workaround for the currently unworking populate
//- Feel free to see examples on page-circles-
element.querySelectorAll("[" + prefix + "-user-id]").forEach(el => {
el.setAttribute(el.getAttribute(prefix + "-user-id"), user["@id"]);
}); });
} applyAdapt(prefix, element, user);
}
//- This function is hooked every time a sib-something with prefix+"-widgets" is populated document.querySelectorAll('sib-display, sib-form').forEach(sibDisplay => {
element.querySelectorAll("[" + prefix + "-widgets]").forEach(elementChild => { applyAdapt(prefix, sibDisplay, user);
elementChild.addEventListener("populate", () => {
recursiveAdaptWidgets(prefix, elementChild, user);
}); });
}); });
} }
@ -125,6 +120,7 @@ async function refreshResource(event) {
if(resourceId.includes('circle') && user != null) { if(resourceId.includes('circle') && user != null) {
let userId = user['@id']; let userId = user['@id'];
refreshSibDisplays(userId + "circles/"); refreshSibDisplays(userId + "circles/");
refreshSibDisplays(resourceId.split('/').slice(0,4).join('/')+'/joinable/');
} }
//clear cache on this resource //clear cache on this resource
@ -218,10 +214,12 @@ document.addEventListener("DOMContentLoaded", function(event) {
.forEach(el => (el.style.visibility = "visible")); .forEach(el => (el.style.visibility = "visible"));
// Hide login button if already logged // Hide login button if already logged
document document
.querySelector('button[role="log in"]') .querySelector('.loggedIn')
.setAttribute("style", "display:none !important"); .setAttribute("style", "display:none !important");
document.querySelectorAll('sib-display, sib-form').forEach(element => {
// Set current user id on set-user-id of sib-display // Set current user id on set-user-id of sib-display
recursiveAdaptWidgets("hd-inherit", document, user); recursiveAdaptWidgets("hd-inherit", element, user);
});
for (leaveBtn of document.querySelectorAll( for (leaveBtn of document.querySelectorAll(
"admin-circle-leave > sib-ac-checker:not([hidden])" "admin-circle-leave > sib-ac-checker:not([hidden])"
)) { )) {
@ -230,6 +228,8 @@ document.addEventListener("DOMContentLoaded", function(event) {
"display:none !important" "display:none !important"
); // Hide Join button ); // Hide Join button
} }
} else {
document.querySelector('sib-auth').login();
} }
}) })
.catch(error => console.log(error)); .catch(error => console.log(error));

4
src/styles/base/header.scss
View File

@ -56,10 +56,6 @@
} }
} }
.notLoggedIn {
visibility: hidden;
}
sib-notifications { sib-notifications {
@include breakpoint(sm) { @include breakpoint(sm) {

6
src/styles/base/main.scss
View File

@ -35,6 +35,10 @@ $breakpoints: (phone: 480px,
backface-visibility: hidden; backface-visibility: hidden;
/*will-change: overflow;*/ /*will-change: overflow;*/
} }
.notLoggedIn {
visibility: hidden;
}
} }
/* Add scrollbar to the left and right menu, and to the content */ /* Add scrollbar to the left and right menu, and to the content */
@ -471,7 +475,7 @@ a,
} }
} }
&.test { &.flex {
display: flex; display: flex;
} }

22
src/styles/base/menu-left.scss
View File

@ -29,7 +29,7 @@
display: flex; display: flex;
flex-direction: row-reverse; flex-direction: row-reverse;
font-weight: bold; font-weight: bold;
padding: 1.6rem; padding: 1.2rem;
&[active] { &[active] {
background-color: $color-46-100-67; background-color: $color-46-100-67;
@ -97,10 +97,9 @@
.project-tab>div>sib-display>div:nth-child(1) { .project-tab>div>sib-display>div:nth-child(1) {
sib-set-default[name='project'] { sib-set-default[name='project'] {
padding: 1rem 1rem 1rem 3.2rem;
.project-customer, .project-customer,
.project-name { .project-name>div {
display: block; display: block;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
@ -113,6 +112,7 @@
} }
.project-name { .project-name {
display: block;
padding-left: 14px; padding-left: 14px;
width: calc(150px - 10px); width: calc(150px - 10px);
/* 10px = padding of the sib-set-default = better alignment */ /* 10px = padding of the sib-set-default = better alignment */
@ -126,7 +126,7 @@
/* End of specific styles of "Projects" tab */ /* End of specific styles of "Projects" tab */
>sib-display.nosub>div>sib-display>div { >sib-display.nosub>div>sib-display>div {
padding: 1rem 1rem 1rem 3.2rem; padding: 1rem 1rem 1rem 3rem;
} }
sib-display>div { sib-display>div {
@ -145,8 +145,9 @@
>div { >div {
color: $color-244-10-70; color: $color-244-10-70;
cursor: pointer; cursor: pointer;
>menu-circle-fix-url>sib-display>div { >menu-fix-url-circle>sib-display>div,
padding: 1rem 1rem 1rem 3.2rem; >menu-fix-url-project>sib-display>div {
padding: 1rem 1rem 1rem 3rem;
} }
} }
@ -156,7 +157,8 @@
} }
&>sib-display[active]>div, &>sib-display[active]>div,
&>sib-display>div>menu-circle-fix-url>sib-display[active]>div { &>sib-display>div>menu-fix-url-circle>sib-display[active]>div,
&>sib-display>div>menu-fix-url-project>sib-display[active]>div {
background-color: $color-46-100-67; background-color: $color-46-100-67;
color: $color-233-18-29; color: $color-233-18-29;
font-weight: bold; font-weight: bold;
@ -164,11 +166,13 @@
} }
&.menu-notification { &.menu-notification {
> sib-display > div > sib-display > div > menu-circle-fix-url { > sib-display > div > sib-display > div > menu-fix-url-circle,
> sib-display > div > sib-display > div > menu-fix-url-project {
flex: 1; flex: 1;
} }
> sib-display > div > sib-display > div, > sib-display > div > sib-display > div,
> sib-display > div > sib-display > div > menu-circle-fix-url > sib-display > div { > sib-display > div > sib-display > div > menu-fix-url-circle > sib-display > div,
> sib-display > div > sib-display > div > menu-fix-url-project > sib-display > div {
display: flex; display: flex;
sib-display-div { sib-display-div {
flex: 3; flex: 3;

2
src/styles/layout/events/_index.scss
View File

@ -1 +1 @@
@import 'events'; @import 'events.scss';

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

@ -1,7 +1,3 @@
$color-203-87-19: hsl(203, 87.8%, 19.2%);
$color-357-67-45: hsl(357,67.5%,45.9%);
$color-212-4-50: hsl(212.7,4.3%,50%);
$color-0-0-22: hsl(0,0%,22.7%);
#events { #events {
width: 100%; width: 100%;
font-family: "Facit"; font-family: "Facit";

8
src/styles/layout/project-profile/project-profile.scss
View File

@ -163,6 +163,14 @@
span { span {
font-weight: bold; font-weight: bold;
&.link-color {
color: $color-244-73-62;
}
&.norm-weight {
font-weight: normal;
}
} }
} }
} }

4
src/templates/hd-customer.pug
View File

@ -12,6 +12,6 @@ sib-widget(name='hd-customer')
ul ul
li #[span(class='mdi-account-outline') ${await value.firstName} ${await value.lastName ? await value.lastName : ""}]${await value.role ? `, ${await value.role}` : ""} li #[span(class='mdi-account-outline') ${await value.firstName} ${await value.lastName ? await value.lastName : ""}]${await value.role ? `, ${await value.role}` : ""}
li li
span(class='mdi-email-outline') span(class='link-color norm-weight mdi-email-outline')
a(href='mailto:${await value.email}') ${await value.email} a(href='mailto:${await value.email}') ${await value.email}
span ${await value.phone ? `<li><span class='mdi-cellphone-iphone'>${await value.phone}</span></li>` : ``} span ${await value.phone ? `<li><span class='norm-weight mdi-cellphone-iphone'>${await value.phone}</span></li>` : ``}

0
src/page-admin-circles-create.pug → src/views/admin/page-admin-circles-create.pug
View File

61
src/page-admin-circles.pug → src/views/admin/page-admin-circles.pug
View File

@ -9,12 +9,11 @@
#circle-left(hidden) #circle-left(hidden)
include page-circle-left.pug include ../circle/page-circle-left.pug
#admin-circle-list(hidden) #admin-circle-list(hidden)
include ../../templates/hd-user-avatar.pug
include templates/hd-user-avatar.pug
sib-widget(name='circle-owner') sib-widget(name='circle-owner')
template template
@ -52,57 +51,49 @@
data-label='Leave circle' data-label='Leave circle'
) )
sib-display(
class='table-body'
bind-user
nested-field='circles'
fields='circle.name, circle.owner, leaveButton'
class-circle.name='w33 cell border cell-with-name'
class-circle.owner='w33 cell border cell-with-id-card'
class-leaveButton='w33 cell border cell-with-buttons'
action-leaveButton="joinButton"
widget-leaveButton="admin-circle-leave-button"
widget-circle.owner='circle-owner'
)
sib-widget(name='admin-circle-join-button') sib-widget(name='admin-circle-join-button')
template template
button.button.text-bold.text-uppercase.reversed.button-blue.bordered.with-icon.icon-arrow-right-circle.test sib-form.button.text-bold.text-uppercase.reversed.button-blue.bordered.with-icon.icon-arrow-right-circle.flex(
sib-form( data-src='${value}'
data-src=''
nested-field='members'
fields='user.@id' fields='user.@id'
label-user.@id='' label-user.@id=''
value-user.@id='' value-user.@id='self'
widget-user.@id='sib-form-hidden' widget-user.@id='sib-form-hidden'
hd-inherit-bind-user2input="input[name='user.@id']" hd-inherit-bind-user2input="input[name='user.@id']"
hd-inherit-widgets
submit-button='Join Circle' submit-button='Join Circle'
) )
sib-widget(name="admin-circle-buttons")
template
sib-display(
data-src='${src}'
nested-field='members'
fields='relation'
action-relation='relation'
widget-relation='admin-circle-leave-button'
search-fields='user'
search-widget-user='sib-form-hidden'
search-value-user="-"
empty-widget='admin-circle-join-button'
hd-inherit-bind-resources='admin-circle-join-button'
hd-inherit-user-id="search-value-user"
hd-inherit-widgets
)
sib-display( sib-display(
class='table-body' class='table-body'
data-src=`${endpoints.circles || endpoints.get.circles}` data-src=`${endpoints.circles || endpoints.get.circles}joinable/`
fields='name, owner, buttons' fields='name, owner, members'
class-name='w33 cell border cell-with-name' class-name='w33 cell border cell-with-name'
class-owner='w33 cell border cell-with-id-card' class-owner='w33 cell border cell-with-id-card'
class-buttons='w33 cell border cell-with-buttons'
widget-buttons="admin-circle-buttons"
action-buttons="buttons"
hd-inherit-widgets
hd-inherit-widgets-multiple
widget-owner='circle-owner' widget-owner='circle-owner'
class-members='w33 cell border cell-with-buttons'
widget-members="admin-circle-join-button"
) )

0
src/page-admin-projects-create.pug → src/views/admin/page-admin-projects-create.pug
View File

7
src/page-admin-projects.pug → src/views/admin/page-admin-projects.pug
View File

@ -8,10 +8,10 @@
h1.title-left.without-margin Administration h1.title-left.without-margin Administration
#project-left(hidden) #project-left(hidden)
include page-project-left.pug include ../project/page-project-left.pug
#admin-project-list(hidden) #admin-project-list(hidden)
include templates/hd-user-avatar.pug include ../../templates/hd-user-avatar.pug
div.content-box__info div.content-box__info
div.admin-header div.admin-header
@ -68,7 +68,6 @@
search-widget-user='sib-form-hidden' search-widget-user='sib-form-hidden'
search-value-user="-" search-value-user="-"
hd-inherit-user-id="search-value-user" hd-inherit-user-id="search-value-user"
hd-inherit-widgets
) )
sib-display( sib-display(
@ -84,8 +83,6 @@
widget-buttons="admin-project-buttons" widget-buttons="admin-project-buttons"
action-buttons="buttons" action-buttons="buttons"
hd-inherit-widgets
hd-inherit-widgets-multiple
widget-captain='project-captain' widget-captain='project-captain'
widget-members='project-admins' widget-members='project-admins'

0
src/page-admin-users.pug → src/views/admin/page-admin-users.pug
View File

0
src/page-circle-chat.pug → src/views/circle/page-circle-chat.pug
View File

2
src/page-circle-edit.pug → src/views/circle/page-circle-edit.pug
View File

@ -1,6 +1,6 @@
div.content-box__info div.content-box__info
include templates/hd-user-avatar.pug include ../../templates/hd-user-avatar.pug
sib-widget(name='hd-user-groups') sib-widget(name='hd-user-groups')
template ${await value.name} template ${await value.name}

0
src/page-circle-left.pug → src/views/circle/page-circle-left.pug
View File

6
src/page-circle-profile.pug → src/views/circle/page-circle-profile.pug
View File

@ -3,7 +3,7 @@ sib-router(default-route='circle-profile', hidden)
sib-route(name='circle-edit') sib-route(name='circle-edit')
#circle-profile(hidden) #circle-profile(hidden)
include templates/hd-circle-team.pug include ../../templates/hd-circle-team.pug
.content-box__info .content-box__info
.space-between .space-between
@ -49,7 +49,7 @@ sib-router(default-route='circle-profile', hidden)
sib-widget(name='circle-join-button') sib-widget(name='circle-join-button')
template template
button.button.btn-margin-left.text-bold.text-uppercase.reversed.button-dark.bordered.with-icon.icon-arrow-right-circle.test button.button.btn-margin-left.text-bold.text-uppercase.reversed.button-dark.bordered.with-icon.icon-arrow-right-circle.flex
sib-form( sib-form(
data-src='' data-src=''
nested-field='members' nested-field='members'
@ -60,7 +60,6 @@ sib-router(default-route='circle-profile', hidden)
widget-user.@id='sib-form-hidden' widget-user.@id='sib-form-hidden'
hd-inherit-bind-user2input="input[name='user.@id']" hd-inherit-bind-user2input="input[name='user.@id']"
hd-inherit-widgets
submit-button='Join Circle' submit-button='Join Circle'
) )
@ -77,7 +76,6 @@ sib-router(default-route='circle-profile', hidden)
empty-widget='circle-join-button' empty-widget='circle-join-button'
hd-inherit-bind-resources='circle-join-button' hd-inherit-bind-resources='circle-join-button'
hd-inherit-user-id="search-value-user" hd-inherit-user-id="search-value-user"
hd-inherit-widgets
) )

0
src/page-job-offer-create.pug → src/views/job-offer/page-job-offer-create.pug
View File

0
src/page-job-offer-edit.pug → src/views/job-offer/page-job-offer-edit.pug
View File

0
src/page-project-chat.pug → src/views/project/page-project-chat.pug
View File

2
src/page-project-edit.pug → src/views/project/page-project-edit.pug
View File

@ -1,6 +1,6 @@
div.content-box__info div.content-box__info
include templates/hd-user-avatar.pug include ../../templates/hd-user-avatar.pug
sib-widget(name='hd-fieldset-title') sib-widget(name='hd-fieldset-title')
template template

0
src/page-project-left.pug → src/views/project/page-project-left.pug
View File

11
src/page-project-profile.pug → src/views/project/page-project-profile.pug
View File

@ -3,11 +3,11 @@ sib-router(default-route='project-profile', hidden)
sib-route(name='project-edit') sib-route(name='project-edit')
#project-profile(hidden) #project-profile(hidden)
include templates/hd-business-provider.pug include ../../templates/hd-business-provider.pug
include templates/hd-captain.pug include ../../templates/hd-captain.pug
include templates/hd-circle-team.pug include ../../templates/hd-circle-team.pug
include templates/hd-customer.pug include ../../templates/hd-customer.pug
include templates/hd-project-team.pug include ../../templates/hd-project-team.pug
.content-box__info .content-box__info
@ -94,7 +94,6 @@ sib-router(default-route='project-profile', hidden)
search-value-user="" search-value-user=""
hd-inherit-user-id="search-value-user" hd-inherit-user-id="search-value-user"
hd-inherit-widgets
) )