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

Merge branch 'staging' into 'project-admin'

Browse Source 
# Conflicts:
#   src/menu-left.pug
#   src/page-circle-profile.pug
This commit is contained in:
Jean-Baptiste Pasquier 2019-12-21 18:06:20 +00:00
commit 6f1dd7d66c
16 changed files with 171 additions and 100 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/menu-left.pug
View File

@ -28,10 +28,12 @@ nav#main__menu
div.menu-icon.icon-folder-alt
sib-route(name='project', rdf-type='hd:project', use-id='', hidden)
div.sub-menu.menu-notification
sib-display(
sib-display.project-tab(
bind-user
nested-field='projects'
fields='line(project.customer.name, dash, project.name), project'
class-project.customer.name='project-customer'
class-project.name='project-name'
empty-widget='hd-create'
empty-value='project'
value-dash=' - '

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

@ -7,6 +7,7 @@ sib-router(default-route='project-profile', hidden)
include templates/hd-captain.pug
include templates/hd-circle-team.pug
include templates/hd-customer.pug
include templates/hd-project-team.pug
.content-box__info
@ -65,10 +66,10 @@ sib-router(default-route='project-profile', hidden)
sib-display(
bind-resources
fields='team'
fields='members'
widget-team='circle-team-template'
multiple-team
widget-members='hd-project-team'
multiple-members
)
sib-widget(name='project-leave-button')

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

@ -113,8 +113,12 @@
width: calc(150px - 10px);
/* 10px = padding of the sib-set-default = better alignment */
}
}
&:hover {
.project-tab>div>sib-display[fields='project(customer.name, name), badge']>div:hover {
background-color: $color-233-20-17;
sib-set-default[name='project'] {
background-color: $color-233-20-17;
box-shadow: 0 0 7px 0 rgba(0, 0, 0, 0.26);
color: $color-218-100-98;
@ -126,6 +130,10 @@
.project-name {
width: auto;
}
.project-name {
font-weight: normal;
}
}
}

2
src/styles/components/_index.scss
View File

@ -4,4 +4,4 @@
@import 'howto';
@import 'sidebar';
@import 'skills';
@import 'user-role';
@import 'tags';

19
src/styles/components/tags.scss Normal file
View File

@ -0,0 +1,19 @@
%tag-role {
border: 1px solid $color-45-95-54;
border-radius: 3px;
color: $color-210-4-50;
font-size: 1.4rem;
font-weight: 400;
margin-right: 0.6rem;
padding: 0.2rem 0.98rem;
}
%tag-admin {
border: 1px solid $color-244-73-62;
border-radius: 3px;
color: $color-244-73-62;
font-size: 1.4rem;
font-weight: 400;
margin-left: 0.6rem;
padding: 0.3rem 0.98rem;
}

9
src/styles/components/user-role.scss
View File

@ -1,9 +0,0 @@
%user-role {
border: 1px solid $color-45-95-54;
border-radius: 3px;
color: $color-210-4-50;
font-size: 1.4rem;
font-weight: 400;
margin-right: 0.4rem;
padding: 0.2rem 0.98rem;
}

2
src/styles/layout/circle/circle-edit.scss
View File

@ -133,7 +133,7 @@
display: flex;
[name='groups'] {
@extend %user-role;
@extend %tag-role;
}
}
}

32
src/styles/layout/circle/circle-profile.scss
View File

