From 101617fed8aa3357ec3579d67396250057740940 Mon Sep 17 00:00:00 2001 From: maxime_senza Date: Wed, 27 May 2020 12:42:08 +0200 Subject: [PATCH 1/6] feature : project - remove unwanted fields from the creation form --- src/views/admin/page-admin-projects-create.pug | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/src/views/admin/page-admin-projects-create.pug b/src/views/admin/page-admin-projects-create.pug index 44c9101..ae158bd 100644 --- a/src/views/admin/page-admin-projects-create.pug +++ b/src/views/admin/page-admin-projects-create.pug @@ -21,33 +21,21 @@ div.content-box__info sib-form( data-src=`${endpoints.projects || endpoints.post.projects}` - fields='line-1(customer, name), line-3(project.description), fieldset-fee, line-4(businessProvider.name, businessProvider.fee), fieldset-captain, line-10(captain)' + fields='line-1(customer, name), line-10(captain)' class-fieldset-fee='fieldset' value-fieldset-fee='Contributions' widget-fieldset-fee='hubl-template-project-title' class-fieldset-captain='fieldset' - value-fieldset-captain='Capitaine' widget-fieldset-captain='hubl-template-project-title' label-customer='Nom du client*' - class-customer='member-select form-label is-light is-half-width' - range-customer=`${endpoints.customers || endpoints.get.customers}` - widget-customer='sib-form-auto-completion' + class-customer='form-label is-light is-half-width' label-name='Nom du projet*' class-name='form-label is-light is-half-width' - label-project.description='Description du projet' - class-project.description='form-label is-light is-full-width' - widget-project.description='sib-form-textarea' - - label-businessProvider.name='Apporteur d\'affaire*' - class-businessProvider.name='form-label is-light is-half-width' - - label-businessProvider.fee='Contribution' - class-businessProvider.fee='form-label is-light is-half-width' label-captain='Capitaine du projet' range-captain=`${endpoints.users || endpoints.get.users}` From 424b8338ef0b6a7edb07c411c94c74ef8678666e Mon Sep 17 00:00:00 2001 From: maxime_senza Date: Thu, 28 May 2020 23:17:16 +0200 Subject: [PATCH 2/6] feature: remove unwanted content & fix css for table --- src/styles/base/table.scss | 1 + src/views/admin/page-admin-projects.pug | 2 +- src/views/project/page-project-profile.pug | 46 +++++++++------------- 3 files changed, 20 insertions(+), 29 deletions(-) diff --git a/src/styles/base/table.scss b/src/styles/base/table.scss index e8a8513..2abc146 100644 --- a/src/styles/base/table.scss +++ b/src/styles/base/table.scss @@ -30,6 +30,7 @@ border-right: 1px solid var(--color-table-border); padding: 2.1rem 0; text-align: center; + width:25%; } >*:last-of-type { diff --git a/src/views/admin/page-admin-projects.pug b/src/views/admin/page-admin-projects.pug index 6f83ba0..53398c3 100644 --- a/src/views/admin/page-admin-projects.pug +++ b/src/views/admin/page-admin-projects.pug @@ -26,7 +26,7 @@ div Nom div Administrateurs div Capitaines - div Accès + div Rejoindre sib-widget(name="hubl-admin-project-leave-button") template diff --git a/src/views/project/page-project-profile.pug b/src/views/project/page-project-profile.pug index d596826..69a04f0 100644 --- a/src/views/project/page-project-profile.pug +++ b/src/views/project/page-project-profile.pug @@ -23,8 +23,23 @@ sib-router(default-route='project-profile', hidden) ) sib-ac-checker(permission='acl:Append', bind-resources, nested-field='members') sib-link(class='button text-bold text-uppercase reversed button-primary bordered with-icon icon-pencil' next='project-edit' bind-resources) Modifier et ajouter un membre + + sib-display( + class='position-end' + bind-resources + nested-field='members' + fields='relation' + + action-relation='relation' + widget-relation='hubl-project-leave-button' + + search-fields='user' + search-widget-user='sib-form-hidden' + search-value-user="" + + hubl-inherit-user-id="search-value-user" + ) - .space-between sib-display( bind-resources @@ -42,19 +57,6 @@ sib-router(default-route='project-profile', hidden) widget-customer.logo='sib-display-img' ) - h2 Contributions: - sib-link(next='project-contributions-help').button-question__position - button(aria-label='modal activator').icon-question.button-question__color - - h2 Informations sur le client : - - sib-display( - bind-resources - fields='customer' - - widget-customer='hubl-customer' - ) - h2 Equipe : sib-display( @@ -65,6 +67,7 @@ sib-router(default-route='project-profile', hidden) multiple-members ) + sib-widget(name='hubl-project-leave-button') template sib-delete( @@ -72,22 +75,9 @@ sib-router(default-route='project-profile', hidden) data-src="${src}" data-label='Quitter le groupe' ) + - sib-display( - class='position-end' - bind-resources - nested-field='members' - fields='relation' - action-relation='relation' - widget-relation='hubl-project-leave-button' - - search-fields='user' - search-widget-user='sib-form-hidden' - search-value-user="" - - hubl-inherit-user-id="search-value-user" - ) #project-edit(hidden) From 62b781ed28d21d7f1682a9c9f75f8e50cde2ecdf Mon Sep 17 00:00:00 2001 From: maxime_senza Date: Sat, 30 May 2020 10:08:18 +0200 Subject: [PATCH 3/6] feature: removing unwanted content && personnalizing content for FNK needs --- src/styles/layout/project/_index.scss | 1 + src/styles/layout/project/project-create.scss | 11 +++++++++++ src/views/admin/page-admin-projects-create.pug | 16 +++++++++++++--- src/views/admin/page-admin-projects.pug | 4 ++-- 4 files changed, 27 insertions(+), 5 deletions(-) create mode 100644 src/styles/layout/project/project-create.scss diff --git a/src/styles/layout/project/_index.scss b/src/styles/layout/project/_index.scss index 5a93164..8c168b5 100644 --- a/src/styles/layout/project/_index.scss +++ b/src/styles/layout/project/_index.scss @@ -1 +1,2 @@ @import 'project-profile'; +@import 'project-create'; diff --git a/src/styles/layout/project/project-create.scss b/src/styles/layout/project/project-create.scss new file mode 100644 index 0000000..ee31f2f --- /dev/null +++ b/src/styles/layout/project/project-create.scss @@ -0,0 +1,11 @@ +/*File made to personnalise upload button | Module will change from sib uploader to sib-images*/ + +#admin-project-create{ + @supports(-webkit-appearance: none) or (-moz-appearance: none) { + input[type="file"]{ + } + input[type="file"]:after{ + + } + } +} \ No newline at end of file diff --git a/src/views/admin/page-admin-projects-create.pug b/src/views/admin/page-admin-projects-create.pug index ae158bd..ceac417 100644 --- a/src/views/admin/page-admin-projects-create.pug +++ b/src/views/admin/page-admin-projects-create.pug @@ -16,12 +16,16 @@ div.content-box__info naked ) - h1.centered Créer un projet + h1 Créer un nouveau projet sib-form( data-src=`${endpoints.projects || endpoints.post.projects}` - fields='line-1(customer, name), line-10(captain)' + fields='status,line-1(customer, name), line-10(captain),logo' + + label-status='Statut du canal' + widget-status='hubl-status' + class-status='form-label is-light is-full-width member-select color' class-fieldset-fee='fieldset' value-fieldset-fee='Contributions' @@ -42,7 +46,13 @@ div.content-box__info class-captain='member-select form-label is-light is-half-width' widget-captain='sib-form-auto-completion' + widget-logo="sib-form-file" + label-logo="Télécharger un logo" + upload-url-logo="https://api.test3.startinblox.com/upload/" + next='admin-project-list' - submit-button='Enregistrer' + submit-button='Enregistrer et ajouter des membres' ) + // + !!! WARNING Logo upload URL hardcoded to test server !!! diff --git a/src/views/admin/page-admin-projects.pug b/src/views/admin/page-admin-projects.pug index 53398c3..a281bfc 100644 --- a/src/views/admin/page-admin-projects.pug +++ b/src/views/admin/page-admin-projects.pug @@ -19,7 +19,7 @@ sib-link( class='button text-bold text-uppercase reversed button-primary bordered with-icon icon-plus' next='admin-project-create' - ) Créer un projet + ) Créer un nouveau projet .table div.table-header.grey-color @@ -85,7 +85,7 @@ class-captain='w25 cell border cell-with-id-card' class-buttons='w25 cell border cell-with-buttons' - widget-buttons="admin-project-buttons" + widget-buttons="hubl-admin-project-buttons" action-buttons="buttons" widget-captain='hubl-project-captain' From 4f351f37fbb4620a48ad173e2a7a15de08af3a14 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Pasquier Date: Mon, 1 Jun 2020 13:02:46 +0200 Subject: [PATCH 4/6] remove useless style --- src/styles/layout/project/_index.scss | 1 - src/styles/layout/project/project-create.scss | 11 ----------- 2 files changed, 12 deletions(-) delete mode 100644 src/styles/layout/project/project-create.scss diff --git a/src/styles/layout/project/_index.scss b/src/styles/layout/project/_index.scss index 8c168b5..5a93164 100644 --- a/src/styles/layout/project/_index.scss +++ b/src/styles/layout/project/_index.scss @@ -1,2 +1 @@ @import 'project-profile'; -@import 'project-create'; diff --git a/src/styles/layout/project/project-create.scss b/src/styles/layout/project/project-create.scss deleted file mode 100644 index ee31f2f..0000000 --- a/src/styles/layout/project/project-create.scss +++ /dev/null @@ -1,11 +0,0 @@ -/*File made to personnalise upload button | Module will change from sib uploader to sib-images*/ - -#admin-project-create{ - @supports(-webkit-appearance: none) or (-moz-appearance: none) { - input[type="file"]{ - } - input[type="file"]:after{ - - } - } -} \ No newline at end of file From a247792ed49f15c18f883568731265cac07ff702 Mon Sep 17 00:00:00 2001 From: maxime_senza Date: Mon, 1 Jun 2020 16:24:05 +0200 Subject: [PATCH 5/6] feature project : remove client and business profider fields in edition form --- src/views/project/page-project-edit.pug | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/views/project/page-project-edit.pug b/src/views/project/page-project-edit.pug index 2a387f0..b3c7517 100644 --- a/src/views/project/page-project-edit.pug +++ b/src/views/project/page-project-edit.pug @@ -13,26 +13,18 @@ div.content-box__info sib-form.form-edit( bind-resources - fields='fieldset-info, block-project__info(customer, name, description), fieldset-fee, block-project__fee(businessProvider, businessProviderFee)' + fields='fieldset-info, block-project__info(name, description), fieldset-fee)' - class-customer='member-select form-label is-light is-half-width' - widget-customer='sib-form-auto-completion' class-name='form-label is-light is-half-width' class-description='form-label is-light is-full-width' label-fieldset-info='' - label-customer='Client*' - range-customer=`${endpoints.customers || endpoints.get.customers}` label-name='Nom du projet*' label-description='Description du projet' widget-fieldset-info='hubl-fieldset-title' widget-description='sib-form-textarea' class-fieldset-fee='fieldset' - class-businessprovider='form-label is-light is-half-width' - class-businessproviderfee='form-label is-light is-half-width' label-fieldset-fee='Contributions' - label-businessprovider='Apporteur d\'affaire' - label-businessproviderfee='Montant de la contribution' widget-fieldset-fee='hubl-fieldset-title' submit-button='Enregistrer' From 701c06a556e2708c78dbe380ce7038cd29d67cec Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Pasquier Date: Mon, 1 Jun 2020 17:29:30 +0200 Subject: [PATCH 6/6] fix: clean project and make it works --- src/templates/hubl-captain.pug | 2 +- .../admin/page-admin-projects-create.pug | 22 +++--- src/views/admin/page-admin-projects.pug | 72 +++++++++++++------ src/views/project/page-project-edit.pug | 25 ++++--- 4 files changed, 77 insertions(+), 44 deletions(-) diff --git a/src/templates/hubl-captain.pug b/src/templates/hubl-captain.pug index aacb117..4e9971b 100644 --- a/src/templates/hubl-captain.pug +++ b/src/templates/hubl-captain.pug @@ -12,5 +12,5 @@ sib-widget(name='hubl-captain') class-is_lead='user-thumb__lead' widget-account.picture='hubl-user-avatar' - value-is_lead='Project lead' + value-is_lead='Capitaine' ) diff --git a/src/views/admin/page-admin-projects-create.pug b/src/views/admin/page-admin-projects-create.pug index ceac417..ccb0082 100644 --- a/src/views/admin/page-admin-projects-create.pug +++ b/src/views/admin/page-admin-projects-create.pug @@ -21,38 +21,36 @@ div.content-box__info sib-form( data-src=`${endpoints.projects || endpoints.post.projects}` - fields='status,line-1(customer, name), line-10(captain),logo' + fields='status,line-1(customer.name, name), description, line-10(captain), logo' - label-status='Statut du canal' + label-status='Statut du canal*' widget-status='hubl-status' class-status='form-label is-light is-full-width member-select color' - class-fieldset-fee='fieldset' - value-fieldset-fee='Contributions' - widget-fieldset-fee='hubl-template-project-title' + label-description='Description du projet' + class-description='form-label is-light is-full-width' + widget-description='sib-form-textarea' class-fieldset-captain='fieldset' widget-fieldset-captain='hubl-template-project-title' - label-customer='Nom du client*' - class-customer='form-label is-light is-half-width' + label-customer.name='Nom du client*' + class-customer.name='form-label is-light is-half-width' label-name='Nom du projet*' class-name='form-label is-light is-half-width' - - label-captain='Capitaine du projet' + label-captain='Capitaine du projet*' range-captain=`${endpoints.users || endpoints.get.users}` class-captain='member-select form-label is-light is-half-width' widget-captain='sib-form-auto-completion' widget-logo="sib-form-file" label-logo="Télécharger un logo" - upload-url-logo="https://api.test3.startinblox.com/upload/" + class-logo='form-label is-light is-full-width' + upload-url-logo=`${endpoints.uploads || endpoints.post.uploads}` next='admin-project-list' submit-button='Enregistrer et ajouter des membres' ) - // - !!! WARNING Logo upload URL hardcoded to test server !!! diff --git a/src/views/admin/page-admin-projects.pug b/src/views/admin/page-admin-projects.pug index a281bfc..c9fa9b2 100644 --- a/src/views/admin/page-admin-projects.pug +++ b/src/views/admin/page-admin-projects.pug @@ -23,10 +23,10 @@ .table div.table-header.grey-color - div Nom - div Administrateurs - div Capitaines - div Rejoindre + div.w25 Nom + div.w25 Administrateurs + div.w25 Capitaines + div.w25 Rejoindre sib-widget(name="hubl-admin-project-leave-button") template @@ -60,36 +60,66 @@ widget-user='hubl-project-captain' ) - sib-widget(name="hubl-admin-project-buttons") + sib-widget(name='hubl-admin-project-leave-button') template - sib-display( - data-src='${src}' - nested-field='members' - fields='relation' - action-relation='relation' - widget-relation='hubl-admin-project-leave-button' - search-fields='user' - search-widget-user='sib-form-hidden' - search-value-user="-" - hubl-inherit-user-id="search-value-user" + sib-delete( + class='button text-bold text-uppercase reversed button-secondary bordered with-icon icon-close' + data-src="${src}" + data-label='Quitter' ) sib-display( class='table-body' - data-src=`${endpoints.projects || endpoints.get.projects}` - fields='name, members, captain, buttons' + bind-user + nested-field="projects" + fields='project.name, project.members, project.captain, leaveButton' - class-name='w25 cell border cell-with-name hashtag' + class-project.name='w25 cell border cell-with-name' + class-project.members='w25 cell border' + class-project.captain='w25 cell border cell-with-id-card' + class-leaveButton='w25 cell border cell-with-buttons' + + action-leaveButton="joinButton" + widget-leaveButton="hubl-admin-project-leave-button" + + widget-project.captain='hubl-project-captain' + widget-project.members='hubl-project-admins' + + order-by="project.name" + ) + + sib-widget(name='hubl-admin-project-join-button') + template + sib-form.button.text-bold.text-uppercase.reversed.button-primary.bordered.with-icon.icon-arrow-right-circle.flex( + data-src='${src}' + nested-field="members" + + fields='user.username' + value-user.username='hubl-workaround-493' + widget-user.username='sib-form-hidden' + + submit-button='Rejoindre' + ) + + sib-display( + class='table-body' + + data-src=`${endpoints.projects || endpoints.get.projects}joinable/` + fields='name, members, captain, joinButton' + + class-name='w25 cell border cell-with-name' class-members='w25 cell border' class-captain='w25 cell border cell-with-id-card' - class-buttons='w25 cell border cell-with-buttons' + class-joinButton='w25 cell border cell-with-buttons' - widget-buttons="hubl-admin-project-buttons" - action-buttons="buttons" + action-joinButton="joinButton" # Workaround: I need members two times + widget-joinButton="hubl-admin-project-join-button" widget-captain='hubl-project-captain' widget-members='hubl-project-admins' + + order-by="name" ) #admin-project-create(hidden) diff --git a/src/views/project/page-project-edit.pug b/src/views/project/page-project-edit.pug index b3c7517..ebbcfb5 100644 --- a/src/views/project/page-project-edit.pug +++ b/src/views/project/page-project-edit.pug @@ -13,21 +13,26 @@ div.content-box__info sib-form.form-edit( bind-resources - fields='fieldset-info, block-project__info(name, description), fieldset-fee)' + fields='status, block-project__info(customer.name, name), description' + + label-status='Statut du canal*' + widget-status='hubl-status' + class-status='form-label is-light is-full-width member-select color' - class-name='form-label is-light is-half-width' - class-description='form-label is-light is-full-width' - label-fieldset-info='' label-name='Nom du projet*' + class-name='form-label is-light is-half-width' + + label-customer.name='Nom du client*' + class-customer.name='form-label is-light is-half-width' + label-description='Description du projet' - widget-fieldset-info='hubl-fieldset-title' + class-description='form-label is-light is-full-width' widget-description='sib-form-textarea' - class-fieldset-fee='fieldset' - label-fieldset-fee='Contributions' - widget-fieldset-fee='hubl-fieldset-title' + partial="" submit-button='Enregistrer' + next='project-information' ) h2 Liste des membres : @@ -48,8 +53,8 @@ div.content-box__info .table div.table-header.grey-color - div Nom - div Accès + div.w66 Nom + div.w33 Accès //-class='table-body' sib-display(