From 747eb622b3273cafa83faa3b55d45f320ea93fe7 Mon Sep 17 00:00:00 2001 From: gaelle morin Date: Thu, 25 Jun 2020 18:52:15 +0200 Subject: [PATCH 01/16] first try to display the picture of project on edit-page --- src/styles/base/form.scss | 3 ++- src/styles/base/main.scss | 24 ++++++++++++++++++++++++ src/views/project/page-project-edit.pug | 4 ++-- 3 files changed, 28 insertions(+), 3 deletions(-) diff --git a/src/styles/base/form.scss b/src/styles/base/form.scss index ad3c93b..9234516 100644 --- a/src/styles/base/form.scss +++ b/src/styles/base/form.scss @@ -7,6 +7,7 @@ @include breakpoint(lg) { display: flex; flex-direction: column; + margin-bottom: 0; transition: all .3s ease; } } @@ -31,7 +32,7 @@ left: 0; margin: 0; margin-left: auto; - margin-top: 109px; + margin-top: 32px; position: relative; width: auto; } diff --git a/src/styles/base/main.scss b/src/styles/base/main.scss index 23a12a6..29c3cc5 100644 --- a/src/styles/base/main.scss +++ b/src/styles/base/main.scss @@ -279,6 +279,30 @@ h5 { width: 15vw; } +.project-edit-logo { + display: flex; + height: 8.5vh; + margin-top: 20px; + margin-bottom: 30px; + + form { + display: flex; + } + + hubl-user-avatar { + width: 104px; + } + + input[type='submit'] { + @extend .button, + .text-bold, + .text-uppercase, + .button-primary, + .bordered; + align-self: center; + } +} + .content-box { @include window-style-modal(); flex-direction: column; diff --git a/src/views/project/page-project-edit.pug b/src/views/project/page-project-edit.pug index cce893a..c104fe7 100644 --- a/src/views/project/page-project-edit.pug +++ b/src/views/project/page-project-edit.pug @@ -33,11 +33,11 @@ div.content-box__info h2 Photo du projet - solid-form.form-picture( + solid-form.form-picture.project-edit-logo( bind-resources fields='customer.logo' widget-customer.logo="hubl-user-avatar" - submit-button='Edit' + submit-button='Modifier la photo' next='project-picture' ) From 053a7972c584cc23724c0f9effe5cf26271cb7e9 Mon Sep 17 00:00:00 2001 From: gaelle morin Date: Mon, 29 Jun 2020 18:51:51 +0200 Subject: [PATCH 02/16] wip --- src/styles/base/header.scss | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/styles/base/header.scss b/src/styles/base/header.scss index 1288dff..a982061 100644 --- a/src/styles/base/header.scss +++ b/src/styles/base/header.scss @@ -124,6 +124,18 @@ sib-notifications { top: 5.6rem; width: 300px; } + + &::before { + display: inline-block; + content: ""; + width: 25px; + height: 25px; + background: violet; + position: absolute; + box-shadow: 0 0 7px 0 rgba(92, 97, 104, 0.24); + transform: rotate(45deg); + right: 100px; + } } } } From 5d5ae81d84bbb954b17350cfe56f8dd3ded25084 Mon Sep 17 00:00:00 2001 From: gaelle morin Date: Tue, 30 Jun 2020 13:06:39 +0200 Subject: [PATCH 03/16] fearture: project-picture-edit - positioning --- src/styles/base/main.scss | 53 +++++++++++++++++++++++++ src/views/project/page-project-edit.pug | 2 +- 2 files changed, 54 insertions(+), 1 deletion(-) diff --git a/src/styles/base/main.scss b/src/styles/base/main.scss index 29c3cc5..175d722 100644 --- a/src/styles/base/main.scss +++ b/src/styles/base/main.scss @@ -303,6 +303,59 @@ h5 { } } +.form-picture { + + form { + display: block; + text-align: center; + margin-bottom: 2.6rem; + padding-top: 1.8rem; + + @include breakpoint(lg) { + display: flex; + width: 100%; + } + + hubl-user-avatar { + display: inline-block; + max-width: 100%; + max-height: 16.5vh; + + @include breakpoint(lg) { + margin-left: 20px; + max-height: 8.5vh; + max-width: none; + width: calc(35vw - 20px); + } + + >object, + >img { + display: block; + max-height: 16.5vh !important; + + @include breakpoint(lg) { + max-height: 8.5vh !important; + } + } + } + + input { + @extend .button, + .text-bold, + .text-uppercase, + .button-primary, + .bordered; + margin: 10px 0; + width: 100%; + + @include breakpoint(lg) { + margin: auto 0 auto 2.2rem; + width: auto; + } + } + } +} + .content-box { @include window-style-modal(); flex-direction: column; diff --git a/src/views/project/page-project-edit.pug b/src/views/project/page-project-edit.pug index c104fe7..3add996 100644 --- a/src/views/project/page-project-edit.pug +++ b/src/views/project/page-project-edit.pug @@ -33,7 +33,7 @@ div.content-box__info h2 Photo du projet - solid-form.form-picture.project-edit-logo( + solid-form.form-picture( bind-resources fields='customer.logo' widget-customer.logo="hubl-user-avatar" From 7dbbe51c6eda8bc81d50fe1e45d304a3e29de69c Mon Sep 17 00:00:00 2001 From: gaelle morin Date: Tue, 30 Jun 2020 13:07:29 +0200 Subject: [PATCH 04/16] wip --- src/styles/base/header.scss | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/src/styles/base/header.scss b/src/styles/base/header.scss index a982061..1288dff 100644 --- a/src/styles/base/header.scss +++ b/src/styles/base/header.scss @@ -124,18 +124,6 @@ sib-notifications { top: 5.6rem; width: 300px; } - - &::before { - display: inline-block; - content: ""; - width: 25px; - height: 25px; - background: violet; - position: absolute; - box-shadow: 0 0 7px 0 rgba(92, 97, 104, 0.24); - transform: rotate(45deg); - right: 100px; - } } } } From c942eaf1e459ae30b7588e0eee3fcc26fb70bb8a Mon Sep 17 00:00:00 2001 From: gaelle morin Date: Tue, 30 Jun 2020 14:17:18 +0200 Subject: [PATCH 05/16] fix: project-profile: full width button to left a project on mobile --- src/views/project/page-project-profile.pug | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/project/page-project-profile.pug b/src/views/project/page-project-profile.pug index c3167df..102c24f 100644 --- a/src/views/project/page-project-profile.pug +++ b/src/views/project/page-project-profile.pug @@ -70,7 +70,7 @@ solid-router(default-route='project-profile', hidden) solid-widget(name='hubl-project-leave-button') template solid-delete( - class='button desktop-btn-margin__left text-bold text-uppercase reversed button-secondary bordered with-icon icon-close' + class='button mobile-full-width desktop-btn-margin__left text-bold text-uppercase reversed button-secondary bordered with-icon icon-close' data-src="${src}" data-label='Quitter le groupe' ) From 03dc7a4251839f5e50b0df96068692df50c17f5a Mon Sep 17 00:00:00 2001 From: gaelle morin Date: Tue, 30 Jun 2020 17:36:14 +0200 Subject: [PATCH 06/16] fix: project-picture-edit - wip --- src/styles/base/main.scss | 38 ++++++++++++++++++++++ src/views/project/page-project-picture.pug | 1 + 2 files changed, 39 insertions(+) diff --git a/src/styles/base/main.scss b/src/styles/base/main.scss index 175d722..c5b5ff9 100644 --- a/src/styles/base/main.scss +++ b/src/styles/base/main.scss @@ -356,6 +356,44 @@ h5 { } } + +.p_relative { + position: relative; +} + +.is-inline-1200 { + + @include breakpoint(lg) { + flex-direction: row; + } +} + +.flex_vertical-center { + align-items: center; +} + +.flex_column { + flex-direction: column; +} + +.pull-left-1200 { + + @include breakpoint(lg) { + float: left; + } +} + +.profile-avatar { + height: 243px; + width: 243px; + margin-left: 2rem; +} + +solid-picture { + +} + + .content-box { @include window-style-modal(); flex-direction: column; diff --git a/src/views/project/page-project-picture.pug b/src/views/project/page-project-picture.pug index 9257a73..5eb81d6 100644 --- a/src/views/project/page-project-picture.pug +++ b/src/views/project/page-project-picture.pug @@ -5,6 +5,7 @@ div.content-box__info h1 Modifier l'image du projet solid-picture( + class="pull-left-1200 avatar-display" bind-resources upload-src=`${endpoints.uploads || endpoints.post.uploads}` upload-id="solid-project-edit-picture" From 2b314116a40f4795500767c3494bf5b701de4c24 Mon Sep 17 00:00:00 2001 From: gaelle morin Date: Fri, 3 Jul 2020 16:47:54 +0200 Subject: [PATCH 07/16] feature: project: modify image - positioning --- src/styles/base/main.scss | 71 +++++++++++++++++++++- src/views/project/page-project-picture.pug | 1 - 2 files changed, 70 insertions(+), 2 deletions(-) diff --git a/src/styles/base/main.scss b/src/styles/base/main.scss index c5b5ff9..425174b 100644 --- a/src/styles/base/main.scss +++ b/src/styles/base/main.scss @@ -357,10 +357,77 @@ h5 { } + .p_relative { position: relative; } +.pull-left-1200 { + + @include breakpoint(lg) { + float: left; + } +} + +.flex_column { + flex-direction: column; +} + +.flex_vertical-center { + align-items: center; +} + +.is-inline-1200 { + + @include breakpoint(lg) { + flex-direction: row; + } +} + +solid-ac-checker.button-padding { + + @include breakpoint(lg) { + padding-left: 32px; + } +} + +.w90 { + + @include breakpoint(sm) { + width: 90%; + } +} + +.w100 { + + @include breakpoint(sm) { + width: 100%; + } +} + +.p_absolute { + position: absolute; + z-index: 1; +} + +.button-register-picture { + bottom: 0; + right: 0; +} + +#solid-picture-remove { + margin-top: 2em; + + @include breakpoint(lg) { + margin-top: 0; + } +} + + +/*.p_relative { + position: relative; +} + .is-inline-1200 { @include breakpoint(lg) { @@ -383,6 +450,8 @@ h5 { } } + + .profile-avatar { height: 243px; width: 243px; @@ -391,7 +460,7 @@ h5 { solid-picture { -} +}*/ .content-box { diff --git a/src/views/project/page-project-picture.pug b/src/views/project/page-project-picture.pug index 5eb81d6..9257a73 100644 --- a/src/views/project/page-project-picture.pug +++ b/src/views/project/page-project-picture.pug @@ -5,7 +5,6 @@ div.content-box__info h1 Modifier l'image du projet solid-picture( - class="pull-left-1200 avatar-display" bind-resources upload-src=`${endpoints.uploads || endpoints.post.uploads}` upload-id="solid-project-edit-picture" From 7ee2f8e14b65514d9104d81095acbd21028ab631 Mon Sep 17 00:00:00 2001 From: gaelle morin Date: Tue, 7 Jul 2020 19:42:52 +0200 Subject: [PATCH 08/16] feature: project: modify image - positioning new try --- src/styles/base/main.scss | 69 ++++++++++++---------- src/views/project/page-project-picture.pug | 2 +- 2 files changed, 40 insertions(+), 31 deletions(-) diff --git a/src/styles/base/main.scss b/src/styles/base/main.scss index 425174b..a822009 100644 --- a/src/styles/base/main.scss +++ b/src/styles/base/main.scss @@ -362,13 +362,6 @@ h5 { position: relative; } -.pull-left-1200 { - - @include breakpoint(lg) { - float: left; - } -} - .flex_column { flex-direction: column; } @@ -377,20 +370,6 @@ h5 { align-items: center; } -.is-inline-1200 { - - @include breakpoint(lg) { - flex-direction: row; - } -} - -solid-ac-checker.button-padding { - - @include breakpoint(lg) { - padding-left: 32px; - } -} - .w90 { @include breakpoint(sm) { @@ -405,21 +384,51 @@ solid-ac-checker.button-padding { } } -.p_absolute { +/*.p_absolute { position: absolute; z-index: 1; +}*/ + +.project-edit-picture { + + >div>*:not(:last-child) { + margin-bottom: 2rem; + } + + solid-display { + max-height: 8.5vh; + max-width: 35vw; + } + + solid-ac-checker:first-of-type { + display: flex; + + #solid-picture-remove { + margin-left: 2rem; + } + } + + solid-ac-checker:last-of-type { + align-self: flex-end; + } } -.button-register-picture { - bottom: 0; - right: 0; -} +.project-edit-picture hubl-user-avatar { + border-radius: 0; + max-height: 8.5vh; + max-width: 35vw; + background: antiquewhite; + display: inline-block; -#solid-picture-remove { - margin-top: 2em; + + object { + max-height: 8.5vh; + max-width: 35vw; + } - @include breakpoint(lg) { - margin-top: 0; + img { + max-height: 8.5vh; + max-width: 35vw; } } diff --git a/src/views/project/page-project-picture.pug b/src/views/project/page-project-picture.pug index 9257a73..7bea1d9 100644 --- a/src/views/project/page-project-picture.pug +++ b/src/views/project/page-project-picture.pug @@ -4,7 +4,7 @@ div.content-box__info h1 Modifier l'image du projet - solid-picture( + solid-picture.project-edit-picture( bind-resources upload-src=`${endpoints.uploads || endpoints.post.uploads}` upload-id="solid-project-edit-picture" From efae21e6c2e6da0094183aeb9ebf7a9534a021ae Mon Sep 17 00:00:00 2001 From: gaelle morin Date: Wed, 8 Jul 2020 18:26:23 +0200 Subject: [PATCH 09/16] feature: project: modify image - refactoring --- src/styles/base/main.scss | 88 ------------------- src/styles/components/_index.scss | 3 +- .../components/project-edit-picture.scss | 39 ++++++++ 3 files changed, 41 insertions(+), 89 deletions(-) create mode 100644 src/styles/components/project-edit-picture.scss diff --git a/src/styles/base/main.scss b/src/styles/base/main.scss index a822009..950b85a 100644 --- a/src/styles/base/main.scss +++ b/src/styles/base/main.scss @@ -384,94 +384,6 @@ h5 { } } -/*.p_absolute { - position: absolute; - z-index: 1; -}*/ - -.project-edit-picture { - - >div>*:not(:last-child) { - margin-bottom: 2rem; - } - - solid-display { - max-height: 8.5vh; - max-width: 35vw; - } - - solid-ac-checker:first-of-type { - display: flex; - - #solid-picture-remove { - margin-left: 2rem; - } - } - - solid-ac-checker:last-of-type { - align-self: flex-end; - } -} - -.project-edit-picture hubl-user-avatar { - border-radius: 0; - max-height: 8.5vh; - max-width: 35vw; - background: antiquewhite; - display: inline-block; - - - object { - max-height: 8.5vh; - max-width: 35vw; - } - - img { - max-height: 8.5vh; - max-width: 35vw; - } -} - - -/*.p_relative { - position: relative; -} - -.is-inline-1200 { - - @include breakpoint(lg) { - flex-direction: row; - } -} - -.flex_vertical-center { - align-items: center; -} - -.flex_column { - flex-direction: column; -} - -.pull-left-1200 { - - @include breakpoint(lg) { - float: left; - } -} - - - -.profile-avatar { - height: 243px; - width: 243px; - margin-left: 2rem; -} - -solid-picture { - -}*/ - - .content-box { @include window-style-modal(); flex-direction: column; diff --git a/src/styles/components/_index.scss b/src/styles/components/_index.scss index d13f842..9f53556 100644 --- a/src/styles/components/_index.scss +++ b/src/styles/components/_index.scss @@ -3,4 +3,5 @@ @import 'filters'; @import 'sidebar'; @import 'skills'; -@import 'tags'; \ No newline at end of file +@import 'tags'; +@import 'project-edit-picture'; diff --git a/src/styles/components/project-edit-picture.scss b/src/styles/components/project-edit-picture.scss new file mode 100644 index 0000000..e167109 --- /dev/null +++ b/src/styles/components/project-edit-picture.scss @@ -0,0 +1,39 @@ +.project-edit-picture { + + >div>*:not(:last-child) { + margin-bottom: 2rem; + } + + hubl-user-avatar { + background: transparent; + border-radius: 0; + display: inline-block; + text-align: center; + + object, img { + position: relative; + } + } + + solid-ac-checker:first-of-type { + display: block; + + @include breakpoint(lg) { + display: flex; + } + + #solid-picture-remove { + margin-left: 0; + margin-top: 2rem; + + @include breakpoint(lg) { + margin-left: 2rem; + margin-top: 0; + } + } + } + + solid-ac-checker:last-of-type { + align-self: flex-end; + } +} From b28a2da35229dc1c544868765a796915e607d054 Mon Sep 17 00:00:00 2001 From: senza Date: Tue, 1 Sep 2020 12:45:39 +0200 Subject: [PATCH 10/16] remove logo from creation form #631 --- src/views/admin/page-admin-projects-create.pug | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/views/admin/page-admin-projects-create.pug b/src/views/admin/page-admin-projects-create.pug index de5e6d6..8caad09 100644 --- a/src/views/admin/page-admin-projects-create.pug +++ b/src/views/admin/page-admin-projects-create.pug @@ -17,7 +17,7 @@ div.content-box__info.flex solid-form.form.button-register( data-src=`${endpoints.projects || endpoints.post.projects}` - fields='status, line-1(customer.name, name), description, line-2(captain), logo' + fields='status, line-1(customer.name, name), description, line-2(captain)' label-status='Statut du cercle*' widget-status='hubl-status' @@ -39,10 +39,6 @@ div.content-box__info.flex widget-captain='solid-form-auto-completion' class='input-text-like' - widget-logo="solid-form-file" - label-logo="Télécharger un logo" - class-logo='select-add' - upload-url-logo=`${endpoints.uploads || endpoints.post.uploads}` next='admin-project-list' From 4a0447f5aeb4d87f2e98ccb2547e3072830bd057 Mon Sep 17 00:00:00 2001 From: senza Date: Tue, 1 Sep 2020 12:47:01 +0200 Subject: [PATCH 11/16] remove logo from edit form #631 --- src/views/project/page-project-edit.pug | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/src/views/project/page-project-edit.pug b/src/views/project/page-project-edit.pug index 84525fe..7ad1327 100644 --- a/src/views/project/page-project-edit.pug +++ b/src/views/project/page-project-edit.pug @@ -31,16 +31,6 @@ div.content-box__info next='project-information' ) - h2 Photo du projet - - solid-form.form-picture( - bind-resources - fields='customer.logo' - widget-customer.logo="hubl-user-avatar" - submit-button='Modifier la photo' - next='project-picture' - ) - h2 Liste des membres : solid-form.block.select-add( From 91e89852b3366d5743b8b1b68fba2e677ec75e0c Mon Sep 17 00:00:00 2001 From: senza Date: Tue, 1 Sep 2020 12:59:39 +0200 Subject: [PATCH 12/16] make projects always private #631 --- src/views/admin/page-admin-projects-create.pug | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/views/admin/page-admin-projects-create.pug b/src/views/admin/page-admin-projects-create.pug index 8caad09..4007644 100644 --- a/src/views/admin/page-admin-projects-create.pug +++ b/src/views/admin/page-admin-projects-create.pug @@ -20,8 +20,9 @@ div.content-box__info.flex fields='status, line-1(customer.name, name), description, line-2(captain)' label-status='Statut du cercle*' - widget-status='hubl-status' + widget-status='solid-form-hidden' class-status='form-label is-light is-full-width' + value-status="Private" label-description='Description du projet' class-description='form-label is-light is-full-width input-text-like' From 1957c79d2dbecc7c04f5a52a61879adfe37d56d5 Mon Sep 17 00:00:00 2001 From: senza Date: Tue, 1 Sep 2020 12:59:59 +0200 Subject: [PATCH 13/16] remove status field in edition form --- src/views/project/page-project-edit.pug | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/views/project/page-project-edit.pug b/src/views/project/page-project-edit.pug index 7ad1327..74568bf 100644 --- a/src/views/project/page-project-edit.pug +++ b/src/views/project/page-project-edit.pug @@ -9,11 +9,8 @@ div.content-box__info solid-form.form.button-register( bind-resources - fields='status, line-1(customer.name, name), description' + fields='line-1(customer.name, name), description' - label-status='Statut du cercle*' - widget-status='hubl-status' - class-status='form-label is-light is-full-width member-select color' label-name='Nom du projet*' class-name='form-label is-light is-half-width input-text-like' From b61bcc54befa15747c42f1d5742728f3d51a4840 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Pasquier Date: Thu, 3 Sep 2020 12:15:47 +0200 Subject: [PATCH 14/16] update: fix project and circles --- src/styles/base/user-thumb.scss | 1 + src/views/admin/page-admin-circles-create.pug | 2 +- .../admin/page-admin-projects-create.pug | 4 +- src/views/circle/page-circle-profile.pug | 28 ++++---- src/views/project/page-project-edit.pug | 61 +++++++++------- src/views/project/page-project-left.pug | 2 +- src/views/project/page-project-profile.pug | 72 +++++++++++-------- 7 files changed, 96 insertions(+), 74 deletions(-) diff --git a/src/styles/base/user-thumb.scss b/src/styles/base/user-thumb.scss index 2541099..8814efb 100644 --- a/src/styles/base/user-thumb.scss +++ b/src/styles/base/user-thumb.scss @@ -38,6 +38,7 @@ } .user-thumb__admin:not(:empty) { + display: block !important; @extend %tag-admin; } diff --git a/src/views/admin/page-admin-circles-create.pug b/src/views/admin/page-admin-circles-create.pug index 0572b8f..4ce3474 100644 --- a/src/views/admin/page-admin-circles-create.pug +++ b/src/views/admin/page-admin-circles-create.pug @@ -25,7 +25,7 @@ div.content-box__info.flex widget-status='hubl-status' - next='admin-circle-list' + next='circle' submit-button='Enregistrer' ) diff --git a/src/views/admin/page-admin-projects-create.pug b/src/views/admin/page-admin-projects-create.pug index 0198aa4..52af542 100644 --- a/src/views/admin/page-admin-projects-create.pug +++ b/src/views/admin/page-admin-projects-create.pug @@ -48,7 +48,7 @@ div.content-box__info.flex class='input-text-like' - next='admin-project-list' + next='project' - submit-button='Enregistrer et ajouter des membres' + submit-button='Enregistrer' ) diff --git a/src/views/circle/page-circle-profile.pug b/src/views/circle/page-circle-profile.pug index f92cbb5..3a699ed 100644 --- a/src/views/circle/page-circle-profile.pug +++ b/src/views/circle/page-circle-profile.pug @@ -26,7 +26,10 @@ solid-router(default-route='circle-profile', hidden) widget-creationDate='solid-display-date' ) solid-ac-checker(permission='acl:Append', bind-resources, nested-field='members') - solid-link(class='button mobile-full-width text-bold text-uppercase reversed button-primary bordered with-icon icon-pencil' next='circle-edit' bind-resources) Modifier et ajouter un membre + solid-ac-checker(permission='acl:Delete', bind-resources) + solid-link(class='button mobile-full-width text-bold text-uppercase reversed button-primary bordered with-icon icon-pencil' next='circle-edit' bind-resources) Modifier et ajouter un membre + solid-ac-checker(no-permission='acl:Delete', bind-resources) + solid-link(class='button mobile-full-width text-bold text-uppercase reversed button-primary bordered with-icon icon-pencil' next='circle-edit' bind-resources) Ajouter un membre div.flex.desktop-button__end @@ -39,11 +42,13 @@ solid-router(default-route='circle-profile', hidden) solid-widget(name='hubl-circle-leave-button') template - solid-delete( - class='button mobile-full-width desktop-btn-margin__left text-bold text-uppercase reversed button-secondary bordered with-icon icon-close' - data-src="${src}" - data-label='Quitter le cercle' - ) + solid-ac-checker(no-permission='acl:Delete', data-src="${src}", nested-field="circle") + solid-delete( + class='button mobile-full-width desktop-btn-margin__left text-bold text-uppercase reversed button-secondary bordered with-icon icon-close' + data-src="${src}" + data-label='Quitter le cercle' + next='circle-left' + ) solid-widget(name='hubl-circle-join-button') template @@ -52,12 +57,9 @@ solid-router(default-route='circle-profile', hidden) data-src='' nested-field='members' - fields='user.@id' - label-user.@id='' - value-user.@id='' - widget-user.@id='solid-form-hidden' - - hubl-inherit-bind-user2input="input[name='user.@id']" + fields='user.username' + value-user.username='hubl-workaround-493' + widget-user.username='solid-form-hidden' submit-button='Rejoindre le cercle' ) @@ -87,7 +89,5 @@ solid-router(default-route='circle-profile', hidden) widget-members='hubl-circle-team-template' ) - - #circle-edit.content-box__height(hidden) include page-circle-edit.pug diff --git a/src/views/project/page-project-edit.pug b/src/views/project/page-project-edit.pug index 74568bf..7ab7e0a 100644 --- a/src/views/project/page-project-edit.pug +++ b/src/views/project/page-project-edit.pug @@ -4,44 +4,52 @@ div.content-box__info solid-link(class='backlink right', bind-resources, next='project-profile') Retour - h1 Modifie ton projet + solid-ac-checker(permission='acl:Write', bind-resources) + h1 Modifie ton projet - solid-form.form.button-register( - bind-resources - - fields='line-1(customer.name, name), description' + div#loader-project-edit.loader.loader-top + div + div + div + div + + solid-form.form.button-register( + bind-resources + + fields='line-1(customer.name, name), description' - label-name='Nom du projet*' - class-name='form-label is-light is-half-width input-text-like' + label-name='Nom du projet*' + class-name='form-label is-light is-half-width input-text-like' - label-customer.name='Nom du client*' - class-customer.name='form-label is-light is-half-width input-text-like' + label-customer.name='Nom du client*' + class-customer.name='form-label is-light is-half-width input-text-like' - label-description='Description du projet' - class-description='form-label is-light is-full-width input-text-like' - widget-description='solid-form-textarea' + label-description='Description du projet' + class-description='form-label is-light is-full-width input-text-like' + widget-description='solid-form-textarea' - partial="" + partial="" - submit-button='Enregistrer' - next='project-information' - ) + submit-button='Enregistrer' + next='project-information' + ) h2 Liste des membres : - solid-form.block.select-add( - bind-resources - nested-field='members' - fields='user' - range-user=`${endpoints.users || endpoints.get.users}` + solid-ac-checker(permission='acl:Append', bind-resources, nested-field='members') + solid-form.block.select-add( + bind-resources + nested-field='members' + fields='user' + range-user=`${endpoints.users || endpoints.get.users}` - class-user='team form-label is-light' - label-user='' - widget-user='solid-form-auto-completion' + class-user='team form-label is-light' + label-user='' + widget-user='solid-form-auto-completion' - submit-button='Ajouter un membre' - ) + submit-button='Ajouter un membre' + ) .table-wrapper .table @@ -54,6 +62,7 @@ div.content-box__info class='table-body' bind-resources fields='members' + loader-id='loader-project-edit' multiple-members='' widget-members='hubl-team-template-edit' diff --git a/src/views/project/page-project-left.pug b/src/views/project/page-project-left.pug index 0283db4..baac307 100644 --- a/src/views/project/page-project-left.pug +++ b/src/views/project/page-project-left.pug @@ -2,4 +2,4 @@ div.content-box__info.flex(style="padding: 15px") p Tu as quitté ce projet. - p Ceci est un groupe privé. Pour le rejoindre, rends-toi dans le panneau administration et demande une invitation. + p Ceci est un projet privé. Pour le rejoindre, rends-toi dans le panneau administration et demande une invitation. diff --git a/src/views/project/page-project-profile.pug b/src/views/project/page-project-profile.pug index 102c24f..a81fd3e 100644 --- a/src/views/project/page-project-profile.pug +++ b/src/views/project/page-project-profile.pug @@ -4,15 +4,21 @@ solid-router(default-route='project-profile', hidden) #project-profile(hidden) include ../../templates/hubl-captain.pug - include ../../templates/hubl-circle-team.pug include ../../templates/hubl-project-team.pug .content-box__info.flex + div#loader-project-profile.loader + div + div + div + div + .flex.space-between.with-padding.mobile-vertical-align solid-display.mobile-margin__bottom( bind-resources fields='creationDateSet(title, creationDate)' + loader-id='loader-project-profile' class-title='word-spacing-right' @@ -21,23 +27,43 @@ solid-router(default-route='project-profile', hidden) widget-creationDate='solid-display-date' ) solid-ac-checker(permission='acl:Append', bind-resources, nested-field='members') - solid-link(class='button mobile-full-width text-bold text-uppercase reversed button-primary bordered with-icon icon-pencil' next='project-edit' bind-resources) Modifier et ajouter un membre + solid-ac-checker(permission='acl:Delete', bind-resources) + solid-link(class='button mobile-full-width text-bold text-uppercase reversed button-primary bordered with-icon icon-pencil' next='project-edit' bind-resources) Modifier et ajouter un membre + solid-ac-checker(no-permission='acl:Delete', bind-resources) + solid-link(class='button mobile-full-width text-bold text-uppercase reversed button-primary bordered with-icon icon-pencil' next='project-edit' bind-resources) Ajouter un membre - solid-display( - class='flex desktop-button__end' - bind-resources - nested-field='members' - fields='relation' + div.flex.desktop-button__end + solid-ac-checker(permission='acl:Delete', bind-resources) + solid-delete( + class='button mobile-full-width text-bold text-uppercase button-primary bordered with-icon icon-trash' + bind-resources + data-label='Supprimer le projet' + ) - action-relation='relation' - widget-relation='hubl-project-leave-button' + solid-widget(name='hubl-project-leave-button') + template + solid-delete( + class='button mobile-full-width desktop-btn-margin__left text-bold text-uppercase reversed button-secondary bordered with-icon icon-close' + data-src="${src}" + data-label='Quitter le projet' + next='project-left' + ) - search-fields='user' - search-widget-user='solid-form-hidden' - search-value-user="" + solid-ac-checker(no-permission='acl:Delete', bind-resources) + solid-display( + bind-resources + nested-field='members' + fields='relation' - hubl-inherit-user-id="search-value-user" - ) + action-relation='relation' + widget-relation='hubl-project-leave-button' + + search-fields='user' + search-widget-user='solid-form-hidden' + search-value-user="" + + hubl-inherit-user-id="search-value-user" + ) .flex.space-between solid-display( @@ -48,13 +74,8 @@ solid-router(default-route='project-profile', hidden) class-label-captain='h2-like' widget-captain='hubl-captain' ) - solid-display( - class='customer-logo' - bind-resources - fields='customer.logo' - - widget-customer.logo='solid-display-img' - ) + + br h2 Equipe : @@ -66,14 +87,5 @@ solid-router(default-route='project-profile', hidden) widget-members='hubl-project-team' ) - - solid-widget(name='hubl-project-leave-button') - template - solid-delete( - class='button mobile-full-width desktop-btn-margin__left text-bold text-uppercase reversed button-secondary bordered with-icon icon-close' - data-src="${src}" - data-label='Quitter le groupe' - ) - #project-edit.content-box__height(hidden) include page-project-edit.pug From f93b6bc2aa5f2fb24d6470b8180796f8aae4801c Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Pasquier Date: Thu, 3 Sep 2020 12:00:59 +0000 Subject: [PATCH 15/16] cicd: rename georgetown-uni to ejp --- .gitlab-ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index abdd685..47230a2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -553,15 +553,15 @@ apidays: tags: - deploy -georgetownuni: +ejp: stage: deployment environment: - name: georgetownuni - url: https://georgetown-uni.hubl.world + name: ejp + url: https://ejp.hubl.world before_script: - npm ci --cache .npm --prefer-offline --only=production script: - - echo "$APP_CONFIG_GEORGETOWNUNI" > config.json + - echo "$APP_CONFIG_EJP" > config.json - echo "$SSH_DEPLOY_KEY" | tr -d '\r' > gitlab.key && chmod 600 gitlab.key - npm run build - scp -i gitlab.key -o StrictHostKeyChecking=no -r dist/* georgetown-uni@astral.startinblox.com:~/front/ From 1172fdba26f20e41d49f7f6aabbd85128ba4fe44 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Pasquier Date: Thu, 3 Sep 2020 15:40:10 +0200 Subject: [PATCH 16/16] fix: remove project description --- src/views/admin/page-admin-projects-create.pug | 6 +----- src/views/project/page-project-edit.pug | 6 +----- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/src/views/admin/page-admin-projects-create.pug b/src/views/admin/page-admin-projects-create.pug index 52af542..1bec5c3 100644 --- a/src/views/admin/page-admin-projects-create.pug +++ b/src/views/admin/page-admin-projects-create.pug @@ -23,7 +23,7 @@ div.content-box__info.flex solid-form.form.button-register( data-src=`${endpoints.projects || endpoints.post.projects}` - fields='status, line-1(customer.name, name), description, line-2(captain)' + fields='status, line-1(customer.name, name), line-2(captain)' loader-id='loader-projects-create' label-status='Statut du cercle*' @@ -31,10 +31,6 @@ div.content-box__info.flex class-status='form-label is-light is-full-width' value-status="Private" - label-description='Description du projet' - class-description='form-label is-light is-full-width input-text-like' - widget-description='solid-form-textarea' - label-customer.name='Nom du client*' class-customer.name='form-label is-light is-half-width input-text-like' diff --git a/src/views/project/page-project-edit.pug b/src/views/project/page-project-edit.pug index 7ab7e0a..82a6c1a 100644 --- a/src/views/project/page-project-edit.pug +++ b/src/views/project/page-project-edit.pug @@ -16,7 +16,7 @@ div.content-box__info solid-form.form.button-register( bind-resources - fields='line-1(customer.name, name), description' + fields='line-1(customer.name, name)' label-name='Nom du projet*' @@ -25,10 +25,6 @@ div.content-box__info label-customer.name='Nom du client*' class-customer.name='form-label is-light is-half-width input-text-like' - label-description='Description du projet' - class-description='form-label is-light is-full-width input-text-like' - widget-description='solid-form-textarea' - partial="" submit-button='Enregistrer'