@ -15,21 +15,15 @@
}
}
>div { /* peut-être à mettre dans main.scss */
/* peut-être à mettre dans main.scss */
>sib-multiple {
label {
display: none;
}
>div>circle-team-template[name='team']>sib-display>div {
circle-team-template>sib-display>div {
display: grid;
grid-column-gap: 1.6rem;
grid-template-columns: 7vh auto;
grid-template-rows: repeat(2, 5.2vh);
>[name='account.picture'] {
>[name='user.account.picture'] {
align-items: center;
align-self: center;
background-color: $color-213-20-91;
@ -60,24 +54,30 @@
}
>[name='sup'] {
align-items: center;
align-self: end;
display: flex;
grid-column: 2 / span 1;
grid-row: 1 / span 1;
margin-bottom: 0.50rem;
[name='name'] {
.user-name {
font-weight: 600;
}
sib-multiple {
.tag-group {
display: flex;
margin-left: 1rem;
margin-bottom: 1px;
margin-left: 0.6rem;
[name='groups'] {
@extend %user-role;
[name='user.groups'] {
@extend %tag-role;
}
}
.tag-admin:not(:empty) {
@extend %tag-admin;
}
}
>[name='sub'] {
@ -86,7 +86,7 @@
grid-row: 2 / span 1;
margin-top: 0.50rem;
>[name$='profile.city']:not(:empty) {
>.city:not(:empty) {
@include mdi('atom');
align-items: center;
display: flex;
@ -100,5 +100,3 @@
}
}
}
}
}

2
src/styles/layout/circle/circle.scss
View File

@ -135,7 +135,7 @@
display: flex;
[name='groups'] {
@extend %user-role;
@extend %tag-role;
}
}
}

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

@ -88,7 +88,7 @@ sib-job-board {
}
>* {
@extend %user-role;
@extend %tag-role;
}
}

2
src/styles/layout/members/members.scss
View File

@ -32,7 +32,7 @@
}
member-info-groups {
@extend %user-role;
@extend %tag-role;
}
#members-list {

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

@ -50,7 +50,7 @@
}
hd-captain>sib-display>div,
circle-team-template>sib-display>div { /* Maybe move it in main.scss. /!\ some fields are different */
hd-project-team>sib-display>div { /* Maybe move it in main.scss. /!\ some fields are different */
display: grid;
grid-column-gap: 1.6rem;
grid-template-columns: 7vh auto;
@ -93,7 +93,7 @@
grid-row: 1 / span 1;
margin-bottom: 0.50rem;
[name='name'] {
.user-name {
font-weight: 600;
}
@ -101,8 +101,9 @@
display: flex;
margin-left: 1rem;
[name='groups'] {
@extend %user-role;
[name='groups'],
[name='user.groups'] {
@extend %tag-role;
}
}
}
@ -117,12 +118,28 @@
@include mdi('atom');
align-items: center;
display: flex;
margin-right: 1.6rem;
&::before {
color: $color-43-100-50;
margin-right: 0.50rem;
}
}
>[name$='name']:not(:empty),
>[name='is_lead'] {
@include icon('eyeglass');
align-items: center;
display: flex;
&::before {
color: $color-43-100-50;
font-size: 1.9rem;
font-weight: bold;
margin-left: 0;
margin-right: 0.50rem;
}
}
}
}

2
src/styles/layout/user/user-profile.scss
View File

@ -35,7 +35,7 @@
padding-left: 1.4rem;
groups-name {
@extend %user-role;
@extend %tag-role;
}
}
}

8
src/templates/hd-captain.pug
View File

@ -4,8 +4,14 @@ sib-widget(name='hd-captain')
template
sib-display(
data-src="${await value}"
fields='account.picture, sup(name), sub(profile.city)'
fields='account.picture, sup(name), sub(profile.city, is_lead)'
class-name='user-name'
class-profile.city='city'
widget-account.picture='hd-user-avatar'
widget-is_lead='hd-user-lead'
)
sib-widget(name='hd-user-lead')
template Project lead

19
src/templates/hd-circle-team.pug
View File

@ -3,14 +3,23 @@ include hd-user-avatar.pug
sib-widget(name='circle-team-template')
template
sib-display(
data-src="${await value}"
fields='account.picture, sup(name, groups), sub(profile.city)'
data-src='${await value}'
fields='user.account.picture, sup(user.name, is_admin, user.groups), sub(user.profile.city)'
widget-account.picture='hd-user-avatar'
widget-groups='hd-user-groups'
class-user.name='user-name'
class-is_admin='tag-admin'
class-user.groups='tag-group'
class-user.profile.city='city'
multiple-groups=''
widget-user.account.picture='hd-user-avatar'
widget-is_admin='hd-user-admin'
widget-user.groups='hd-user-groups'
multiple-user.groups=''
)
sib-widget(name='hd-user-admin')
template ${await value ? "Administrator" : ""}
sib-widget(name='hd-user-groups')
template ${await value.name}

20
src/templates/hd-project-team.pug Normal file
View File

@ -0,0 +1,20 @@
include hd-user-avatar.pug
sib-widget(name='hd-project-team')
template
sib-display(
data-src='${await value}'
fields='account.picture, sup(user.name, user.groups), sub(user.profile.city, name)'
class-user.name='user-name'
class-user.groups='tag-group'
class-user.profile.city='city'
widget-account.picture='hd-user-avatar'
widget-user.groups='hd-user-groups'
multiple-user.groups=''
)
sib-widget(name='hd-user-groups')
template ${await value.name}