From e5c766c42d25653237dbb1d53c21cd3c704b1888 Mon Sep 17 00:00:00 2001 From: gaelle morin Date: Tue, 27 Apr 2021 12:41:05 +0200 Subject: [PATCH 01/19] patch: communities-profile - Default picture added on large screens --- src/images/photos.svg | 1 + src/styles/admin-circles/_index.scss | 40 +++++++++++++++++++ src/views/partials/widgets.pug | 1 + .../hubl-communities-profile-picture.pug | 2 +- 4 files changed, 43 insertions(+), 1 deletion(-) create mode 100644 src/images/photos.svg diff --git a/src/images/photos.svg b/src/images/photos.svg new file mode 100644 index 0000000..acf15ad --- /dev/null +++ b/src/images/photos.svg @@ -0,0 +1 @@ + diff --git a/src/styles/admin-circles/_index.scss b/src/styles/admin-circles/_index.scss index 7752f3d..ad0c607 100644 --- a/src/styles/admin-circles/_index.scss +++ b/src/styles/admin-circles/_index.scss @@ -176,6 +176,10 @@ background-size: cover; } } + + .picture-empty { + display: none; + } } .communities-map { @@ -343,6 +347,42 @@ } } } + + @media (min-width: 768.01px) { + + .communities-profile-picture { + + .picture-empty { + display: flex; + justify-content: center; + align-items: center; + + object { + height: 100px; + width: 100px; + object-fit: cover; + object-position: center; + } + } + + &:nth-child(2)>.picture-empty { + background: #E4E9F1; + + svg { + fill: #D0D4DA; + } + } + + &:nth-child(1)>.picture-empty, + &:nth-child(3)>.picture-empty { + background: #E9F2FF; + + svg { + fill: #D7E2F3; + } + } + } + } .flex { display: flex; diff --git a/src/views/partials/widgets.pug b/src/views/partials/widgets.pug index ee38e84..37ca813 100644 --- a/src/views/partials/widgets.pug +++ b/src/views/partials/widgets.pug @@ -27,6 +27,7 @@ include widgets/hubl-communities-edit-email.pug include widgets/hubl-communities-edit-website.pug include widgets/hubl-communities-logo.pug include widgets/hubl-communities-map-fix-url-name.pug +include widgets/hubl-communities-profile-picture.pug include widgets/hubl-communities-profile-email.pug include widgets/hubl-communities-profile-facebook.pug include widgets/hubl-communities-profile-instagram.pug diff --git a/src/views/partials/widgets/hubl-communities-profile-picture.pug b/src/views/partials/widgets/hubl-communities-profile-picture.pug index c470f50..06c73d4 100644 --- a/src/views/partials/widgets/hubl-communities-profile-picture.pug +++ b/src/views/partials/widgets/hubl-communities-profile-picture.pug @@ -1,3 +1,3 @@ if componentSet.has('communities') && getRoute('communities') solid-widget(name='hubl-communities-profile-picture') - template ${value != "" ? `
` : `
`} + template ${value != "" ? `
` : `
`} From 5e871e19fa4dbbd44b7497c14ce88b5d9a0aea64 Mon Sep 17 00:00:00 2001 From: gaelle morin Date: Tue, 27 Apr 2021 12:41:05 +0200 Subject: [PATCH 02/19] patch: communities-profile - Default picture added on large screens --- src/images/photos.svg | 1 + src/styles/admin-circles/_index.scss | 40 +++++++++++++++++++ src/views/partials/widgets.pug | 1 + .../hubl-communities-profile-picture.pug | 2 +- 4 files changed, 43 insertions(+), 1 deletion(-) create mode 100644 src/images/photos.svg diff --git a/src/images/photos.svg b/src/images/photos.svg new file mode 100644 index 0000000..acf15ad --- /dev/null +++ b/src/images/photos.svg @@ -0,0 +1 @@ + diff --git a/src/styles/admin-circles/_index.scss b/src/styles/admin-circles/_index.scss index 7752f3d..ad0c607 100644 --- a/src/styles/admin-circles/_index.scss +++ b/src/styles/admin-circles/_index.scss @@ -176,6 +176,10 @@ background-size: cover; } } + + .picture-empty { + display: none; + } } .communities-map { @@ -343,6 +347,42 @@ } } } + + @media (min-width: 768.01px) { + + .communities-profile-picture { + + .picture-empty { + display: flex; + justify-content: center; + align-items: center; + + object { + height: 100px; + width: 100px; + object-fit: cover; + object-position: center; + } + } + + &:nth-child(2)>.picture-empty { + background: #E4E9F1; + + svg { + fill: #D0D4DA; + } + } + + &:nth-child(1)>.picture-empty, + &:nth-child(3)>.picture-empty { + background: #E9F2FF; + + svg { + fill: #D7E2F3; + } + } + } + } .flex { display: flex; diff --git a/src/views/partials/widgets.pug b/src/views/partials/widgets.pug index ee38e84..37ca813 100644 --- a/src/views/partials/widgets.pug +++ b/src/views/partials/widgets.pug @@ -27,6 +27,7 @@ include widgets/hubl-communities-edit-email.pug include widgets/hubl-communities-edit-website.pug include widgets/hubl-communities-logo.pug include widgets/hubl-communities-map-fix-url-name.pug +include widgets/hubl-communities-profile-picture.pug include widgets/hubl-communities-profile-email.pug include widgets/hubl-communities-profile-facebook.pug include widgets/hubl-communities-profile-instagram.pug diff --git a/src/views/partials/widgets/hubl-communities-profile-picture.pug b/src/views/partials/widgets/hubl-communities-profile-picture.pug index c470f50..06c73d4 100644 --- a/src/views/partials/widgets/hubl-communities-profile-picture.pug +++ b/src/views/partials/widgets/hubl-communities-profile-picture.pug @@ -1,3 +1,3 @@ if componentSet.has('communities') && getRoute('communities') solid-widget(name='hubl-communities-profile-picture') - template ${value != "" ? `
` : `
`} + template ${value != "" ? `
` : `
`} From 13c4aa488a5ca45dd169781e8395cce3bbdba2e5 Mon Sep 17 00:00:00 2001 From: Marjolaine Le Bon Date: Wed, 28 Apr 2021 11:42:25 +0200 Subject: [PATCH 03/19] update: add client address on edit and create form --- src/locales/en.json | 2 ++ src/locales/es.json | 2 ++ src/locales/fr.json | 2 ++ src/views/partials/admin/page-admin-projects-create.pug | 8 +++++--- src/views/partials/project/page-project-edit.pug | 8 +++++--- 5 files changed, 16 insertions(+), 6 deletions(-) diff --git a/src/locales/en.json b/src/locales/en.json index 676c885..d39c3d8 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -202,6 +202,7 @@ "labelDescription": "Project description", "descriptionHelp": "You can use markdown", "labelCustomer": "Customer name*", + "labelCustomerAddress": "Customer address", "labelCaptain": "Project captain*", "buttonSubmit": "Save" }, @@ -211,6 +212,7 @@ "title": "Edit your project", "labelName": "Project name *", "labelCustomer": "Customer name *", + "labelCustomerAddress": "Customer address", "labelCaptain": "Captain *", "labelDescription": "Project description", "descriptionHelp": "You can use markdown", diff --git a/src/locales/es.json b/src/locales/es.json index 8019338..539883b 100644 --- a/src/locales/es.json +++ b/src/locales/es.json @@ -202,6 +202,7 @@ "labelDescription": "Descripción del proyecto", "descriptionHelp": "Puedes usar markdown", "labelCustomer": "Nombre del/la clientx *", + "labelCustomerAddress": "Dirección del/la clientx", "labelCaptain": "Líder del proyecto *", "buttonSubmit": "Guardar" }, @@ -211,6 +212,7 @@ "title": "Modificar tu proyecto", "labelName": "Nombre del proyecto *", "labelCustomer": "Nombre del/la clientx *", + "labelCustomerAddress": "Dirección del/la clientx", "labelCaptain": "Capitain *", "labelDescription": "Descripción del proyecto", "descriptionHelp": "Puedes usar markdown", diff --git a/src/locales/fr.json b/src/locales/fr.json index ac3d9dd..a02276d 100644 --- a/src/locales/fr.json +++ b/src/locales/fr.json @@ -200,6 +200,7 @@ "labelDescription": "Description du projet", "descriptionHelp": "Vous pouvez utiliser Markdown", "labelCustomer": "Nom du client*", + "labelCustomerAddress": "Adresse du client", "labelCaptain": "Capitaine du projet*", "buttonSubmit": "Enregistrer" }, @@ -209,6 +210,7 @@ "title": "Modifie ton projet", "labelName": "Nom du projet *", "labelCustomer": "Nom du client *", + "labelCustomerAddress": "Adresse du client", "labelCaptain": "Capitaine *", "labelDescription": "Description du projet", "descriptionHelp": "Vous pouvez utiliser Markdown", diff --git a/src/views/partials/admin/page-admin-projects-create.pug b/src/views/partials/admin/page-admin-projects-create.pug index 467b7ae..75e7212 100644 --- a/src/views/partials/admin/page-admin-projects-create.pug +++ b/src/views/partials/admin/page-admin-projects-create.pug @@ -16,7 +16,7 @@ div.segment.full.padding-large.sm-padding-xsmall.sm-padding-top-medium.whitespac solid-form.form( data-src=`${getComponent('projects').endpoints.post}` - fields='status, customer.name, name, description, help, captain, linebreak' + fields='status,customer(customer.name, customer.address), name, description, help, captain, linebreak' range-captain=`${getComponent('projects').endpoints.captains}` required-status @@ -27,13 +27,15 @@ div.segment.full.padding-large.sm-padding-xsmall.sm-padding-top-medium.whitespac label-status='' label-customer.name='' + label-customer.address='' label-name='' label-description='' label-help='' label-captain='' class-customer.name='segment margin-bottom-medium half sm-full padding-right-small sm-padding-none text-small text-semibold text-uppercase text-color-heading' - class-name='segment margin-bottom-medium half sm-full padding-left-small sm-padding-none text-small text-semibold text-uppercase text-color-heading' + class-customer.address='segment margin-bottom-medium half sm-full padding-right-small sm-padding-none text-small text-semibold text-uppercase text-color-heading' + class-name='segment margin-bottom-medium half sm-full sm-padding-none text-small text-semibold text-uppercase text-color-heading' class-description='segment margin-bottom-xxsmall full text-small text-semibold text-uppercase text-color-heading' class-help='segment full text-small margin-bottom-medium padding-left-small' class-captain='segment margin-bottom-medium half sm-full padding-right-small sm-padding-none text-small text-semibold text-uppercase text-color-heading whitespace-normal' @@ -50,5 +52,5 @@ div.segment.full.padding-large.sm-padding-xsmall.sm-padding-top-medium.whitespac submit-widget="button" next=getRoute('projects', true) - data-trans='label-status=project.create.labelStatus;label-customer.name=project.create.labelCustomer;label-name=project.create.labelName;label-description=project.create.labelDescription;label-captain=project.create.labelCaptain;label-help=project.create.descriptionHelp;submit-button=project.create.buttonSubmit' + data-trans='label-status=project.create.labelStatus;label-customer.name=project.create.labelCustomer;label-customer.address=project.create.labelCustomerAddress;label-name=project.create.labelName;label-description=project.create.labelDescription;label-captain=project.create.labelCaptain;label-help=project.create.descriptionHelp;submit-button=project.create.buttonSubmit' ) diff --git a/src/views/partials/project/page-project-edit.pug b/src/views/partials/project/page-project-edit.pug index 08ff1a7..bf33b9c 100644 --- a/src/views/partials/project/page-project-edit.pug +++ b/src/views/partials/project/page-project-edit.pug @@ -32,7 +32,7 @@ div.segment.full.padding-large.whitespace-normal solid-form.form( bind-resources - fields='customer.name, name, description, help, captain, linebreak' + fields='customer(customer.name, customer.address), name, description, help, captain, linebreak' required-customer.name required-name required-captain @@ -40,12 +40,14 @@ div.segment.full.padding-large.whitespace-normal label-name='' label-customer.name='' + label-customer.address='' label-description='' label-captain='' label-help='' class-customer.name='segment margin-bottom-medium half sm-full padding-right-small sm-padding-none text-small text-semibold text-uppercase text-color-heading' - class-name='segment margin-bottom-medium half sm-full padding-left-small sm-padding-none text-small text-semibold text-uppercase text-color-heading' + class-customer.address='segment margin-bottom-medium half sm-full padding-right-small sm-padding-none text-small text-semibold text-uppercase text-color-heading' + class-name='segment margin-bottom-medium half sm-full sm-padding-none text-small text-semibold text-uppercase text-color-heading' class-description='segment margin-bottom-xxsmall full text-small text-semibold text-uppercase text-color-heading' class-captain='segment margin-bottom-medium half sm-full padding-right-small sm-padding-none text-small text-semibold text-uppercase text-color-heading whitespace-normal' class-linebreak='segment full' @@ -62,7 +64,7 @@ div.segment.full.padding-large.whitespace-normal submit-widget="button" next=`${component.route}-information` - data-trans='label-name=project.edit.labelName;label-captain=project.edit.labelCaptain;label-customer.name=project.edit.labelCustomer;label-description=project.edit.labelDescription;label-help=project.edit.descriptionHelp;submit-button=project.edit.buttonSubmit' + data-trans='label-name=project.edit.labelName;label-captain=project.edit.labelCaptain;label-customer.name=project.edit.labelCustomer;label-customer.address=project.edit.labelCustomerAddress;label-description=project.edit.labelDescription;label-help=project.edit.descriptionHelp;submit-button=project.edit.buttonSubmit' ) h3.segment.full.padding-bottom-small.border-bottom.border-color-grey.text-color-heading.text-bold.text-letter-spacing-large(data-trans='project.edit.subTitle') From 53b7b3ebddea92ba77a47f664e32296a27e98e28 Mon Sep 17 00:00:00 2001 From: gaelle morin Date: Wed, 28 Apr 2021 12:32:06 +0200 Subject: [PATCH 04/19] fix: communities-profile - Pictures on small screens --- src/styles/admin-circles/_index.scss | 4 ---- src/views/partials/communities/page-community-profile.pug | 8 ++++---- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/src/styles/admin-circles/_index.scss b/src/styles/admin-circles/_index.scss index ad0c607..d47aad1 100644 --- a/src/styles/admin-circles/_index.scss +++ b/src/styles/admin-circles/_index.scss @@ -383,8 +383,4 @@ } } } - - .flex { - display: flex; - } } \ No newline at end of file diff --git a/src/views/partials/communities/page-community-profile.pug b/src/views/partials/communities/page-community-profile.pug index 029020b..cb76b1b 100644 --- a/src/views/partials/communities/page-community-profile.pug +++ b/src/views/partials/communities/page-community-profile.pug @@ -41,10 +41,10 @@ div.community-profile.padding-medium.sm-padding-none class-segment10="segment full text-right" - class-segment11="segment full whitespace-normal flex" - class-profile.picture1="communities-profile-picture segment third sm-full" - class-profile.picture2="communities-profile-picture segment third sm-full" - class-profile.picture3="communities-profile-picture segment third sm-full" + class-segment11="segment full whitespace-normal" + class-profile.picture1="communities-profile-picture segment third sm-full text-top" + class-profile.picture2="communities-profile-picture segment third sm-full text-top" + class-profile.picture3="communities-profile-picture segment third sm-full text-top" widget-logo="hubl-communities-profile-logo" widget-profile.description="solid-display-value-markdown" From 392b96e3c73c0657530dd481267035ebfbcae7ef Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Pasquier Date: Wed, 28 Apr 2021 16:17:23 +0200 Subject: [PATCH 05/19] fix: invoicing integration on blox project --- .../partials/admin/page-admin-projects-create.pug | 13 +++++++------ src/views/partials/project/page-project-edit.pug | 11 ++++++----- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/src/views/partials/admin/page-admin-projects-create.pug b/src/views/partials/admin/page-admin-projects-create.pug index 75e7212..93eb0b0 100644 --- a/src/views/partials/admin/page-admin-projects-create.pug +++ b/src/views/partials/admin/page-admin-projects-create.pug @@ -16,7 +16,6 @@ div.segment.full.padding-large.sm-padding-xsmall.sm-padding-top-medium.whitespac solid-form.form( data-src=`${getComponent('projects').endpoints.post}` - fields='status,customer(customer.name, customer.address), name, description, help, captain, linebreak' range-captain=`${getComponent('projects').endpoints.captains}` required-status @@ -32,13 +31,11 @@ div.segment.full.padding-large.sm-padding-xsmall.sm-padding-top-medium.whitespac label-description='' label-help='' label-captain='' - + class-customer.name='segment margin-bottom-medium half sm-full padding-right-small sm-padding-none text-small text-semibold text-uppercase text-color-heading' - class-customer.address='segment margin-bottom-medium half sm-full padding-right-small sm-padding-none text-small text-semibold text-uppercase text-color-heading' - class-name='segment margin-bottom-medium half sm-full sm-padding-none text-small text-semibold text-uppercase text-color-heading' + class-customer.address='segment margin-bottom-medium half sm-full padding-left-small sm-padding-none text-small text-semibold text-uppercase text-color-heading' class-description='segment margin-bottom-xxsmall full text-small text-semibold text-uppercase text-color-heading' class-help='segment full text-small margin-bottom-medium padding-left-small' - class-captain='segment margin-bottom-medium half sm-full padding-right-small sm-padding-none text-small text-semibold text-uppercase text-color-heading whitespace-normal' class-linebreak='segment full sm-hidden' widget-status='solid-form-hidden' @@ -53,4 +50,8 @@ div.segment.full.padding-large.sm-padding-xsmall.sm-padding-top-medium.whitespac next=getRoute('projects', true) data-trans='label-status=project.create.labelStatus;label-customer.name=project.create.labelCustomer;label-customer.address=project.create.labelCustomerAddress;label-name=project.create.labelName;label-description=project.create.labelDescription;label-captain=project.create.labelCaptain;label-help=project.create.descriptionHelp;submit-button=project.create.buttonSubmit' - ) + )&attributes({ + "fields": componentSet.has('invoices') ? "status, customer.name, customer.address, name, captain, description, help, linebreak" : "status, customer.name, name, description, help, captain, linebreak", + "class-captain": componentSet.has('invoices') ? 'segment margin-bottom-medium half sm-full padding-left-small sm-padding-none text-small text-semibold text-uppercase text-color-heading whitespace-normal' : 'segment margin-bottom-medium half sm-full padding-right-small sm-padding-none text-small text-semibold text-uppercase text-color-heading whitespace-normal', + "class-name": componentSet.has('invoices') ? 'segment margin-bottom-medium half sm-full padding-right-small sm-padding-none text-small text-semibold text-uppercase text-color-heading' : 'segment margin-bottom-medium half sm-full sm-padding-none text-small text-semibold text-uppercase text-color-heading' + }) diff --git a/src/views/partials/project/page-project-edit.pug b/src/views/partials/project/page-project-edit.pug index bf33b9c..4b193a7 100644 --- a/src/views/partials/project/page-project-edit.pug +++ b/src/views/partials/project/page-project-edit.pug @@ -32,7 +32,6 @@ div.segment.full.padding-large.whitespace-normal solid-form.form( bind-resources - fields='customer(customer.name, customer.address), name, description, help, captain, linebreak' required-customer.name required-name required-captain @@ -46,10 +45,8 @@ div.segment.full.padding-large.whitespace-normal label-help='' class-customer.name='segment margin-bottom-medium half sm-full padding-right-small sm-padding-none text-small text-semibold text-uppercase text-color-heading' - class-customer.address='segment margin-bottom-medium half sm-full padding-right-small sm-padding-none text-small text-semibold text-uppercase text-color-heading' - class-name='segment margin-bottom-medium half sm-full sm-padding-none text-small text-semibold text-uppercase text-color-heading' + class-customer.address='segment margin-bottom-medium half sm-full padding-left-small sm-padding-none text-small text-semibold text-uppercase text-color-heading' class-description='segment margin-bottom-xxsmall full text-small text-semibold text-uppercase text-color-heading' - class-captain='segment margin-bottom-medium half sm-full padding-right-small sm-padding-none text-small text-semibold text-uppercase text-color-heading whitespace-normal' class-linebreak='segment full' class-help='segment full sm-full text-small margin-bottom-medium padding-left-small' @@ -65,7 +62,11 @@ div.segment.full.padding-large.whitespace-normal next=`${component.route}-information` data-trans='label-name=project.edit.labelName;label-captain=project.edit.labelCaptain;label-customer.name=project.edit.labelCustomer;label-customer.address=project.edit.labelCustomerAddress;label-description=project.edit.labelDescription;label-help=project.edit.descriptionHelp;submit-button=project.edit.buttonSubmit' - ) + )&attributes({ + "fields": componentSet.has('invoices') ? "customer.name, customer.address, name, captain, description, help, linebreak" : "customer.name, name, description, help, captain, linebreak", + "class-captain": componentSet.has('invoices') ? 'segment margin-bottom-medium half sm-full padding-left-small sm-padding-none text-small text-semibold text-uppercase text-color-heading whitespace-normal' : 'segment margin-bottom-medium half sm-full padding-right-small sm-padding-none text-small text-semibold text-uppercase text-color-heading whitespace-normal', + "class-name": componentSet.has('invoices') ? 'segment margin-bottom-medium half sm-full padding-right-small sm-padding-none text-small text-semibold text-uppercase text-color-heading' : 'segment margin-bottom-medium half sm-full sm-padding-none text-small text-semibold text-uppercase text-color-heading' + }) h3.segment.full.padding-bottom-small.border-bottom.border-color-grey.text-color-heading.text-bold.text-letter-spacing-large(data-trans='project.edit.subTitle') From 1b79019f4eb28c4d73d84c53396edfaec73043e2 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Pasquier Date: Wed, 28 Apr 2021 16:55:41 +0200 Subject: [PATCH 06/19] fix: en.json --- src/locales/en.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/locales/en.json b/src/locales/en.json index d39c3d8..4035871 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -197,7 +197,7 @@ }, "create": { "backlink": "Back", - "title": " Create a nouveau project", + "title": " Create a new project", "labelName": "Project name*", "labelDescription": "Project description", "descriptionHelp": "You can use markdown", From 6286c5a519ad166bb117e5176ca5cef03e7df26f Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Pasquier Date: Wed, 28 Apr 2021 17:18:49 +0200 Subject: [PATCH 07/19] fix: reduce menu contact name --- src/styles/left-nav/_index.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/src/styles/left-nav/_index.scss b/src/styles/left-nav/_index.scss index 8b1e70a..8eec398 100644 --- a/src/styles/left-nav/_index.scss +++ b/src/styles/left-nav/_index.scss @@ -166,6 +166,7 @@ nav#main__menu { margin-right: 15px; margin-left: 3px; vertical-align: middle; + width: calc(75% - 15px); } } From 7d4378b862207bb9f59f16a148a89be35cea7fe2 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Pasquier Date: Mon, 3 May 2021 08:46:02 +0000 Subject: [PATCH 08/19] fix: extension route check --- src/views/page-project.pug | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/page-project.pug b/src/views/page-project.pug index 3463989..773ac41 100644 --- a/src/views/page-project.pug +++ b/src/views/page-project.pug @@ -23,7 +23,7 @@ include partials/project/page-project-picture.pug if component.extensions for extension of component.extensions - if extension.type == 'invoices' + if extension.type == 'invoices' && extension.route div( id=`${extension.route}-invoices` hidden @@ -51,7 +51,7 @@ nav.jsRightMenu.segment.sm-hidden.text-disable-selection.sidebar.whitespace-norm solid-route(name=`${component.route}-picture` use-id) if component.extensions for extension of component.extensions - if extension.type == 'invoices' + if extension.type == 'invoices' && extension.route solid-route.segment.full(name=`${extension.route}-invoices` use-id) li.segment.full.padding-medium span.icon.ci-receipt.icon-xlarge.margin-right-medium From 31d5357028224c8e41b5115f83e400c0cfabacc1 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Pasquier Date: Mon, 3 May 2021 08:48:23 +0000 Subject: [PATCH 09/19] fix: extension.route on circles --- src/views/page-circle.pug | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/views/page-circle.pug b/src/views/page-circle.pug index d06725c..8e962b9 100644 --- a/src/views/page-circle.pug +++ b/src/views/page-circle.pug @@ -16,7 +16,7 @@ include partials/circle/page-circle-profile.pug if component.extensions for extension of component.extensions - if extension.type == 'events' + if extension.type == 'events' && extension.route div( id=`${extension.route}-events` hidden @@ -24,7 +24,7 @@ no-render ) include partials/circle/page-circle-events.pug - if extension.type == 'resources' + if extension.type == 'resources' && extension.route div( id=`${extension.route}-resources` hidden @@ -32,7 +32,7 @@ no-render ) include partials/circle/page-circle-resources.pug - if extension.type == 'polls' + if extension.type == 'polls' && extension.route div( id=`${extension.route}-polls` hidden @@ -59,17 +59,17 @@ nav.jsRightMenu.segment.sm-hidden.text-disable-selection.sidebar.whitespace-norm a(data-trans='circle.menuRight.information') if component.extensions for extension of component.extensions - if extension.type == 'resources' + if extension.type == 'resources' && extension.route solid-route.segment.full(name=`${extension.route}-resources` use-id) li.segment.full.padding-medium span.icon.ci-file.icon-xlarge.margin-right-medium a(data-trans='circle.menuRight.resources') - if extension.type == 'events' + if extension.type == 'events' && extension.route solid-route.segment.full(name=`${extension.route}-events` use-id) li.segment.full.padding-medium span.icon.ci-appointment.icon-xlarge.margin-right-medium a(data-trans='circle.menuRight.events') - if extension.type == 'polls' + if extension.type == 'polls' && extension.route solid-route.segment.full(name=`${extension.route}-polls` use-id) li.segment.full.padding-medium span.icon.ci-list.icon-xlarge.margin-right-medium From d0914997df365698a6ee2fd707dcf478f778f9cc Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Pasquier Date: Tue, 4 May 2021 13:20:52 +0200 Subject: [PATCH 10/19] fix: duplicate widget --- src/views/partials/widgets.pug | 1 - 1 file changed, 1 deletion(-) diff --git a/src/views/partials/widgets.pug b/src/views/partials/widgets.pug index 37ca813..ee38e84 100644 --- a/src/views/partials/widgets.pug +++ b/src/views/partials/widgets.pug @@ -27,7 +27,6 @@ include widgets/hubl-communities-edit-email.pug include widgets/hubl-communities-edit-website.pug include widgets/hubl-communities-logo.pug include widgets/hubl-communities-map-fix-url-name.pug -include widgets/hubl-communities-profile-picture.pug include widgets/hubl-communities-profile-email.pug include widgets/hubl-communities-profile-facebook.pug include widgets/hubl-communities-profile-instagram.pug From 6ca98191e7a3f7c4480520840162203f43470825 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Pasquier Date: Tue, 4 May 2021 14:32:31 +0200 Subject: [PATCH 11/19] fix: use-id on chat create route --- src/views/partials/menu-left.pug | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/partials/menu-left.pug b/src/views/partials/menu-left.pug index 1464866..3827c53 100644 --- a/src/views/partials/menu-left.pug +++ b/src/views/partials/menu-left.pug @@ -80,7 +80,7 @@ solid-router#navbar-router(default-route=defaultRoute) solid-link.segment.block.menu-icon.icon.icon-small.icon-user-follow(next=getRoute('profileDirectory', true)) solid-badge.badge(data-type="Message") solid-route(name=`admin-${component.route}`, hidden) - solid-route(name=`admin-${component.route}-create` hidden) + solid-route(name=`admin-${component.route}-create` use-id='' hidden) solid-route(name=component.route, rdf-type='foaf:user', use-id='', hidden) div.sub-menu.menu-notification.padding-bottom-xxsmall.jsMenuSub div.loader.loader-menu(id=`loader-${component.route}`) From 672f20699d0e3c56c2972c3346f2599d75826a58 Mon Sep 17 00:00:00 2001 From: Marjolaine Le Bon Date: Thu, 6 May 2021 12:10:51 +0200 Subject: [PATCH 12/19] update: projects => add business provider --- src/locales/en.json | 15 ++++++ src/locales/es.json | 15 ++++++ src/locales/fr.json | 15 ++++++ src/styles/index.scss | 1 + src/styles/projects/_index.scss | 48 +++++++++++++++++ .../admin/page-admin-projects-create.pug | 29 +++++++++- .../partials/project/page-project-edit.pug | 54 +++++++++++++++++++ .../partials/project/page-project-profile.pug | 35 ++++++++++++ 8 files changed, 210 insertions(+), 2 deletions(-) create mode 100644 src/styles/projects/_index.scss diff --git a/src/locales/en.json b/src/locales/en.json index 4035871..f298595 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -204,6 +204,11 @@ "labelCustomer": "Customer name*", "labelCustomerAddress": "Customer address", "labelCaptain": "Project captain*", + "labelBusinessprovider": "Business Input", + "labelBusinessproviderAdd": "Add a Business Provider", + "labelBusinessproviderRemove": "Remove", + "labelBusinessproviderName": "Business Provider Name", + "labelBusinessproviderFee": "Amount of contribution (%)", "buttonSubmit": "Save" }, "edit": { @@ -216,6 +221,10 @@ "labelCaptain": "Captain *", "labelDescription": "Project description", "descriptionHelp": "You can use markdown", + "businessProviderTitle": "Business Provider", + "businessTableHeader1": "Business provider name", + "businessTableHeader2": "Amount of contribution (%)", + "buttonAddBusinessProvider": "Add", "subTitle": "Team members :", "tableHeader1": "Name", "tableHeader2": "Access", @@ -254,6 +263,12 @@ "buttonJoin": "Join the project", "captain": "Captain :", "description": "Description :", + "clientInformations": "Client Informations : ", + "customerName": "Customer name : ", + "customerAddress": "Customer address : ", + "businessProvider": "Business Provider : ", + "businessProviderName": "Business provider name : ", + "businessProviderFee": "Amount of contribution : ", "subTitle": "Team :" } }, diff --git a/src/locales/es.json b/src/locales/es.json index 539883b..2fb0834 100644 --- a/src/locales/es.json +++ b/src/locales/es.json @@ -204,6 +204,11 @@ "labelCustomer": "Nombre del/la clientx *", "labelCustomerAddress": "Dirección del/la clientx", "labelCaptain": "Líder del proyecto *", + "labelBusinessprovider": "Contribución empresarial", + "labelBusinessproviderAdd": "Eliminar", + "labelBusinessproviderRemove": "Añadir la entrada del negocio", + "labelBusinessproviderName": "Nombre del contribuyente empresarial", + "labelBusinessproviderFee": "Importe de la contribución (%)", "buttonSubmit": "Guardar" }, "edit": { @@ -216,6 +221,10 @@ "labelCaptain": "Capitain *", "labelDescription": "Descripción del proyecto", "descriptionHelp": "Puedes usar markdown", + "businessProviderTitle": "Contribución empresarial", + "businessTableHeader1": "Nombre del contribuyente empresarial", + "businessTableHeader2": "Importe de la contribución (%)", + "buttonAddBusinessProvider": "Añadir", "subTitle": "Lista de miembrxs: ", "tableHeader1": "Nombre", "tableHeader2": "Acceso", @@ -254,6 +263,12 @@ "buttonJoin": "Unirse al proyecto", "captain": "Líder : ", "description": "Descripción :", + "clientInformations": "información al clientx : ", + "customerName": "Nombre del/la clientx : ", + "customerAddress": "Dirección del/la clientx : ", + "businessProvider": "Contribución empresarial : ", + "businessProviderName": "Nombre del contribuyente empresarial : ", + "businessProviderFee": "Importe de la contribución : ", "subTitle": "Equipo : " } }, diff --git a/src/locales/fr.json b/src/locales/fr.json index a02276d..4b82e19 100644 --- a/src/locales/fr.json +++ b/src/locales/fr.json @@ -202,6 +202,11 @@ "labelCustomer": "Nom du client*", "labelCustomerAddress": "Adresse du client", "labelCaptain": "Capitaine du projet*", + "labelBusinessprovider": "Apport d'affaire", + "labelBusinessproviderAdd": "Ajouter de l'apport d'affaire", + "labelBusinessproviderRemove": "Retirer", + "labelBusinessproviderName": "Nom de l'apporteur d'affaire", + "labelBusinessproviderFee": "Montant de l'apport d'affaire (%)", "buttonSubmit": "Enregistrer" }, "edit": { @@ -214,6 +219,10 @@ "labelCaptain": "Capitaine *", "labelDescription": "Description du projet", "descriptionHelp": "Vous pouvez utiliser Markdown", + "businessProviderTitle": "Apport d'affaire", + "businessTableHeader1": "Nom de l'apporteur d'affaire", + "businessTableHeader2": "Montant de l'apport d'affaire (%)", + "buttonAddBusinessProvider": "Ajouter", "subTitle": "Liste des membres :", "tableHeader1": "Nom", "tableHeader2": "Accès", @@ -252,6 +261,12 @@ "buttonJoin": "Rejoindre le projet", "captain": "Capitaine :", "description": "Description :", + "clientInformations": "Informations sur le client : ", + "customerName": "Nom du client : ", + "customerAddress": "Adresse du client : ", + "businessProvider": "Apport d'affaire : ", + "businessProviderName": "Nom de l'apporteur d'affaire : ", + "businessProviderFee": "Montant de l'apport d'affaire : ", "subTitle": "Equipe :" } }, diff --git a/src/styles/index.scss b/src/styles/index.scss index 8ae3a07..98c9fd3 100644 --- a/src/styles/index.scss +++ b/src/styles/index.scss @@ -42,6 +42,7 @@ solid-display>div { @import 'chat'; @import 'forms'; @import 'communities'; +@import 'projects'; @import 'admin-circles'; nav#main__menu { diff --git a/src/styles/projects/_index.scss b/src/styles/projects/_index.scss new file mode 100644 index 0000000..5b7cdde --- /dev/null +++ b/src/styles/projects/_index.scss @@ -0,0 +1,48 @@ +#admin-projects-create .form solid-multiple-form { + height: 100%; + button { + border: 1px solid var(--color-secondary); + text-transform: uppercase; + color: var(--color-secondary); + background-color: white; + font-weight: 700; + padding: 9px 20px; + font-size: 12px; + line-height: 14px; + border-radius: 16.5px; + } + button:hover { + background-color: var(--color-secondary); + color: white; + } +} +#projects-edit .edit-businessprovider form { + display: table-row; + border-bottom: 1px solid #C9C8C8; + border-right: 1px solid #C9C8C8; + .segment.table-cell { + border-bottom: 1px solid #C9C8C8; + border-right: 1px solid #C9C8C8; + height: 60px; + padding: 10px; + } + [type="submit"] { + float: none; + display: flex; + margin: 19px auto; + color: var(--color-secondary); + background-color: white; + } + [type="submit"]:hover { + background-color: var(--color-secondary); + color: white; + } +} +#projects-information .display-businessprovider { + [name="fee"]:after { + content: " %"; + } + > div > solid-display:not(:first-child) [name="titlebusinessprovider"] { + display: none; + } +} diff --git a/src/views/partials/admin/page-admin-projects-create.pug b/src/views/partials/admin/page-admin-projects-create.pug index 93eb0b0..f4f481a 100644 --- a/src/views/partials/admin/page-admin-projects-create.pug +++ b/src/views/partials/admin/page-admin-projects-create.pug @@ -13,6 +13,23 @@ div.segment.full.padding-large.sm-padding-xsmall.sm-padding-top-medium.whitespac div div + solid-widget(name="businessprovider-widget") + template + solid-form.segment.three-quarter.sm-full.margin-right-medium.margin-bottom-small( + data-src="\${value}" + data-holder + naked + fields="name, fee" + + label-name='' + label-fee='' + + class-name="segment two-third padding-right-small sm-padding-none text-small text-semibold text-uppercase text-color-heading" + class-fee="segment third padding-left-small sm-padding-none text-small text-semibold text-uppercase text-color-heading" + + data-trans='label-name=project.create.labelBusinessproviderName;label-fee=project.create.labelBusinessproviderFee' + ) + solid-form.form( data-src=`${getComponent('projects').endpoints.post}` @@ -31,12 +48,19 @@ div.segment.full.padding-large.sm-padding-xsmall.sm-padding-top-medium.whitespac label-description='' label-help='' label-captain='' + label-businessprovider='' class-customer.name='segment margin-bottom-medium half sm-full padding-right-small sm-padding-none text-small text-semibold text-uppercase text-color-heading' class-customer.address='segment margin-bottom-medium half sm-full padding-left-small sm-padding-none text-small text-semibold text-uppercase text-color-heading' class-description='segment margin-bottom-xxsmall full text-small text-semibold text-uppercase text-color-heading' class-help='segment full text-small margin-bottom-medium padding-left-small' class-linebreak='segment full sm-hidden' + class-businessprovider="segment full margin-bottom-medium" + + multiple-businessprovider + widget-businessprovider="businessprovider-widget" + multiple-businessprovider-add-label='' + multiple-businessprovider-remove-label='' widget-status='solid-form-hidden' value-status='Private' @@ -49,9 +73,10 @@ div.segment.full.padding-large.sm-padding-xsmall.sm-padding-top-medium.whitespac submit-widget="button" next=getRoute('projects', true) - data-trans='label-status=project.create.labelStatus;label-customer.name=project.create.labelCustomer;label-customer.address=project.create.labelCustomerAddress;label-name=project.create.labelName;label-description=project.create.labelDescription;label-captain=project.create.labelCaptain;label-help=project.create.descriptionHelp;submit-button=project.create.buttonSubmit' + data-trans='label-status=project.create.labelStatus;label-customer.name=project.create.labelCustomer;label-customer.address=project.create.labelCustomerAddress;label-businessprovider=project.create.labelBusinessprovider;multiple-businessprovider-add-label=project.create.labelBusinessproviderAdd;multiple-businessprovider-remove-label=project.create.labelBusinessproviderRemove;label-name=project.create.labelName;label-description=project.create.labelDescription;label-captain=project.create.labelCaptain;label-help=project.create.descriptionHelp;submit-button=project.create.buttonSubmit' )&attributes({ - "fields": componentSet.has('invoices') ? "status, customer.name, customer.address, name, captain, description, help, linebreak" : "status, customer.name, name, description, help, captain, linebreak", + "fields": componentSet.has('invoices') ? "status, customer.name, customer.address, name, captain, businessprovider, description, help, linebreak" : "status, customer.name, name, description, help, captain, linebreak", "class-captain": componentSet.has('invoices') ? 'segment margin-bottom-medium half sm-full padding-left-small sm-padding-none text-small text-semibold text-uppercase text-color-heading whitespace-normal' : 'segment margin-bottom-medium half sm-full padding-right-small sm-padding-none text-small text-semibold text-uppercase text-color-heading whitespace-normal', "class-name": componentSet.has('invoices') ? 'segment margin-bottom-medium half sm-full padding-right-small sm-padding-none text-small text-semibold text-uppercase text-color-heading' : 'segment margin-bottom-medium half sm-full sm-padding-none text-small text-semibold text-uppercase text-color-heading' }) + diff --git a/src/views/partials/project/page-project-edit.pug b/src/views/partials/project/page-project-edit.pug index 4b193a7..6a679ca 100644 --- a/src/views/partials/project/page-project-edit.pug +++ b/src/views/partials/project/page-project-edit.pug @@ -67,6 +67,60 @@ div.segment.full.padding-large.whitespace-normal "class-captain": componentSet.has('invoices') ? 'segment margin-bottom-medium half sm-full padding-left-small sm-padding-none text-small text-semibold text-uppercase text-color-heading whitespace-normal' : 'segment margin-bottom-medium half sm-full padding-right-small sm-padding-none text-small text-semibold text-uppercase text-color-heading whitespace-normal', "class-name": componentSet.has('invoices') ? 'segment margin-bottom-medium half sm-full padding-right-small sm-padding-none text-small text-semibold text-uppercase text-color-heading' : 'segment margin-bottom-medium half sm-full sm-padding-none text-small text-semibold text-uppercase text-color-heading' }) + if componentSet.has("invoices") + h3.segment.full.padding-bottom-small.border-bottom.border-color-grey.text-color-heading.text-bold.text-letter-spacing-large(data-trans='project.edit.businessProviderTitle') + + .segment.table-wrapper.margin-top-medium + .table + div.table-header.bg-color-third.text-color-heading + div.segment.table-cell.third(data-trans='project.edit.businessTableHeader1') + div.segment.table-cell.third(data-trans='project.edit.businessTableHeader2') + div.segment.table-cell.third + + solid-display( + bind-resources + class='table-body' + nested-field='businessprovider' + fields='segment1(name), segment2(fee), remove' + + class-segment1='segment table-cell third text-center' + class-segment2='segment table-cell third text-center' + class-remove='segment table-cell third text-center' + + class-name='text-small text-semibold' + class-fee='text-small text-semibold' + + multiple-businessprovider + multiple-businessprovider-fields="name, fee" + + action-remove='remove' + widget-remove='hubl-circle-edit-members-delete' + ) + + solid-form.form.table-body.edit-businessprovider( + bind-resources + class='table-body' + nested-field='businessprovider' + fields='segment1(name), segment2(fee)' + + placeholder-name="" + placeholder-fee="" + + class-segment1='segment table-cell third text-center' + class-segment2='segment table-cell third text-center' + + class-name="segment full text-small" + class-fee="segment full text-small" + + widget-name="solid-form-placeholder-text" + widget-fee="solid-form-placeholder-text" + + submit-button='' + submit-widget="button" + + data-trans='submit-button=project.edit.buttonAddBusinessProvider;placeholder-name=project.edit.businessTableHeader1;placeholder-fee=project.edit.businessTableHeader2' + ) + h3.segment.full.padding-bottom-small.border-bottom.border-color-grey.text-color-heading.text-bold.text-letter-spacing-large(data-trans='project.edit.subTitle') diff --git a/src/views/partials/project/page-project-profile.pug b/src/views/partials/project/page-project-profile.pug index ca86e47..b7850c8 100644 --- a/src/views/partials/project/page-project-profile.pug +++ b/src/views/partials/project/page-project-profile.pug @@ -102,6 +102,41 @@ div( class-description='segment margin-bottom-large whitespace-normal' widget-description='solid-display-value-markdown' ) + + if componentSet.has("invoices") + h3.text-color-heading.text-bold.text-letter-spacing-large(data-trans='project.profile.clientInformations') + + solid-display.segment.full.labelled-avatar.two-lines.whitespace-normal.children.children-full.sm-children-full.margin-bottom-medium( + bind-resources + fields='customerName(titlecustomername, customer.name), customerAddress(titlecustomeraddress, customer.address)' + + value-titlecustomername='' + value-titlecustomeraddress='' + + class-customerName="segment block" + class-customerAddress="segment block margin-top-small margin-bottom-medium whitespace-normal" + class-titlecustomername="text-semibold text-color-heading margin-right-xxsmall" + class-titlecustomeraddress="text-semibold text-color-heading margin-right-xxsmall" + + data-trans='value-titlecustomername=project.profile.customerName;value-titlecustomeraddress=project.profile.customerAddress' + ) + solid-display.segment.block.full.labelled-avatar.two-lines.whitespace-normal.children.children-full.sm-children-full.children-margin-bottom-medium.display-businessprovider( + bind-resources + nested-field='businessprovider' + fields='titlebusinessprovider, businessProvider(businessProviderName(titlebusinessprovidername, name), businessProviderFee(titlebusinessproviderfee, fee))' + + value-titlebusinessprovider='' + value-titlebusinessprovidername='' + value-titlebusinessproviderfee='' + + class-businessProviderName="segment block margin-bottom-xxsmall" + class-businessProviderFee="segment block margin-bottom-small" + class-titlebusinessprovider="segment block text-color-heading text-bold text-letter-spacing-large text-xlarge margin-top-medium margin-bottom-small" + class-titlebusinessprovidername="text-semibold text-color-heading margin-right-xxsmall" + class-titlebusinessproviderfee="text-semibold text-color-heading margin-right-xxsmall" + + data-trans='value-titlebusinessprovider=project.profile.businessProvider;value-titlebusinessprovidername=project.profile.businessProviderName;value-titlebusinessproviderfee=project.profile.businessProviderFee' + ) h3.text-color-heading.text-bold.text-letter-spacing-large(data-trans='project.profile.subTitle') From 6849f3d1fb3f861e9d37feed608fc21926f86af5 Mon Sep 17 00:00:00 2001 From: Marjolaine Le Bon Date: Thu, 6 May 2021 15:35:47 +0200 Subject: [PATCH 13/19] update: simplify display business provider on profile project --- src/locales/en.json | 6 ++---- src/locales/es.json | 4 +--- src/locales/fr.json | 4 +--- src/styles/projects/_index.scss | 4 ++++ .../partials/project/page-project-profile.pug | 16 ++++++---------- 5 files changed, 14 insertions(+), 20 deletions(-) diff --git a/src/locales/en.json b/src/locales/en.json index f298595..1cb489d 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -221,7 +221,7 @@ "labelCaptain": "Captain *", "labelDescription": "Project description", "descriptionHelp": "You can use markdown", - "businessProviderTitle": "Business Provider", + "businessProviderTitle": "Business Provider : ", "businessTableHeader1": "Business provider name", "businessTableHeader2": "Amount of contribution (%)", "buttonAddBusinessProvider": "Add", @@ -265,10 +265,8 @@ "description": "Description :", "clientInformations": "Client Informations : ", "customerName": "Customer name : ", - "customerAddress": "Customer address : ", + "customerAddress": "Customer address : ", "businessProvider": "Business Provider : ", - "businessProviderName": "Business provider name : ", - "businessProviderFee": "Amount of contribution : ", "subTitle": "Team :" } }, diff --git a/src/locales/es.json b/src/locales/es.json index 2fb0834..4f9bb28 100644 --- a/src/locales/es.json +++ b/src/locales/es.json @@ -221,7 +221,7 @@ "labelCaptain": "Capitain *", "labelDescription": "Descripción del proyecto", "descriptionHelp": "Puedes usar markdown", - "businessProviderTitle": "Contribución empresarial", + "businessProviderTitle": "Contribución empresarial : ", "businessTableHeader1": "Nombre del contribuyente empresarial", "businessTableHeader2": "Importe de la contribución (%)", "buttonAddBusinessProvider": "Añadir", @@ -267,8 +267,6 @@ "customerName": "Nombre del/la clientx : ", "customerAddress": "Dirección del/la clientx : ", "businessProvider": "Contribución empresarial : ", - "businessProviderName": "Nombre del contribuyente empresarial : ", - "businessProviderFee": "Importe de la contribución : ", "subTitle": "Equipo : " } }, diff --git a/src/locales/fr.json b/src/locales/fr.json index 4b82e19..425efe4 100644 --- a/src/locales/fr.json +++ b/src/locales/fr.json @@ -219,7 +219,7 @@ "labelCaptain": "Capitaine *", "labelDescription": "Description du projet", "descriptionHelp": "Vous pouvez utiliser Markdown", - "businessProviderTitle": "Apport d'affaire", + "businessProviderTitle": "Apport d'affaire : ", "businessTableHeader1": "Nom de l'apporteur d'affaire", "businessTableHeader2": "Montant de l'apport d'affaire (%)", "buttonAddBusinessProvider": "Ajouter", @@ -265,8 +265,6 @@ "customerName": "Nom du client : ", "customerAddress": "Adresse du client : ", "businessProvider": "Apport d'affaire : ", - "businessProviderName": "Nom de l'apporteur d'affaire : ", - "businessProviderFee": "Montant de l'apport d'affaire : ", "subTitle": "Equipe :" } }, diff --git a/src/styles/projects/_index.scss b/src/styles/projects/_index.scss index 5b7cdde..04bc481 100644 --- a/src/styles/projects/_index.scss +++ b/src/styles/projects/_index.scss @@ -39,6 +39,10 @@ } } #projects-information .display-businessprovider { + [name="name"]::after { + content: " - "; + margin-left: 5px; + } [name="fee"]:after { content: " %"; } diff --git a/src/views/partials/project/page-project-profile.pug b/src/views/partials/project/page-project-profile.pug index b7850c8..5e33c8e 100644 --- a/src/views/partials/project/page-project-profile.pug +++ b/src/views/partials/project/page-project-profile.pug @@ -120,22 +120,18 @@ div( data-trans='value-titlecustomername=project.profile.customerName;value-titlecustomeraddress=project.profile.customerAddress' ) - solid-display.segment.block.full.labelled-avatar.two-lines.whitespace-normal.children.children-full.sm-children-full.children-margin-bottom-medium.display-businessprovider( + solid-display.segment.block.full.labelled-avatar.two-lines.whitespace-normal.children.children-full.sm-children-full.margin-bottom-medium.display-businessprovider( bind-resources nested-field='businessprovider' - fields='titlebusinessprovider, businessProvider(businessProviderName(titlebusinessprovidername, name), businessProviderFee(titlebusinessproviderfee, fee))' + fields='titlebusinessprovider, businessProvider(name, fee)' value-titlebusinessprovider='' - value-titlebusinessprovidername='' - value-titlebusinessproviderfee='' - class-businessProviderName="segment block margin-bottom-xxsmall" - class-businessProviderFee="segment block margin-bottom-small" - class-titlebusinessprovider="segment block text-color-heading text-bold text-letter-spacing-large text-xlarge margin-top-medium margin-bottom-small" - class-titlebusinessprovidername="text-semibold text-color-heading margin-right-xxsmall" - class-titlebusinessproviderfee="text-semibold text-color-heading margin-right-xxsmall" + class-titlebusinessprovider="segment block text-color-heading text-bold text-letter-spacing-large text-xlarge margin-bottom-small" + class-businessProvider="segment block margin-bottom-xsmall" + class-fee="margin-left-xxsmall" - data-trans='value-titlebusinessprovider=project.profile.businessProvider;value-titlebusinessprovidername=project.profile.businessProviderName;value-titlebusinessproviderfee=project.profile.businessProviderFee' + data-trans='value-titlebusinessprovider=project.profile.businessProvider' ) h3.text-color-heading.text-bold.text-letter-spacing-large(data-trans='project.profile.subTitle') From 3f8c298ed496052f8546b879aaf2c239ec66cbf9 Mon Sep 17 00:00:00 2001 From: Marjolaine Le Bon Date: Thu, 6 May 2021 12:10:51 +0200 Subject: [PATCH 14/19] update: projects => add business provider --- src/locales/en.json | 15 ++++++ src/locales/es.json | 15 ++++++ src/locales/fr.json | 15 ++++++ src/styles/index.scss | 1 + src/styles/projects/_index.scss | 48 +++++++++++++++++ .../admin/page-admin-projects-create.pug | 29 +++++++++- .../partials/project/page-project-edit.pug | 54 +++++++++++++++++++ .../partials/project/page-project-profile.pug | 35 ++++++++++++ 8 files changed, 210 insertions(+), 2 deletions(-) create mode 100644 src/styles/projects/_index.scss diff --git a/src/locales/en.json b/src/locales/en.json index 4035871..f298595 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -204,6 +204,11 @@ "labelCustomer": "Customer name*", "labelCustomerAddress": "Customer address", "labelCaptain": "Project captain*", + "labelBusinessprovider": "Business Input", + "labelBusinessproviderAdd": "Add a Business Provider", + "labelBusinessproviderRemove": "Remove", + "labelBusinessproviderName": "Business Provider Name", + "labelBusinessproviderFee": "Amount of contribution (%)", "buttonSubmit": "Save" }, "edit": { @@ -216,6 +221,10 @@ "labelCaptain": "Captain *", "labelDescription": "Project description", "descriptionHelp": "You can use markdown", + "businessProviderTitle": "Business Provider", + "businessTableHeader1": "Business provider name", + "businessTableHeader2": "Amount of contribution (%)", + "buttonAddBusinessProvider": "Add", "subTitle": "Team members :", "tableHeader1": "Name", "tableHeader2": "Access", @@ -254,6 +263,12 @@ "buttonJoin": "Join the project", "captain": "Captain :", "description": "Description :", + "clientInformations": "Client Informations : ", + "customerName": "Customer name : ", + "customerAddress": "Customer address : ", + "businessProvider": "Business Provider : ", + "businessProviderName": "Business provider name : ", + "businessProviderFee": "Amount of contribution : ", "subTitle": "Team :" } }, diff --git a/src/locales/es.json b/src/locales/es.json index 539883b..2fb0834 100644 --- a/src/locales/es.json +++ b/src/locales/es.json @@ -204,6 +204,11 @@ "labelCustomer": "Nombre del/la clientx *", "labelCustomerAddress": "Dirección del/la clientx", "labelCaptain": "Líder del proyecto *", + "labelBusinessprovider": "Contribución empresarial", + "labelBusinessproviderAdd": "Eliminar", + "labelBusinessproviderRemove": "Añadir la entrada del negocio", + "labelBusinessproviderName": "Nombre del contribuyente empresarial", + "labelBusinessproviderFee": "Importe de la contribución (%)", "buttonSubmit": "Guardar" }, "edit": { @@ -216,6 +221,10 @@ "labelCaptain": "Capitain *", "labelDescription": "Descripción del proyecto", "descriptionHelp": "Puedes usar markdown", + "businessProviderTitle": "Contribución empresarial", + "businessTableHeader1": "Nombre del contribuyente empresarial", + "businessTableHeader2": "Importe de la contribución (%)", + "buttonAddBusinessProvider": "Añadir", "subTitle": "Lista de miembrxs: ", "tableHeader1": "Nombre", "tableHeader2": "Acceso", @@ -254,6 +263,12 @@ "buttonJoin": "Unirse al proyecto", "captain": "Líder : ", "description": "Descripción :", + "clientInformations": "información al clientx : ", + "customerName": "Nombre del/la clientx : ", + "customerAddress": "Dirección del/la clientx : ", + "businessProvider": "Contribución empresarial : ", + "businessProviderName": "Nombre del contribuyente empresarial : ", + "businessProviderFee": "Importe de la contribución : ", "subTitle": "Equipo : " } }, diff --git a/src/locales/fr.json b/src/locales/fr.json index a02276d..4b82e19 100644 --- a/src/locales/fr.json +++ b/src/locales/fr.json @@ -202,6 +202,11 @@ "labelCustomer": "Nom du client*", "labelCustomerAddress": "Adresse du client", "labelCaptain": "Capitaine du projet*", + "labelBusinessprovider": "Apport d'affaire", + "labelBusinessproviderAdd": "Ajouter de l'apport d'affaire", + "labelBusinessproviderRemove": "Retirer", + "labelBusinessproviderName": "Nom de l'apporteur d'affaire", + "labelBusinessproviderFee": "Montant de l'apport d'affaire (%)", "buttonSubmit": "Enregistrer" }, "edit": { @@ -214,6 +219,10 @@ "labelCaptain": "Capitaine *", "labelDescription": "Description du projet", "descriptionHelp": "Vous pouvez utiliser Markdown", + "businessProviderTitle": "Apport d'affaire", + "businessTableHeader1": "Nom de l'apporteur d'affaire", + "businessTableHeader2": "Montant de l'apport d'affaire (%)", + "buttonAddBusinessProvider": "Ajouter", "subTitle": "Liste des membres :", "tableHeader1": "Nom", "tableHeader2": "Accès", @@ -252,6 +261,12 @@ "buttonJoin": "Rejoindre le projet", "captain": "Capitaine :", "description": "Description :", + "clientInformations": "Informations sur le client : ", + "customerName": "Nom du client : ", + "customerAddress": "Adresse du client : ", + "businessProvider": "Apport d'affaire : ", + "businessProviderName": "Nom de l'apporteur d'affaire : ", + "businessProviderFee": "Montant de l'apport d'affaire : ", "subTitle": "Equipe :" } }, diff --git a/src/styles/index.scss b/src/styles/index.scss index 8ae3a07..98c9fd3 100644 --- a/src/styles/index.scss +++ b/src/styles/index.scss @@ -42,6 +42,7 @@ solid-display>div { @import 'chat'; @import 'forms'; @import 'communities'; +@import 'projects'; @import 'admin-circles'; nav#main__menu { diff --git a/src/styles/projects/_index.scss b/src/styles/projects/_index.scss new file mode 100644 index 0000000..5b7cdde --- /dev/null +++ b/src/styles/projects/_index.scss @@ -0,0 +1,48 @@ +#admin-projects-create .form solid-multiple-form { + height: 100%; + button { + border: 1px solid var(--color-secondary); + text-transform: uppercase; + color: var(--color-secondary); + background-color: white; + font-weight: 700; + padding: 9px 20px; + font-size: 12px; + line-height: 14px; + border-radius: 16.5px; + } + button:hover { + background-color: var(--color-secondary); + color: white; + } +} +#projects-edit .edit-businessprovider form { + display: table-row; + border-bottom: 1px solid #C9C8C8; + border-right: 1px solid #C9C8C8; + .segment.table-cell { + border-bottom: 1px solid #C9C8C8; + border-right: 1px solid #C9C8C8; + height: 60px; + padding: 10px; + } + [type="submit"] { + float: none; + display: flex; + margin: 19px auto; + color: var(--color-secondary); + background-color: white; + } + [type="submit"]:hover { + background-color: var(--color-secondary); + color: white; + } +} +#projects-information .display-businessprovider { + [name="fee"]:after { + content: " %"; + } + > div > solid-display:not(:first-child) [name="titlebusinessprovider"] { + display: none; + } +} diff --git a/src/views/partials/admin/page-admin-projects-create.pug b/src/views/partials/admin/page-admin-projects-create.pug index 93eb0b0..f4f481a 100644 --- a/src/views/partials/admin/page-admin-projects-create.pug +++ b/src/views/partials/admin/page-admin-projects-create.pug @@ -13,6 +13,23 @@ div.segment.full.padding-large.sm-padding-xsmall.sm-padding-top-medium.whitespac div div + solid-widget(name="businessprovider-widget") + template + solid-form.segment.three-quarter.sm-full.margin-right-medium.margin-bottom-small( + data-src="\${value}" + data-holder + naked + fields="name, fee" + + label-name='' + label-fee='' + + class-name="segment two-third padding-right-small sm-padding-none text-small text-semibold text-uppercase text-color-heading" + class-fee="segment third padding-left-small sm-padding-none text-small text-semibold text-uppercase text-color-heading" + + data-trans='label-name=project.create.labelBusinessproviderName;label-fee=project.create.labelBusinessproviderFee' + ) + solid-form.form( data-src=`${getComponent('projects').endpoints.post}` @@ -31,12 +48,19 @@ div.segment.full.padding-large.sm-padding-xsmall.sm-padding-top-medium.whitespac label-description='' label-help='' label-captain='' + label-businessprovider='' class-customer.name='segment margin-bottom-medium half sm-full padding-right-small sm-padding-none text-small text-semibold text-uppercase text-color-heading' class-customer.address='segment margin-bottom-medium half sm-full padding-left-small sm-padding-none text-small text-semibold text-uppercase text-color-heading' class-description='segment margin-bottom-xxsmall full text-small text-semibold text-uppercase text-color-heading' class-help='segment full text-small margin-bottom-medium padding-left-small' class-linebreak='segment full sm-hidden' + class-businessprovider="segment full margin-bottom-medium" + + multiple-businessprovider + widget-businessprovider="businessprovider-widget" + multiple-businessprovider-add-label='' + multiple-businessprovider-remove-label='' widget-status='solid-form-hidden' value-status='Private' @@ -49,9 +73,10 @@ div.segment.full.padding-large.sm-padding-xsmall.sm-padding-top-medium.whitespac submit-widget="button" next=getRoute('projects', true) - data-trans='label-status=project.create.labelStatus;label-customer.name=project.create.labelCustomer;label-customer.address=project.create.labelCustomerAddress;label-name=project.create.labelName;label-description=project.create.labelDescription;label-captain=project.create.labelCaptain;label-help=project.create.descriptionHelp;submit-button=project.create.buttonSubmit' + data-trans='label-status=project.create.labelStatus;label-customer.name=project.create.labelCustomer;label-customer.address=project.create.labelCustomerAddress;label-businessprovider=project.create.labelBusinessprovider;multiple-businessprovider-add-label=project.create.labelBusinessproviderAdd;multiple-businessprovider-remove-label=project.create.labelBusinessproviderRemove;label-name=project.create.labelName;label-description=project.create.labelDescription;label-captain=project.create.labelCaptain;label-help=project.create.descriptionHelp;submit-button=project.create.buttonSubmit' )&attributes({ - "fields": componentSet.has('invoices') ? "status, customer.name, customer.address, name, captain, description, help, linebreak" : "status, customer.name, name, description, help, captain, linebreak", + "fields": componentSet.has('invoices') ? "status, customer.name, customer.address, name, captain, businessprovider, description, help, linebreak" : "status, customer.name, name, description, help, captain, linebreak", "class-captain": componentSet.has('invoices') ? 'segment margin-bottom-medium half sm-full padding-left-small sm-padding-none text-small text-semibold text-uppercase text-color-heading whitespace-normal' : 'segment margin-bottom-medium half sm-full padding-right-small sm-padding-none text-small text-semibold text-uppercase text-color-heading whitespace-normal', "class-name": componentSet.has('invoices') ? 'segment margin-bottom-medium half sm-full padding-right-small sm-padding-none text-small text-semibold text-uppercase text-color-heading' : 'segment margin-bottom-medium half sm-full sm-padding-none text-small text-semibold text-uppercase text-color-heading' }) + diff --git a/src/views/partials/project/page-project-edit.pug b/src/views/partials/project/page-project-edit.pug index 4b193a7..6a679ca 100644 --- a/src/views/partials/project/page-project-edit.pug +++ b/src/views/partials/project/page-project-edit.pug @@ -67,6 +67,60 @@ div.segment.full.padding-large.whitespace-normal "class-captain": componentSet.has('invoices') ? 'segment margin-bottom-medium half sm-full padding-left-small sm-padding-none text-small text-semibold text-uppercase text-color-heading whitespace-normal' : 'segment margin-bottom-medium half sm-full padding-right-small sm-padding-none text-small text-semibold text-uppercase text-color-heading whitespace-normal', "class-name": componentSet.has('invoices') ? 'segment margin-bottom-medium half sm-full padding-right-small sm-padding-none text-small text-semibold text-uppercase text-color-heading' : 'segment margin-bottom-medium half sm-full sm-padding-none text-small text-semibold text-uppercase text-color-heading' }) + if componentSet.has("invoices") + h3.segment.full.padding-bottom-small.border-bottom.border-color-grey.text-color-heading.text-bold.text-letter-spacing-large(data-trans='project.edit.businessProviderTitle') + + .segment.table-wrapper.margin-top-medium + .table + div.table-header.bg-color-third.text-color-heading + div.segment.table-cell.third(data-trans='project.edit.businessTableHeader1') + div.segment.table-cell.third(data-trans='project.edit.businessTableHeader2') + div.segment.table-cell.third + + solid-display( + bind-resources + class='table-body' + nested-field='businessprovider' + fields='segment1(name), segment2(fee), remove' + + class-segment1='segment table-cell third text-center' + class-segment2='segment table-cell third text-center' + class-remove='segment table-cell third text-center' + + class-name='text-small text-semibold' + class-fee='text-small text-semibold' + + multiple-businessprovider + multiple-businessprovider-fields="name, fee" + + action-remove='remove' + widget-remove='hubl-circle-edit-members-delete' + ) + + solid-form.form.table-body.edit-businessprovider( + bind-resources + class='table-body' + nested-field='businessprovider' + fields='segment1(name), segment2(fee)' + + placeholder-name="" + placeholder-fee="" + + class-segment1='segment table-cell third text-center' + class-segment2='segment table-cell third text-center' + + class-name="segment full text-small" + class-fee="segment full text-small" + + widget-name="solid-form-placeholder-text" + widget-fee="solid-form-placeholder-text" + + submit-button='' + submit-widget="button" + + data-trans='submit-button=project.edit.buttonAddBusinessProvider;placeholder-name=project.edit.businessTableHeader1;placeholder-fee=project.edit.businessTableHeader2' + ) + h3.segment.full.padding-bottom-small.border-bottom.border-color-grey.text-color-heading.text-bold.text-letter-spacing-large(data-trans='project.edit.subTitle') diff --git a/src/views/partials/project/page-project-profile.pug b/src/views/partials/project/page-project-profile.pug index ca86e47..b7850c8 100644 --- a/src/views/partials/project/page-project-profile.pug +++ b/src/views/partials/project/page-project-profile.pug @@ -102,6 +102,41 @@ div( class-description='segment margin-bottom-large whitespace-normal' widget-description='solid-display-value-markdown' ) + + if componentSet.has("invoices") + h3.text-color-heading.text-bold.text-letter-spacing-large(data-trans='project.profile.clientInformations') + + solid-display.segment.full.labelled-avatar.two-lines.whitespace-normal.children.children-full.sm-children-full.margin-bottom-medium( + bind-resources + fields='customerName(titlecustomername, customer.name), customerAddress(titlecustomeraddress, customer.address)' + + value-titlecustomername='' + value-titlecustomeraddress='' + + class-customerName="segment block" + class-customerAddress="segment block margin-top-small margin-bottom-medium whitespace-normal" + class-titlecustomername="text-semibold text-color-heading margin-right-xxsmall" + class-titlecustomeraddress="text-semibold text-color-heading margin-right-xxsmall" + + data-trans='value-titlecustomername=project.profile.customerName;value-titlecustomeraddress=project.profile.customerAddress' + ) + solid-display.segment.block.full.labelled-avatar.two-lines.whitespace-normal.children.children-full.sm-children-full.children-margin-bottom-medium.display-businessprovider( + bind-resources + nested-field='businessprovider' + fields='titlebusinessprovider, businessProvider(businessProviderName(titlebusinessprovidername, name), businessProviderFee(titlebusinessproviderfee, fee))' + + value-titlebusinessprovider='' + value-titlebusinessprovidername='' + value-titlebusinessproviderfee='' + + class-businessProviderName="segment block margin-bottom-xxsmall" + class-businessProviderFee="segment block margin-bottom-small" + class-titlebusinessprovider="segment block text-color-heading text-bold text-letter-spacing-large text-xlarge margin-top-medium margin-bottom-small" + class-titlebusinessprovidername="text-semibold text-color-heading margin-right-xxsmall" + class-titlebusinessproviderfee="text-semibold text-color-heading margin-right-xxsmall" + + data-trans='value-titlebusinessprovider=project.profile.businessProvider;value-titlebusinessprovidername=project.profile.businessProviderName;value-titlebusinessproviderfee=project.profile.businessProviderFee' + ) h3.text-color-heading.text-bold.text-letter-spacing-large(data-trans='project.profile.subTitle') From e335cf5b1f253f8a9fa96989dba9c8f12b6e6c7d Mon Sep 17 00:00:00 2001 From: Marjolaine Le Bon Date: Thu, 6 May 2021 15:35:47 +0200 Subject: [PATCH 15/19] update: simplify display business provider on profile project --- src/locales/en.json | 6 ++---- src/locales/es.json | 4 +--- src/locales/fr.json | 4 +--- src/styles/projects/_index.scss | 4 ++++ .../partials/project/page-project-profile.pug | 16 ++++++---------- 5 files changed, 14 insertions(+), 20 deletions(-) diff --git a/src/locales/en.json b/src/locales/en.json index f298595..1cb489d 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -221,7 +221,7 @@ "labelCaptain": "Captain *", "labelDescription": "Project description", "descriptionHelp": "You can use markdown", - "businessProviderTitle": "Business Provider", + "businessProviderTitle": "Business Provider : ", "businessTableHeader1": "Business provider name", "businessTableHeader2": "Amount of contribution (%)", "buttonAddBusinessProvider": "Add", @@ -265,10 +265,8 @@ "description": "Description :", "clientInformations": "Client Informations : ", "customerName": "Customer name : ", - "customerAddress": "Customer address : ", + "customerAddress": "Customer address : ", "businessProvider": "Business Provider : ", - "businessProviderName": "Business provider name : ", - "businessProviderFee": "Amount of contribution : ", "subTitle": "Team :" } }, diff --git a/src/locales/es.json b/src/locales/es.json index 2fb0834..4f9bb28 100644 --- a/src/locales/es.json +++ b/src/locales/es.json @@ -221,7 +221,7 @@ "labelCaptain": "Capitain *", "labelDescription": "Descripción del proyecto", "descriptionHelp": "Puedes usar markdown", - "businessProviderTitle": "Contribución empresarial", + "businessProviderTitle": "Contribución empresarial : ", "businessTableHeader1": "Nombre del contribuyente empresarial", "businessTableHeader2": "Importe de la contribución (%)", "buttonAddBusinessProvider": "Añadir", @@ -267,8 +267,6 @@ "customerName": "Nombre del/la clientx : ", "customerAddress": "Dirección del/la clientx : ", "businessProvider": "Contribución empresarial : ", - "businessProviderName": "Nombre del contribuyente empresarial : ", - "businessProviderFee": "Importe de la contribución : ", "subTitle": "Equipo : " } }, diff --git a/src/locales/fr.json b/src/locales/fr.json index 4b82e19..425efe4 100644 --- a/src/locales/fr.json +++ b/src/locales/fr.json @@ -219,7 +219,7 @@ "labelCaptain": "Capitaine *", "labelDescription": "Description du projet", "descriptionHelp": "Vous pouvez utiliser Markdown", - "businessProviderTitle": "Apport d'affaire", + "businessProviderTitle": "Apport d'affaire : ", "businessTableHeader1": "Nom de l'apporteur d'affaire", "businessTableHeader2": "Montant de l'apport d'affaire (%)", "buttonAddBusinessProvider": "Ajouter", @@ -265,8 +265,6 @@ "customerName": "Nom du client : ", "customerAddress": "Adresse du client : ", "businessProvider": "Apport d'affaire : ", - "businessProviderName": "Nom de l'apporteur d'affaire : ", - "businessProviderFee": "Montant de l'apport d'affaire : ", "subTitle": "Equipe :" } }, diff --git a/src/styles/projects/_index.scss b/src/styles/projects/_index.scss index 5b7cdde..04bc481 100644 --- a/src/styles/projects/_index.scss +++ b/src/styles/projects/_index.scss @@ -39,6 +39,10 @@ } } #projects-information .display-businessprovider { + [name="name"]::after { + content: " - "; + margin-left: 5px; + } [name="fee"]:after { content: " %"; } diff --git a/src/views/partials/project/page-project-profile.pug b/src/views/partials/project/page-project-profile.pug index b7850c8..5e33c8e 100644 --- a/src/views/partials/project/page-project-profile.pug +++ b/src/views/partials/project/page-project-profile.pug @@ -120,22 +120,18 @@ div( data-trans='value-titlecustomername=project.profile.customerName;value-titlecustomeraddress=project.profile.customerAddress' ) - solid-display.segment.block.full.labelled-avatar.two-lines.whitespace-normal.children.children-full.sm-children-full.children-margin-bottom-medium.display-businessprovider( + solid-display.segment.block.full.labelled-avatar.two-lines.whitespace-normal.children.children-full.sm-children-full.margin-bottom-medium.display-businessprovider( bind-resources nested-field='businessprovider' - fields='titlebusinessprovider, businessProvider(businessProviderName(titlebusinessprovidername, name), businessProviderFee(titlebusinessproviderfee, fee))' + fields='titlebusinessprovider, businessProvider(name, fee)' value-titlebusinessprovider='' - value-titlebusinessprovidername='' - value-titlebusinessproviderfee='' - class-businessProviderName="segment block margin-bottom-xxsmall" - class-businessProviderFee="segment block margin-bottom-small" - class-titlebusinessprovider="segment block text-color-heading text-bold text-letter-spacing-large text-xlarge margin-top-medium margin-bottom-small" - class-titlebusinessprovidername="text-semibold text-color-heading margin-right-xxsmall" - class-titlebusinessproviderfee="text-semibold text-color-heading margin-right-xxsmall" + class-titlebusinessprovider="segment block text-color-heading text-bold text-letter-spacing-large text-xlarge margin-bottom-small" + class-businessProvider="segment block margin-bottom-xsmall" + class-fee="margin-left-xxsmall" - data-trans='value-titlebusinessprovider=project.profile.businessProvider;value-titlebusinessprovidername=project.profile.businessProviderName;value-titlebusinessproviderfee=project.profile.businessProviderFee' + data-trans='value-titlebusinessprovider=project.profile.businessProvider' ) h3.text-color-heading.text-bold.text-letter-spacing-large(data-trans='project.profile.subTitle') From 6c9e670aba75d468f894b5e5501421a54998e58d Mon Sep 17 00:00:00 2001 From: antoine37120 Date: Fri, 7 May 2021 16:23:06 +0200 Subject: [PATCH 16/19] update: add key circle for circle range use in resources --- README.md | 1 + src/views/page-resources.pug | 2 +- src/views/partials/circle/page-circle-resources.pug | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 66371bc..2548567 100644 --- a/README.md +++ b/README.md @@ -579,6 +579,7 @@ Module declaration, on `config.json`: "post": "http://server.url/resources/", "types": "http://server.url/types/", "keywords": "http://server.url/keywords/", + "circles": "http://server.url/circles", "postTypes": "http://server.url/types/", "postKeywords": "http://server.url/keywords/", "uploads": "http://server.url/upload/" diff --git a/src/views/page-resources.pug b/src/views/page-resources.pug index f90d0f2..cf86075 100644 --- a/src/views/page-resources.pug +++ b/src/views/page-resources.pug @@ -5,7 +5,7 @@ div.whitespace-normal post-data-type-src=`${component.endpoints.postTypes}` range-resource-keyword=`${component.endpoints.keywords}` post-data-keyword-src=`${component.endpoints.postKeywords}` - range-resource-circle=`${getComponent('circles').endpoints.get}/` + circles=`${component.endpoints.circles}` associated-circle-label="" data-trans=`associated-circle-label=${component.parameters && component.parameters.associatedName ? component.parameters.associatedName : 'circle.extensions.associated'}` upload-dir=`${component.endpoints.uploads}` diff --git a/src/views/partials/circle/page-circle-resources.pug b/src/views/partials/circle/page-circle-resources.pug index cd46f6b..0020e82 100644 --- a/src/views/partials/circle/page-circle-resources.pug +++ b/src/views/partials/circle/page-circle-resources.pug @@ -6,7 +6,7 @@ solid-resource( post-data-type-src=`${extension.endpoints.postTypes}` range-resource-keyword=`${extension.endpoints.keywords}` post-data-keyword-src=`${extension.endpoints.postKeywords}` - range-resource-circle=`${getComponent('circles').endpoints.get}/` + circles=`${extension.endpoints.cicle}` associated-circle-label="" data-trans=`associated-circle-label=${extension.parameters && extension.parameters.associatedName ? extension.parameters.associatedName : 'circle.extensions.associated'}` upload-dir=`${extension.endpoints.uploads}` From bf23ce7c088681432f7468e0a75c789c69be5d91 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Pasquier Date: Fri, 7 May 2021 14:56:05 +0000 Subject: [PATCH 17/19] fix: typo --- src/views/partials/circle/page-circle-resources.pug | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/partials/circle/page-circle-resources.pug b/src/views/partials/circle/page-circle-resources.pug index 0020e82..a3ac649 100644 --- a/src/views/partials/circle/page-circle-resources.pug +++ b/src/views/partials/circle/page-circle-resources.pug @@ -6,7 +6,7 @@ solid-resource( post-data-type-src=`${extension.endpoints.postTypes}` range-resource-keyword=`${extension.endpoints.keywords}` post-data-keyword-src=`${extension.endpoints.postKeywords}` - circles=`${extension.endpoints.cicle}` + circles=`${extension.endpoints.circles}` associated-circle-label="" data-trans=`associated-circle-label=${extension.parameters && extension.parameters.associatedName ? extension.parameters.associatedName : 'circle.extensions.associated'}` upload-dir=`${extension.endpoints.uploads}` From b8dd2aca56c84806d85927fb2331f68651b439cf Mon Sep 17 00:00:00 2001 From: antoine37120 Date: Sat, 8 May 2021 12:29:59 +0200 Subject: [PATCH 18/19] minor: add / for circles uri --- src/views/page-resources.pug | 4 +--- src/views/partials/circle/page-circle-resources.pug | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/views/page-resources.pug b/src/views/page-resources.pug index cf86075..c29dac9 100644 --- a/src/views/page-resources.pug +++ b/src/views/page-resources.pug @@ -5,12 +5,10 @@ div.whitespace-normal post-data-type-src=`${component.endpoints.postTypes}` range-resource-keyword=`${component.endpoints.keywords}` post-data-keyword-src=`${component.endpoints.postKeywords}` - circles=`${component.endpoints.circles}` + circles=`${component.endpoints.circles}/` associated-circle-label="" data-trans=`associated-circle-label=${component.parameters && component.parameters.associatedName ? component.parameters.associatedName : 'circle.extensions.associated'}` upload-dir=`${component.endpoints.uploads}` id-prefix='default' uniq=component.uniq ) - - diff --git a/src/views/partials/circle/page-circle-resources.pug b/src/views/partials/circle/page-circle-resources.pug index a3ac649..04ed838 100644 --- a/src/views/partials/circle/page-circle-resources.pug +++ b/src/views/partials/circle/page-circle-resources.pug @@ -6,7 +6,7 @@ solid-resource( post-data-type-src=`${extension.endpoints.postTypes}` range-resource-keyword=`${extension.endpoints.keywords}` post-data-keyword-src=`${extension.endpoints.postKeywords}` - circles=`${extension.endpoints.circles}` + circles=`${extension.endpoints.circles}/` associated-circle-label="" data-trans=`associated-circle-label=${extension.parameters && extension.parameters.associatedName ? extension.parameters.associatedName : 'circle.extensions.associated'}` upload-dir=`${extension.endpoints.uploads}` From 9ce9e7d906b72e9ce8a39ec820ca0f0418d098fc Mon Sep 17 00:00:00 2001 From: Marjolaine Le Bon Date: Mon, 10 May 2021 11:17:20 +0200 Subject: [PATCH 19/19] update: add a file for the businessprovider creation widget --- .../admin/page-admin-projects-create.pug | 19 +------------------ src/views/partials/widgets.pug | 1 + .../widgets/hubl-project-businessprovider.pug | 17 +++++++++++++++++ 3 files changed, 19 insertions(+), 18 deletions(-) create mode 100644 src/views/partials/widgets/hubl-project-businessprovider.pug diff --git a/src/views/partials/admin/page-admin-projects-create.pug b/src/views/partials/admin/page-admin-projects-create.pug index f4f481a..102ef9f 100644 --- a/src/views/partials/admin/page-admin-projects-create.pug +++ b/src/views/partials/admin/page-admin-projects-create.pug @@ -13,23 +13,6 @@ div.segment.full.padding-large.sm-padding-xsmall.sm-padding-top-medium.whitespac div div - solid-widget(name="businessprovider-widget") - template - solid-form.segment.three-quarter.sm-full.margin-right-medium.margin-bottom-small( - data-src="\${value}" - data-holder - naked - fields="name, fee" - - label-name='' - label-fee='' - - class-name="segment two-third padding-right-small sm-padding-none text-small text-semibold text-uppercase text-color-heading" - class-fee="segment third padding-left-small sm-padding-none text-small text-semibold text-uppercase text-color-heading" - - data-trans='label-name=project.create.labelBusinessproviderName;label-fee=project.create.labelBusinessproviderFee' - ) - solid-form.form( data-src=`${getComponent('projects').endpoints.post}` @@ -58,7 +41,7 @@ div.segment.full.padding-large.sm-padding-xsmall.sm-padding-top-medium.whitespac class-businessprovider="segment full margin-bottom-medium" multiple-businessprovider - widget-businessprovider="businessprovider-widget" + widget-businessprovider="hubl-project-businessprovider" multiple-businessprovider-add-label='' multiple-businessprovider-remove-label='' diff --git a/src/views/partials/widgets.pug b/src/views/partials/widgets.pug index ee38e84..085d687 100644 --- a/src/views/partials/widgets.pug +++ b/src/views/partials/widgets.pug @@ -48,6 +48,7 @@ include widgets/hubl-menu-jabberid.pug include widgets/hubl-menu-publicprivate.pug include widgets/hubl-project-admins.pug include widgets/hubl-project-captain.pug +include widgets/hubl-project-businessprovider.pug include widgets/hubl-project-edit-admin.pug include widgets/hubl-project-edit-members-delete.pug include widgets/hubl-project-team-contact.pug diff --git a/src/views/partials/widgets/hubl-project-businessprovider.pug b/src/views/partials/widgets/hubl-project-businessprovider.pug new file mode 100644 index 0000000..cc0c980 --- /dev/null +++ b/src/views/partials/widgets/hubl-project-businessprovider.pug @@ -0,0 +1,17 @@ +if componentSet.has('invoice') && componentSet.has('projects') + solid-widget(name="hubl-project-businessprovider") + template + solid-form.segment.three-quarter.sm-full.margin-right-medium.margin-bottom-small( + data-src="\${value}" + data-holder + naked + fields="name, fee" + + label-name='' + label-fee='' + + class-name="segment two-third padding-right-small sm-padding-none text-small text-semibold text-uppercase text-color-heading" + class-fee="segment third padding-left-small sm-padding-none text-small text-semibold text-uppercase text-color-heading" + + data-trans='label-name=project.create.labelBusinessproviderName;label-fee=project.create.labelBusinessproviderFee' + )