From cf30a0e3635ad34e4c69e6a7a59b51f52db062fa Mon Sep 17 00:00:00 2001 From: gaelle morin Date: Wed, 13 May 2020 10:16:00 +0200 Subject: [PATCH] update: groups removed --- src/styles/abstracts/_variables.scss | 2 -- src/styles/base/table.scss | 4 ---- src/styles/base/user-thumb.scss | 11 ----------- src/styles/components/tags.scss | 12 +----------- src/styles/layout/circle/circle-profile.scss | 4 ---- src/styles/layout/project/project-profile.scss | 4 ---- src/templates/hubl-circle-team.pug | 9 +-------- src/templates/hubl-groups.pug | 1 + src/templates/hubl-project-team.pug | 9 +-------- src/views/admin/page-admin-users-create.pug | 1 - src/views/admin/page-admin-users-edit.pug | 1 - src/views/admin/page-admin-users.pug | 7 ------- src/views/circle/page-circle-edit.pug | 9 +-------- 13 files changed, 5 insertions(+), 69 deletions(-) diff --git a/src/styles/abstracts/_variables.scss b/src/styles/abstracts/_variables.scss index 5e2f53f..bf2571b 100644 --- a/src/styles/abstracts/_variables.scss +++ b/src/styles/abstracts/_variables.scss @@ -78,8 +78,6 @@ /* tags */ --color-tag-admin-text: var(--color-complementary); --color-tag-admin-border: var(--color-complementary); - --color-tag-group-text: var(--color-primary); - --color-tag-group-border: var(--color-primary); /* Form elements */ --color-button-white: var(--color-white); diff --git a/src/styles/base/table.scss b/src/styles/base/table.scss index e8a8513..b81db9b 100644 --- a/src/styles/base/table.scss +++ b/src/styles/base/table.scss @@ -127,10 +127,6 @@ .user-thumb__name { @extend %user-thumb__name; } - - .user-thumb__groups { - @extend %user-thumb__groups; - } } >[name='sub'] { diff --git a/src/styles/base/user-thumb.scss b/src/styles/base/user-thumb.scss index 8f519c4..987137a 100644 --- a/src/styles/base/user-thumb.scss +++ b/src/styles/base/user-thumb.scss @@ -57,17 +57,6 @@ margin-right: 1rem; } -%user-thumb__groups { - display: flex; - margin-bottom: 1px; - margin-left: 0.6rem; - - [name='groups'], - [name='user.groups'] { - @extend %tag-role; - } -} - %user-thumb__admin { @extend %tag-admin; } diff --git a/src/styles/components/tags.scss b/src/styles/components/tags.scss index e1f5f73..1337089 100644 --- a/src/styles/components/tags.scss +++ b/src/styles/components/tags.scss @@ -1,13 +1,3 @@ -%tag-role { - border: 1px solid var(--color-tag-group-border); - border-radius: 3px; - color: var(--color-tag-group-text); - font-size: 1.4rem; - font-weight: 400; - margin-right: 0.6rem; - padding: 0.2rem 0.98rem; -} - %tag-admin { border: 1px solid var(--color-tag-admin-border); border-radius: 3px; @@ -16,4 +6,4 @@ font-weight: 400; margin-left: 0.6rem; padding: 0.35rem 0.98rem; -} \ No newline at end of file +} diff --git a/src/styles/layout/circle/circle-profile.scss b/src/styles/layout/circle/circle-profile.scss index 4afb54a..7b15091 100644 --- a/src/styles/layout/circle/circle-profile.scss +++ b/src/styles/layout/circle/circle-profile.scss @@ -22,10 +22,6 @@ @extend %user-thumb__name; } - .tag-group { - @extend %user-thumb__groups; - } - .tag-admin:not(:empty) { @extend %tag-admin; } diff --git a/src/styles/layout/project/project-profile.scss b/src/styles/layout/project/project-profile.scss index b38c218..c56e260 100644 --- a/src/styles/layout/project/project-profile.scss +++ b/src/styles/layout/project/project-profile.scss @@ -64,10 +64,6 @@ @extend %user-thumb__name; } - sib-multiple { - @extend %user-thumb__groups; - } - .tag-admin:not(:empty) { @extend %tag-admin; } diff --git a/src/templates/hubl-circle-team.pug b/src/templates/hubl-circle-team.pug index f985788..180c45e 100644 --- a/src/templates/hubl-circle-team.pug +++ b/src/templates/hubl-circle-team.pug @@ -4,24 +4,17 @@ sib-widget(name='hubl-circle-team-template') template sib-display.user-thumb( data-src='${await value.user}' - fields='account.picture, sup(name, isadmin, groups), sub(profile.city)' + fields='account.picture, sup(name, isadmin), sub(profile.city)' value-isadmin='${await value.is_admin}' class-account.picture='user-thumb__picture' class-name='user-thumb__name' class-isadmin='tag-admin' - class-groups='tag-group' class-profile.city='user-thumb__city' widget-account.picture='hubl-user-avatar' widget-isadmin='hubl-circle-user-admin' - widget-groups='hubl-circle-user-groups' - - multiple-groups='' ) sib-widget(name='hubl-circle-user-admin') template ${(await value) != "false" ? "Administrateur" : ""} - -sib-widget(name='hubl-circle-user-groups') - template ${await value.name} diff --git a/src/templates/hubl-groups.pug b/src/templates/hubl-groups.pug index 49bd446..7601ff0 100644 --- a/src/templates/hubl-groups.pug +++ b/src/templates/hubl-groups.pug @@ -1,3 +1,4 @@ +//- to be deleted when correcting user-profile sib-widget(name='hubl-groups-name') template ${value.name} diff --git a/src/templates/hubl-project-team.pug b/src/templates/hubl-project-team.pug index 6d47d27..217bf39 100644 --- a/src/templates/hubl-project-team.pug +++ b/src/templates/hubl-project-team.pug @@ -4,26 +4,19 @@ sib-widget(name='hubl-project-team') template sib-display.user-thumb( data-src='${await value}' - fields='user.account.picture, sup(user.name, isadmin, user.groups), sub(user.profile.city, name)' + fields='user.account.picture, sup(user.name, isadmin), sub(user.profile.city, name)' value-isadmin='${await value.is_admin}' class-user.account.picture='user-thumb__picture' class-user.name='user-thumb__name' class-isadmin='tag-admin' - class-user.groups='tag-group' class-user.profile.city='user-thumb__city' class-name='user-thumb__lead' widget-user.account.picture='hubl-user-avatar' widget-isadmin='hubl-project-user-admin' - widget-user.groups='hubl-project-user-groups' - - multiple-user.groups='' ) sib-widget(name='hubl-project-user-admin') template ${(await value) == "false" ? "" : "Administrateur"} - -sib-widget(name='hubl-project-user-groups') - template ${await value.name} diff --git a/src/views/admin/page-admin-users-create.pug b/src/views/admin/page-admin-users-create.pug index f27b2ad..cc84ab9 100644 --- a/src/views/admin/page-admin-users-create.pug +++ b/src/views/admin/page-admin-users-create.pug @@ -5,7 +5,6 @@ div.content-box__info sib-form.button-register( data-src=`${endpoints.users || endpoints.post.users}` - range-groups=`${endpoints.groups || endpoints.get.groups}` fields='line-1(first_name, last_name), line-2(username, email), line-3(password)' diff --git a/src/views/admin/page-admin-users-edit.pug b/src/views/admin/page-admin-users-edit.pug index c18b4d5..eb1808b 100644 --- a/src/views/admin/page-admin-users-edit.pug +++ b/src/views/admin/page-admin-users-edit.pug @@ -10,7 +10,6 @@ div.content-box__info sib-form.button-register( bind-resources='' - range-groups=`${endpoints.groups || endpoints.get.groups}` fields='line-1(first_name, last_name), line-2(username, email)' diff --git a/src/views/admin/page-admin-users.pug b/src/views/admin/page-admin-users.pug index 2aed94b..98db225 100644 --- a/src/views/admin/page-admin-users.pug +++ b/src/views/admin/page-admin-users.pug @@ -16,13 +16,6 @@ next="${value}" ) - sib-widget(name='hubl-user-admin-groups-display') - template - sib-display( - data-src="${value}" - fields="name" - ) - #admin-users-list(hidden) div.content-box__info diff --git a/src/views/circle/page-circle-edit.pug b/src/views/circle/page-circle-edit.pug index c238f40..ccda297 100644 --- a/src/views/circle/page-circle-edit.pug +++ b/src/views/circle/page-circle-edit.pug @@ -2,25 +2,18 @@ div.content-box__info include ../../templates/hubl-user-avatar.pug - sib-widget(name='hubl-user-groups') - template ${await value.name} - sib-widget(name='hubl-team-template-edit') template sib-display.user-thumb( class='w66 cell border cell-with-id-card user-thumb' data-src='${await value.user}' - fields='account.picture, sup(name, groups), sub(profile.city)' + fields='account.picture, sup(name), sub(profile.city)' class-account.picture='user-thumb__picture' class-name='user-thumb__name' - class-groups='user-thumb__groups' class-profile.city='user-thumb__city' widget-account.picture='hubl-user-avatar' - - multiple-groups='' - widget-groups='hubl-user-groups' ) sib-ac-checker(