From 101617fed8aa3357ec3579d67396250057740940 Mon Sep 17 00:00:00 2001 From: maxime_senza Date: Wed, 27 May 2020 12:42:08 +0200 Subject: [PATCH 01/11] 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 02/11] 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 03/11] 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 04/11] 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 05/11] 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 06/11] 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( From 9a084d5cae85233fdcf9e0f17d87dfa99ee8b00b Mon Sep 17 00:00:00 2001 From: gaelle morin Date: Mon, 15 Jun 2020 10:15:19 +0200 Subject: [PATCH 07/11] fix: colors for directory with hubl colors --- src/styles/abstracts/_variables.scss | 55 +++++++++++++++++++++++++++- 1 file changed, 54 insertions(+), 1 deletion(-) diff --git a/src/styles/abstracts/_variables.scss b/src/styles/abstracts/_variables.scss index 13c0135..eff3b70 100644 --- a/src/styles/abstracts/_variables.scss +++ b/src/styles/abstracts/_variables.scss @@ -124,9 +124,62 @@ --color-directory-complementary: var(--color-complementary)!important; --color-directory-complementary-darken: var(--color-complementary-darken)!important; --color-directory-white: var(--color-white)!important; - --color-directory-black: var(--color-black)!important; + --color-directory-black: var(--color-black) !important; + + --color-directory-h1: var(--color-directory-complementary-darken) !important; + --color-directory-text: var(--color-grey-5) !important; + --color-directory-avatar-background: var(--color-avatar-background) !important; + --color-directory-send-border: var(--color-directory-complementary) !important; + --color-directory-list-icon: var(--color-directory-primary) !important; + --color-directory-back-link: var(--color-grey-1) !important; + --color-directory-border: #DAE2F3 !important; + --color-directory-content-header-border: #DAE2F3 !important; + + --color-directory-counter-background: #F0F3F6 !important; + --color-directory-counter-border: #9BA0A7 !important; + --color-directory-counter-text: var(--color-grey-3) !important; + + --color-directory-paginate: var(--color-grey-1) !important; + --color-directory-paginate-disabled: #9BA0A7 !important; + + --color-directory-form-input: #EDF1FA !important; + --color-directory-form-input-text: var(--color-directory-grey-4) !important; + --color-directory-form-input-active: var(--color-directory-complementary) !important; + --color-directory-form-select-icon: var(--color-directory-complementary) !important; } + +/* Colors for buttons to send a message to a member and to update or remove your profile picture */ +#member-profile>div.profile-card>div.user-profile>div>sib-display>div>sib-action.button.button-primary.bordered, +button#sib-picture-browse.button.button-primary, +button#sib-picture-remove.button.button-primary { + border: 1px solid var(--color-directory-complementary) !important; +} + +#member-profile sib-action.button.button-primary>sib-link, +button#sib-picture-browse.button.button-primary, +button#sib-picture-remove.button.button-primary { + color: var(--color-directory-complementary) !important; +} + +#member-profile>div.profile-card>div.user-profile>div>sib-display>div>sib-action.button.button-primary.bordered>sib-link::before { + background-color: var(--color-directory-complementary); +} + +/* Hover */ +#member-profile sib-action.button.button-primary:hover, +#member-profile sib-action.button.button-primary:hover>sib-link, +button#sib-picture-browse.button.button-primary:hover, +button#sib-picture-remove.button.button-primary:hover { + color: var(--color-directory-white) !important; + background-color: var(--color-directory-complementary) !important; +} + +#member-profile>div.profile-card>div.user-profile>div>sib-display>div>sib-action.button.button-primary.bordered:hover>sib-link::before { + background-color: var(--color-directory-white); +} + + /* Variables for event */ $color-212-4-50: hsl(212.7,4.3%,50%); $color-0-0-22: hsl(0,0%,22.7%); From 34ec5d9d380bcb9d645614cc81293e1cd8b27854 Mon Sep 17 00:00:00 2001 From: Jure Ursic Date: Mon, 15 Jun 2020 13:56:13 +0200 Subject: [PATCH 08/11] feature: project picture --- src/dependencies.pug | 2 +- src/page-project.pug | 5 ++++- src/views/admin/page-admin-projects-create.pug | 9 ++------- src/views/project/page-project-edit.pug | 10 ++++++++++ src/views/project/page-project-picture.pug | 14 ++++++++++++++ 5 files changed, 31 insertions(+), 9 deletions(-) create mode 100644 src/views/project/page-project-picture.pug diff --git a/src/dependencies.pug b/src/dependencies.pug index 5de986a..ca6e07e 100644 --- a/src/dependencies.pug +++ b/src/dependencies.pug @@ -25,7 +25,7 @@ if endpoints.joboffers || (endpoints.get && endpoints.get.joboffers) if (endpoints.uploads || (endpoints.get && endpoints.get.uploads)) && (endpoints.skills || (endpoints.get && endpoints.get.skills)) && (endpoints.users || (endpoints.get && endpoints.get.users)) script(type="module" src="https://unpkg.com/@startinblox/component-directory@0.3" defer) - //- script(type="module" src="/lib/sib-directory/index.js" defer) + //- script(type="module" src="/lib/sib-directory/dist/index.js" defer) if endpoints.dashboards || (endpoints.get && endpoints.get.dashboards) script(type="module" src="https://unpkg.com/@startinblox/component-dashboard@0.1" defer) diff --git a/src/page-project.pug b/src/page-project.pug index 49eb16a..b01d888 100644 --- a/src/page-project.pug +++ b/src/page-project.pug @@ -22,6 +22,8 @@ include views/project/page-project-chat.pug #project-information(hidden) include views/project/page-project-profile.pug + #project-picture(hidden) + include views/project/page-project-picture.pug dialog(id='project-contributions-help').modal sib-link(next='project-profile') @@ -39,4 +41,5 @@ nav.jsRightMenu(role='navigation') sib-route(name='project-information') li a Information - sib-route(name='project-contributions-help') \ No newline at end of file + sib-route(name='project-contributions-help') + sib-route(name='project-picture' use-id) \ 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 ccb0082..6ef4939 100644 --- a/src/views/admin/page-admin-projects-create.pug +++ b/src/views/admin/page-admin-projects-create.pug @@ -21,7 +21,7 @@ div.content-box__info sib-form( data-src=`${endpoints.projects || endpoints.post.projects}` - fields='status,line-1(customer.name, name), description, line-10(captain), logo' + fields='status,line-1(customer.name, name), description, line-10(captain)' label-status='Statut du canal*' widget-status='hubl-status' @@ -45,12 +45,7 @@ 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" - class-logo='form-label is-light is-full-width' - upload-url-logo=`${endpoints.uploads || endpoints.post.uploads}` - - next='admin-project-list' + next='project-picture' submit-button='Enregistrer et ajouter des membres' ) diff --git a/src/views/project/page-project-edit.pug b/src/views/project/page-project-edit.pug index ebbcfb5..1480145 100644 --- a/src/views/project/page-project-edit.pug +++ b/src/views/project/page-project-edit.pug @@ -35,6 +35,16 @@ div.content-box__info next='project-information' ) + h2 PPhoto du projet + + sib-form.form-picture( + bind-resources + fields='customer.logo' + widget-customer.logo="hubl-user-avatar" + submit-button='Edit' + next='project-picture' + ) + h2 Liste des membres : sib-form.block.select-add-member( diff --git a/src/views/project/page-project-picture.pug b/src/views/project/page-project-picture.pug new file mode 100644 index 0000000..7c92ccc --- /dev/null +++ b/src/views/project/page-project-picture.pug @@ -0,0 +1,14 @@ +div.content-box__info + + sib-link(class='backlink right', bind-resources, next='project-edit') Retour + + h1 Modifier l'image du projet + + sib-picture( + bind-resources + upload-src=`${endpoints.uploads || endpoints.post.uploads}` + upload-id="sib-project-edit-picture" + nested-fields='customer' + fields='logo' + next='project-edit' + ) From 4e0f307a83bdfd832e25d38ea1b43783f1fbdfef Mon Sep 17 00:00:00 2001 From: gaelle morin Date: Mon, 15 Jun 2020 16:32:47 +0200 Subject: [PATCH 09/11] fix: colors moved to client.sample.happy-dev.css --- client.sample.happy-dev.css | 46 ++++++++++++++++++------ src/styles/abstracts/_variables.scss | 53 ---------------------------- 2 files changed, 35 insertions(+), 64 deletions(-) diff --git a/client.sample.happy-dev.css b/client.sample.happy-dev.css index 8642cc0..786b931 100644 --- a/client.sample.happy-dev.css +++ b/client.sample.happy-dev.css @@ -123,6 +123,15 @@ --color-directory-list-icon: var(--color-primary); --color-directory-text: var(--color-directory-grey-4); + --color-directory-send-border: var(--color-complementary); + --color-directory-list-icon: var(--color-primary); + --color-directory-counter-background: var(--color-directory-grey-5); + --color-directory-counter-border: #9BA0A7; + --color-directory-counter-text: #4A4A4A; + + --color-directory-paginate: #36383B; + --color-directory-paginate-disabled: #9BA0A7; + --color-directory-form-input: #EDF1FA; --color-directory-form-input-text: var(--color-directory-grey-4); --color-directory-form-input-active: var(--color-complementary); @@ -202,17 +211,32 @@ /* Directory - my profile*/ -/* Button to update the avatar */ -#sib-picture-browse, -#sib-picture-remove { - background-color: var(--color-white); - border: 1px solid var(--color-complementary); - color: var(--color-complementary); +/* Colors for buttons to send a message to a member and to update or remove your profile picture */ +#member-profile>div.profile-card>div.user-profile>div>sib-display>div>sib-action.button.button-primary.bordered, +button#sib-picture-browse.button.button-primary, +button#sib-picture-remove.button.button-primary { + border: 1px solid var(--color-directory-complementary); } -#sib-picture-browse:hover, -#sib-picture-remove:hover { - background-color: var(--color-complementary); - border: 1px solid var(--color-complementary); - color: var(--color-white); +#member-profile sib-action.button.button-primary>sib-link, +button#sib-picture-browse.button.button-primary, +button#sib-picture-remove.button.button-primary { + color: var(--color-directory-complementary); +} + +#member-profile>div.profile-card>div.user-profile>div>sib-display>div>sib-action.button.button-primary.bordered>sib-link::before { + background-color: var(--color-directory-complementary); +} + +/* Hover */ +#member-profile sib-action.button.button-primary:hover, +#member-profile sib-action.button.button-primary:hover>sib-link, +button#sib-picture-browse.button.button-primary:hover, +button#sib-picture-remove.button.button-primary:hover { + color: var(--color-directory-white); + background-color: var(--color-directory-complementary); +} + +#member-profile>div.profile-card>div.user-profile>div>sib-display>div>sib-action.button.button-primary.bordered:hover>sib-link::before { + background-color: var(--color-directory-white); } diff --git a/src/styles/abstracts/_variables.scss b/src/styles/abstracts/_variables.scss index eff3b70..09c290a 100644 --- a/src/styles/abstracts/_variables.scss +++ b/src/styles/abstracts/_variables.scss @@ -125,61 +125,8 @@ --color-directory-complementary-darken: var(--color-complementary-darken)!important; --color-directory-white: var(--color-white)!important; --color-directory-black: var(--color-black) !important; - - --color-directory-h1: var(--color-directory-complementary-darken) !important; - --color-directory-text: var(--color-grey-5) !important; - --color-directory-avatar-background: var(--color-avatar-background) !important; - --color-directory-send-border: var(--color-directory-complementary) !important; - --color-directory-list-icon: var(--color-directory-primary) !important; - --color-directory-back-link: var(--color-grey-1) !important; - --color-directory-border: #DAE2F3 !important; - --color-directory-content-header-border: #DAE2F3 !important; - - --color-directory-counter-background: #F0F3F6 !important; - --color-directory-counter-border: #9BA0A7 !important; - --color-directory-counter-text: var(--color-grey-3) !important; - - --color-directory-paginate: var(--color-grey-1) !important; - --color-directory-paginate-disabled: #9BA0A7 !important; - - --color-directory-form-input: #EDF1FA !important; - --color-directory-form-input-text: var(--color-directory-grey-4) !important; - --color-directory-form-input-active: var(--color-directory-complementary) !important; - --color-directory-form-select-icon: var(--color-directory-complementary) !important; } - -/* Colors for buttons to send a message to a member and to update or remove your profile picture */ -#member-profile>div.profile-card>div.user-profile>div>sib-display>div>sib-action.button.button-primary.bordered, -button#sib-picture-browse.button.button-primary, -button#sib-picture-remove.button.button-primary { - border: 1px solid var(--color-directory-complementary) !important; -} - -#member-profile sib-action.button.button-primary>sib-link, -button#sib-picture-browse.button.button-primary, -button#sib-picture-remove.button.button-primary { - color: var(--color-directory-complementary) !important; -} - -#member-profile>div.profile-card>div.user-profile>div>sib-display>div>sib-action.button.button-primary.bordered>sib-link::before { - background-color: var(--color-directory-complementary); -} - -/* Hover */ -#member-profile sib-action.button.button-primary:hover, -#member-profile sib-action.button.button-primary:hover>sib-link, -button#sib-picture-browse.button.button-primary:hover, -button#sib-picture-remove.button.button-primary:hover { - color: var(--color-directory-white) !important; - background-color: var(--color-directory-complementary) !important; -} - -#member-profile>div.profile-card>div.user-profile>div>sib-display>div>sib-action.button.button-primary.bordered:hover>sib-link::before { - background-color: var(--color-directory-white); -} - - /* Variables for event */ $color-212-4-50: hsl(212.7,4.3%,50%); $color-0-0-22: hsl(0,0%,22.7%); From c263beb6b446c2c2817fce90c12008695a0a57bc Mon Sep 17 00:00:00 2001 From: gaelle morin Date: Mon, 15 Jun 2020 17:18:03 +0200 Subject: [PATCH 10/11] fix: important added --- client.sample.happy-dev.css | 48 ++++++++++++++-------------- src/styles/abstracts/_variables.scss | 4 +-- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/client.sample.happy-dev.css b/client.sample.happy-dev.css index 786b931..0840970 100644 --- a/client.sample.happy-dev.css +++ b/client.sample.happy-dev.css @@ -112,30 +112,30 @@ --color-chat-grey-3: var(--color-grey-10); /* Directory */ - --color-directory-grey-4: #7A7F85; - --color-directory-grey-5: #F0F3F6; + --color-directory-grey-4: #7A7F85 !important; + --color-directory-grey-5: #F0F3F6 !important; - --color-directory-avatar-background: #E4E8ED; - --color-directory-back-link: #36383B; - --color-directory-border: #DAE2F3; - --color-directory-content-header-border: #DAE2F3; + --color-directory-avatar-background: #E4E8ED !important; + --color-directory-back-link: #36383B !important; + --color-directory-border: #DAE2F3 !important; + --color-directory-content-header-border: #DAE2F3 !important; --color-directory-h1: var(--color-complementary-darken); --color-directory-list-icon: var(--color-primary); --color-directory-text: var(--color-directory-grey-4); - --color-directory-send-border: var(--color-complementary); - --color-directory-list-icon: var(--color-primary); - --color-directory-counter-background: var(--color-directory-grey-5); - --color-directory-counter-border: #9BA0A7; - --color-directory-counter-text: #4A4A4A; + --color-directory-send-border: var(--color-complementary) !important; + --color-directory-list-icon: var(--color-primary) !important; + --color-directory-counter-background: var(--color-directory-grey-5) !important; + --color-directory-counter-border: #9BA0A7 !important; + --color-directory-counter-text: #4A4A4A !important; - --color-directory-paginate: #36383B; - --color-directory-paginate-disabled: #9BA0A7; + --color-directory-paginate: #36383B !important; + --color-directory-paginate-disabled: #9BA0A7 !important; - --color-directory-form-input: #EDF1FA; - --color-directory-form-input-text: var(--color-directory-grey-4); - --color-directory-form-input-active: var(--color-complementary); - --color-directory-form-select-icon: var(--color-complementary); + --color-directory-form-input: #EDF1FA !important; + --color-directory-form-input-text: var(--color-directory-grey-4) !important; + --color-directory-form-input-active: var(--color-complementary) !important; + --color-directory-form-select-icon: var(--color-complementary) !important; } /* Button to edit a channel or a project (in project-profile) */ @@ -215,17 +215,17 @@ #member-profile>div.profile-card>div.user-profile>div>sib-display>div>sib-action.button.button-primary.bordered, button#sib-picture-browse.button.button-primary, button#sib-picture-remove.button.button-primary { - border: 1px solid var(--color-directory-complementary); + border: 1px solid var(--color-directory-complementary) !important; } #member-profile sib-action.button.button-primary>sib-link, button#sib-picture-browse.button.button-primary, button#sib-picture-remove.button.button-primary { - color: var(--color-directory-complementary); + color: var(--color-directory-complementary) !important; } #member-profile>div.profile-card>div.user-profile>div>sib-display>div>sib-action.button.button-primary.bordered>sib-link::before { - background-color: var(--color-directory-complementary); + background-color: var(--color-directory-complementary) !important; } /* Hover */ @@ -233,10 +233,10 @@ button#sib-picture-remove.button.button-primary { #member-profile sib-action.button.button-primary:hover>sib-link, button#sib-picture-browse.button.button-primary:hover, button#sib-picture-remove.button.button-primary:hover { - color: var(--color-directory-white); - background-color: var(--color-directory-complementary); + color: var(--color-directory-white) !important; + background-color: var(--color-directory-complementary) !important; } #member-profile>div.profile-card>div.user-profile>div>sib-display>div>sib-action.button.button-primary.bordered:hover>sib-link::before { - background-color: var(--color-directory-white); -} + background-color: var(--color-directory-white) !important; +} \ No newline at end of file diff --git a/src/styles/abstracts/_variables.scss b/src/styles/abstracts/_variables.scss index 09c290a..93a91d4 100644 --- a/src/styles/abstracts/_variables.scss +++ b/src/styles/abstracts/_variables.scss @@ -124,11 +124,11 @@ --color-directory-complementary: var(--color-complementary)!important; --color-directory-complementary-darken: var(--color-complementary-darken)!important; --color-directory-white: var(--color-white)!important; - --color-directory-black: var(--color-black) !important; + --color-directory-black: var(--color-black)!important; } /* Variables for event */ $color-212-4-50: hsl(212.7,4.3%,50%); $color-0-0-22: hsl(0,0%,22.7%); $color-203-87-19: hsl(203, 87.8%, 19.2%); -$color-357-67-45: hsl(357,67.5%,45.9%); \ No newline at end of file +$color-357-67-45: hsl(357,67.5%,45.9%); From eed570dc8716d2e3b01bf3d6a8e0fc1c0e797e5c Mon Sep 17 00:00:00 2001 From: Jure Ursic Date: Thu, 18 Jun 2020 04:58:39 +0200 Subject: [PATCH 11/11] fix: Customer additional field --- src/dependencies.pug | 4 +--- src/page-project.pug | 1 - src/scripts/reactive-store.js | 12 +++++++++--- src/views/project/page-project-edit.pug | 2 +- src/views/project/page-project-picture.pug | 1 + 5 files changed, 12 insertions(+), 8 deletions(-) diff --git a/src/dependencies.pug b/src/dependencies.pug index 7aa93ee..debdfe5 100644 --- a/src/dependencies.pug +++ b/src/dependencies.pug @@ -19,9 +19,7 @@ if endpoints.events || (endpoints.get && endpoints.get.events) if endpoints.joboffers || (endpoints.get && endpoints.get.joboffers) script(type="module" src="https://unpkg.com/@startinblox/component-job-board@0.3" defer) - script(type="module" src="https://unpkg.com/@startinblox/component-conversation@0.3" defer) - //- script(type="module" src="/lib/sib-job-board/sib-job-board.js" defer) - //- script(type="module" src="/lib/sib-conversation/sib-conversation.js" defer) + //- script(type="module" src="/lib/sib-job-board/dist/index.js" defer) if (endpoints.uploads || (endpoints.get && endpoints.get.uploads)) && (endpoints.skills || (endpoints.get && endpoints.get.skills)) && (endpoints.users || (endpoints.get && endpoints.get.users)) script(type="module" src="https://unpkg.com/@startinblox/component-directory@0.4" defer) diff --git a/src/page-project.pug b/src/page-project.pug index ac99260..23fe1c4 100644 --- a/src/page-project.pug +++ b/src/page-project.pug @@ -34,5 +34,4 @@ nav.jsRightMenu(role='navigation') sib-route(name='project-information') li a Information - sib-route(name='project-contributions-help') sib-route(name='project-picture' use-id) \ No newline at end of file diff --git a/src/scripts/reactive-store.js b/src/scripts/reactive-store.js index a8bd608..f2b1693 100644 --- a/src/scripts/reactive-store.js +++ b/src/scripts/reactive-store.js @@ -27,9 +27,15 @@ async function updateSources(resource) { async function resToChildrens(resource) { resource = resource.getResourceData(); - refreshSibDisplays(resource["http://happy-dev.fr/owl/#user"]["@id"]); - refreshSibDisplays(resource["http://happy-dev.fr/owl/#project"]["@id"] + "members/"); - refreshSibDisplays(resource["http://happy-dev.fr/owl/#circle"]["@id"] + "members/"); + if (resource["http://happy-dev.fr/owl/#user"]) { + refreshSibDisplays(resource["http://happy-dev.fr/owl/#user"]["@id"]); + } + if (resource["http://happy-dev.fr/owl/#project"]) { + refreshSibDisplays(resource["http://happy-dev.fr/owl/#project"]["@id"] + "members/"); + } + if (resource["http://happy-dev.fr/owl/#circle"]) { + refreshSibDisplays(resource["http://happy-dev.fr/owl/#circle"]["@id"] + "members/"); + } } //auxiliary function updates displays using a given resource diff --git a/src/views/project/page-project-edit.pug b/src/views/project/page-project-edit.pug index e87de38..83bec42 100644 --- a/src/views/project/page-project-edit.pug +++ b/src/views/project/page-project-edit.pug @@ -31,7 +31,7 @@ div.content-box__info next='project-information' ) - h2 PPhoto du projet + h2 Photo du projet sib-form.form-picture( bind-resources diff --git a/src/views/project/page-project-picture.pug b/src/views/project/page-project-picture.pug index 7c92ccc..32b5622 100644 --- a/src/views/project/page-project-picture.pug +++ b/src/views/project/page-project-picture.pug @@ -11,4 +11,5 @@ div.content-box__info nested-fields='customer' fields='logo' next='project-edit' + additional='name' )