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

Merge branch 'staging' into gm-missing-edit-circle

Browse Source
This commit is contained in:
Jean-Baptiste Pasquier
2019-10-24 16:22:06 +02:00
parent b18fb237f2 61be5d780c
commit a71fbf1b78
12 changed files with 141 additions and 385 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/config.sample.json
View File

@ -3,6 +3,7 @@
"cdn": "https://cdn.happy-dev.fr",
"xmpp": "https://jabber.happy-dev.fr/http-bind/",
"authority": "http://127.0.0.1:8000/openid/",
"clientName": "SIB App",
"endpoints": {
"businessproviders": "http://127.0.0.1:8000/businessproviders/",
"circles": "http://127.0.0.1:8000/circles/",
@ -11,13 +12,14 @@
"projects": "http://127.0.0.1:8000/projects/",
"skills": "http://127.0.0.1:8000/skills/",
"users": "http://127.0.0.1:8000/users/"
}
}
},
"alpha": {
"cdn": "https://cdn.happy-dev.fr",
"xmpp": "https://jabber.happy-dev.fr/http-bind/",
"authority": "https://api.alpha.happy-dev.fr/openid/",
"clientName": "SIB App",
"endpoints": {
"businessproviders": "https://api.alpha.happy-dev.fr/businessproviders/",
"circles": "https://api.alpha.happy-dev.fr/circles/",
@ -26,7 +28,7 @@
"projects": "https://api.alpha.happy-dev.fr/projects/",
"skills": "https://api.alpha.happy-dev.fr/skills/",
"users": "https://api.alpha.happy-dev.fr/users/"
}
}
},
"paris": {
@ -34,6 +36,7 @@
"cdn": "https://cdn.happy-dev.fr",
"xmpp": "https://jabber.happy-dev.fr/http-bind/",
"authority": "https://api.test-paris.happy-dev.fr/openid/",
"clientName": "SIB App",
"endpoints": {
"businessproviders": "https://api.test-paris.happy-dev.fr/businessproviders/",
"circles": "https://api.test-paris.happy-dev.fr/circles/",
@ -42,13 +45,14 @@
"projects": "https://api.test-paris.happy-dev.fr/projects/",
"skills": "https://api.test-paris.happy-dev.fr/skills/",
"users": "https://api.test-paris.happy-dev.fr/users/"
}
}
},
"nantes": {
"cdn": "https://cdn.happy-dev.fr",
"xmpp": "https://jabber.happy-dev.fr/http-bind/",
"authority": "https://api.test-nantes.happy-dev.fr/openid/",
"clientName": "SIB App",
"endpoints": {
"businessproviders": "https://api.test-nantes.happy-dev.fr/businessproviders/",
"circles": "https://api.test-nantes.happy-dev.fr/circles/",

6
src/context.jsonld Normal file
View File

@ -0,0 +1,6 @@
{
"inbox": "http://happy-dev.fr/owl/#inbox",
"object": "http://happy-dev.fr/owl/#object",
"author": "http://happy-dev.fr/owl/#author"
}

6
src/dependencies.pug
View File

@ -18,7 +18,11 @@ link(rel='stylesheet', href='https://fonts.googleapis.com/css?family=Open+Sans:3
script(type="module" src="https://unpkg.com/@startinblox/core@0.9")
script(type="module" src="https://unpkg.com/@startinblox/router@0.7")
script(type="module" src="https://unpkg.com/@startinblox/component-chat@0.4")
//- script(type="module" src="https://unpkg.com/@startinblox/component-notifications@0.2")
script(type="module" src="https://unpkg.com/@startinblox/component-notifications@0.3")
//- script(type="module" src="https://unpkg.com/@startinblox/component-conversation@0.3")
//- script(type="module" src="https://unpkg.com/@startinblox/component-directory@0.3")
//- script(type="module" src="https://unpkg.com/@startinblox/component-job-board@0.3")
//- Context - Fix for LDFlex
script(data-default-context, type="application/ld+json")
include context.jsonld

4
src/header.pug
View File

@ -17,7 +17,8 @@ include templates/hd-user-avatar.pug
details#user-controls
summary(tabindex='0' role='button')
sib-display#user-controls__profile(
fields='first_name, account.picture'
fields='firstName, account.picture'
extra-context='{firstName:"first_name"}'
widget-account.picture='hd-user-avatar'
bind-user
)
@ -30,5 +31,6 @@ sib-auth
sib-auth-provider(
data-authority=`${authority}`
data-id=`${authorityName || "paris"}`
data-client-name=`${clientName || "SIB App"}`
)

6
src/menu-left.pug
View File

@ -32,6 +32,10 @@ nav#main__menu
//- empty-widget='hd-create'
//- empty-value='project'
//- value-dash=' - '
//- search-fields='team'
//- search-widget-team='sib-form-hidden'
//- search-value-team='-'
//- set-user-id='search-value-team'
//- widget-badge='hd-counter'
//- action-badge='badge'
//- )
@ -54,7 +58,7 @@ nav#main__menu
action-badge='badge'
search-fields='team'
search-widget-team='sib-form-hidden'
search-value-team=''
search-value-team='-'
set-user-id='search-value-team'
order-by='name'
next='circle'

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

@ -3,9 +3,10 @@
include templates/template-business-provider.pug
include templates/template-customer.pug
include templates/template-team.pug
include templates/template-captain.pug
sib-display(
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)',
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-captain(label-captain, captain), block-team(label-team, members)',
value-const-title1='N°',
value-const-title2='-',
@ -19,11 +20,13 @@
value-label-customer='CUSTOMER INFORMATIONS:',
widget-customer='customer-template',
value-label-captain='CAPTAIN:',
widget-captain='captain-template',
value-label-team='TEAM:',
widget-members='team-template',
multiple-members='',
multiple-members,
bind-resources
)

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

@ -156,7 +156,7 @@
width: 45%;
}
sib-display-value[name='first_name'] {
sib-display-value[name='firstName'] {
@include icon('arrow-down');
align-items: center;
display: flex;
@ -224,7 +224,7 @@
div {
sib-display-value[name='first_name'] {
sib-display-value[name='firstName'] {
@include icon('close');
&::before {

2
src/styles/layout/job-offers/job-offers.scss
View File

@ -75,7 +75,7 @@ sib-job-board {
margin: 0.25em;
}
[name='author.first_name'] {
[name='author.firstName'] {
color: $color-0-0-29;
font-weight: 600;
}

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

@ -98,9 +98,7 @@
#clientBox {
display: flex;
margin-left: auto;
margin-right: auto;
margin-top: 1.7rem;
margin: 1.7rem auto;
max-width: 100%;
>* {
@ -166,75 +164,80 @@
}
}
[name='block-team'] {
[name='block-team'], [name='block-captain'] {
label {
display: none;
}
>sib-multiple {
sib-display.project-profile-user-avatar {
align-self: center;
grid-column: 1 / span 1;
grid-row: 1 / span 2;
label {
display: none;
div {
background-color: $color-0-0-100;
border-radius: 50%;
height: 7vh;
overflow: hidden;
position: relative;
width: 7vh;
img {
height: 100%;
left: 0;
object-fit: cover;
position: absolute;
top: 0;
width: 100%;
}
}
}
team-template[name='members'], captain-template[name='captain'] {
display: grid;
grid-column-gap: 1.6rem;
grid-template-columns: 7vh auto;
grid-template-rows: repeat(2, 5.2vh);
> div:nth-child(2) {
align-self: end;
display: flex;
grid-column: 2 / span 1;
grid-row: 1 / span 1;
span {
align-self: center;
font-weight: 600;
}
span ~ sib-display {
> div {
display: flex;
margin-left: 1rem;
sib-multiple [name='name'] {
@extend %user-role;
}
}
}
}
>team-template[name='members'] {
display: grid;
grid-column-gap: 1.6rem;
grid-template-columns: 7vh auto;
grid-template-rows: repeat(2, 5.2vh);
>sib-display:first-child {
align-self: center;
grid-column: 1 / span 1;
grid-row: 1 / span 2;
div {
background-color: $color-0-0-100;
border-radius: 50%;
height: 7vh;
overflow: hidden;
position: relative;
width: 7vh;
img {
height: 100%;
left: 0;
object-fit: cover;
position: absolute;
top: 0;
width: 100%;
}
}
}
>div:nth-child(2) {
align-self: end;
display: flex;
grid-column: 2 / span 1;
grid-row: 1 / span 1;
span {
align-self: center;
font-weight: 600;
}
span~sib-display {
>div {
display: flex;
margin-left: 1rem;
sib-multiple [name='name'] {
@extend %user-role;
}
}
}
}
>span:nth-child(3) {
align-self: start;
grid-column: 2 / span 1;
grid-row: 2 / span 1;
}
> span:nth-child(3) {
align-self: start;
grid-column: 2 / span 1;
grid-row: 2 / span 1;
}
}
}
.project-profile-user-avatar {
display: inline;
* {
height: 100%;
width: 100%;
}
}
}

23
src/templates/template-captain.pug Normal file
View File

@ -0,0 +1,23 @@
include hd-user-avatar.pug
sib-widget(name='captain-template')
template
sib-display.project-profile-user-avatar(
data-src="${value ? value['@id'] : ''}"
fields='account.picture',
widget-account.picture='hd-user-avatar'
)
div(name='user.thumb')
sib-display(
data-src="${value ? value['@id'] : ''}"
fields='name'
)
sib-display(
data-src="${value ? value['@id'] : ''}",
fields='name'
nested-field="groups"
)
sib-display(
data-src="${value ? value['@id'] : ''}"
fields='username'
)

20
src/templates/template-team.pug
View File

@ -2,16 +2,22 @@ include hd-user-avatar.pug
sib-widget(name='team-template')
template
sib-display(
data-src="${value.user['@id']}"
sib-display.project-profile-user-avatar(
data-src="${value.user ? value.user['@id'] : ''}"
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']}",
fields='name',
multiple-name
data-src="${value.user ? value.user['@id'] : ''}"
fields='name'
)
span ${value.name}
sib-display(
data-src="${value.user ? value.user['@id'] : ''}",
fields='name'
nested-field="groups"
)
sib-display(
data-src="${value.user ? value.user['@id'] : ''}"
fields='username'
)