diff --git a/src/dependencies.pug b/src/dependencies.pug
index fcc75e3d2baae5876be5dd123404e63ae9055344..b6daed353551d1a1faca2f5a0ec7642c61003056 100644
--- a/src/dependencies.pug
+++ b/src/dependencies.pug
@@ -1,4 +1,4 @@
-script(type="module" src="https://unpkg.com/@startinblox/oidc@0.6")
+script(type="module" src="https://unpkg.com/@startinblox/oidc@0.7")
script(src="/scripts/index.js")
//- Stylesheets
@@ -7,19 +7,18 @@ link(rel='stylesheet', href='https://fonts.googleapis.com/css?family=Open+Sans:3
link(rel='stylesheet', href='https://fonts.googleapis.com/css?family=Open+Sans:300,300i,400,400i,600,600i,700,700i,800,800i')
//- local
-//- script(type="module" src="/lib/sib-core/src/index.js")
//- script(type="module" src="/lib/sib-router/src/index.js")
//- script(type="module" src="/lib/sib-chat/sib-chat.js")
//- script(type="module" src="/lib/sib-notifications/sib-notifications.js")
//- script(type="module" src="/lib/sib-conversation/sib-conversation.js")
//- script(type="module" src="/lib/sib-directory/sib-directory.js")
-//- script(type="module" src="/lib/sib-job-board/sib-job-board.js")
+//- script(type="module" src="/lib/sib-joboffers/sib-job-board.js")
//- CDN
-script(type="module" src="https://unpkg.com/@startinblox/core@0.7")
+script(type="module" src="https://unpkg.com/@startinblox/core@0.8")
script(type="module" src="https://unpkg.com/@startinblox/router@0.7")
-script(type="module" src="https://unpkg.com/@startinblox/component-chat@0.1")
-script(type="module" src="https://unpkg.com/@startinblox/component-notifications@0.1.25")
-script(type="module" src="https://unpkg.com/@startinblox/component-conversation@0.2")
-script(type="module" src="https://unpkg.com/@startinblox/component-directory@0.1")
-script(type="module" src="https://unpkg.com/@startinblox/component-job-board@0.1")
+script(type="module" src="https://unpkg.com/@startinblox/component-chat@0.2")
+script(type="module" src="https://unpkg.com/@startinblox/component-notifications@0.2")
+script(type="module" src="https://unpkg.com/@startinblox/component-conversation@0.3")
+script(type="module" src="https://unpkg.com/@startinblox/component-directory@beta")
+script(type="module" src="https://unpkg.com/@startinblox/component-job-board@beta")
diff --git a/src/header.pug b/src/header.pug
index a4ce606f69e0faf611681177a4736aefecbea883..2e44180c00e7d2a625b7995f9e7fe5e9b73492a4 100644
--- a/src/header.pug
+++ b/src/header.pug
@@ -8,7 +8,7 @@
//- i#close-search-icon.icon-close(aria-hidden='true')
sib-notifications(
- id-suffix="inbox"
+ nested-field="inbox"
bind-user
)
@@ -17,7 +17,7 @@ include templates/hd-user-avatar.pug
details#user-controls
summary(tabindex='0' role='button')
sib-display#user-controls__profile(
- data-fields='first_name, account.picture'
+ fields='first_name, account.picture'
widget-account.picture='hd-user-avatar'
bind-user
)
diff --git a/src/menu-left.pug b/src/menu-left.pug
index 79cc956f5f6fa9ced44e5f2b842d7fdcef2e1cfb..59e078a1891bec09228ad262093eb8395e793820 100644
--- a/src/menu-left.pug
+++ b/src/menu-left.pug
@@ -23,8 +23,7 @@ nav#main__menu
div.sub-menu.menu-notification
sib-display(
data-src=`${endpoints.projects}`
- data-fields='project, badge'
- set-project='customer.name, dash, name'
+ fields='project(customer.name, dash, name), badge'
value-dash=' - '
widget-badge='hd-counter'
action-badge='badge'
@@ -41,7 +40,7 @@ nav#main__menu
//- div.sub-menu
//- sib-display(
//- data-src=`${endpoints.circles}`,
- //- data-fields='name',
+ //- fields='name',
//- widget-name='sib-display-div',
//- next='circle'
//- )
@@ -56,7 +55,7 @@ nav#main__menu
div.sub-menu.menu-notification
sib-display(
data-src=`${endpoints.users}`
- data-fields='username, badge'
+ fields='username, badge'
widget-username='sib-display-div'
widget-badge='hd-counter'
action-badge='badge'
diff --git a/src/page-circle-create.pug b/src/page-circle-create.pug
index cfc2a83a81532a4b7dfb9d6811922e3ffa55c3e9..6ad81a16741748530aea81b4d8142aad2f40ef19 100644
--- a/src/page-circle-create.pug
+++ b/src/page-circle-create.pug
@@ -7,7 +7,7 @@
range-owner=`${endpoints.users}`,
range-team=`${endpoints.users}`
- data-fields='name, description, description-text, owner, owner-text, team, team-text, jabberRoom, foaf:jabberID',
+ fields='name, description, description-text, owner, owner-text, team, team-text, jabberRoom, foaf:jabberID',
label-name="Channel's name",
label-description='Description',
@@ -22,5 +22,5 @@
widget-description='sib-form-textarea',
widget-jabberRoom='sib-form-checkbox',
- widget-team='sib-form-multiple-dropdown'
)
+ //- widget-team='sib-form-multiple-dropdown'
diff --git a/src/page-circle-edit.pug b/src/page-circle-edit.pug
index b27226de02ce932fd42f8901921bdcb293bbacd3..7e23b009aac6b0f7f50f186be7b5fc196dbd8de4 100644
--- a/src/page-circle-edit.pug
+++ b/src/page-circle-edit.pug
@@ -2,8 +2,8 @@
h1 Edit group
sib-form.block(
range-owner=`${endpoints.users}`,
- data-fields="name, description, owner, team, jabberID, jabberRoom"
+ fields="name, description, owner, team, jabberID, jabberRoom"
range-team=`${endpoints.users}`,
- widget-team='sib-form-multiple-dropdown',
bind-resources
)
+ //- widget-team='sib-form-multiple-dropdown',
diff --git a/src/page-circle-profile.pug b/src/page-circle-profile.pug
index 70260fac813709b9211b27f7c3edfab87aadb5f4..9deac43d8291bb6bcd46492f2e09f499b9abcbc9 100644
--- a/src/page-circle-profile.pug
+++ b/src/page-circle-profile.pug
@@ -1,24 +1,20 @@
.content-box.with-padding.full-width
h2 Channel's name:
sib-display(
- data-fields='name',
+ fields='name',
bind-resources
)
h2 Description:
sib-display(
- data-fields='description',
+ fields='description',
bind-resources
)
h2 In group:
sib-display.block-group(
- id-suffix='team',
- data-fields='teammate-img, teammate-name, teammate-pseudonym, teammate-profile, teammate-contact',
-
- set-teammate-img='account.picture',
- set-teammate-pseudonym='before-pseudo, username',
- set-teammate-name='name',
+ nested-field='team',
+ fields='teammate-img(account.picture), teammate-name(name), teammate-pseudonym(before-pseudo, username), teammate-profile, teammate-contact',
template-teammate-contact='chat-link',
diff --git a/src/page-job-offer-create.pug b/src/page-job-offer-create.pug
index f2186445534c41afd357a767d7cc779aa818d27f..dcf9bec4ca0606e6c3bdad0ad619384a3ab10d25 100644
--- a/src/page-job-offer-create.pug
+++ b/src/page-job-offer-create.pug
@@ -14,7 +14,7 @@
data-src=`${endpoints.joboffers}`
range-skills=`${endpoints.skills}`
- data-fields='title, title-text, description, description-text, skills, closingDate'
+ fields='title, title-text, description, description-text, skills, closingDate'
class-title='field form-label is-light is-expanded'
label-title='Title*'
diff --git a/src/page-job-offer-edit.pug b/src/page-job-offer-edit.pug
index bce315ca5a74bb5099f6650334a92a769ef4599f..619a3ddd85d3274227a1088cd74a49f17d60c959 100644
--- a/src/page-job-offer-edit.pug
+++ b/src/page-job-offer-edit.pug
@@ -5,7 +5,7 @@
bind-resources
range-skills=`${endpoints.skills}`
- data-fields='title, description, skills, closingDate'
+ fields='title, description, skills, closingDate'
class-title='field form-label is-light is-expanded'
label-title='Title*'
diff --git a/src/page-project-create.pug b/src/page-project-create.pug
index 29f271cea1f6d9531f66301ea9cc877f9416d006..80cbceaa5cf4e3b011c4ce32488fc98a238959d1 100644
--- a/src/page-project-create.pug
+++ b/src/page-project-create.pug
@@ -7,20 +7,17 @@
range-members=`${endpoints.users}`,
range-team=`${endpoints.users}`,
- data-fields='block-project__info, block-project__fee, block-project__customer',
+ fields='block-project__info(customer.name, name, customer.logo, description), block-project__fee(fieldset-fee, businessProvider, businessProviderFee), block-project__customer(fieldset-customer, customer.companyRegister, customer.address, customer.firstName, customer.lastName, customer.role, customer.email, customer.phone)',
- set-block-project__info='customer.name, name, customer.logo, description',
label-customer.name='Customer\'s name',
label-name='Project\'s name',
label-customer.logo='Customer\'s logo',
label-description='Project description',
- set-block-project__fee='fieldset-fee, businessProvider, businessProviderFee',
widget-fieldset-fee='hd-template-project-title',
label-businessProvider='Business provider',
label-businessProviderFee='Amount of the contribution',
- set-block-project__customer='fieldset-customer, customer.companyRegister, customer.address, customer.firstName, customer.lastName, customer.role, customer.email, customer.phone',
widget-fieldset-customer='hd-template-project-title',
label-customer.companyRegister='Company register',
label-customer.address='Address',
diff --git a/src/page-project-drive.pug b/src/page-project-drive.pug
index 0e2a9f36dc5c23a2c1b72628812ae2ef66873dda..1c06462050212e1d76e57c6c83aea1f985263143 100644
--- a/src/page-project-drive.pug
+++ b/src/page-project-drive.pug
@@ -6,6 +6,6 @@ sib-widget(name='hd-drive')
.content-box.with-padding.full-width.chat-view
sib-display(
bind-resources=""
- data-fields="driveID"
+ fields="driveID"
widget-driveID='hd-drive'
)
\ No newline at end of file
diff --git a/src/page-project-edit.pug b/src/page-project-edit.pug
index ecb101b7c820d73ede3ae720fb8d2dac6326f88d..3aad238e3f7caae42ede5da1c153bfaa92120c1b 100644
--- a/src/page-project-edit.pug
+++ b/src/page-project-edit.pug
@@ -13,7 +13,7 @@
sib-form.team.is-horizontal(
naked,
data-src='${id}',
- data-fields='user.name, name',
+ fields='user.name, name',
range-user.name=`${endpoints.users}`,
class-name='field',
class-user.name='field',
@@ -22,15 +22,13 @@
)
sib-form.block(
- data-fields='block-project__info, block-project__fee, block-project__customer, block-project__team',
+ fields='block-project__info(customer.name, name, customer.logo, description), block-project__fee(fieldset-fee, businessProvider, businessProvider.fee), block-project__customer(fieldset-customer, customer.companyRegister, customer.address, customer.firstName, customer.lastName, customer.role, customer.email, customer.phone), block-project__team(fieldset-team, members)',
- set-block-project__info='customer.name, name, customer.logo, description',
label-customer.name='Customer\'s name',
label-name='Project\'s name',
label-customer.logo='Customer\'s logo',
label-description='Project description',
- set-block-project__fee='fieldset-fee, businessProvider, businessProvider.fee',
range-businessProvider=`${endpoints.businessproviders}`,
label-businessProvider='Business provider',
label-businessProvider.fee='Amount of the contribution (%)',
@@ -38,7 +36,6 @@
widget-businessProvider.fee='sib-form-number',
label-fieldset-fee='Fee',
- set-block-project__customer='fieldset-customer, customer.companyRegister, customer.address, customer.firstName, customer.lastName, customer.role, customer.email, customer.phone',
label-customer.companyRegister='Company registration number',
label-customer.address='Address',
label-customer.firstName='Name of the contact at the customer\'s premises',
@@ -49,7 +46,6 @@
widget-fieldset-customer='hd-template-project-title',
label-fieldset-customer='Customer information',
- set-block-project__team='fieldset-team, members',
label-fieldset-team='The team',
widget-fieldset-team='hd-template-project-title',
widget-members='template-members',
diff --git a/src/page-project-profile.pug b/src/page-project-profile.pug
index a25bbab23fa53cf535b827d6cd5253798166395b..c3aa6d366109eda8dd0bae9dda540ebb16d6421d 100644
--- a/src/page-project-profile.pug
+++ b/src/page-project-profile.pug
@@ -5,28 +5,21 @@
include templates/template-team.pug
sib-display(
- data-fields='block-title, infos, block-lead, block-fee, block-customer, block-team',
+ fields='block-title(const-title1, number, customer.name, const-title2, name, entitled, creationDate), infos(block-description(label-description, description), block-logo(customer.logo)), block-lead, block-fee(label-fee, businessProvider), block-customer(label-customer, customer), block-team(label-team, members)',
- set-block-title='const-title1, number, customer.name, const-title2, name, entitled, creationDate',
value-const-title1='N°',
value-const-title2='-',
value-entitled='Creation date:'
- set-infos='block-description, block-logo',
- set-block-description='label-description, description',
- set-block-logo='customer.logo',
value-label-description='DESCRIPTION:',
widget-customer.logo='sib-display-img',
- set-block-fee='label-fee, businessProvider',
value-label-fee='FEE:',
widget-businessProvider='template-business-provider'
- set-block-customer='label-customer, customer',
value-label-customer='CUSTOMER INFORMATIONS:',
widget-customer='customer-template',
- set-block-team='label-team, members',
value-label-team='TEAM:',
widget-members='team-template',
multiple-members='',
diff --git a/src/page-user-profile.pug b/src/page-user-profile.pug
index ed4a578fe17b5297e3e5585066daac394edcb383..a5634046512e2b5e2d91a51f4aea445ad7e6a2f0 100644
--- a/src/page-user-profile.pug
+++ b/src/page-user-profile.pug
@@ -6,15 +6,14 @@ include templates/template-groups.pug
sib-display.avatar-display(
bind-user=''
- data-fields='account.picture'
+ fields='account.picture'
label-account.picture=''
widget-account.picture='sib-display-img'
)
sib-display.name-diplay(
bind-user=''
- data-fields='user-name-groups, username'
- set-user-name-groups='name, groups'
+ fields='user-name-groups(name, groups), username'
class-name='name'
@@ -27,13 +26,7 @@ include templates/template-groups.pug
sib-form.info-form(
bind-user=''
- data-fields='profile.bio, inline-1, inline-2, inline-3, account.picture, instruction'
-
- set-inline-1='profile.city, email'
-
- set-inline-2='profile.phone, profile.website'
-
- set-inline-3='profile.available'
+ fields='profile.bio, inline-1(profile.city, email), inline-2(profile.phone, profile.website), inline-3(profile.available), account.picture, instruction'
class-profile.bio='form-label is-light'
label-profile.bio='short description'
@@ -63,7 +56,7 @@ include templates/template-groups.pug
sib-form(
bind-user=''
range-skills=`${endpoints.skills}`
- data-fields='skills'
+ fields='skills'
class-skills='form-label is-dark'
label-skills='Your main skills (4 max.):'
diff --git a/src/scripts/index.js b/src/scripts/index.js
index cc8c6e46d4aae49b1b422f620c97604c140c1ccd..621808ed4af730d0d0b3277a11c48c03bbf0e57a 100644
--- a/src/scripts/index.js
+++ b/src/scripts/index.js
@@ -36,13 +36,14 @@ document.addEventListener('DOMContentLoaded', function (event) {
});
//- Header login hide/show
- if(document.querySelector('sib-auth').getUser() !== null) {
- document.querySelector('button[role="log in"]').style.display = 'none';
- //- Token expired, hack for ask relogin
- if(new Date(document.querySelector('sib-auth').getUser().expires_at*1000) <= new Date()) {
- document.querySelector('button[role="log in"]').style.display = '';
- document.querySelector('button[role="log in"]').style.color = 'red';
- document.querySelector('button[role="log in"]').innerHTML = 'Re-login';
- }
- }
+ // if(document.querySelector('sib-auth').getUser() !== null) {
+ // document.querySelector('button[role="log in"]').style.display = 'none';
+ // //- Token expired, hack for ask relogin
+ // if(new Date(document.querySelector('sib-auth').getUser().expires_at*1000) <= new Date()) {
+ // document.querySelector('button[role="log in"]').style.display = '';
+ // document.querySelector('button[role="log in"]').style.color = 'red';
+ // document.querySelector('button[role="log in"]').innerHTML = 'Re-login';
+ // }
+ // }
+
});
\ No newline at end of file
diff --git a/src/styles/base/menu-left.scss b/src/styles/base/menu-left.scss
index 8f417f4d5b5b5341fa7f1e8009851a29650747f7..d5c98cb79552fea4c579423ed7865d4bd439aafc 100644
--- a/src/styles/base/menu-left.scss
+++ b/src/styles/base/menu-left.scss
@@ -105,7 +105,7 @@
padding: 10px 10px 10px 32px;
}
- div[name='project'] {
+ sib-route[name='project'] {
display: flex;
flex: 3;
@@ -114,7 +114,7 @@
height: 20px;
}
- sib-display-div[name='dash'] {
+ sib-display-value[name='dash'] {
margin: 0 0.4em;
}
}
diff --git a/src/styles/layout/circle-profile/circle-profile.scss b/src/styles/layout/circle-profile/circle-profile.scss
index 94d0bbf04d9652b7584070e2796f02655c9f94c8..1df3fff47db09021bfc3613e458820a4d19f1295 100644
--- a/src/styles/layout/circle-profile/circle-profile.scss
+++ b/src/styles/layout/circle-profile/circle-profile.scss
@@ -29,7 +29,7 @@
top: -2px;
}
- > div[name='teammate-img'] {
+ > sib-set-default[name='teammate-img'] {
background-color: $color-215-9-73;
border-radius: 50%;
grid-column: 1 / span 2;
@@ -47,12 +47,12 @@
}
}
- div[name='teammate-name'] {
+ sib-set-default[name='teammate-name'] {
grid-column: 3 / span 2;
grid-row: 1 / span 1;
}
- > div[name='teammate-pseudonym'] {
+ > sib-set-default[name='teammate-pseudonym'] {
align-self: start;
font-size: 1.2rem;
grid-column: 3 / span 2;
diff --git a/src/styles/layout/job-offers/job-offers.scss b/src/styles/layout/job-offers/job-offers.scss
index 1b45f5e0adc7bacd81709845ea891a40161f517d..1eac0c15627e8f894969b1d3472c06733b060b3c 100644
--- a/src/styles/layout/job-offers/job-offers.scss
+++ b/src/styles/layout/job-offers/job-offers.scss
@@ -61,6 +61,7 @@ sib-job-board {
margin: 1.7rem 0;
[name="offer-detail"] {
+ display: block;
border-bottom: 1px solid $color-210-17-91;
margin: 0 2.1rem;
padding: 2.1rem 0;
diff --git a/src/styles/layout/members/member-profile.scss b/src/styles/layout/members/member-profile.scss
index 0fa709a0b90670d5c7d1384449b6ae69e630e2d5..53fd9c3f8ce9543e5ae97f6c0769849f71cc99c1 100644
--- a/src/styles/layout/members/member-profile.scss
+++ b/src/styles/layout/members/member-profile.scss
@@ -11,7 +11,7 @@
.member-bio {
- div[name='member-profile__bio'] {
+ sib-set-default[name='member-profile__bio'] {
display: grid;
grid-gap: 1rem;
grid-template-areas: "avatar name status"
@@ -20,7 +20,7 @@
"avatar list button";
grid-template-columns: 1fr 2fr 1fr;
- div[name='member-img'] {
+ sib-set-default[name='member-img'] {
grid-area: avatar;
member-picture {
@@ -56,7 +56,7 @@
}
}
- div[name='member-profile'] {
+ sib-set-default[name='member-profile'] {
align-items: baseline;
align-self: end;
display: flex;
@@ -72,7 +72,8 @@
grid-area: bio;
}
- div[name='infos'] {
+ sib-set-default[name='infos'] {
+ display: block;
grid-area: list;
@extend %member-info;
diff --git a/src/styles/layout/members/members.scss b/src/styles/layout/members/members.scss
index e60df83bd7df25f2203933cd0f26c028ceeb58e2..6d18f5f2bba4e7f80d793f8631cd3e45acf0e1ad 100644
--- a/src/styles/layout/members/members.scss
+++ b/src/styles/layout/members/members.scss
@@ -146,7 +146,7 @@ member-info-groups {
}
}
- div[name='header'] {
+ sib-set-default[name='header'] {
border-bottom: 1px solid $color-210-25-95;
display: flex;
flex-direction: column;
@@ -212,7 +212,8 @@ member-info-groups {
}
}
- div[name='infos'] {
+ sib-set-default[name='infos'] {
+ display: block;
padding: 0 1.7rem;
@extend %member-info;
diff --git a/src/templates/template-team.pug b/src/templates/template-team.pug
index 2b8073345e26a71582572294091964fe6bcf3e95..ac3a2ffccdcad1e556d0f2a8698e62f798aad1c5 100644
--- a/src/templates/template-team.pug
+++ b/src/templates/template-team.pug
@@ -4,14 +4,14 @@ sib-widget(name='team-template')
template
sib-display(
data-src="${value.user['@id']}"
- data-fields='account.picture',
+ fields='account.picture',
widget-account.picture='hd-user-avatar'
)
div(name='user.thumb')
span ${value.user.name}
sib-display(
data-src="${value.user.groups['@id']}",
- data-fields='name',
+ fields='name',
multiple-name
)
span ${value.name}