From 7fae8e63877d0f98622d0d51650704fafc33ab07 Mon Sep 17 00:00:00 2001 From: gaelle morin Date: Fri, 20 Dec 2019 16:09:18 +0100 Subject: [PATCH] feature: members' name of a project now displayed --- src/page-project-profile.pug | 7 +++-- src/styles/layout/circle/circle-profile.scss | 1 + .../project-profile/project-profile.scss | 30 ++++++++++++++++--- src/templates/hd-captain.pug | 8 ++++- src/templates/hd-project-team.pug | 20 +++++++++++++ 5 files changed, 58 insertions(+), 8 deletions(-) create mode 100644 src/templates/hd-project-team.pug diff --git a/src/page-project-profile.pug b/src/page-project-profile.pug index f8b72ff..aefb717 100644 --- a/src/page-project-profile.pug +++ b/src/page-project-profile.pug @@ -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') diff --git a/src/styles/layout/circle/circle-profile.scss b/src/styles/layout/circle/circle-profile.scss index 73e2b4e..cba66e5 100644 --- a/src/styles/layout/circle/circle-profile.scss +++ b/src/styles/layout/circle/circle-profile.scss @@ -67,6 +67,7 @@ .tag-group { display: flex; + margin-bottom: 1px; margin-left: 0.6rem; [name='user.groups'] { diff --git a/src/styles/layout/project-profile/project-profile.scss b/src/styles/layout/project-profile/project-profile.scss index 51893e1..b2c594e 100644 --- a/src/styles/layout/project-profile/project-profile.scss +++ b/src/styles/layout/project-profile/project-profile.scss @@ -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,6 +118,27 @@ @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; + } } } } diff --git a/src/templates/hd-captain.pug b/src/templates/hd-captain.pug index f16a51a..7119ea2 100644 --- a/src/templates/hd-captain.pug +++ b/src/templates/hd-captain.pug @@ -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 diff --git a/src/templates/hd-project-team.pug b/src/templates/hd-project-team.pug new file mode 100644 index 0000000..639e2ff --- /dev/null +++ b/src/templates/hd-project-team.pug @@ -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}