From 647a62bba7f015542626f88bd966666cd9826c60 Mon Sep 17 00:00:00 2001 From: Jure Ursic Date: Thu, 14 May 2020 15:03:08 +0200 Subject: [PATCH 01/42] update: removed not needed attribute on sib-directory --- src/page-directory.pug | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/page-directory.pug b/src/page-directory.pug index e8f8c3c..a37d1b0 100644 --- a/src/page-directory.pug +++ b/src/page-directory.pug @@ -1,5 +1,4 @@ sib-directory( - data-src=`${endpoints.users || endpoints.get.users}`, - range-groups=`${endpoints.groups || endpoints.get.groups}`, + data-src=`${endpoints.users || endpoints.get.users}` range-skills=`${endpoints.skills || endpoints.get.skills}` ) From 101617fed8aa3357ec3579d67396250057740940 Mon Sep 17 00:00:00 2001 From: maxime_senza Date: Wed, 27 May 2020 12:42:08 +0200 Subject: [PATCH 02/42] 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 03/42] 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 a703671853c5cabc0b75dd938852257a38e2e1a2 Mon Sep 17 00:00:00 2001 From: Jure Ursic Date: Fri, 29 May 2020 17:33:02 +0200 Subject: [PATCH 04/42] feature: job-board listing,, createand edit --- src/dependencies.pug | 4 ++-- src/menu-left.pug | 2 +- src/page-job-offers.pug | 22 ++----------------- src/views/job-offer/page-job-offer-create.pug | 1 - src/views/job-offer/page-job-offer-edit.pug | 1 - 5 files changed, 5 insertions(+), 25 deletions(-) diff --git a/src/dependencies.pug b/src/dependencies.pug index 46c0ab6..b64c1d2 100644 --- a/src/dependencies.pug +++ b/src/dependencies.pug @@ -20,12 +20,12 @@ 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-job-board/index.js" defer) //- script(type="module" src="/lib/sib-conversation/sib-conversation.js" defer) if publicDirectory && (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/sib-directory.js" defer) +//- script(type="module" src="/lib/sib-directory/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/menu-left.pug b/src/menu-left.pug index 3c82383..f5dbdcc 100644 --- a/src/menu-left.pug +++ b/src/menu-left.pug @@ -60,7 +60,7 @@ nav#main__menu.jsLeftMenu div.menu-icon.icon-people div.divider if endpoints.joboffers || (endpoints.get && endpoints.get.joboffers) - sib-route.menu(name='job-offers', rdf-type='hd:joboffer') + sib-route.menu(name='job-offers') div.menu-label Offres de mission div.menu-icon.icon-briefcase div.divider diff --git a/src/page-job-offers.pug b/src/page-job-offers.pug index b7cb186..f173429 100644 --- a/src/page-job-offers.pug +++ b/src/page-job-offers.pug @@ -1,25 +1,7 @@ .content-box.full-width - #job-offer-board - .job-offers__container + #job-offers.job-offers__container sib-job-board( data-src=`${endpoints.joboffers || endpoints.get.joboffers}`, + post-data-src=`${endpoints.joboffers || endpoints.post.joboffers}`, range-skills=`${endpoints.skills || endpoints.get.skills}` ) - - div.job-offers__newoffer - sib-link(next="job-offer-create").plus-button - div.icon-plus - div Post a new offer - - #job-offer-create(hidden) - sib-link(class="backlink", next="job-offers") Back - include views/job-offer/page-job-offer-create.pug - - #job-offer-edit(hidden) - sib-link(class="backlink", next="job-offers") Back - include views/job-offer/page-job-offer-edit.pug - -sib-router(default-route='job-offer-board') - sib-route(name='job-offer-board') - sib-route(name='job-offer-create') - sib-route(name='job-offer-edit') \ No newline at end of file diff --git a/src/views/job-offer/page-job-offer-create.pug b/src/views/job-offer/page-job-offer-create.pug index bc9c1d6..71ab905 100644 --- a/src/views/job-offer/page-job-offer-create.pug +++ b/src/views/job-offer/page-job-offer-create.pug @@ -25,4 +25,3 @@ next='job-offers' ) - diff --git a/src/views/job-offer/page-job-offer-edit.pug b/src/views/job-offer/page-job-offer-edit.pug index 7fde4ff..0d81831 100644 --- a/src/views/job-offer/page-job-offer-edit.pug +++ b/src/views/job-offer/page-job-offer-edit.pug @@ -25,4 +25,3 @@ next='job-offers' ) - From 62b781ed28d21d7f1682a9c9f75f8e50cde2ecdf Mon Sep 17 00:00:00 2001 From: maxime_senza Date: Sat, 30 May 2020 10:08:18 +0200 Subject: [PATCH 05/42] 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 06/42] 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 f8d875a59066d4762af6360572d561c02a9c97c5 Mon Sep 17 00:00:00 2001 From: Jure Ursic Date: Mon, 1 Jun 2020 15:48:26 +0200 Subject: [PATCH 07/42] update: removing conversationn dependency and adding rdf-type attribute --- src/dependencies.pug | 2 -- src/menu-left.pug | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/dependencies.pug b/src/dependencies.pug index 9689c72..24f492e 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/index.js" defer) - //- script(type="module" src="/lib/sib-conversation/sib-conversation.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.3" defer) diff --git a/src/menu-left.pug b/src/menu-left.pug index e87886e..c98932d 100644 --- a/src/menu-left.pug +++ b/src/menu-left.pug @@ -60,7 +60,7 @@ nav#main__menu.jsLeftMenu div.menu-icon.icon-people div.divider if endpoints.joboffers || (endpoints.get && endpoints.get.joboffers) - sib-route.menu(name='job-offers') + sib-route.menu(name='job-offers' rdf-type='hd:joboffer') div.menu-label Offres de mission div.menu-icon.icon-briefcase div.divider From a247792ed49f15c18f883568731265cac07ff702 Mon Sep 17 00:00:00 2001 From: maxime_senza Date: Mon, 1 Jun 2020 16:24:05 +0200 Subject: [PATCH 08/42] 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 09/42] 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 dfac59edc29ee6b0abda2f11d80ea5a864dcaee8 Mon Sep 17 00:00:00 2001 From: maxime_senza Date: Tue, 9 Jun 2020 01:42:45 +0200 Subject: [PATCH 10/42] feature: add simple incon font script --- src/index.pug | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/index.pug b/src/index.pug index dd21d1d..3522550 100644 --- a/src/index.pug +++ b/src/index.pug @@ -6,6 +6,8 @@ html(lang="en") title #{clientName || "My Personal Hubl"} meta(name="viewport", content="width=device-width, initial-scale=1.0") meta(http-equiv="X-UA-Compatible", content="ie=edge") + //link for google fonts + if clientFavicon link(rel="icon" type="image/png" href=`${clientFavicon}`) else From 9a084d5cae85233fdcf9e0f17d87dfa99ee8b00b Mon Sep 17 00:00:00 2001 From: gaelle morin Date: Mon, 15 Jun 2020 10:15:19 +0200 Subject: [PATCH 11/42] 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 661f5c0f5ba5a8cd164c50092be483d9abde0615 Mon Sep 17 00:00:00 2001 From: gaelle morin Date: Mon, 15 Jun 2020 12:59:43 +0200 Subject: [PATCH 12/42] fix: new classes added to project-profile --- src/views/circle/page-circle-profile.pug | 3 ++- src/views/project/page-project-profile.pug | 10 +++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/views/circle/page-circle-profile.pug b/src/views/circle/page-circle-profile.pug index 7f96881..a424df2 100644 --- a/src/views/circle/page-circle-profile.pug +++ b/src/views/circle/page-circle-profile.pug @@ -4,7 +4,8 @@ sib-router(default-route='circle-profile', hidden) #circle-profile(hidden) include ../../templates/hubl-circle-team.pug - .content-box__info + + .content-box__info.flex .flex.space-between.with-padding.mobile-vertical-align sib-display.mobile-margin__bottom( diff --git a/src/views/project/page-project-profile.pug b/src/views/project/page-project-profile.pug index c734a18..e4260c6 100644 --- a/src/views/project/page-project-profile.pug +++ b/src/views/project/page-project-profile.pug @@ -21,10 +21,10 @@ sib-router(default-route='project-profile', hidden) widget-creationDate='sib-display-date' ) 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-link(class='button mobile-full-width text-bold text-uppercase reversed button-primary bordered with-icon icon-pencil' next='project-edit' bind-resources) Modifier et ajouter un membre sib-display( - class='position-end' + class='flex desktop-button__end' bind-resources nested-field='members' fields='relation' @@ -39,7 +39,7 @@ sib-router(default-route='project-profile', hidden) hubl-inherit-user-id="search-value-user" ) - .space-between + .flex.space-between sib-display( bind-resources fields='label-captain, captain' @@ -58,12 +58,12 @@ sib-router(default-route='project-profile', hidden) h2 Equipe : - sib-display( + sib-display.block( bind-resources fields='members' - widget-members='hubl-project-team' multiple-members + widget-members='hubl-project-team' ) From 34ec5d9d380bcb9d645614cc81293e1cd8b27854 Mon Sep 17 00:00:00 2001 From: Jure Ursic Date: Mon, 15 Jun 2020 13:56:13 +0200 Subject: [PATCH 13/42] 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 d70fd6dac8f79bb7410b639f69ec201ae781c552 Mon Sep 17 00:00:00 2001 From: gaelle morin Date: Mon, 15 Jun 2020 14:27:49 +0200 Subject: [PATCH 14/42] fix: new classes added to project-edit + fixbug on table for project- and circle-edit --- src/styles/base/table.scss | 12 ++------- src/views/circle/page-circle-edit.pug | 12 ++++----- src/views/project/page-project-edit.pug | 36 ++++++++++++------------- 3 files changed, 26 insertions(+), 34 deletions(-) diff --git a/src/styles/base/table.scss b/src/styles/base/table.scss index e917128..f32d741 100644 --- a/src/styles/base/table.scss +++ b/src/styles/base/table.scss @@ -117,16 +117,8 @@ width: 70px; } - .w262 { - width: 262px; - } - - .W152 { - width: 152px; - } - - .w355 { - width: 355px; + .w162 { + width: 162px; } .hashtag::before { diff --git a/src/views/circle/page-circle-edit.pug b/src/views/circle/page-circle-edit.pug index 89e2b8f..82af171 100644 --- a/src/views/circle/page-circle-edit.pug +++ b/src/views/circle/page-circle-edit.pug @@ -8,7 +8,7 @@ div.content-box__info sib-widget(name='hubl-team-template-edit') template sib-display.user-thumb.is-spaced( - class='w355 cell border cell-with-id-card user-thumb' + class='w280 cell border cell-with-id-card user-thumb' data-src='${await value.user}' fields='account.picture, sup(name, groups), sub(profile.city)' @@ -24,7 +24,7 @@ div.content-box__info ) sib-ac-checker( - class='W152 cell border' + class='w162 cell border' permission="acl:Delete" data-src="${value['@id']}" ) @@ -36,7 +36,7 @@ div.content-box__info //- Only to show the table grid sib-ac-checker( - class='W152 cell border' + class='w162 cell border' no-permission="acl:Delete" data-src="${value['@id']}" ) @@ -72,7 +72,7 @@ div.content-box__info next='circle-information' ) - h2 Liste des membres: + h2 Liste des membres : sib-ac-checker(permission='acl:Append', bind-resources, nested-field='members') sib-form.block.select-add( @@ -91,8 +91,8 @@ div.content-box__info .table-wrapper .table div.table-header.grey-color - div.w355 Nom - div.W152 Accès + div.w280 Nom + div.w162 Accès //-class='table-body' sib-display( diff --git a/src/views/project/page-project-edit.pug b/src/views/project/page-project-edit.pug index afefc88..f5e3ad2 100644 --- a/src/views/project/page-project-edit.pug +++ b/src/views/project/page-project-edit.pug @@ -9,20 +9,20 @@ div.content-box__info sib-form.form.button-register( bind-resources - fields='status, block-project__info(customer.name, name), description' + fields='status, line-1(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' label-name='Nom du projet*' - class-name='form-label is-light is-half-width' + class-name='form-label is-light is-half-width input-text-like' label-customer.name='Nom du client*' - class-customer.name='form-label is-light is-half-width' + class-customer.name='form-label is-light is-half-width input-text-like' label-description='Description du projet' - class-description='form-label is-light is-full-width' + class-description='form-label is-light is-full-width input-text-like' widget-description='sib-form-textarea' partial="" @@ -33,7 +33,7 @@ div.content-box__info h2 Liste des membres : - sib-form.block.select-add.button-add( + sib-form.block.select-add( bind-resources nested-field='members' fields='user' @@ -46,18 +46,18 @@ div.content-box__info submit-button='Ajouter un membre' ) - .table + .table-wrapper + .table + div.table-header.grey-color + div.w280 Nom + div.w162 Accès - div.table-header.grey-color - div.w66 Nom - div.w33 Accès + //-class='table-body' + sib-display( + class='table-body' + bind-resources + fields='members' - //-class='table-body' - sib-display( - class='table-body' - bind-resources - fields='members' - - multiple-members='' - widget-members='hubl-team-template-edit' - ) + multiple-members='' + widget-members='hubl-team-template-edit' + ) From 54da12c7a3bce1e2b89e40e84c18ecec9454176a Mon Sep 17 00:00:00 2001 From: gaelle morin Date: Mon, 15 Jun 2020 16:06:01 +0200 Subject: [PATCH 15/42] fix: new classes added to admin-project --- src/styles/base/table.scss | 4 + src/views/admin/page-admin-projects.pug | 159 ++++++++++++------------ 2 files changed, 84 insertions(+), 79 deletions(-) diff --git a/src/styles/base/table.scss b/src/styles/base/table.scss index f32d741..a3c97c3 100644 --- a/src/styles/base/table.scss +++ b/src/styles/base/table.scss @@ -113,6 +113,10 @@ width: 280px; } + .w230 { + width: 230px; + } + .w70 { width: 70px; } diff --git a/src/views/admin/page-admin-projects.pug b/src/views/admin/page-admin-projects.pug index c263c4e..fc66bf6 100644 --- a/src/views/admin/page-admin-projects.pug +++ b/src/views/admin/page-admin-projects.pug @@ -22,106 +22,107 @@ next='admin-project-create' ) Créer un nouveau projet - .table - div.table-header.grey-color - div.w25 Nom - div.w25 Administrateurs - div.w25 Capitaines - div.w25 Rejoindre + .table-wrapper + .table + div.table-header.grey-color + div.w280 Nom + div.w280 Administrateurs + div.w280 Capitaines + div.w230 Rejoindre - sib-widget(name="hubl-admin-project-leave-button") - template - sib-delete( - class='button text-bold text-uppercase reversed button-secondary bordered with-icon icon-close' - data-src="${src}" - data-label='Quitter' - ) + sib-widget(name="hubl-admin-project-leave-button") + template + sib-delete( + class='button text-bold text-uppercase reversed button-secondary bordered with-icon icon-close' + data-src="${src}" + data-label='Quitter' + ) - sib-widget(name='hubl-project-captain') - template - sib-display.user-thumb( - data-src='${await value}' - fields='account.picture, sup(name), sub(username)' + sib-widget(name='hubl-project-captain') + template + sib-display.user-thumb( + data-src='${await value}' + fields='account.picture, sup(name), sub(username)' - class-account.picture='user-thumb__picture' - class-name='user-thumb__name' - class-username='user-thumb__username' + class-account.picture='user-thumb__picture' + class-name='user-thumb__name' + class-username='user-thumb__username' - widget-account.picture='hubl-user-avatar' - ) + widget-account.picture='hubl-user-avatar' + ) - sib-widget(name='hubl-project-admins') - template - sib-display( - data-src='${value}' - fields='user' - search-fields='is_admin' - search-value-is_admin='true' - search-widget-is_admin='sib-form-hidden' - widget-user='hubl-project-captain' - ) + sib-widget(name='hubl-project-admins') + template + sib-display( + data-src='${value}' + fields='user' + search-fields='is_admin' + search-value-is_admin='true' + search-widget-is_admin='sib-form-hidden' + widget-user='hubl-project-captain' + ) - sib-widget(name='hubl-admin-project-leave-button') - template - sib-delete( - class='button text-bold text-uppercase reversed button-secondary bordered with-icon icon-close' - data-src="${src}" - data-label='Quitter' - ) + sib-widget(name='hubl-admin-project-leave-button') + template + 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' + sib-display( + class='table-body' - bind-user - nested-field="projects" - fields='project.name, project.members, project.captain, leaveButton' + bind-user + nested-field="projects" + fields='project.name, project.members, project.captain, leaveButton' - 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' + class-project.name='w280 cell border cell-with-name' + class-project.members='w280 cell border' + class-project.captain='w280 cell border cell-with-id-card' + class-leaveButton='w230 cell border cell-with-buttons' - action-leaveButton="joinButton" - widget-leaveButton="hubl-admin-project-leave-button" + action-leaveButton="joinButton" + widget-leaveButton="hubl-admin-project-leave-button" - widget-project.captain='hubl-project-captain' - widget-project.members='hubl-project-admins' + widget-project.captain='hubl-project-captain' + widget-project.members='hubl-project-admins' - order-by="project.name" - ) + 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" + 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' + fields='user.username' + value-user.username='hubl-workaround-493' + widget-user.username='sib-form-hidden' - submit-button='Rejoindre' - ) + submit-button='Rejoindre' + ) - sib-display( - class='table-body' + sib-display( + class='table-body' - data-src=`${endpoints.projects || endpoints.get.projects}joinable/` - fields='name, members, captain, joinButton' + 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-joinButton='w25 cell border cell-with-buttons' + class-name='w280 cell border cell-with-name' + class-members='w280 cell border' + class-captain='w280 cell border cell-with-id-card' + class-joinButton='w230 cell border cell-with-buttons' - action-joinButton="joinButton" # Workaround: I need members two times - widget-joinButton="hubl-admin-project-join-button" + 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' + widget-captain='hubl-project-captain' + widget-members='hubl-project-admins' - order-by="name" - ) + order-by="name" + ) #admin-project-create(hidden) include page-admin-projects-create.pug \ No newline at end of file From 4e0f307a83bdfd832e25d38ea1b43783f1fbdfef Mon Sep 17 00:00:00 2001 From: gaelle morin Date: Mon, 15 Jun 2020 16:32:47 +0200 Subject: [PATCH 16/42] 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 17/42] 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 aafc8654f510a790420d6b723ed0c525555ffc19 Mon Sep 17 00:00:00 2001 From: gaelle morin Date: Mon, 15 Jun 2020 17:48:36 +0200 Subject: [PATCH 18/42] fix: circle leave fixed --- src/styles/base/table.scss | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/styles/base/table.scss b/src/styles/base/table.scss index a3c97c3..ae20542 100644 --- a/src/styles/base/table.scss +++ b/src/styles/base/table.scss @@ -205,8 +205,9 @@ .circle-leave { position: relative; - width: 40%; - min-width: 40%; + width: 164px; + margin: 0 auto; + min-width: 164px; &>button { height: 29px; From 30c015be91982d23b8bd96f8c1c3a2ca73596b82 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Pasquier Date: Mon, 15 Jun 2020 18:50:10 +0200 Subject: [PATCH 19/42] happy dev sample button color --- client.sample.happy-dev.css | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/client.sample.happy-dev.css b/client.sample.happy-dev.css index 8642cc0..0565062 100644 --- a/client.sample.happy-dev.css +++ b/client.sample.happy-dev.css @@ -216,3 +216,7 @@ border: 1px solid var(--color-complementary); color: var(--color-white); } + +#members-list .send-display sib-link::before { + background-color: var(--color-directory-complementary)!important; +} From 985764874a30708a4b93ef3bb1f3656747284aba Mon Sep 17 00:00:00 2001 From: gaelle morin Date: Mon, 15 Jun 2020 19:30:27 +0200 Subject: [PATCH 20/42] fix: new classes added to admin-project (end) --- src/styles/base/table.scss | 1 - src/views/admin/page-admin-projects.pug | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/styles/base/table.scss b/src/styles/base/table.scss index ae20542..2648870 100644 --- a/src/styles/base/table.scss +++ b/src/styles/base/table.scss @@ -71,7 +71,6 @@ /* Styles of the table and its elements */ .table { - border-bottom: 1px solid var(--color-table-border); border-left: 1px solid var(--color-table-border); border-right: 1px solid var(--color-table-border); } diff --git a/src/views/admin/page-admin-projects.pug b/src/views/admin/page-admin-projects.pug index fc66bf6..9276e6b 100644 --- a/src/views/admin/page-admin-projects.pug +++ b/src/views/admin/page-admin-projects.pug @@ -40,7 +40,7 @@ sib-widget(name='hubl-project-captain') template - sib-display.user-thumb( + sib-display.user-thumb.is-spaced( data-src='${await value}' fields='account.picture, sup(name), sub(username)' @@ -53,7 +53,7 @@ sib-widget(name='hubl-project-admins') template - sib-display( + sib-display.user-thumb.is-spaced( data-src='${value}' fields='user' search-fields='is_admin' From 052e325e15da7aafa6c7891b61997975173dac43 Mon Sep 17 00:00:00 2001 From: gaelle morin Date: Mon, 15 Jun 2020 20:12:57 +0200 Subject: [PATCH 21/42] fix: new classes added to admin-project-create --- src/views/admin/page-admin-projects-create.pug | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/src/views/admin/page-admin-projects-create.pug b/src/views/admin/page-admin-projects-create.pug index ceb7eea..6d829a3 100644 --- a/src/views/admin/page-admin-projects-create.pug +++ b/src/views/admin/page-admin-projects-create.pug @@ -12,26 +12,23 @@ div.content-box__info.flex naked ) - h1 Créer un nouveau projet + h1.centered Créer un nouveau projet sib-form.form.button-register( 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-2(captain), logo' label-status='Statut du canal*' widget-status='hubl-status' - class-status='form-label is-light is-full-width member-select color' + class-status='form-label is-light is-full-width' label-description='Description du projet' - class-description='form-label is-light is-full-width' + class-description='form-label is-light is-full-width input-text-like' widget-description='sib-form-textarea' - - class-fieldset-captain='fieldset' - widget-fieldset-captain='hubl-template-project-title' label-customer.name='Nom du client*' - class-customer.name='form-label is-light is-half-width' + class-customer.name='form-label is-light is-half-width input-text-like' label-name='Nom du projet*' class-name='form-label is-light is-half-width input-text-like' @@ -43,7 +40,7 @@ div.content-box__info.flex widget-logo="sib-form-file" label-logo="Télécharger un logo" - class-logo='form-label is-light is-full-width' + class-logo='form-label is-light select-add' upload-url-logo=`${endpoints.uploads || endpoints.post.uploads}` next='admin-project-list' From 5e5b3068951eb224dff32d0e4a61ba076520ebc7 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Pasquier Date: Mon, 15 Jun 2020 21:00:42 +0200 Subject: [PATCH 22/42] fix dist folder of local job board --- src/dependencies.pug | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/dependencies.pug b/src/dependencies.pug index b2abe2e..e8e1f29 100644 --- a/src/dependencies.pug +++ b/src/dependencies.pug @@ -19,7 +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="/lib/sib-job-board/index.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) From 6b3e7fd73c1feaf7e7e0e486a4273cd951de9a44 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Pasquier Date: Mon, 15 Jun 2020 21:16:52 +0200 Subject: [PATCH 23/42] bump job board version --- src/dependencies.pug | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/dependencies.pug b/src/dependencies.pug index e8e1f29..3cb08a8 100644 --- a/src/dependencies.pug +++ b/src/dependencies.pug @@ -18,7 +18,7 @@ if endpoints.events || (endpoints.get && endpoints.get.events) //- script(type="module" src="/lib/sib-event/sib-event.js" defer) 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-job-board@0.4" 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)) From f25ca6557f5edfb7595c0ecd4aeb19aa8cfb6524 Mon Sep 17 00:00:00 2001 From: maxime_senza Date: Tue, 16 Jun 2020 02:01:21 +0200 Subject: [PATCH 24/42] feature: job board : colors variables --- src/styles/abstracts/_variables.scss | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/src/styles/abstracts/_variables.scss b/src/styles/abstracts/_variables.scss index e974acd..b68ee21 100644 --- a/src/styles/abstracts/_variables.scss +++ b/src/styles/abstracts/_variables.scss @@ -118,10 +118,23 @@ --color-backlink: var(--color-secondary); --color-content-header: var(--color-grey-9); + + +/*Variables for the job board*/ +--color-job-board-primary: var(--color-primary) !important; +--color-job-board-secondary: var(--color-secondary)!important; +--color-job-board-complementary: var(--color-complementary)!important; +--color-job-board-complementary-darken: var(--color-complementary-darken)!important; +--color-job-board-white: var(--color-white)!important; +--color-job-board-black-1: var(--color-black)!important; +--color-job-board-grey-10: #E4E8ED !important; // for some reason with the var it doesh't work var(--color-grey-12) !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 4f7635e8d25d3ddf9321a642b1ce100de2339a0a Mon Sep 17 00:00:00 2001 From: gaelle morin Date: Tue, 16 Jun 2020 12:38:09 +0200 Subject: [PATCH 25/42] update: style for sib-form-file added --- src/styles/base/form.scss | 59 +++++++++++++------ .../admin/page-admin-projects-create.pug | 3 +- 2 files changed, 43 insertions(+), 19 deletions(-) diff --git a/src/styles/base/form.scss b/src/styles/base/form.scss index 7d555fc..0f1c7a3 100644 --- a/src/styles/base/form.scss +++ b/src/styles/base/form.scss @@ -224,31 +224,54 @@ sib-form-date { } sib-form-file { + margin-top: 1.8rem; + + div { + display: flex; + flex-direction: row-reverse; + align-items: center; + justify-content: flex-end; + + input[type='text'] { + margin-bottom: 0.8rem; + } - label { + input[type='file'] { + height: 0.1px; + opacity: 0; + overflow: hidden; + position: absolute; + width: 0.1px; + z-index: -1; + } + + label { + @extend .button, + .text-bold, + .text-uppercase, + .button-primary, + .bordered; + margin: auto 2.2rem; + } + + input[type='file']:focus, + label:hover ~ input[type='file'] { + background-color: var(--color-secondary); + } + + label ~ input[type='file']:focus { + outline: 1px dotted #000; + outline: -webkit-focus-ring-color auto 5px; + } + + /*label { align-items: baseline; clear: both; display: flex; flex-direction: row; flex-wrap: wrap; max-width: 100%; - - div { - width: 100%; - } - - input[type='text'] { - box-sizing: border-box; - flex: 0 0 50%; - } - - input[type='file'] { - box-sizing: border-box; - flex: 0 0 20%; - color: var(--color-input-text); - cursor: pointer; - padding-left: 3rem; - } + }*/ } } diff --git a/src/views/admin/page-admin-projects-create.pug b/src/views/admin/page-admin-projects-create.pug index 6d829a3..6c01fba 100644 --- a/src/views/admin/page-admin-projects-create.pug +++ b/src/views/admin/page-admin-projects-create.pug @@ -38,9 +38,10 @@ div.content-box__info.flex class-captain='form-label is-light is-half-width' widget-captain='sib-form-auto-completion' + class='input-text-like' widget-logo="sib-form-file" label-logo="Télécharger un logo" - class-logo='form-label is-light select-add' + class-logo='select-add' upload-url-logo=`${endpoints.uploads || endpoints.post.uploads}` next='admin-project-list' From cf93abcd5c5b837df0a89851ae2180f9eaf0f291 Mon Sep 17 00:00:00 2001 From: gaelle morin Date: Tue, 16 Jun 2020 13:02:42 +0200 Subject: [PATCH 26/42] update: style for sib-form-file on mobile --- src/styles/base/form.scss | 50 ++++++++++++++++++--------------------- 1 file changed, 23 insertions(+), 27 deletions(-) diff --git a/src/styles/base/form.scss b/src/styles/base/form.scss index 0f1c7a3..55c4624 100644 --- a/src/styles/base/form.scss +++ b/src/styles/base/form.scss @@ -224,18 +224,18 @@ sib-form-date { } sib-form-file { - margin-top: 1.8rem; div { display: flex; - flex-direction: row-reverse; + flex-direction: column-reverse; align-items: center; - justify-content: flex-end; - - input[type='text'] { - margin-bottom: 0.8rem; + margin-top: 1.8rem; + + @include breakpoint(lg) { + flex-direction: row-reverse; + justify-content: flex-end; } - + input[type='file'] { height: 0.1px; opacity: 0; @@ -244,6 +244,15 @@ sib-form-file { width: 0.1px; z-index: -1; } + + input[type='text'] { + margin-bottom: 0.8rem; + width: 100%; + + @include breakpoint(lg) { + width: auto; + } + } label { @extend .button, @@ -251,27 +260,14 @@ sib-form-file { .text-uppercase, .button-primary, .bordered; - margin: auto 2.2rem; + text-align: center; + width: 100%; + + @include breakpoint(lg) { + margin: auto 2.2rem; + width: auto; + } } - - input[type='file']:focus, - label:hover ~ input[type='file'] { - background-color: var(--color-secondary); - } - - label ~ input[type='file']:focus { - outline: 1px dotted #000; - outline: -webkit-focus-ring-color auto 5px; - } - - /*label { - align-items: baseline; - clear: both; - display: flex; - flex-direction: row; - flex-wrap: wrap; - max-width: 100%; - }*/ } } From 7c6f36727e6c2bda4e11d9fb20e6459e22809e44 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Pasquier Date: Tue, 16 Jun 2020 13:44:01 +0200 Subject: [PATCH 27/42] remove iconify --- src/index.pug | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/index.pug b/src/index.pug index 12b96c4..fd04427 100644 --- a/src/index.pug +++ b/src/index.pug @@ -6,8 +6,6 @@ html(lang="en") title #{clientName || "My Personal Hubl"} meta(name="viewport", content="width=device-width, initial-scale=1.0") meta(http-equiv="X-UA-Compatible", content="ie=edge") - //link for google fonts - if clientFavicon link(rel="icon" type="image/png" href=`${clientFavicon}`) else From c81086350074eb30c890ae72933a24b7becd2271 Mon Sep 17 00:00:00 2001 From: gaelle morin Date: Tue, 16 Jun 2020 15:52:10 +0200 Subject: [PATCH 28/42] fix: button register on mobile --- src/styles/base/form.scss | 20 ++++++++++++++++++-- src/styles/base/table.scss | 5 +++++ 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/src/styles/base/form.scss b/src/styles/base/form.scss index 55c4624..8b6ca5d 100644 --- a/src/styles/base/form.scss +++ b/src/styles/base/form.scss @@ -18,8 +18,23 @@ .reversed, .button-secondary, .bordered; - margin-left: auto; - margin-top: 3.2rem; + height: auto; + position: fixed; + bottom: 1em; + left: 10%; + white-space: normal; + width: 80%; + z-index: 1; + + @include breakpoint(lg) { + height: 3rem; + left: 0; + margin: 0; + margin-left: auto; + margin-top: 109px; + position: relative; + width: auto; + } } .form-label { @@ -78,6 +93,7 @@ textarea { height: 100px; + resize: vertical; } .content-box { diff --git a/src/styles/base/table.scss b/src/styles/base/table.scss index 2648870..95af476 100644 --- a/src/styles/base/table.scss +++ b/src/styles/base/table.scss @@ -4,6 +4,11 @@ overflow: auto; position: relative; width: 100%; + margin-bottom: 6rem; + + @include breakpoint(lg) { + margin-bottom: 0; + } .table { border-collapse: collapse; From eed570dc8716d2e3b01bf3d6a8e0fc1c0e797e5c Mon Sep 17 00:00:00 2001 From: Jure Ursic Date: Thu, 18 Jun 2020 04:58:39 +0200 Subject: [PATCH 29/42] 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' ) From 2ae8db7429945d7b23728f246db7b769406a02cd Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Pasquier Date: Thu, 18 Jun 2020 20:02:54 +0200 Subject: [PATCH 30/42] minor: Implement core 0.10 --- README.md | 10 +- client.sample.happy-dev.css | 60 +++---- cypress/integration/tests.spec.js | 20 +-- src/components/hubl-reactivity.js | 39 +++++ src/components/hubl-search-users.js | 2 +- src/components/hubl-status.js | 4 +- src/dependencies.pug | 27 +-- src/header.pug | 10 +- src/index.pug | 12 +- src/menu-left.pug | 58 +++---- src/page-admin.pug | 8 +- src/page-circle.pug | 12 +- src/page-dashboard.pug | 2 +- src/page-directory.pug | 2 +- src/page-job-offers.pug | 2 +- src/page-messages.pug | 4 +- src/page-profile.pug | 2 +- src/page-project.pug | 14 +- src/page-user-profile.pug | 16 +- src/scripts/reactive-store.js | 158 ------------------ src/scripts/sib-notifications.js | 6 +- src/scripts/unreads-menu.js | 2 +- src/scripts/widget-extension.js | 12 +- src/styles/base/form.scss | 18 +- src/styles/base/header.scss | 8 +- src/styles/base/main.scss | 22 +-- src/styles/base/menu-left.scss | 51 +++--- src/styles/base/table.scss | 6 +- src/styles/components/chat.scss | 2 +- src/styles/components/comment.scss | 12 +- src/styles/components/filters.scss | 6 +- src/styles/components/sidebar.scss | 4 +- src/styles/components/skills.scss | 2 +- src/styles/layout/dashboard/dashboard.scss | 2 +- src/styles/layout/events/events.scss | 12 +- src/styles/layout/job-offers/job-offers.scss | 18 +- src/styles/layout/members/member-profile.scss | 14 +- src/styles/layout/members/members.scss | 18 +- src/styles/layout/user/user-profile.scss | 2 +- src/templates/hubl-captain.pug | 4 +- src/templates/hubl-circle-team.pug | 6 +- src/templates/hubl-project-team.pug | 6 +- src/templates/hubl-user-avatar.pug | 2 +- src/views/admin/page-admin-circles-create.pug | 4 +- src/views/admin/page-admin-circles.pug | 34 ++-- .../admin/page-admin-projects-create.pug | 20 +-- src/views/admin/page-admin-projects.pug | 44 ++--- src/views/admin/page-admin-users-create.pug | 6 +- src/views/admin/page-admin-users-edit.pug | 6 +- src/views/admin/page-admin-users.pug | 22 +-- src/views/circle/page-circle-chat.pug | 2 +- src/views/circle/page-circle-edit.pug | 28 ++-- src/views/circle/page-circle-left.pug | 2 +- src/views/circle/page-circle-profile.pug | 34 ++-- src/views/job-offer/page-job-offer-create.pug | 10 +- src/views/job-offer/page-job-offer-edit.pug | 10 +- src/views/project/page-project-chat.pug | 2 +- src/views/project/page-project-edit.pug | 14 +- src/views/project/page-project-left.pug | 2 +- src/views/project/page-project-picture.pug | 6 +- src/views/project/page-project-profile.pug | 30 ++-- 61 files changed, 439 insertions(+), 534 deletions(-) create mode 100644 src/components/hubl-reactivity.js delete mode 100644 src/scripts/reactive-store.js diff --git a/README.md b/README.md index b002528..85a9757 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ These instructions will get you a copy of the project up and running on your loc To install Hubl, you'll need: -* A Hubl Server (djangoldp>=0.6.42) with the appropriate modules +* A Hubl Server (djangoldp>=0.7.11) with the appropriate modules * A Prosody Server (with [appropriate modules](https://git.startinblox.com/infra/prosody-modules/) * A SMTP Server (optional) * NodeJS on your machine @@ -71,7 +71,7 @@ By default, a Hubl includes only individual chat modules. On Server: `djangoldp_account`, `djangoldp_profile`, `djangoldp_notification`, `djangoldp_skill`, `djangoldp_upload`, `oidc_provider` packages -On `config.json`: +On `config.json`: ```json { @@ -177,7 +177,7 @@ On `config.json`: ### Project -(Experimental) Project are a private group chat including Customer and Business Provider management. To activate them, you need: +Project are a private group chat including Customer and Business Provider management. To activate them, you need: On Server: `djangoldp_project` packages @@ -194,7 +194,7 @@ On `config.json`: ### Users Directory -(In development) Directory includes a listing of each users of your app and editable individual profile. To activate them, you need: +Directory includes a listing of each users of your app and editable individual profile. To activate them, you need: On Server: `djangoldp_skill`, `djangoldp_upload` packages @@ -211,7 +211,7 @@ On `config.json`: ### Job Offers -(In development) Job Offers includes a job board with conversation. To activate them, you need: +Job Offers includes a job board with conversation. To activate them, you need: On Server: `djangoldp_joboffer`, `djangoldp_skill`, `djangoldp_upload`, `djangoldp_conversation` packages diff --git a/client.sample.happy-dev.css b/client.sample.happy-dev.css index 8cdb1bf..18eb3c0 100644 --- a/client.sample.happy-dev.css +++ b/client.sample.happy-dev.css @@ -139,14 +139,14 @@ } /* Button to edit a channel or a project (in project-profile) */ -#project sib-link[next="project-edit"], -#circle sib-link[next="circle-edit"] { +#project solid-link[next="project-edit"], +#circle solid-link[next="circle-edit"] { background: var(--color-complementary); border: 1px solid var(--color-complementary); } -#project sib-link[next="project-edit"]:hover, -#circle sib-link[next="circle-edit"]:hover { +#project solid-link[next="project-edit"]:hover, +#circle solid-link[next="circle-edit"]:hover { background: var(--color-white); border: 1px solid var(--color-complementary); color: var(--color-complementary); @@ -154,57 +154,57 @@ /* Button to delete a channel */ /* box-button is depreciated */ -#circle-profile>div>div.desktop-button__end>sib-ac-checker>sib-delete, -#circle-profile>div>div.box-button>sib-ac-checker>sib-delete { +#circle-profile>div>div.desktop-button__end>solid-ac-checker>solid-delete, +#circle-profile>div>div.box-button>solid-ac-checker>solid-delete { background: var(--color-white); border: 1px solid var(--color-complementary); color: var(--color-complementary); } -#circle-profile>div>div.desktop-button__end>sib-ac-checker>sib-delete>button, -#circle-profile>div>div.box-button>sib-ac-checker>sib-delete>button { +#circle-profile>div>div.desktop-button__end>solid-ac-checker>solid-delete>button, +#circle-profile>div>div.box-button>solid-ac-checker>solid-delete>button { color: var(--color-complementary); } -#circle-profile>div>div.desktop-button__end>sib-ac-checker>sib-delete:hover, -#circle-profile>div>div.box-button>sib-ac-checker>sib-delete:hover { +#circle-profile>div>div.desktop-button__end>solid-ac-checker>solid-delete:hover, +#circle-profile>div>div.box-button>solid-ac-checker>solid-delete:hover { background: var(--color-complementary); border: 1px solid var(--color-complementary); color: var(--color-white); } -#circle-profile>div>div.desktop-button__end>sib-ac-checker>sib-delete:hover>button, -#circle-profile>div>div.box-button>sib-ac-checker>sib-delete:hover>button { +#circle-profile>div>div.desktop-button__end>solid-ac-checker>solid-delete:hover>button, +#circle-profile>div>div.box-button>solid-ac-checker>solid-delete:hover>button { color: var(--color-white); } /* Button with a pen to edit a user */ -#admin-users-list>div>div.table>sib-display>div>sib-display>div>sib-action-hd-custom>sib-ac-checker>sib-link { +#admin-users-list>div>div.table>solid-display>div>solid-display>div>solid-action-hd-custom>solid-ac-checker>solid-link { background: var(--color-complementary); border: 1px solid var(--color-complementary); color: var(--color-white); } -#admin-users-list>div>div.table>sib-display>div>sib-display>div>sib-action-hd-custom>sib-ac-checker>sib-link:hover { +#admin-users-list>div>div.table>solid-display>div>solid-display>div>solid-action-hd-custom>solid-ac-checker>solid-link:hover { background: var(--color-white); border: 1px solid var(--color-complementary); color: var(--color-complementary); } /* Button to join a channel */ -#admin-circle-list>div>div.table>sib-display:nth-child(5)>div>sib-display>div>admin-circle-join-button>sib-form { +#admin-circle-list>div>div.table>solid-display:nth-child(5)>div>solid-display>div>admin-circle-join-button>solid-form { background: var(--color-complementary); border: 1px solid var(--color-complementary); color: var(--color-white); } -#admin-circle-list>div>div.table>sib-display:nth-child(5)>div>sib-display>div>admin-circle-join-button>sib-form:hover { +#admin-circle-list>div>div.table>solid-display:nth-child(5)>div>solid-display>div>admin-circle-join-button>solid-form:hover { background: var(--color-white); border: 1px solid var(--color-complementary); color: var(--color-complementary); } -#admin-circle-list>div>div.table>sib-display:nth-child(5)>div>sib-display>div>admin-circle-join-button>sib-form:hover input { +#admin-circle-list>div>div.table>solid-display:nth-child(5)>div>solid-display>div>admin-circle-join-button>solid-form:hover input { color: var(--color-complementary); } @@ -212,35 +212,35 @@ /* Directory - my profile*/ /* 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 { +#member-profile>div.profile-card>div.user-profile>div>solid-display>div>solid-action.button.button-primary.bordered, +button#solid-picture-browse.button.button-primary, +button#solid-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 { +#member-profile solid-action.button.button-primary>solid-link, +button#solid-picture-browse.button.button-primary, +button#solid-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 { +#member-profile>div.profile-card>div.user-profile>div>solid-display>div>solid-action.button.button-primary.bordered>solid-link::before { background-color: var(--color-directory-complementary) !important; } /* 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 { +#member-profile solid-action.button.button-primary:hover, +#member-profile solid-action.button.button-primary:hover>solid-link, +button#solid-picture-browse.button.button-primary:hover, +button#solid-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 { +#member-profile>div.profile-card>div.user-profile>div>solid-display>div>solid-action.button.button-primary.bordered:hover>solid-link::before { background-color: var(--color-directory-white) !important; } -#members-list .send-display sib-link::before { +#members-list .send-display solid-link::before { background-color: var(--color-directory-complementary)!important; } diff --git a/cypress/integration/tests.spec.js b/cypress/integration/tests.spec.js index cee47af..ba53571 100644 --- a/cypress/integration/tests.spec.js +++ b/cypress/integration/tests.spec.js @@ -48,21 +48,21 @@ context('Browser testing', () => { // }); // describe('Main interface', () => { // // it('should show my name on top right', () => { -// // cy.get('sib-display-value').contains('Admin'); +// // cy.get('solid-display-value').contains('Admin'); // // }); // it('should show my username on the left menu', () => { -// cy.get('[fields="username, badge"][data-src="http://localhost:8000/users/admin/"] > :nth-child(1) > sib-display-div > div').contains('admin'); +// cy.get('[fields="username, badge"][data-src="http://localhost:8000/users/admin/"] > :nth-child(1) > solid-display-div > div').contains('admin'); // }); // it('should open a chat with myself', () => { -// cy.get('[fields="username, badge"][data-src="http://localhost:8000/users/admin/"] > :nth-child(1) > sib-display-div > div').click(); +// cy.get('[fields="username, badge"][data-src="http://localhost:8000/users/admin/"] > :nth-child(1) > solid-display-div > div').click(); // cy.get('.name').contains('admin'); // }); // it('should not work, because I have no Prosody configured', () => { -// cy.get('.content-box > .chat-view > sib-chat').should('be.empty'); +// cy.get('.content-box > .chat-view > solid-xmpp-chat').should('be.empty'); // }); // describe('Circles', () => { // it('should navigate the Administration from left menu', () => { -// cy.get('.create > sib-link').click(); +// cy.get('.create > solid-link').click(); // cy.get('#admin-circles > .content-box > .content-box__header > .without-margin').contains('Administration'); // cy.get('#admin-circle-list > .content-box__info > .admin-header > .admin-header__title').contains('Circles'); // }); @@ -76,10 +76,10 @@ context('Browser testing', () => { // crypto.getRandomValues(name); // name = "Test Circle " + name; // it('should allow Circle Creation', () => { -// cy.get('form > sib-form-label-text[name="name"] > label > input').type(name); -// cy.get('.content-box__info > sib-form > form > sib-form-label-text[name="description"] > label > input').type('With a great description!'); -// cy.get('#admin-circle-create > .content-box__info > sib-form > form > [type="submit"]').click(); -// cy.get('#admin-circle-list > div > div.table > sib-display').contains(name); +// cy.get('form > solid-form-label-text[name="name"] > label > input').type(name); +// cy.get('.content-box__info > solid-form > form > solid-form-label-text[name="description"] > label > input').type('With a great description!'); +// cy.get('#admin-circle-create > .content-box__info > solid-form > form > [type="submit"]').click(); +// cy.get('#admin-circle-list > div > div.table > solid-display').contains(name); // }); // it('should open the circle information page', () => { // cy.screenshot(); @@ -87,7 +87,7 @@ context('Browser testing', () => { // cy.get('[name="circle-information"] > li').click(); // }); // it('should delete the circle', () => { -// cy.get('.box-button > sib-ac-checker > .button').click(); +// cy.get('.box-button > solid-ac-checker > .button').click(); // cy.get('#navbar-router').should('not.contain', name); // }); // }); diff --git a/src/components/hubl-reactivity.js b/src/components/hubl-reactivity.js new file mode 100644 index 0000000..7e668c1 --- /dev/null +++ b/src/components/hubl-reactivity.js @@ -0,0 +1,39 @@ +import { store } from 'https://unpkg.com/@startinblox/core@0.10'; +import { Sib } from "https://unpkg.com/@startinblox/core@0.10/dist/libs/Sib.js"; +import { StoreMixin } from "https://unpkg.com/@startinblox/core@0.10/dist/mixins/storeMixin.js"; + +export const HublReactivity = { + name: 'hubl-reactivity', + use: [StoreMixin], + attributes: { + targetSrc: { + type: String, + default: '', + callback: function () { + this.subscribe(); + } + }, + dataSrc: { + type: String, + default: '', + callback: async function (value) { + this.resourceId = null; + if (this.nestedField) { + const resource = store.get(value) || await store.getData(value, this.context); + const nestedResource = await resource[this.nestedField] + this.resourceId = nestedResource ? nestedResource['@id'] : null; + } else { + this.resourceId = value; + } + this.subscribe(); + } + }, + }, + subscribe() { + if (this.resourceId && this.targetSrc) { + store.subscribeVirtualContainerTo(this.resourceId, this.targetSrc); + } + } +} + +Sib.register(HublReactivity); \ No newline at end of file diff --git a/src/components/hubl-search-users.js b/src/components/hubl-search-users.js index 1916860..ab4300e 100644 --- a/src/components/hubl-search-users.js +++ b/src/components/hubl-search-users.js @@ -1,4 +1,4 @@ -import { widgetFactory } from 'https://unpkg.com/@startinblox/core@0.9/dist/widgets/widget-factory.js'; +import { widgetFactory } from 'https://unpkg.com/@startinblox/core@0.10/dist/widgets/widget-factory.js'; const HublSearchUsers = widgetFactory( 'hubl-search-users', diff --git a/src/components/hubl-status.js b/src/components/hubl-status.js index f3d256d..7a94718 100644 --- a/src/components/hubl-status.js +++ b/src/components/hubl-status.js @@ -1,5 +1,5 @@ -import { widgetFactory } from 'https://unpkg.com/@startinblox/core@0.9/dist/widgets/widget-factory.js'; -import { importCSS } from 'https://unpkg.com/@startinblox/core@0.9/dist/libs/helpers.js'; +import { widgetFactory } from 'https://unpkg.com/@startinblox/core@0.10/dist/widgets/widget-factory.js'; +import { importCSS } from 'https://unpkg.com/@startinblox/core@0.10/dist/libs/helpers.js'; import SlimSelect from 'https://dev.jspm.io/slim-select@1.23'; const HublStatus = widgetFactory( diff --git a/src/dependencies.pug b/src/dependencies.pug index 20fff65..b5215a2 100644 --- a/src/dependencies.pug +++ b/src/dependencies.pug @@ -1,16 +1,17 @@ script(type="module" src="/components/hubl-search-users.js" defer) script(type="module" src="/components/hubl-status.js" defer) +script(type="module" src="/components/hubl-reactivity.js" defer) -script(type="module" src="https://unpkg.com/@startinblox/core@0.9" defer) +script(type="module" src="https://unpkg.com/@startinblox/core@0.10" defer) //- script(type="module" src="/lib/sib-core/dist/index.js" defer) -script(type="module" src="https://unpkg.com/@startinblox/oidc@0.8" defer) +script(type="module" src="https://unpkg.com/@startinblox/oidc@0.9" defer) //- script(type="module" src="/lib/sib-oidc/index.js" defer) -script(type="module" src="https://unpkg.com/@startinblox/router@0.7" defer) - //- script(type="module" src="/lib/sib-router/src/index.js" defer) +script(type="module" src="https://unpkg.com/@startinblox/router@0.8" defer) + //- script(type="module" src="/lib/solid-router/src/index.js" defer) -script(type="module" src="https://unpkg.com/@startinblox/component-notifications@0.3" defer) +script(type="module" src="https://unpkg.com/@startinblox/component-notifications@0.4" defer) //- script(type="module" src="/lib/sib-notifications/index.js" defer) if endpoints.events || (endpoints.get && endpoints.get.events) @@ -18,20 +19,20 @@ if endpoints.events || (endpoints.get && endpoints.get.events) //- script(type="module" src="/lib/sib-event/sib-event.js" defer) if endpoints.joboffers || (endpoints.get && endpoints.get.joboffers) - script(type="module" src="https://unpkg.com/@startinblox/component-job-board@0.4" defer) - //- script(type="module" src="/lib/sib-job-board/dist/index.js" defer) + //- script(type="module" src="https://unpkg.com/@startinblox/component-job-board@0.6" defer) + script(type="module" src="/lib/solid-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) - //- script(type="module" src="/lib/sib-directory/dist/index.js" defer) + //- script(type="module" src="https://unpkg.com/@startinblox/component-directory@0.5" defer) + script(type="module" src="/lib/solid-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) - //- script(type="module" src="/lib/sib-dashboard/sib-dashboard.js" defer) + //- script(type="module" src="https://unpkg.com/@startinblox/component-dashboard@0.2" defer) + script(type="module" src="/lib/solid-dashboard/dist/index.js" defer) if endpoints.users || (endpoints.get && endpoints.get.users) - script(type="module" src="https://unpkg.com/@startinblox/component-chat@0.6" defer) - //-script(type="module" src="/lib/sib-chat/sib-chat.js" defer) + //- script(type="module" src="https://unpkg.com/@startinblox/component-chat@0.7" defer) + script(type="module" src="/lib/solid-xmpp-chat/dist/index.js" defer) script(src="/scripts/index.js" defer) diff --git a/src/header.pug b/src/header.pug index 106fc37..75a2806 100644 --- a/src/header.pug +++ b/src/header.pug @@ -1,5 +1,5 @@ .logo - sib-link(next='dashboard') + solid-link(next='dashboard') img(src=`${clientLogo || '/images/logo.png'}` style=`max-height:${clientLogoHeight || '32px'}`) sib-notifications.notLoggedIn( @@ -11,7 +11,7 @@ include templates/hubl-user-avatar.pug details#user-controls.notLoggedIn summary(tabindex='0' role='button') - sib-display#user-controls__profile( + solid-display#user-controls__profile( fields='first_name, account.picture' class-first_name='flex' class-account.picture='avatar' @@ -23,11 +23,11 @@ details#user-controls.notLoggedIn ul if (endpoints.uploads || (endpoints.get && endpoints.get.uploads)) && (endpoints.skills || (endpoints.get && endpoints.get.skills)) && (endpoints.users || (endpoints.get && endpoints.get.users)) li - sib-link(next='profile') Mon profil + solid-link(next='profile') Mon profil li - sib-link(next='admin') Administration + solid-link(next='admin') Administration li - sib-link(next='about') A propos + solid-link(next='about') A propos button(role='log out' onclick="document.querySelector('sib-auth').logout();") Se déconnecter button.loggedIn(role='log in' onclick="document.querySelector('sib-auth').login();") Se connecter diff --git a/src/index.pug b/src/index.pug index 1a139fe..c5b7116 100644 --- a/src/index.pug +++ b/src/index.pug @@ -35,14 +35,24 @@ html(lang="en") if endpoints.joboffers || (endpoints.get && endpoints.get.joboffers) #job-offers(hidden).no-sidebar.with-padding + hubl-reactivity(data-src=`${endpoints.joboffers || endpoints.get.joboffers}current/` target-src=`${endpoints.joboffers || endpoints.get.joboffers}`) + hubl-reactivity(data-src=`${endpoints.joboffers || endpoints.get.joboffers}current/` target-src=`${endpoints.joboffers || endpoints.get.joboffers}expired/`) + hubl-reactivity(data-src=`${endpoints.joboffers || endpoints.get.joboffers}` target-src=`${endpoints.joboffers || endpoints.get.joboffers}current/`) + hubl-reactivity(data-src=`${endpoints.joboffers || endpoints.get.joboffers}` target-src=`${endpoints.joboffers || endpoints.get.joboffers}expired/`) + hubl-reactivity(data-src=`${endpoints.joboffers || endpoints.get.joboffers}expired/` target-src=`${endpoints.joboffers || endpoints.get.joboffers}`) + hubl-reactivity(data-src=`${endpoints.joboffers || endpoints.get.joboffers}` target-src=`${endpoints.joboffers || endpoints.get.joboffers}current/`) include page-job-offers.pug if endpoints.projects || (endpoints.get && endpoints.get.projects) #project(hidden).with-sidebar + hubl-reactivity(data-src=`${endpoints.projects || endpoints.get.projects}joinable/` target-src=`${endpoints.projects || endpoints.get.projects}`) + hubl-reactivity(data-src=`${endpoints.projects || endpoints.get.projects}` target-src=`${endpoints.projects || endpoints.get.projects}joinable/`) include page-project.pug if endpoints.circles || (endpoints.get && endpoints.get.circles) #circle(hidden).with-sidebar + hubl-reactivity(data-src=`${endpoints.circles || endpoints.get.circles}joinable/` target-src=`${endpoints.circles || endpoints.get.circles}`) + hubl-reactivity(data-src=`${endpoints.circles || endpoints.get.circles}` target-src=`${endpoints.circles || endpoints.get.circles}joinable/`) include page-circle.pug if endpoints.users || (endpoints.get && endpoints.get.users) @@ -66,7 +76,7 @@ html(lang="en") if analytics each provider in analytics if provider.type && provider.url && provider.url - sib-analytics( + solid-analytics( type=`${provider.type}` url=`${provider.url}` id=`${provider.id}` diff --git a/src/menu-left.pug b/src/menu-left.pug index e304b87..89ddf39 100644 --- a/src/menu-left.pug +++ b/src/menu-left.pug @@ -1,40 +1,40 @@ -sib-widget(name='hubl-counter') +solid-widget(name='hubl-counter') template - sib-fix-badge(data-src="${value == 'badge' ? src : value}") + solid-fix-badge(data-src="${value == 'badge' ? src : value}") -sib-widget(name='hubl-menu-jabberid') +solid-widget(name='hubl-menu-jabberid') template div.hidden( data-jabberID="${value}" ) -sib-widget(name='hubl-menu-publicprivate') +solid-widget(name='hubl-menu-publicprivate') template div ${value == 'Public' ? '#' : ''} -sib-widget(name='hubl-create') +solid-widget(name='hubl-create') template p.create Tu ne fais partie d'aucun ${value}. br | Pour en créer un nouveau, tu peux te rendre dans le - sib-link(next='admin') panneau d'administration + solid-link(next='admin') panneau d'administration -sib-widget(name='hubl-menu-fix-url-circle') +solid-widget(name='hubl-menu-fix-url-circle') template - sib-display( + solid-display( data-src='${value}' fields='status, name, jabberID, badge' value-badge='${value}' widget-status='hubl-menu-publicprivate' widget-badge='hubl-counter' widget-jabberID='hubl-menu-jabberid' - widget-name='sib-display-div' + widget-name='solid-display-div' order-by="name" ) -sib-widget(name='hubl-menu-fix-url-project') +solid-widget(name='hubl-menu-fix-url-project') template - sib-display( + solid-display( data-src='${value}' fields='status, project(customer.name, name, jabberID), badge' class-name='project-name' @@ -43,43 +43,43 @@ sib-widget(name='hubl-menu-fix-url-project') widget-status='hubl-menu-publicprivate' widget-jabberID='hubl-menu-jabberid' widget-badge='hubl-counter' - widget-name='sib-display-div' + widget-name='solid-display-div' order-by="customer.name" ) -sib-router#navbar-router(default-route='dashboard') +solid-router#navbar-router(default-route='dashboard') if endpoints.dashboards || (endpoints.get && endpoints.get.dashboards) - sib-route.menu(name='dashboard') + solid-route.menu(name='dashboard') div.menu-label Tableau de bord div.menu-icon.icon-home div.divider if publicDirectory && (endpoints.users || (endpoints.get && endpoints.get.users)) - sib-route.menu(name='members') + solid-route.menu(name='members') div.menu-label Annuaire des membres div.menu-icon.icon-people div.divider if endpoints.joboffers || (endpoints.get && endpoints.get.joboffers) - sib-route.menu(name='job-offers', rdf-type='hd:joboffer') + solid-route.menu(name='job-offers', rdf-type='hd:joboffer') div.menu-label Offres de mission div.menu-icon.icon-briefcase div.divider if endpoints.events || (endpoints.get && endpoints.get.events) - sib-route.menu(name='events') + solid-route.menu(name='events') div.menu-label Evènements div.menu-icon.icon-calendar div.divider if endpoints.projects || (endpoints.get && endpoints.get.projects) div - sib-link(next='admin-project-list') + solid-link(next='admin-project-list') div.menu div.menu-chevron div.menu-icon.icon-arrow-right-circle div.menu-label Projets div.menu-icon.icon-folder-alt - sib-route(name='project', rdf-type='hd:project', use-id='', hidden) + solid-route(name='project', rdf-type='hd:project', use-id='', hidden) div.sub-menu.menu-notification - sib-display.project-tab( + solid-display.project-tab( bind-user nested-field='projects' fields='project' @@ -92,15 +92,15 @@ sib-router#navbar-router(default-route='dashboard') div.divider if endpoints.circles || (endpoints.get && endpoints.get.circles) div - sib-link(next='admin-circle-list') + solid-link(next='admin-circle-list') div.menu div.menu-chevron div.menu-icon.icon-arrow-right-circle div.menu-label Canaux div.menu-icon.icon-folder-alt - sib-route(name='circle', rdf-type='hd:circle', use-id='', hidden) + solid-route(name='circle', rdf-type='hd:circle', use-id='', hidden) div.sub-menu.menu-notification - sib-display.circle-tab( + solid-display.circle-tab( bind-user nested-field='circles' fields='circle' @@ -118,15 +118,15 @@ sib-router#navbar-router(default-route='dashboard') div.menu-icon.icon-arrow-up div.menu-label Messages div.menu-icon.icon-envelope-letter - sib-route(name='messages', rdf-type='foaf:user', use-id='', hidden) + solid-route(name='messages', rdf-type='foaf:user', use-id='', hidden) div.sub-menu.menu-notification - sib-display.nosub.message-tab( + solid-display.nosub.message-tab( data-src=`${endpoints.users || (endpoints.get && endpoints.get.users)}` fields='name, chatProfile.jabberID, badge' search-fields="name" search-label-name="Rechercher..." search-widget-name="hubl-search-users" - widget-name='sib-display-div' + widget-name='solid-display-div' widget-badge='hubl-counter' widget-chatProfile.jabberID='hubl-menu-jabberid' action-badge='badge' @@ -136,6 +136,6 @@ sib-router#navbar-router(default-route='dashboard') ) div.divider - sib-route(name='admin', hidden) - sib-route.menu(name='profile', hidden) - sib-route(name='about', hidden) + solid-route(name='admin', hidden) + solid-route.menu(name='profile', hidden) + solid-route(name='about', hidden) diff --git a/src/page-admin.pug b/src/page-admin.pug index 30b7cd0..54e08f9 100644 --- a/src/page-admin.pug +++ b/src/page-admin.pug @@ -9,19 +9,19 @@ #admin-users(hidden) include views/admin/page-admin-users.pug nav.jsRightMenu(role='navigation') - sib-router(default-route='admin-circles') + solid-router(default-route='admin-circles') ul li.jsOffsiteToggle a Replier le menu if (endpoints.users || (endpoints.get && endpoints.get.users)) - sib-route.active-color(name='admin-users') + solid-route.active-color(name='admin-users') li a Utilisateurs if endpoints.circles || (endpoints.get && endpoints.get.circles) - sib-route(name='admin-circles') + solid-route(name='admin-circles') li a Canaux if endpoints.projects || (endpoints.get && endpoints.get.projects) - sib-route(name='admin-projects') + solid-route(name='admin-projects') li a Projets diff --git a/src/page-circle.pug b/src/page-circle.pug index 6439aac..3282972 100644 --- a/src/page-circle.pug +++ b/src/page-circle.pug @@ -1,8 +1,8 @@ .views-container.sidebar-is-closed .content-box.flex.full-width.with-form div.content-box__header - sib-ac-checker.flex.space-between(permission='acl:Read', bind-resources) - sib-display( + solid-ac-checker.flex.space-between(permission='acl:Read', bind-resources) + solid-display( bind-resources fields='name, description' @@ -11,20 +11,20 @@ ) button.mobile-sidebar-button.jsMobileSidebarOpenButton.icon-arrow-left-circle MENU div.content-box__height - sib-ac-checker(permission='acl:Read', bind-resources) + solid-ac-checker(permission='acl:Read', bind-resources) #circle-chat(hidden) include views/circle/page-circle-chat.pug #circle-information.content-box__height(hidden) include views/circle/page-circle-profile.pug nav.jsRightMenu(role='navigation') - sib-router(default-route='circle-chat') + solid-router(default-route='circle-chat') ul li.jsOffsiteToggle a Replier le menu - sib-route(name='circle-chat') + solid-route(name='circle-chat') li a Chat - sib-route(name='circle-information') + solid-route(name='circle-information') li a Information diff --git a/src/page-dashboard.pug b/src/page-dashboard.pug index ea3db7d..9a22752 100644 --- a/src/page-dashboard.pug +++ b/src/page-dashboard.pug @@ -1,5 +1,5 @@ .views-container h1 Tableau de bord - sib-dashboard( + solid-dashboard( data-src=`${endpoints.dashboards || endpoints.get.dashboards}` ) diff --git a/src/page-directory.pug b/src/page-directory.pug index a37d1b0..3937823 100644 --- a/src/page-directory.pug +++ b/src/page-directory.pug @@ -1,4 +1,4 @@ -sib-directory( +solid-directory( data-src=`${endpoints.users || endpoints.get.users}` range-skills=`${endpoints.skills || endpoints.get.skills}` ) diff --git a/src/page-job-offers.pug b/src/page-job-offers.pug index f173429..bf83ad6 100644 --- a/src/page-job-offers.pug +++ b/src/page-job-offers.pug @@ -1,6 +1,6 @@ .content-box.full-width #job-offers.job-offers__container - sib-job-board( + solid-job-board( data-src=`${endpoints.joboffers || endpoints.get.joboffers}`, post-data-src=`${endpoints.joboffers || endpoints.post.joboffers}`, range-skills=`${endpoints.skills || endpoints.get.skills}` diff --git a/src/page-messages.pug b/src/page-messages.pug index 154a42d..21f7c6d 100644 --- a/src/page-messages.pug +++ b/src/page-messages.pug @@ -1,7 +1,7 @@ .content-box.flex.full-width div.content-box__header - sib-display( + solid-display( bind-resources fields='name, parenthesis, username, endParenthesis' value-parenthesis=" (" @@ -14,7 +14,7 @@ ) .chat-view - sib-chat( + solid-xmpp-chat( data-authentication='login', data-auto-login='true', data-bosh-service-url=`${xmpp}`, diff --git a/src/page-profile.pug b/src/page-profile.pug index 79702ef..32d9bb6 100644 --- a/src/page-profile.pug +++ b/src/page-profile.pug @@ -1,4 +1,4 @@ -sib-profile( +solid-profile( bind-user upload-src=`${endpoints.uploads || endpoints.post.uploads}` range-skills=`${endpoints.skills || endpoints.get.skills}` diff --git a/src/page-project.pug b/src/page-project.pug index 23fe1c4..3c10265 100644 --- a/src/page-project.pug +++ b/src/page-project.pug @@ -1,8 +1,8 @@ .views-container.sidebar-is-closed .content-box.flex.full-width.with-form div.content-box__header - sib-ac-checker.flex.space-between(permission='acl:Read', bind-resources) - sib-display( + solid-ac-checker.flex.space-between(permission='acl:Read', bind-resources) + solid-display( bind-resources fields='const-title1, number, customer.name, name' @@ -15,7 +15,7 @@ ) button.mobile-sidebar-button.jsMobileSidebarOpenButton.icon-arrow-left-circle MENU div.content-box__height - sib-ac-checker(permission='acl:Read', bind-resources) + solid-ac-checker(permission='acl:Read', bind-resources) #project-chat(hidden) include views/project/page-project-chat.pug #project-information.content-box__height(hidden) @@ -24,14 +24,14 @@ include views/project/page-project-picture.pug nav.jsRightMenu(role='navigation') - sib-router(default-route='project-chat') + solid-router(default-route='project-chat') ul li.jsOffsiteToggle a Replier le menu - sib-route(name='project-chat') + solid-route(name='project-chat') li a Chat - sib-route(name='project-information') + solid-route(name='project-information') li a Information - sib-route(name='project-picture' use-id) \ No newline at end of file + solid-route(name='project-picture' use-id) \ No newline at end of file diff --git a/src/page-user-profile.pug b/src/page-user-profile.pug index d10d1e1..aee271e 100644 --- a/src/page-user-profile.pug +++ b/src/page-user-profile.pug @@ -4,14 +4,14 @@ include templates/hubl-groups.pug .section.user-bio - sib-display.avatar-display( + solid-display.avatar-display( bind-user='' fields='account.picture' label-account.picture='' - widget-account.picture='sib-display-img' + widget-account.picture='solid-display-img' ) - sib-display.name-diplay( + solid-display.name-diplay( bind-user='' fields='user-name-groups(name, groups), username' @@ -24,7 +24,7 @@ include templates/hubl-groups.pug class-username='username' ) - sib-form.info-form( + solid-form.info-form( bind-user='' fields='profile.bio, inline-1(profile.city, email), inline-2(profile.phone, profile.website), inline-3(profile.available), account.picture, instruction' @@ -53,19 +53,19 @@ include templates/hubl-groups.pug .section.user-skills - sib-form( + solid-form( bind-user='' range-skills=`${endpoints.skills || endpoints.get.skills}` fields='skills' class-skills='form-label is-dark' label-skills='Your main skills (4 max.):' - multiple-skills='sib-multiple-select' - widget-skills='sib-form-auto-completion' + multiple-skills='solid-multiple-select' + widget-skills='solid-form-auto-completion' ) - sib-widget(name='hubl-instruction') + solid-widget(name='hubl-instruction') template span Show us your most beautiful smile p Pictures help us to know ourselves and also to recognize ourselves, so don't be afraid to show your pretty face and avoid strange avatars. diff --git a/src/scripts/reactive-store.js b/src/scripts/reactive-store.js deleted file mode 100644 index f2b1693..0000000 --- a/src/scripts/reactive-store.js +++ /dev/null @@ -1,158 +0,0 @@ -//auxiliary function clears cache & refreshes sib-displays for a given resource ID -function refreshSibDisplays(resourceId, clearCache = true) { - let cacheCleared = false; - - Array.from(document.querySelectorAll("sib-display")) - .filter(sibDisplay => sibDisplay.component?sibDisplay.component.resourceId == resourceId:false) // keep only elements with resource == edited resource - .forEach(async (e) => { - //clear cache if we were unable to before - if ((clearCache && !cacheCleared) && e.component.resource != null) { - await e.component.resource.clearCache(); - cacheCleared = true; - } - e.dataset.src = e.dataset.src; - }); // and update them -} - -async function updateSources(resource) { - let res = resource.split('/'); - res.splice(3, 0, 'sources'); - let cacheCleared = false; - if (event.target.component.resource != null) { - await event.target.component.resource.clearCache(); - cacheCleared = true; - } - refreshSibDisplays(res.join('/'),cacheCleared); -} - -async function resToChildrens(resource) { - resource = resource.getResourceData(); - 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 -//NOTE: this is a temporary workaround and should be replaced by a reactive storage -//https://git.startinblox.com/framework/sib-core/issues/524 -async function refreshResource(event) { - - // if of the edited resource || id of the container of the created resource - const resourceId = event.detail.resource["@id"] || event.target.dataset.src; - updateSources(resourceId, event); - [...new Set(Array.from(document.querySelectorAll('[data-src="' + resourceId + '"]')).map(e=>e.component?e.component.resource:null).filter(e=>e!=null))].forEach(resToChildrens); - [...new Set(Array.from(document.querySelectorAll('[data-src="' + resourceId.replace('circle-members','circles').split('/').slice(0, 4).join('/') + '/"]')).map(e=>e.component?e.component.resource:null).filter(e=>e!=null))].forEach(resToChildrens); - [...new Set(Array.from(document.querySelectorAll('[nested-field="' + resourceId.split('/').slice(3, 4).join('').replace('circle-members','circles') + '"]')).map(e=>e.component?e.component.resource:null).filter(e=>e!=null))].forEach(resToChildrens); - - //special cases updating users/X/circles for the left-side-menu (leaving or joining circle) - let user = await document.querySelector('sib-auth').getUser(); - if(resourceId.includes('circle') && user != null) { - let userId = user['@id']; - refreshSibDisplays(userId + "circles/"); - refreshSibDisplays(resourceId.replace('circle-members','circles').split('/').slice(0, 3).join('/') + '/circles/joinable/'); - refreshSibDisplays(resourceId.replace('circle-members','circles').split('/').slice(0, 3).join('/') + '/sources/circlesjoinable/'); - } - - if(resourceId.includes('users')) { - refreshSibDisplays(resourceId.split('/').slice(0, 3).join('/') + '/users/'); - refreshSibDisplays(resourceId.split('/').slice(0, 3).join('/') + '/sources/users/'); - refreshSibDisplays(resourceId + 'profile/'); - refreshSibDisplays(resourceId + 'account/'); - refreshSibDisplays(resourceId + 'chatProfile/'); - refreshSibDisplays(resourceId + 'skills/'); - refreshSibDisplays(resourceId + 'account/'); - } - - //clear cache on this resource - //NOTE: this is required because the cache is not refreshed after POSTing changes on the resource - let cacheCleared = false; - if (event.target.component.resource != null) { - await event.target.component.resource.clearCache(); - cacheCleared = true; - } - - //update all displays which use this resource - refreshSibDisplays(resourceId, cacheCleared); -} - -//auxiliary function performs a redirect -//NOTE: currently a sib-display is required to dispatch the requestNavigation event -function performRedirect(route) { - document.dispatchEvent( - new CustomEvent("requestNavigation", { - bubbles: true, - detail: { route: route } - }) - ); -} - -//auxiliary function redirects after leaving a project/circle -//NOTE: this is a temporary workaround until the following issues are resolved: -//https://git.startinblox.com/framework/sib-core/issues/476 -//https://git.startinblox.com/framework/sib-core/issues/546 -async function checkForPostLeaveRedirect(event) { - //a redirect will only be required if I left in the information page of the resource - if(!window.location.href.includes('-information')) { - return; - } - //first need to get a sib-display with this resource id (to have access to the target Proxy, containing model fields) - const resourceId = event.detail.resource['@id'] || event.target.dataset.src; - let target = document.querySelector('[data-src="' + resourceId + '"]'); - let resource = target.component.resource.getResourceData(); - - //no redirect is required for public circles - let targetCircleId = resource["http://happy-dev.fr/owl/#circle"]; - if(targetCircleId != undefined) { - let targetCircle = document.querySelector('[data-src="' + targetCircleId["@id"] + '"]'); - let targetCircleResource = targetCircle.component.resource.getResourceData(); - if(targetCircleResource['http://happy-dev.fr/owl/#status'] == 'Public') { - return; - } - } - - //a redirect will only be required if I've deleted myself - let targetUser = resource['http://happy-dev.fr/owl/#user']; - if(targetUser != undefined) { - //compare with current user - let user = await document.querySelector('sib-auth').getUser(); - if(targetUser['@id'] != user['@id'] && targetUser['@id'] != undefined) { - return; - } - } - - //perform the redirect - if(resourceId.includes('circle')) { - performRedirect('circle-left'); - } else if(resourceId.includes('project')) { - performRedirect('project-left'); - } -} - - -document.addEventListener("DOMContentLoaded", function(event) { - const menuWrappers = Array.from(document.querySelectorAll(".menu-wrapper")); - - //- Toggle sub-menus - menuWrappers.forEach(menuWrapper => { - const menu = menuWrapper.querySelector(".menu"); - menu.addEventListener("click", e => { - menuWrapper.classList.toggle("is-closed"); - }); - }); - - //- Watch every sib-forms & update data-src of linked sib-display - document.querySelector("body").addEventListener("save", event => { - refreshResource(event); - }); - document.querySelector("body").addEventListener("resourceDeleted", event => { - //I might need to be redirected from this page - checkForPostLeaveRedirect(event).then(refreshResource(event)); - }); - -}); diff --git a/src/scripts/sib-notifications.js b/src/scripts/sib-notifications.js index d45bba7..a6c9ddb 100644 --- a/src/scripts/sib-notifications.js +++ b/src/scripts/sib-notifications.js @@ -12,7 +12,7 @@ async function updateBadges(element) { } // update badges unreadNotifications.forEach((notifNumber, objectId) => { - const badge = document.querySelector(`sib-fix-badge[data-src="${objectId}"]`); + const badge = document.querySelector(`solid-fix-badge[data-src="${objectId}"]`); if (badge) { badge.innerText = notifNumber || ''; badge.style.display = notifNumber ? 'block' : 'none'; @@ -29,7 +29,7 @@ document.addEventListener("DOMContentLoaded", function (event) { clearInterval(checkNotificationMenuExist); notifsMenu.addEventListener('populate', (event) => { const checkExist = setInterval(function () { // wait for left menus to exist - const subMenus = document.querySelectorAll('.sub-menu > sib-display > div'); + const subMenus = document.querySelectorAll('.sub-menu > solid-display > div'); if (subMenus.length >= 2) { updateBadges(event.target); clearInterval(checkExist); @@ -53,7 +53,7 @@ document.addEventListener("DOMContentLoaded", function (event) { // on read notification window.addEventListener('read', (event) => { if (event.detail && event.detail.resource && event.detail.resource['@id']) { - const badge = document.querySelector(`sib-fix-badge[data-src="${event.detail.resource['@id']}"]`); + const badge = document.querySelector(`solid-fix-badge[data-src="${event.detail.resource['@id']}"]`); if (badge) badge.style.display = "none"; } }); diff --git a/src/scripts/unreads-menu.js b/src/scripts/unreads-menu.js index 3cd1904..66b18b5 100644 --- a/src/scripts/unreads-menu.js +++ b/src/scripts/unreads-menu.js @@ -8,7 +8,7 @@ document.addEventListener("DOMContentLoaded", function (event) { window.addEventListener('read', (event) => { if (event.detail && event.detail.resource && event.detail.resource['@id']) { - const badge = document.querySelector(`sib-fix-badge[data-src="${event.detail.resource['@id']}"]`); + const badge = document.querySelector(`solid-fix-badge[data-src="${event.detail.resource['@id']}"]`); if (badge) badge.parentElement.parentElement.classList.remove('unread'); } }); diff --git a/src/scripts/widget-extension.js b/src/scripts/widget-extension.js index d126f3b..13c2295 100644 --- a/src/scripts/widget-extension.js +++ b/src/scripts/widget-extension.js @@ -8,10 +8,10 @@ function applyAdapt(prefix, sibDisplay, user) { ); } - //- Allow to set data-src to a children sib-form + //- Allow to set data-src to a children solid-form if (sibDisplay.getAttribute(prefix + "-bind-resources")) { let form = sibDisplay.querySelector( - sibDisplay.getAttribute(prefix + "-bind-resources") + " sib-form" + sibDisplay.getAttribute(prefix + "-bind-resources") + " solid-form" ); if (form) { form.setAttribute( @@ -38,7 +38,7 @@ function recursiveAdaptWidgets(prefix, element, user) { el.setAttribute(el.getAttribute(prefix + "-user-id"), user["@id"]); }); applyAdapt(prefix, element, user); - document.querySelectorAll('sib-display, sib-form').forEach(sibDisplay => { + document.querySelectorAll('solid-display, solid-form').forEach(sibDisplay => { applyAdapt(prefix, sibDisplay, user); }); }); @@ -50,12 +50,12 @@ document.addEventListener("DOMContentLoaded", function (event) { .getUser() .then(user => { if (user !== null) { - document.querySelectorAll('sib-display, sib-form').forEach(element => { - // Set current user id on set-user-id of sib-display + document.querySelectorAll('solid-display, solid-form').forEach(element => { + // Set current user id on set-user-id of solid-display recursiveAdaptWidgets("hubl-inherit", element, user); }); for (leaveBtn of document.querySelectorAll( - "admin-circle-leave > sib-ac-checker:not([hidden])" + "admin-circle-leave > solid-ac-checker:not([hidden])" )) { // Hide Join button leaveBtn.parentNode.parentNode.parentNode.nextElementSibling.setAttribute( diff --git a/src/styles/base/form.scss b/src/styles/base/form.scss index 8b6ca5d..ad3c93b 100644 --- a/src/styles/base/form.scss +++ b/src/styles/base/form.scss @@ -100,13 +100,13 @@ textarea { &.with-form { - /*sib-set-default:not([name='user-thumb']) { + /*solid-set-default:not([name='user-thumb']) { clear: both; display: flex!important; flex-wrap: wrap; max-width: 100%; - sib-form-label-text { + solid-form-label-text { float: left; width: 50%; } @@ -114,7 +114,7 @@ textarea { } } -/*sib-form[set-user-id-select] { +/*solid-form[set-user-id-select] { input[type="submit"] { margin-left: 0; @@ -129,7 +129,7 @@ textarea { /* WIDGETS SIB (let in .content-box to override default styles) */ -sib-form-auto-completion, +solid-form-auto-completion, hubl-status { .ss-main { @@ -205,7 +205,7 @@ hubl-status { } /* End */ -sib-form-date { +solid-form-date { input[type="date"] { background-image: url("/images/calendar.svg"); background-position: right 12px top 50%; @@ -239,7 +239,7 @@ sib-form-date { } } -sib-form-file { +solid-form-file { div { display: flex; @@ -287,13 +287,13 @@ sib-form-file { } } -/*sib-multiple-select { +/*solid-multiple-select { &.select-skills .ss-values .ss-disabled::before { content: "Select skills"; } - sib-form-auto-completion > label { + solid-form-auto-completion > label { display: flex; flex-direction: column; @@ -377,7 +377,7 @@ hubl-member-form { margin-bottom: 1rem; } - sib-form-auto-completion { + solid-form-auto-completion { float: left; } diff --git a/src/styles/base/header.scss b/src/styles/base/header.scss index c8634f8..1288dff 100644 --- a/src/styles/base/header.scss +++ b/src/styles/base/header.scss @@ -40,7 +40,7 @@ } /* To remove the place taken by this element */ - sib-widget[name='hubl-user-avatar'] { + solid-widget[name='hubl-user-avatar'] { display: contents; } } @@ -176,7 +176,7 @@ sib-notifications { } } - sib-display-value[name='first_name'] { + solid-display-value[name='first_name'] { @include icon('arrow-down'); align-items: center; display: none; @@ -224,7 +224,7 @@ sib-notifications { li { - sib-link { + solid-link { color: var(--color-grey-4); display: block; border-bottom: 1px solid var(--color-user-panel-list-border); @@ -259,7 +259,7 @@ sib-notifications { div { - sib-display-value[name='first_name'] { + solid-display-value[name='first_name'] { @include icon('close'); &::before { diff --git a/src/styles/base/main.scss b/src/styles/base/main.scss index 97ca857..23a12a6 100644 --- a/src/styles/base/main.scss +++ b/src/styles/base/main.scss @@ -22,8 +22,8 @@ } } -/* Fix for sib-dashboard fixture */ -sib-dashboard section { +/* Fix for solid-dashboard fixture */ +solid-dashboard section { padding: 1rem !important; @include breakpoint(lg) { @@ -322,14 +322,14 @@ h5 { } } - sib-display { + solid-display { @include breakpoint(sm) { float: left; } } - /* For sib-display on project, circle, or private message view */ - sib-display { + /* For solid-display on project, circle, or private message view */ + solid-display { width: calc(100% - 94px); /* 94px = width of .mobile-sidebar-button */ div { @@ -394,7 +394,7 @@ h5 { max-width: 75%; } - sib-link { + solid-link { font-size: 2.7rem; position: absolute; right: 32px; @@ -430,8 +430,8 @@ h5 { } } - sib-ac-checker, - sib-link { + solid-ac-checker, + solid-link { width: 100%; @include breakpoint(lg) { @@ -516,9 +516,9 @@ h5 { @import 'user-thumb'; // Button global CSS -sib-delete, -sib-route, -sib-link, +solid-delete, +solid-route, +solid-link, button, input[type='submit'], a, diff --git a/src/styles/base/menu-left.scss b/src/styles/base/menu-left.scss index 4d68192..7b070ed 100644 --- a/src/styles/base/menu-left.scss +++ b/src/styles/base/menu-left.scss @@ -11,7 +11,7 @@ font-weight: bolder; } - sib-router { + solid-router { .menu-wrapper { &.is-closed { .sub-menu { @@ -24,7 +24,7 @@ } } - sib-link { + solid-link { width: 100%; } @@ -42,7 +42,7 @@ background-color: var(--color-menu-icon-background-active); } - .menu-notification>sib-display>div:first-child { + .menu-notification>solid-display>div:first-child { background-color: var(--color-menu-badge-background); } } @@ -85,7 +85,7 @@ width: 2em; } - >sib-display { + >solid-display { display: block; } } @@ -94,9 +94,9 @@ /* Ellipsis for project tab */ - .project-tab>div>sib-display>div:nth-child(1) { + .project-tab>div>solid-display>div:nth-child(1) { - sib-set-default[name='project'] { + solid-set-default[name='project'] { flex: 3; .project-customer, @@ -125,9 +125,9 @@ /* Ellipsis for circle tab */ - .circle-tab>div>sib-display>div { + .circle-tab>div>solid-display>div { - sib-display-div[name='name'] { + solid-display-div[name='name'] { flex: 3; >div[name='name'] { @@ -147,7 +147,7 @@ /* Ellipsis for message tab */ - .message-tab>div>sib-display>div>sib-display-div>div { + .message-tab>div>solid-display>div>solid-display-div>div { box-sizing: border-box; width: calc(80vw - 96px); /*96px = padding of the element + width and margin of counter */ @@ -156,7 +156,7 @@ } } - sib-display.nosub>sib-form[fields="name"]>hubl-search-users>input { + solid-display.nosub>solid-form[fields="name"]>hubl-search-users>input { margin-left: 30px; margin-bottom: 10px; width: calc(80vw - 71px); @@ -169,11 +169,12 @@ @include breakpoint(lg) { margin: auto; + margin-bottom: 10px; width: auto; } } - sib-display.nosub>nav { + solid-display.nosub>nav { text-align: center; overflow: hidden; display: grid; @@ -209,18 +210,18 @@ } } - >sib-display.nosub>div>sib-display>div { + >solid-display.nosub>div>solid-display>div { padding: 1rem 1rem 1rem 3rem; } - sib-display>div { + solid-display>div { .create { color: var(--color-white); margin: 1rem 1rem 2.2rem 3.2rem; } - &>sib-display { + &>solid-display { &:last-child>div { margin-bottom: 2.2rem; } @@ -229,8 +230,8 @@ color: var(--color-grey-6); cursor: pointer; - >hubl-menu-fix-url-circle>sib-display>div, - >hubl-menu-fix-url-project>sib-display>div { + >hubl-menu-fix-url-circle>solid-display>div, + >hubl-menu-fix-url-project>solid-display>div { padding: 1rem 1rem 1rem 3rem; } } @@ -240,9 +241,9 @@ } } - &>sib-display[active]>div, - &>sib-display>div>hubl-menu-fix-url-circle>sib-display[active]>div, - &>sib-display>div>hubl-menu-fix-url-project>sib-display[active]>div { + &>solid-display[active]>div, + &>solid-display>div>hubl-menu-fix-url-circle>solid-display[active]>div, + &>solid-display>div>hubl-menu-fix-url-project>solid-display[active]>div { background-color: var(--color-menu-highlight-primary); color: var(--color-menu-text-active); font-weight: bold; @@ -251,14 +252,14 @@ &.menu-notification { - >sib-display>div>sib-display>div>hubl-menu-fix-url-circle, - >sib-display>div>sib-display>div>hubl-menu-fix-url-project { + >solid-display>div>solid-display>div>hubl-menu-fix-url-circle, + >solid-display>div>solid-display>div>hubl-menu-fix-url-project { flex: 1; } - >sib-display>div>sib-display>div, - >sib-display>div>sib-display>div>hubl-menu-fix-url-circle>sib-display>div, - >sib-display>div>sib-display>div>hubl-menu-fix-url-project>sib-display>div { + >solid-display>div>solid-display>div, + >solid-display>div>solid-display>div>hubl-menu-fix-url-circle>solid-display>div, + >solid-display>div>solid-display>div>hubl-menu-fix-url-project>solid-display>div { display: flex; justify-content: space-between; } @@ -293,7 +294,7 @@ } // Temporary fix for badges -sib-fix-badge { +solid-fix-badge { display: none; box-sizing: border-box; font-family: sans-serif; diff --git a/src/styles/base/table.scss b/src/styles/base/table.scss index 95af476..6ecc645 100644 --- a/src/styles/base/table.scss +++ b/src/styles/base/table.scss @@ -37,7 +37,7 @@ &>div { display: contents; - &>sib-display { + &>solid-display { display: table-row; &>div { @@ -51,7 +51,7 @@ } } - &>sib-multiple { + &>solid-multiple { display: contents; &>div { @@ -183,7 +183,7 @@ } } -.table sib-ac-checker { +.table solid-ac-checker { text-align: center; } diff --git a/src/styles/components/chat.scss b/src/styles/components/chat.scss index e476d53..440e3be 100644 --- a/src/styles/components/chat.scss +++ b/src/styles/components/chat.scss @@ -8,7 +8,7 @@ height: calc(100vh - 84px - 83px); /* Header's and subheader's height on mobile */ } - > sib-chat { + > solid-xmpp-chat { position: absolute; top: 0; left: 0; diff --git a/src/styles/components/comment.scss b/src/styles/components/comment.scss index f269428..0a4dc94 100644 --- a/src/styles/components/comment.scss +++ b/src/styles/components/comment.scss @@ -37,9 +37,9 @@ } } - sib-conversation.conversation { + solid-conversation.conversation { - .sib-conversation { + .solid-conversation { font-family: Open Sans; [name='conversation-wrapper'] { @@ -67,14 +67,14 @@ } } - >sib-display.conversation>div>sib-display:first-child { + >solid-display.conversation>div>solid-display:first-child { margin-bottom: 4.5rem; } - sib-ac-checker { + solid-ac-checker { border-top: 1px solid $color-210-17-91; - sib-form-textarea { + solid-form-textarea { >label div { color: $color-210-5-56; @@ -111,7 +111,7 @@ } } - .conversation>div>sib-display, + .conversation>div>solid-display, .conversation-form { border: none; margin: 1rem 2.1rem; diff --git a/src/styles/components/filters.scss b/src/styles/components/filters.scss index 2823c38..1831909 100644 --- a/src/styles/components/filters.scss +++ b/src/styles/components/filters.scss @@ -41,19 +41,19 @@ } } - sib-form-label-text { + solid-form-label-text { display: flex; flex-direction: column; } - sib-form-placeholder-dropdown[name="skills"] { + solid-form-placeholder-dropdown[name="skills"] { grid-column-end: 3; grid-column-start: 1; } } .job-board, #members-list { - sib-form[naked] { + solid-form[naked] { @extend %filters; } }*/ diff --git a/src/styles/components/sidebar.scss b/src/styles/components/sidebar.scss index 6e4d13a..9454ebe 100644 --- a/src/styles/components/sidebar.scss +++ b/src/styles/components/sidebar.scss @@ -45,7 +45,7 @@ transition: all 0.5s; width: 25rem; - >sib-router { + >solid-router { color: var(--color-right-menu-text); flex: 0 0 auto; font-weight: 600; @@ -79,7 +79,7 @@ @include icon('arrow-right-circle'); } - >sib-route { + >solid-route { &[name*='circle'], &[name*='project'] { diff --git a/src/styles/components/skills.scss b/src/styles/components/skills.scss index 496f0a5..b6290fd 100644 --- a/src/styles/components/skills.scss +++ b/src/styles/components/skills.scss @@ -1,4 +1,4 @@ -sib-multiple[name*='skills'] { +solid-multiple[name*='skills'] { display: flex; flex-wrap: wrap; } diff --git a/src/styles/layout/dashboard/dashboard.scss b/src/styles/layout/dashboard/dashboard.scss index 0718af8..a7beab8 100644 --- a/src/styles/layout/dashboard/dashboard.scss +++ b/src/styles/layout/dashboard/dashboard.scss @@ -2,6 +2,6 @@ margin: 0 2px; } -sib-dashboard .icon::before { +solid-dashboard .icon::before { width: 41px; } \ No newline at end of file diff --git a/src/styles/layout/events/events.scss b/src/styles/layout/events/events.scss index 3b38a7e..6ada157 100644 --- a/src/styles/layout/events/events.scss +++ b/src/styles/layout/events/events.scss @@ -17,12 +17,12 @@ font-weight: 700; } #listevents [name="name"], - sib-display-link-event .mdi::before { + solid-display-link-event .mdi::before { color: $color-357-67-45; } .event-place-name, .nextevent-startdate, - sib-display-link-event { + solid-display-link-event { color: $color-0-0-22; } .sib-event { @@ -43,7 +43,7 @@ padding: 5px 20px; color: $color-203-87-19; } - sib-form sib-form-dropdown{ + solid-form solid-form-dropdown{ label div { height: 2.5rem; } @@ -72,7 +72,7 @@ width: max-content; height: max-content; } - sib-display-location-events { + solid-display-location-events { padding: 5px; } } @@ -83,7 +83,7 @@ line-height: 3.8rem; color: $color-203-87-19; } - sib-display div .event-type { + solid-display div .event-type { width: max-content; padding: 5px 20px; } @@ -91,7 +91,7 @@ font-size: 1.6rem; line-height: 2.6rem; } - sib-display-link-event a { + solid-display-link-event a { font-size: 1.6rem; } } diff --git a/src/styles/layout/job-offers/job-offers.scss b/src/styles/layout/job-offers/job-offers.scss index ef08ead..80e6b89 100644 --- a/src/styles/layout/job-offers/job-offers.scss +++ b/src/styles/layout/job-offers/job-offers.scss @@ -2,7 +2,7 @@ @extend %grid-layer; } -sib-job-board { +solid-job-board { @extend %grid-layer-main; @extend %containerV; } @@ -37,7 +37,7 @@ sib-job-board { .job-board__list { @extend %grid-layer; - >sib-form { + >solid-form { grid-column-start: start; grid-column-end: middle; grid-row-start: start; @@ -54,7 +54,7 @@ sib-job-board { margin-top: 5rem; } - >sib-display { + >solid-display { @include window-style-modal(); display: block; font-size: 1.5rem; @@ -71,7 +71,7 @@ sib-job-board { display: flex; margin: -0.25em; - >*:not(sib-action) { + >*:not(solid-action) { margin: 0.25em; } @@ -80,7 +80,7 @@ sib-job-board { font-weight: 600; } - sib-multiple[name$='groups'] { + solid-multiple[name$='groups'] { display: flex; label { @@ -147,7 +147,7 @@ sib-job-board { font-size: 1.3rem; float: right; - >sib-link { + >solid-link { cursor: pointer; @include icon('speech'); @@ -180,7 +180,7 @@ sib-job-board { } } - .sib-conversation, + .solid-conversation, .conversation > div { display: flex; flex-direction: column-reverse; @@ -194,11 +194,11 @@ sib-job-board { } } -sib-action[name='edit'] { +solid-action[name='edit'] { margin-left: auto; color: $color-215-6-63; - &>sib-link { + &>solid-link { @include icon('pencil'); font-size: 2rem; } diff --git a/src/styles/layout/members/member-profile.scss b/src/styles/layout/members/member-profile.scss index 22ee6ed..4a334d8 100644 --- a/src/styles/layout/members/member-profile.scss +++ b/src/styles/layout/members/member-profile.scss @@ -11,7 +11,7 @@ .member-bio { - sib-set-default[name='member-profile__bio'] { + solid-set-default[name='member-profile__bio'] { display: grid; grid-gap: 1rem; grid-template-areas: "avatar name status" @@ -20,7 +20,7 @@ "avatar list button"; grid-template-columns: 1fr 2fr 1fr; - sib-set-default[name='member-img'] { + solid-set-default[name='member-img'] { grid-area: avatar; member-picture { @@ -56,23 +56,23 @@ } } - sib-set-default[name='member-profile'] { + solid-set-default[name='member-profile'] { align-items: baseline; align-self: end; display: flex; grid-area: name; - >sib-multiple[name$='groups'] { + >solid-multiple[name$='groups'] { display: flex; padding-left: 1.4rem; } } - sib-display-value[name='profile.bio'] { + solid-display-value[name='profile.bio'] { grid-area: bio; } - sib-set-default[name='infos'] { + solid-set-default[name='infos'] { display: block; grid-area: list; @@ -115,7 +115,7 @@ } } - sib-action[name='send'] { + solid-action[name='send'] { align-self: flex-end; grid-area: button; justify-self: flex-end; diff --git a/src/styles/layout/members/members.scss b/src/styles/layout/members/members.scss index 54934e2..ca07cb0 100644 --- a/src/styles/layout/members/members.scss +++ b/src/styles/layout/members/members.scss @@ -1,8 +1,8 @@ /*%member-info { - sib-multiple[name^='user.'], + solid-multiple[name^='user.'], >member-info>div, - >sib-display-value { + >solid-display-value { display: flex; flex-wrap: wrap; margin-bottom: 0; @@ -70,7 +70,7 @@ member-info-groups { } } - &>sib-form { + &>solid-form { grid-column-start: start; grid-column-end: middle; grid-row-start: start; @@ -126,7 +126,7 @@ member-info-groups { grid-template-columns: repeat(3, 1.5fr); } - &>sib-display { + &>solid-display { background-color: white; box-shadow: 0 0 6px 0 rgba(0, 0, 0, 0.14); color: $color-210-4-50; @@ -151,7 +151,7 @@ member-info-groups { display: none; } - sib-multiple[name$='groups'] { + solid-multiple[name$='groups'] { align-items: flex-start; display: flex; justify-content: flex-end; @@ -189,7 +189,7 @@ member-info-groups { } } - sib-set-default[name='bio'] { + solid-set-default[name='bio'] { align-items: center; border-bottom: 1px solid $color-210-25-95; display: flex; @@ -204,7 +204,7 @@ member-info-groups { margin-top: 0.6rem; } - sib-display-value[name$='bio'] { + solid-display-value[name$='bio'] { flex: 1; margin: 2.5rem 0; padding: 0 10px; @@ -228,11 +228,11 @@ member-info-groups { } } - sib-set-default[name='infos'] { + solid-set-default[name='infos'] { padding: 0.4rem 2rem 3.7rem; @extend %member-info; - sib-multiple[name='skills'] { + solid-multiple[name='skills'] { margin: 1.6rem 0; } } diff --git a/src/styles/layout/user/user-profile.scss b/src/styles/layout/user/user-profile.scss index 90c1542..8a2be67 100644 --- a/src/styles/layout/user/user-profile.scss +++ b/src/styles/layout/user/user-profile.scss @@ -30,7 +30,7 @@ align-self: end; display: flex; - sib-multiple { + solid-multiple { display: flex; padding-left: 1.4rem; diff --git a/src/templates/hubl-captain.pug b/src/templates/hubl-captain.pug index fa0a8db..4b2bc9b 100644 --- a/src/templates/hubl-captain.pug +++ b/src/templates/hubl-captain.pug @@ -1,8 +1,8 @@ include hubl-user-avatar.pug -sib-widget(name='hubl-captain') +solid-widget(name='hubl-captain') template - sib-display.user-thumb( + solid-display.user-thumb( data-src="${await value}" fields='account.picture, sup(name), sub(is_lead)' diff --git a/src/templates/hubl-circle-team.pug b/src/templates/hubl-circle-team.pug index e02fd4a..2aff831 100644 --- a/src/templates/hubl-circle-team.pug +++ b/src/templates/hubl-circle-team.pug @@ -1,8 +1,8 @@ include hubl-user-avatar.pug -sib-widget(name='hubl-circle-team-template') +solid-widget(name='hubl-circle-team-template') template - sib-display.user-thumb.is-spaced( + solid-display.user-thumb.is-spaced( data-src='${await value.user}' fields='account.picture, sup(name, isadmin), sub(profile.city)' value-isadmin='${await value.is_admin}' @@ -16,5 +16,5 @@ sib-widget(name='hubl-circle-team-template') widget-isadmin='hubl-circle-user-admin' ) -sib-widget(name='hubl-circle-user-admin') +solid-widget(name='hubl-circle-user-admin') template ${(await value) != "false" ? "Administrateur" : ""} diff --git a/src/templates/hubl-project-team.pug b/src/templates/hubl-project-team.pug index f00ddca..f8334c7 100644 --- a/src/templates/hubl-project-team.pug +++ b/src/templates/hubl-project-team.pug @@ -1,8 +1,8 @@ include hubl-user-avatar.pug -sib-widget(name='hubl-project-team') +solid-widget(name='hubl-project-team') template - sib-display.user-thumb.is-spaced( + solid-display.user-thumb.is-spaced( data-src='${await value}' fields='user.account.picture, sup(user.name, isadmin), sub(user.profile.city, name)' value-isadmin='${await value.is_admin}' @@ -18,5 +18,5 @@ sib-widget(name='hubl-project-team') widget-isadmin='hubl-project-user-admin' ) -sib-widget(name='hubl-project-user-admin') +solid-widget(name='hubl-project-user-admin') template ${(await value) == "false" ? "" : "Administrateur"} diff --git a/src/templates/hubl-user-avatar.pug b/src/templates/hubl-user-avatar.pug index 08a2876..68cffa1 100644 --- a/src/templates/hubl-user-avatar.pug +++ b/src/templates/hubl-user-avatar.pug @@ -1,2 +1,2 @@ -sib-widget(name='hubl-user-avatar') +solid-widget(name='hubl-user-avatar') template ${await value ? `` : ``} diff --git a/src/views/admin/page-admin-circles-create.pug b/src/views/admin/page-admin-circles-create.pug index 5883464..2e94345 100644 --- a/src/views/admin/page-admin-circles-create.pug +++ b/src/views/admin/page-admin-circles-create.pug @@ -1,9 +1,9 @@ div.content-box__info.flex - sib-link(class="backlink right", next='admin-circle-list') Retour + solid-link(class="backlink right", next='admin-circle-list') Retour h1.centered Créer un canal - sib-form.form.button-register( + solid-form.form.button-register( data-src=`${endpoints.circles || endpoints.post.circles}` fields='status, name, description' diff --git a/src/views/admin/page-admin-circles.pug b/src/views/admin/page-admin-circles.pug index 47278b6..d6c1e01 100644 --- a/src/views/admin/page-admin-circles.pug +++ b/src/views/admin/page-admin-circles.pug @@ -1,8 +1,8 @@ .content-box.flex.full-width.with-form - sib-router(default-route='admin-circle-list', hidden) - sib-route(name='admin-circle-list') - sib-route(name='admin-circle-create') - sib-route(name='circle-left') + solid-router(default-route='admin-circle-list', hidden) + solid-route(name='admin-circle-list') + solid-route(name='admin-circle-create') + solid-route(name='circle-left') div.content-box__header.flex.space-between h1.without-margin Administration @@ -13,9 +13,9 @@ #admin-circle-list.content-box__height(hidden) include ../../templates/hubl-user-avatar.pug - sib-widget(name='hubl-circle-owner') + solid-widget(name='hubl-circle-owner') template - sib-display.user-thumb.is-spaced( + solid-display.user-thumb.is-spaced( data-src='${await value}' fields='account.picture, sup(name), sub(username)' @@ -33,7 +33,7 @@ h3 Canaux - sib-link( + solid-link( class='button text-bold text-uppercase reversed button-primary bordered with-icon icon-plus' next='admin-circle-create' ) Créer un canal @@ -46,15 +46,18 @@ div.w280 Administrateurs div.w280 Rejoindre - sib-widget(name='hubl-admin-circle-leave-button') + solid-widget(name='hubl-admin-circle-leave-button') template - sib-delete( + solid-delete( class='circle-leave button text-bold text-uppercase reversed button-secondary bordered with-icon icon-close' data-src="${src}" data-label='Quitter' ) + hubl-reactivity(data-src=`${endpoints.circles || endpoints.get.circles}` target-src='${src}') + hubl-reactivity(data-src=`${endpoints.circles || endpoints.get.circles}joinable/` target-src='${src}') + hubl-reactivity(bind-user nested-field="circles" target-src='${src}') - sib-display( + solid-display( class='table-body' bind-user @@ -72,19 +75,22 @@ order-by="circle.name" ) - sib-widget(name='hubl-admin-circle-join-button') + solid-widget(name='hubl-admin-circle-join-button') template - sib-form.circle-join.button.text-bold.text-uppercase.reversed.button-primary.bordered.with-icon.icon-arrow-right-circle.flex( + solid-form.circle-join.button.text-bold.text-uppercase.reversed.button-primary.bordered.with-icon.icon-arrow-right-circle.flex( data-src='${value}' fields='user.username' value-user.username='hubl-workaround-493' - widget-user.username='sib-form-hidden' + widget-user.username='solid-form-hidden' submit-button='Rejoindre' ) + hubl-reactivity(data-src=`${endpoints.circles || endpoints.get.circles}` target-src='${value}') + hubl-reactivity(data-src=`${endpoints.circles || endpoints.get.circles}joinable/` target-src='${value}') + hubl-reactivity(bind-user nested-field="circles" target-src='${value}') - sib-display( + solid-display( class='table-body' data-src=`${endpoints.circles || endpoints.get.circles}joinable/` diff --git a/src/views/admin/page-admin-projects-create.pug b/src/views/admin/page-admin-projects-create.pug index ef701be..57c9748 100644 --- a/src/views/admin/page-admin-projects-create.pug +++ b/src/views/admin/page-admin-projects-create.pug @@ -1,23 +1,23 @@ div.content-box__info.flex - sib-link(class="backlink right" next='admin-project-list') Retour + solid-link(class="backlink right" next='admin-project-list') Retour - sib-widget(name="hubl-admin-project-add-user") + solid-widget(name="hubl-admin-project-add-user") template - sib-form( + solid-form( data-holder fields='user, project' range-user=`${endpoints.users || endpoints.get.users}` value-project='${src}' - widget-project='sib-form-hidden' + widget-project='solid-form-hidden' naked ) h1.centered Créer un nouveau projet - sib-form.form.button-register( + solid-form.form.button-register( 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-2(captain), logo' label-status='Statut du canal*' widget-status='hubl-status' @@ -25,7 +25,7 @@ div.content-box__info.flex label-description='Description du projet' class-description='form-label is-light is-full-width input-text-like' - widget-description='sib-form-textarea' + widget-description='solid-form-textarea' label-customer.name='Nom du client*' class-customer.name='form-label is-light is-half-width input-text-like' @@ -36,15 +36,15 @@ div.content-box__info.flex label-captain='Capitaine du projet*' range-captain=`${endpoints.users || endpoints.get.users}` class-captain='form-label is-light is-half-width' - widget-captain='sib-form-auto-completion' + widget-captain='solid-form-auto-completion' class='input-text-like' - widget-logo="sib-form-file" + widget-logo="solid-form-file" label-logo="Télécharger un logo" class-logo='select-add' upload-url-logo=`${endpoints.uploads || endpoints.post.uploads}` - next='project-picture' + next='admin-project-list' submit-button='Enregistrer et ajouter des membres' ) diff --git a/src/views/admin/page-admin-projects.pug b/src/views/admin/page-admin-projects.pug index 9276e6b..4aece07 100644 --- a/src/views/admin/page-admin-projects.pug +++ b/src/views/admin/page-admin-projects.pug @@ -1,8 +1,8 @@ .content-box.flex.full-width.with-form - sib-router(default-route='admin-project-list', hidden) - sib-route(name='admin-project-list') - sib-route(name='admin-project-create') - sib-route(name='project-left') + solid-router(default-route='admin-project-list', hidden) + solid-route(name='admin-project-list') + solid-route(name='admin-project-create') + solid-route(name='project-left') div.content-box__header.flex.space-between h1.without-margin Administration @@ -17,7 +17,7 @@ div.content-box__info.flex div.admin-header.flex h3 Projets - sib-link( + solid-link( class='button text-bold text-uppercase reversed button-primary bordered with-icon icon-plus' next='admin-project-create' ) Créer un nouveau projet @@ -30,17 +30,20 @@ div.w280 Capitaines div.w230 Rejoindre - sib-widget(name="hubl-admin-project-leave-button") + solid-widget(name="hubl-admin-project-leave-button") template - sib-delete( + solid-delete( class='button text-bold text-uppercase reversed button-secondary bordered with-icon icon-close' data-src="${src}" data-label='Quitter' ) + hubl-reactivity(data-src=`${endpoints.projects || endpoints.get.projects}` target-src='${src}') + hubl-reactivity(data-src=`${endpoints.projects || endpoints.get.projects}joinable/` target-src='${src}') + hubl-reactivity(bind-user nested-field="projects" target-src='${src}') - sib-widget(name='hubl-project-captain') + solid-widget(name='hubl-project-captain') template - sib-display.user-thumb.is-spaced( + solid-display.user-thumb.is-spaced( data-src='${await value}' fields='account.picture, sup(name), sub(username)' @@ -51,26 +54,26 @@ widget-account.picture='hubl-user-avatar' ) - sib-widget(name='hubl-project-admins') + solid-widget(name='hubl-project-admins') template - sib-display.user-thumb.is-spaced( + solid-display.user-thumb.is-spaced( data-src='${value}' fields='user' search-fields='is_admin' search-value-is_admin='true' - search-widget-is_admin='sib-form-hidden' + search-widget-is_admin='solid-form-hidden' widget-user='hubl-project-captain' ) - sib-widget(name='hubl-admin-project-leave-button') + solid-widget(name='hubl-admin-project-leave-button') template - sib-delete( + solid-delete( class='button text-bold text-uppercase reversed button-secondary bordered with-icon icon-close' data-src="${src}" data-label='Quitter' ) - sib-display( + solid-display( class='table-body' bind-user @@ -91,20 +94,23 @@ order-by="project.name" ) - sib-widget(name='hubl-admin-project-join-button') + solid-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( + solid-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' + widget-user.username='solid-form-hidden' submit-button='Rejoindre' ) + hubl-reactivity(data-src=`${endpoints.projects || endpoints.get.projects}` target-src='${src}') + hubl-reactivity(data-src=`${endpoints.projects || endpoints.get.projects}joinable/` target-src='${src}') + hubl-reactivity(bind-user nested-field="projects" target-src='${src}') - sib-display( + solid-display( class='table-body' data-src=`${endpoints.projects || endpoints.get.projects}joinable/` diff --git a/src/views/admin/page-admin-users-create.pug b/src/views/admin/page-admin-users-create.pug index a90d8c7..f52dc81 100644 --- a/src/views/admin/page-admin-users-create.pug +++ b/src/views/admin/page-admin-users-create.pug @@ -1,9 +1,9 @@ div.content-box__info.flex - sib-link(class='backlink right', next='admin-users-list') Retour + solid-link(class='backlink right', next='admin-users-list') Retour h1.centered Ajouter un utilisateur à la plateforme - sib-form.form.button-register( + solid-form.form.button-register( data-src=`${endpoints.users || endpoints.post.users}` fields='line-1(first_name, last_name), line-2(username, email), line-3(password)' @@ -19,7 +19,7 @@ div.content-box__info.flex label-email='E-mail *' value-password='' - widget-password='sib-form-hidden' + widget-password='solid-form-hidden' next='admin-users-list' diff --git a/src/views/admin/page-admin-users-edit.pug b/src/views/admin/page-admin-users-edit.pug index 5198749..d372cb3 100644 --- a/src/views/admin/page-admin-users-edit.pug +++ b/src/views/admin/page-admin-users-edit.pug @@ -1,14 +1,14 @@ div.content-box__info.flex - sib-link(class='backlink right', next='admin-users-list') Retour + solid-link(class='backlink right', next='admin-users-list') Retour h1.centered span Modifier un utilisateur - sib-display( + solid-display( bind-resources='' fields='name' ) - sib-form.form.button-register( + solid-form.form.button-register( bind-resources='' fields='line-1(first_name, last_name), line-2(username, email)' diff --git a/src/views/admin/page-admin-users.pug b/src/views/admin/page-admin-users.pug index bae8156..84cd0e7 100644 --- a/src/views/admin/page-admin-users.pug +++ b/src/views/admin/page-admin-users.pug @@ -1,17 +1,17 @@ .content-box.flex.full-width.with-form - sib-router(default-route='admin-users-list', hidden) - sib-route(name='admin-users-list') - sib-route(name='admin-users-create') - sib-route(name='admin-users-edit') + solid-router(default-route='admin-users-list', hidden) + solid-route(name='admin-users-list') + solid-route(name='admin-users-create') + solid-route(name='admin-users-edit') div.content-box__header.flex.space-between h1.without-margin Administration button.mobile-sidebar-button.jsMobileSidebarOpenButton.icon-arrow-left-circle MENU - sib-widget(name='hubl-sib-action-custom') + solid-widget(name='hubl-solid-action-custom') template - sib-ac-checker(data-src="${src}", permission='acl:Write') - sib-link( + solid-ac-checker(data-src="${src}", permission='acl:Write') + solid-link( class='button rounded reversed button-primary bordered icon-pencil' data-src="${src}" next="${value}" @@ -22,8 +22,8 @@ div.content-box__info.flex div.admin-header.flex h3 Utilisateurs - sib-ac-checker(data-src=`${endpoints.users || endpoints.post.users}`, permission='acl:Append') - sib-link( + solid-ac-checker(data-src=`${endpoints.users || endpoints.post.users}`, permission='acl:Append') + solid-link( class='button text-bold text-uppercase reversed button-primary bordered with-icon icon-plus' next='admin-users-create' ) Ajouter un utilisateur @@ -34,7 +34,7 @@ div.w280 Nom div.w70 - sib-display( + solid-display( class='table-body' data-src=`${endpoints.users || endpoints.get.users}` fields='cell-1(user-thumb(account.picture, sup(name), sub(username))), actions' @@ -48,7 +48,7 @@ label-actions='Edit' action-actions='admin-users-edit' class-actions='w70 border cell-with-buttons' - widget-actions='hubl-sib-action-custom' + widget-actions='hubl-solid-action-custom' order-by='username' ) diff --git a/src/views/circle/page-circle-chat.pug b/src/views/circle/page-circle-chat.pug index 7e522a2..baee3eb 100644 --- a/src/views/circle/page-circle-chat.pug +++ b/src/views/circle/page-circle-chat.pug @@ -1,5 +1,5 @@ .chat-view - sib-chat( + solid-xmpp-chat( data-authentication='login', data-auto-login='true', data-bosh-service-url=`${xmpp}`, diff --git a/src/views/circle/page-circle-edit.pug b/src/views/circle/page-circle-edit.pug index 82af171..979ec1c 100644 --- a/src/views/circle/page-circle-edit.pug +++ b/src/views/circle/page-circle-edit.pug @@ -2,12 +2,12 @@ div.content-box__info include ../../templates/hubl-user-avatar.pug - sib-widget(name='hubl-user-groups') + solid-widget(name='hubl-user-groups') template ${await value.name} - sib-widget(name='hubl-team-template-edit') + solid-widget(name='hubl-team-template-edit') template - sib-display.user-thumb.is-spaced( + solid-display.user-thumb.is-spaced( class='w280 cell border cell-with-id-card user-thumb' data-src='${await value.user}' fields='account.picture, sup(name, groups), sub(profile.city)' @@ -23,30 +23,30 @@ div.content-box__info widget-groups='hubl-user-groups' ) - sib-ac-checker( + solid-ac-checker( class='w162 cell border' permission="acl:Delete" data-src="${value['@id']}" ) - sib-delete( + solid-delete( class='button text-bold text-uppercase reversed button-secondary bordered with-icon icon-close' data-src="${value['@id']}" data-label='Retirer' ) //- Only to show the table grid - sib-ac-checker( + solid-ac-checker( class='w162 cell border' no-permission="acl:Delete" data-src="${value['@id']}" ) - sib-link(class="backlink right", bind-resources, next='circle-profile') Retour + solid-link(class="backlink right", bind-resources, next='circle-profile') Retour - sib-ac-checker(permission='acl:Write', bind-resources) + solid-ac-checker(permission='acl:Write', bind-resources) h1 Modifie ton canal - sib-form.form.button-register( + solid-form.form.button-register( bind-resources fields='status, line-1(name, owner), description' @@ -64,7 +64,7 @@ div.content-box__info class-description='form-label is-light is-full-width input-text-like' class-status='form-label is-light is-full-width member-select color' - widget-owner='sib-form-auto-completion' + widget-owner='solid-form-auto-completion' partial='' @@ -74,8 +74,8 @@ div.content-box__info h2 Liste des membres : - sib-ac-checker(permission='acl:Append', bind-resources, nested-field='members') - sib-form.block.select-add( + solid-ac-checker(permission='acl:Append', bind-resources, nested-field='members') + solid-form.block.select-add( bind-resources nested-field='members' fields='user' @@ -83,7 +83,7 @@ div.content-box__info class-user='team form-label is-light' label-user='' - widget-user='sib-form-auto-completion' + widget-user='solid-form-auto-completion' submit-button='Ajouter un membre' ) @@ -95,7 +95,7 @@ div.content-box__info div.w162 Accès //-class='table-body' - sib-display( + solid-display( class='table-body' bind-resources fields='members' diff --git a/src/views/circle/page-circle-left.pug b/src/views/circle/page-circle-left.pug index 8ad8fe8..0a6b700 100644 --- a/src/views/circle/page-circle-left.pug +++ b/src/views/circle/page-circle-left.pug @@ -2,4 +2,4 @@ div.content-box__info.flex(style="padding: 15px") p Tu as quitté ce canal. - p Pour le rejoindre à nouveau, rends-toi dans le panneau administration ou contacte un administrateur. + p Pour le rejoindre à nouveau, rends-toi dans le panneau administration ou contacte un administrateur. diff --git a/src/views/circle/page-circle-profile.pug b/src/views/circle/page-circle-profile.pug index a424df2..df4f59e 100644 --- a/src/views/circle/page-circle-profile.pug +++ b/src/views/circle/page-circle-profile.pug @@ -1,6 +1,6 @@ -sib-router(default-route='circle-profile', hidden) - sib-route(name='circle-profile') - sib-route(name='circle-edit') +solid-router(default-route='circle-profile', hidden) + solid-route(name='circle-profile') + solid-route(name='circle-edit') #circle-profile(hidden) include ../../templates/hubl-circle-team.pug @@ -8,7 +8,7 @@ sib-router(default-route='circle-profile', hidden) .content-box__info.flex .flex.space-between.with-padding.mobile-vertical-align - sib-display.mobile-margin__bottom( + solid-display.mobile-margin__bottom( bind-resources fields='creationDateSet(title, creationDate)' @@ -16,53 +16,53 @@ sib-router(default-route='circle-profile', hidden) value-title='Date de création : ' - widget-creationDate='sib-display-date' + widget-creationDate='solid-display-date' ) - sib-ac-checker(permission='acl:Append', bind-resources, nested-field='members') - sib-link(class='button mobile-full-width text-bold text-uppercase reversed button-primary bordered with-icon icon-pencil' next='circle-edit' bind-resources) Modifier et ajouter un membre + solid-ac-checker(permission='acl:Append', bind-resources, nested-field='members') + solid-link(class='button mobile-full-width text-bold text-uppercase reversed button-primary bordered with-icon icon-pencil' next='circle-edit' bind-resources) Modifier et ajouter un membre div.flex.desktop-button__end - sib-ac-checker(permission='acl:Delete', bind-resources) - sib-delete( + solid-ac-checker(permission='acl:Delete', bind-resources) + solid-delete( class='button mobile-full-width text-bold text-uppercase button-primary bordered with-icon icon-trash' bind-resources data-label='Supprimer le canal' ) - sib-widget(name='hubl-circle-leave-button') + solid-widget(name='hubl-circle-leave-button') template - sib-delete( + solid-delete( class='button mobile-full-width desktop-btn-margin__left text-bold text-uppercase reversed button-secondary bordered with-icon icon-close' data-src="${src}" data-label='Quitter le canal' ) - sib-widget(name='hubl-circle-join-button') + solid-widget(name='hubl-circle-join-button') template button.button.desktop-btn-margin__left.text-bold.text-uppercase.reversed.button-primary.bordered.with-icon.icon-arrow-right-circle.flex - sib-form( + solid-form( data-src='' nested-field='members' fields='user.@id' label-user.@id='' value-user.@id='' - widget-user.@id='sib-form-hidden' + widget-user.@id='solid-form-hidden' hubl-inherit-bind-user2input="input[name='user.@id']" submit-button='Rejoindre le canal' ) - sib-display( + solid-display( bind-resources nested-field='members' fields='relation' action-relation='relation' widget-relation='hubl-circle-leave-button' search-fields='user' - search-widget-user='sib-form-hidden' + search-widget-user='solid-form-hidden' search-value-user="" empty-widget='hubl-circle-join-button' hubl-inherit-bind-resources='hubl-circle-join-button' @@ -71,7 +71,7 @@ sib-router(default-route='circle-profile', hidden) h2 Membres : - sib-display.block( + solid-display.block( bind-resources fields='members' diff --git a/src/views/job-offer/page-job-offer-create.pug b/src/views/job-offer/page-job-offer-create.pug index 71ab905..113c06b 100644 --- a/src/views/job-offer/page-job-offer-create.pug +++ b/src/views/job-offer/page-job-offer-create.pug @@ -1,7 +1,7 @@ .content-box.with-padding.with-form h1 Post a new job offer - sib-form( + solid-form( data-src=`${endpoints.joboffers || endpoints.post.joboffers}` range-skills=`${endpoints.skills || endpoints.get.skills}` @@ -12,16 +12,16 @@ class-description='field form-label is-light is-expanded' label-description='Description*' - widget-description='sib-form-textarea' + widget-description='solid-form-textarea' class-skills='form-label is-dark select-skills' label-skills='The required skills for this mission:*' - multiple-skills='sib-multiple-select' - widget-skills='sib-form-auto-completion' + multiple-skills='solid-multiple-select' + widget-skills='solid-form-auto-completion' class-closingDate='form-label is-dark' label-closingDate='Publication end date:*' - widget-closingDate='sib-form-date' + widget-closingDate='solid-form-date' next='job-offers' ) diff --git a/src/views/job-offer/page-job-offer-edit.pug b/src/views/job-offer/page-job-offer-edit.pug index 0d81831..5693c91 100644 --- a/src/views/job-offer/page-job-offer-edit.pug +++ b/src/views/job-offer/page-job-offer-edit.pug @@ -1,7 +1,7 @@ .content-box.with-padding.with-form h1 Edit your job offer - sib-form( + solid-form( bind-resources range-skills=`${endpoints.skills || endpoints.get.skills}` @@ -12,16 +12,16 @@ class-description='field form-label is-light is-expanded' label-description='Description*' - widget-description='sib-form-textarea' + widget-description='solid-form-textarea' class-skills='form-label is-dark select-skills' label-skills='The required skills for this mission:*' - multiple-skills='sib-multiple-select' - widget-skills='sib-form-auto-completion' + multiple-skills='solid-multiple-select' + widget-skills='solid-form-auto-completion' class-closingDate='form-label is-dark' label-closingDate='Publication end date:*' - widget-closingDate='sib-form-date' + widget-closingDate='solid-form-date' next='job-offers' ) diff --git a/src/views/project/page-project-chat.pug b/src/views/project/page-project-chat.pug index c7aed59..add91ab 100644 --- a/src/views/project/page-project-chat.pug +++ b/src/views/project/page-project-chat.pug @@ -1,5 +1,5 @@ .content-box.flex.full-width.chat-view - sib-chat( + solid-xmpp-chat( data-authentication='login', data-auto-login='true', data-bosh-service-url=`${xmpp}`, diff --git a/src/views/project/page-project-edit.pug b/src/views/project/page-project-edit.pug index b160bc1..cce893a 100644 --- a/src/views/project/page-project-edit.pug +++ b/src/views/project/page-project-edit.pug @@ -2,11 +2,11 @@ div.content-box__info include ../../templates/hubl-user-avatar.pug - sib-link(class='backlink right', bind-resources, next='project-profile') Retour + solid-link(class='backlink right', bind-resources, next='project-profile') Retour h1 Modifie ton projet - sib-form.form.button-register( + solid-form.form.button-register( bind-resources fields='status, line-1(customer.name, name), description' @@ -23,7 +23,7 @@ div.content-box__info label-description='Description du projet' class-description='form-label is-light is-full-width input-text-like' - widget-description='sib-form-textarea' + widget-description='solid-form-textarea' partial="" @@ -33,7 +33,7 @@ div.content-box__info h2 Photo du projet - sib-form.form-picture( + solid-form.form-picture( bind-resources fields='customer.logo' widget-customer.logo="hubl-user-avatar" @@ -43,7 +43,7 @@ div.content-box__info h2 Liste des membres : - sib-form.block.select-add( + solid-form.block.select-add( bind-resources nested-field='members' fields='user' @@ -51,7 +51,7 @@ div.content-box__info class-user='team form-label is-light' label-user='' - widget-user='sib-form-auto-completion' + widget-user='solid-form-auto-completion' submit-button='Ajouter un membre' ) @@ -63,7 +63,7 @@ div.content-box__info div.w162 Accès //-class='table-body' - sib-display( + solid-display( class='table-body' bind-resources fields='members' diff --git a/src/views/project/page-project-left.pug b/src/views/project/page-project-left.pug index 71135fc..0283db4 100644 --- a/src/views/project/page-project-left.pug +++ b/src/views/project/page-project-left.pug @@ -2,4 +2,4 @@ div.content-box__info.flex(style="padding: 15px") p Tu as quitté ce projet. - p Ceci est un groupe privé. Pour le rejoindre, rends-toi dans le panneau administration et demande une invitation. + p Ceci est un groupe privé. Pour le rejoindre, rends-toi dans le panneau administration et demande une invitation. diff --git a/src/views/project/page-project-picture.pug b/src/views/project/page-project-picture.pug index 32b5622..9257a73 100644 --- a/src/views/project/page-project-picture.pug +++ b/src/views/project/page-project-picture.pug @@ -1,13 +1,13 @@ div.content-box__info - sib-link(class='backlink right', bind-resources, next='project-edit') Retour + solid-link(class='backlink right', bind-resources, next='project-edit') Retour h1 Modifier l'image du projet - sib-picture( + solid-picture( bind-resources upload-src=`${endpoints.uploads || endpoints.post.uploads}` - upload-id="sib-project-edit-picture" + upload-id="solid-project-edit-picture" nested-fields='customer' fields='logo' next='project-edit' diff --git a/src/views/project/page-project-profile.pug b/src/views/project/page-project-profile.pug index e4260c6..c3167df 100644 --- a/src/views/project/page-project-profile.pug +++ b/src/views/project/page-project-profile.pug @@ -1,6 +1,6 @@ -sib-router(default-route='project-profile', hidden) - sib-route(name='project-profile') - sib-route(name='project-edit') +solid-router(default-route='project-profile', hidden) + solid-route(name='project-profile') + solid-route(name='project-edit') #project-profile(hidden) include ../../templates/hubl-captain.pug @@ -10,7 +10,7 @@ sib-router(default-route='project-profile', hidden) .content-box__info.flex .flex.space-between.with-padding.mobile-vertical-align - sib-display.mobile-margin__bottom( + solid-display.mobile-margin__bottom( bind-resources fields='creationDateSet(title, creationDate)' @@ -18,12 +18,12 @@ sib-router(default-route='project-profile', hidden) value-title='Date de création : ' - widget-creationDate='sib-display-date' + widget-creationDate='solid-display-date' ) - sib-ac-checker(permission='acl:Append', bind-resources, nested-field='members') - sib-link(class='button mobile-full-width text-bold text-uppercase reversed button-primary bordered with-icon icon-pencil' next='project-edit' bind-resources) Modifier et ajouter un membre + solid-ac-checker(permission='acl:Append', bind-resources, nested-field='members') + solid-link(class='button mobile-full-width text-bold text-uppercase reversed button-primary bordered with-icon icon-pencil' next='project-edit' bind-resources) Modifier et ajouter un membre - sib-display( + solid-display( class='flex desktop-button__end' bind-resources nested-field='members' @@ -33,14 +33,14 @@ sib-router(default-route='project-profile', hidden) widget-relation='hubl-project-leave-button' search-fields='user' - search-widget-user='sib-form-hidden' + search-widget-user='solid-form-hidden' search-value-user="" hubl-inherit-user-id="search-value-user" ) .flex.space-between - sib-display( + solid-display( bind-resources fields='label-captain, captain' @@ -48,17 +48,17 @@ sib-router(default-route='project-profile', hidden) class-label-captain='h2-like' widget-captain='hubl-captain' ) - sib-display( + solid-display( class='customer-logo' bind-resources fields='customer.logo' - widget-customer.logo='sib-display-img' + widget-customer.logo='solid-display-img' ) h2 Equipe : - sib-display.block( + solid-display.block( bind-resources fields='members' @@ -67,9 +67,9 @@ sib-router(default-route='project-profile', hidden) ) - sib-widget(name='hubl-project-leave-button') + solid-widget(name='hubl-project-leave-button') template - sib-delete( + solid-delete( class='button desktop-btn-margin__left text-bold text-uppercase reversed button-secondary bordered with-icon icon-close' data-src="${src}" data-label='Quitter le groupe' From e1f8686927bb30f14025177b9cfd9c381bfc87d2 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Pasquier Date: Thu, 18 Jun 2020 20:09:52 +0200 Subject: [PATCH 31/42] update: use beta for components --- src/dependencies.pug | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/dependencies.pug b/src/dependencies.pug index b5215a2..02a008e 100644 --- a/src/dependencies.pug +++ b/src/dependencies.pug @@ -19,20 +19,20 @@ if endpoints.events || (endpoints.get && endpoints.get.events) //- script(type="module" src="/lib/sib-event/sib-event.js" defer) if endpoints.joboffers || (endpoints.get && endpoints.get.joboffers) - //- script(type="module" src="https://unpkg.com/@startinblox/component-job-board@0.6" defer) - script(type="module" src="/lib/solid-job-board/dist/index.js" defer) + script(type="module" src="https://unpkg.com/@startinblox/component-job-board@beta" defer) + //- script(type="module" src="/lib/solid-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.5" defer) - script(type="module" src="/lib/solid-directory/dist/index.js" defer) + script(type="module" src="https://unpkg.com/@startinblox/component-directory@beta" defer) + //- script(type="module" src="/lib/solid-directory/dist/index.js" defer) if endpoints.dashboards || (endpoints.get && endpoints.get.dashboards) - //- script(type="module" src="https://unpkg.com/@startinblox/component-dashboard@0.2" defer) - script(type="module" src="/lib/solid-dashboard/dist/index.js" defer) + script(type="module" src="https://unpkg.com/@startinblox/component-dashboard@beta" defer) + //- script(type="module" src="/lib/solid-dashboard/dist/index.js" defer) if endpoints.users || (endpoints.get && endpoints.get.users) - //- script(type="module" src="https://unpkg.com/@startinblox/component-chat@0.7" defer) - script(type="module" src="/lib/solid-xmpp-chat/dist/index.js" defer) + script(type="module" src="https://unpkg.com/@startinblox/component-chat@beta" defer) + //- script(type="module" src="/lib/solid-xmpp-chat/dist/index.js" defer) script(src="/scripts/index.js" defer) From c9ab6fa861238cfce4eb68e379b2ece1b061ee82 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Pasquier Date: Thu, 18 Jun 2020 20:10:43 +0200 Subject: [PATCH 32/42] update: use brelease for components --- src/dependencies.pug | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/dependencies.pug b/src/dependencies.pug index 02a008e..d5fc232 100644 --- a/src/dependencies.pug +++ b/src/dependencies.pug @@ -19,19 +19,19 @@ if endpoints.events || (endpoints.get && endpoints.get.events) //- script(type="module" src="/lib/sib-event/sib-event.js" defer) if endpoints.joboffers || (endpoints.get && endpoints.get.joboffers) - script(type="module" src="https://unpkg.com/@startinblox/component-job-board@beta" defer) + script(type="module" src="https://unpkg.com/@startinblox/component-job-board@0.6" defer) //- script(type="module" src="/lib/solid-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@beta" defer) + script(type="module" src="https://unpkg.com/@startinblox/component-directory@0.5" defer) //- script(type="module" src="/lib/solid-directory/dist/index.js" defer) if endpoints.dashboards || (endpoints.get && endpoints.get.dashboards) - script(type="module" src="https://unpkg.com/@startinblox/component-dashboard@beta" defer) + script(type="module" src="https://unpkg.com/@startinblox/component-dashboard@0.2" defer) //- script(type="module" src="/lib/solid-dashboard/dist/index.js" defer) if endpoints.users || (endpoints.get && endpoints.get.users) - script(type="module" src="https://unpkg.com/@startinblox/component-chat@beta" defer) + script(type="module" src="https://unpkg.com/@startinblox/component-chat@0.7" defer) //- script(type="module" src="/lib/solid-xmpp-chat/dist/index.js" defer) script(src="/scripts/index.js" defer) From 9136b2633133c92c648f5f272262cdbbc3b8476e Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Pasquier Date: Thu, 18 Jun 2020 20:40:10 +0200 Subject: [PATCH 33/42] fix job board version --- src/dependencies.pug | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/dependencies.pug b/src/dependencies.pug index d5fc232..f5c7451 100644 --- a/src/dependencies.pug +++ b/src/dependencies.pug @@ -19,7 +19,7 @@ if endpoints.events || (endpoints.get && endpoints.get.events) //- script(type="module" src="/lib/sib-event/sib-event.js" defer) if endpoints.joboffers || (endpoints.get && endpoints.get.joboffers) - script(type="module" src="https://unpkg.com/@startinblox/component-job-board@0.6" defer) + script(type="module" src="https://unpkg.com/@startinblox/component-job-board@0.5" defer) //- script(type="module" src="/lib/solid-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)) From 50acb9f5e1342bb765bda67f67034ae1d1e7f4fd Mon Sep 17 00:00:00 2001 From: gaelle morin Date: Fri, 19 Jun 2020 18:36:47 +0200 Subject: [PATCH 34/42] fix: avatar bug + display of admin name --- src/styles/base/table.scss | 8 ++++++++ src/views/admin/page-admin-projects.pug | 6 +++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/src/styles/base/table.scss b/src/styles/base/table.scss index 6ecc645..b4db062 100644 --- a/src/styles/base/table.scss +++ b/src/styles/base/table.scss @@ -228,3 +228,11 @@ margin-left: -50px; } } + +/* Fix only for admin-projects > administrator display */ + +#admin-project-list>div>div.table-wrapper>div>solid-display:nth-child(6)>div>solid-display>div>hubl-project-admins>solid-display>div, +#admin-project-list>div>div.table-wrapper>div>solid-display:nth-child(6)>div>solid-display>div>hubl-project-admins>solid-display>div>solid-display, +#admin-project-list>div>div.table-wrapper>div>solid-display:nth-child(6)>div>solid-display>div>hubl-project-admins>solid-display>div>solid-display>div { + display: contents; +} diff --git a/src/views/admin/page-admin-projects.pug b/src/views/admin/page-admin-projects.pug index 4aece07..49b7a34 100644 --- a/src/views/admin/page-admin-projects.pug +++ b/src/views/admin/page-admin-projects.pug @@ -47,7 +47,7 @@ data-src='${await value}' fields='account.picture, sup(name), sub(username)' - class-account.picture='user-thumb__picture' + class-account.picture='avatar user-thumb__picture' class-name='user-thumb__name' class-username='user-thumb__username' @@ -81,7 +81,7 @@ fields='project.name, project.members, project.captain, leaveButton' class-project.name='w280 cell border cell-with-name' - class-project.members='w280 cell border' + class-project.members='w280 cell border cell-with-id-card' class-project.captain='w280 cell border cell-with-id-card' class-leaveButton='w230 cell border cell-with-buttons' @@ -117,7 +117,7 @@ fields='name, members, captain, joinButton' class-name='w280 cell border cell-with-name' - class-members='w280 cell border' + class-members='w280 cell border cell-with-id-card' class-captain='w280 cell border cell-with-id-card' class-joinButton='w230 cell border cell-with-buttons' From 084e16d3b548290af4368872d68edd2e539afdbd Mon Sep 17 00:00:00 2001 From: gaelle morin Date: Mon, 22 Jun 2020 10:58:01 +0200 Subject: [PATCH 35/42] fix: display of admin name: additional classes removed --- src/styles/base/table.scss | 8 -------- src/views/admin/page-admin-projects.pug | 2 +- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/src/styles/base/table.scss b/src/styles/base/table.scss index b4db062..6ecc645 100644 --- a/src/styles/base/table.scss +++ b/src/styles/base/table.scss @@ -228,11 +228,3 @@ margin-left: -50px; } } - -/* Fix only for admin-projects > administrator display */ - -#admin-project-list>div>div.table-wrapper>div>solid-display:nth-child(6)>div>solid-display>div>hubl-project-admins>solid-display>div, -#admin-project-list>div>div.table-wrapper>div>solid-display:nth-child(6)>div>solid-display>div>hubl-project-admins>solid-display>div>solid-display, -#admin-project-list>div>div.table-wrapper>div>solid-display:nth-child(6)>div>solid-display>div>hubl-project-admins>solid-display>div>solid-display>div { - display: contents; -} diff --git a/src/views/admin/page-admin-projects.pug b/src/views/admin/page-admin-projects.pug index 49b7a34..a5b066d 100644 --- a/src/views/admin/page-admin-projects.pug +++ b/src/views/admin/page-admin-projects.pug @@ -56,7 +56,7 @@ solid-widget(name='hubl-project-admins') template - solid-display.user-thumb.is-spaced( + solid-display( data-src='${value}' fields='user' search-fields='is_admin' From 5ef462ca6b9798f1184b081e4f551b8a721ef424 Mon Sep 17 00:00:00 2001 From: gaelle morin Date: Tue, 23 Jun 2020 18:18:35 +0200 Subject: [PATCH 36/42] feature: dashboard - HD colors added --- client.sample.happy-dev.css | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/client.sample.happy-dev.css b/client.sample.happy-dev.css index 18eb3c0..b60f865 100644 --- a/client.sample.happy-dev.css +++ b/client.sample.happy-dev.css @@ -244,3 +244,22 @@ button#solid-picture-remove.button.button-primary:hover { #members-list .send-display solid-link::before { background-color: var(--color-directory-complementary)!important; } + +/* Dashboard */ +.dashboard-card>div>div>p { + color: var(--color-complementary) !important; +} + +.dashboard-card i { + border-color: var(--color-primary) !important; + color: var(--color-complementary) !important; +} + +.dashboard-card sib-link { + border-color: var(--color-complementary) !important; + color: var(--color-complementary) !important; +} + +.dashboard-card sib-link:hover { + background-color: var(--color-complementary) !important; +} From 287b809f1971dafdfaa327ae33bba0fb7d59db5b Mon Sep 17 00:00:00 2001 From: gaelle morin Date: Tue, 23 Jun 2020 18:48:10 +0200 Subject: [PATCH 37/42] feature: dashboard - HD colors for svg added --- client.sample.happy-dev.css | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/client.sample.happy-dev.css b/client.sample.happy-dev.css index b60f865..c3be74b 100644 --- a/client.sample.happy-dev.css +++ b/client.sample.happy-dev.css @@ -250,6 +250,10 @@ button#solid-picture-remove.button.button-primary:hover { color: var(--color-complementary) !important; } +.dashboard-card .svg-color-secondary { + fill: var(--color-complementary) !important; +} + .dashboard-card i { border-color: var(--color-primary) !important; color: var(--color-complementary) !important; From aa3f21e04e0ea3e43a3414678be470280a2f4007 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Pasquier Date: Tue, 23 Jun 2020 17:11:19 +0000 Subject: [PATCH 38/42] fix: sample using solid- instead of sib- --- client.sample.happy-dev.css | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/client.sample.happy-dev.css b/client.sample.happy-dev.css index c3be74b..f75cb0a 100644 --- a/client.sample.happy-dev.css +++ b/client.sample.happy-dev.css @@ -259,11 +259,12 @@ button#solid-picture-remove.button.button-primary:hover { color: var(--color-complementary) !important; } -.dashboard-card sib-link { +.dashboard-card sib-link, .dashboard-card solid-link { border-color: var(--color-complementary) !important; color: var(--color-complementary) !important; } -.dashboard-card sib-link:hover { +.dashboard-card sib-link:hover, .dashboard-card solid-link:hover { background-color: var(--color-complementary) !important; + color: #fff !important; } From 50de1734c89589dcec0862162ca60504ec40a504 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Pasquier Date: Tue, 23 Jun 2020 20:29:12 +0200 Subject: [PATCH 39/42] fix: reactivity force reverse relation on hubl-reactivity --- src/components/hubl-reactivity.js | 1 + src/index.pug | 12 +++++++----- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/components/hubl-reactivity.js b/src/components/hubl-reactivity.js index 7e668c1..dce2a6c 100644 --- a/src/components/hubl-reactivity.js +++ b/src/components/hubl-reactivity.js @@ -32,6 +32,7 @@ export const HublReactivity = { subscribe() { if (this.resourceId && this.targetSrc) { store.subscribeVirtualContainerTo(this.resourceId, this.targetSrc); + store.subscribeVirtualContainerTo(this.targetSrc, this.resourceId); } } } diff --git a/src/index.pug b/src/index.pug index c5b7116..492ed20 100644 --- a/src/index.pug +++ b/src/index.pug @@ -37,22 +37,24 @@ html(lang="en") #job-offers(hidden).no-sidebar.with-padding hubl-reactivity(data-src=`${endpoints.joboffers || endpoints.get.joboffers}current/` target-src=`${endpoints.joboffers || endpoints.get.joboffers}`) hubl-reactivity(data-src=`${endpoints.joboffers || endpoints.get.joboffers}current/` target-src=`${endpoints.joboffers || endpoints.get.joboffers}expired/`) - hubl-reactivity(data-src=`${endpoints.joboffers || endpoints.get.joboffers}` target-src=`${endpoints.joboffers || endpoints.get.joboffers}current/`) - hubl-reactivity(data-src=`${endpoints.joboffers || endpoints.get.joboffers}` target-src=`${endpoints.joboffers || endpoints.get.joboffers}expired/`) hubl-reactivity(data-src=`${endpoints.joboffers || endpoints.get.joboffers}expired/` target-src=`${endpoints.joboffers || endpoints.get.joboffers}`) - hubl-reactivity(data-src=`${endpoints.joboffers || endpoints.get.joboffers}` target-src=`${endpoints.joboffers || endpoints.get.joboffers}current/`) + hubl-reactivity(bind-user nested-field="joboffers" target-src=`${endpoints.joboffers || endpoints.get.joboffers}expired/`) + hubl-reactivity(bind-user nested-field="joboffers" target-src=`${endpoints.joboffers || endpoints.get.joboffers}`) + hubl-reactivity(bind-user nested-field="joboffers" target-src=`${endpoints.joboffers || endpoints.get.joboffers}current/`) include page-job-offers.pug if endpoints.projects || (endpoints.get && endpoints.get.projects) #project(hidden).with-sidebar hubl-reactivity(data-src=`${endpoints.projects || endpoints.get.projects}joinable/` target-src=`${endpoints.projects || endpoints.get.projects}`) - hubl-reactivity(data-src=`${endpoints.projects || endpoints.get.projects}` target-src=`${endpoints.projects || endpoints.get.projects}joinable/`) + hubl-reactivity(bind-user nested-field="projects" target-src=`${endpoints.projects || endpoints.get.projects}`) + hubl-reactivity(bind-user nested-field="projects" target-src=`${endpoints.projects || endpoints.get.projects}joinable/`) include page-project.pug if endpoints.circles || (endpoints.get && endpoints.get.circles) #circle(hidden).with-sidebar hubl-reactivity(data-src=`${endpoints.circles || endpoints.get.circles}joinable/` target-src=`${endpoints.circles || endpoints.get.circles}`) - hubl-reactivity(data-src=`${endpoints.circles || endpoints.get.circles}` target-src=`${endpoints.circles || endpoints.get.circles}joinable/`) + hubl-reactivity(bind-user nested-field="circles" target-src=`${endpoints.circles || endpoints.get.circles}`) + hubl-reactivity(bind-user nested-field="circles" target-src=`${endpoints.circles || endpoints.get.circles}joinable/`) include page-circle.pug if endpoints.users || (endpoints.get && endpoints.get.users) From db22df5e438a261ee16449ea872b149325458a44 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Pasquier Date: Thu, 25 Jun 2020 20:09:12 +0200 Subject: [PATCH 40/42] update: bump solid-xmpp-chat to 0.8 --- src/dependencies.pug | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/dependencies.pug b/src/dependencies.pug index f5c7451..55b275b 100644 --- a/src/dependencies.pug +++ b/src/dependencies.pug @@ -31,7 +31,7 @@ if endpoints.dashboards || (endpoints.get && endpoints.get.dashboards) //- script(type="module" src="/lib/solid-dashboard/dist/index.js" defer) if endpoints.users || (endpoints.get && endpoints.get.users) - script(type="module" src="https://unpkg.com/@startinblox/component-chat@0.7" defer) + script(type="module" src="https://unpkg.com/@startinblox/component-chat@0.8" defer) //- script(type="module" src="/lib/solid-xmpp-chat/dist/index.js" defer) script(src="/scripts/index.js" defer) From 0ae350c33e08642fc2b2ccf3aa931989d9b19c31 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Pasquier Date: Mon, 29 Jun 2020 17:59:23 +0000 Subject: [PATCH 41/42] cicd: add playground --- .gitlab-ci.yml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 19aeb4c..a660e45 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -282,3 +282,21 @@ communityhubl: when: manual tags: - deploy + +playground: + stage: deployment + environment: + name: playground + url: https://playground.hubl.world + before_script: + - npm ci --cache .npm --prefer-offline --only=production + script: + - echo "$APP_CONFIG_PLAYGROUND" > config.json + - echo "$SSH_DEPLOY_KEY" | tr -d '\r' > gitlab.key && chmod 600 gitlab.key + - npm run build + - scp -i gitlab.key -o StrictHostKeyChecking=no -r dist/* playground@astral.startinblox.com:~/front/ + only: + - master + when: manual + tags: + - deploy From 9650e3cf9c3a73d633f8b5e86b1da32513e1564c Mon Sep 17 00:00:00 2001 From: Alice Poggioli Date: Thu, 9 Jul 2020 13:26:31 +0000 Subject: [PATCH 42/42] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 85a9757..790fd7d 100644 --- a/README.md +++ b/README.md @@ -87,7 +87,7 @@ On `config.json`: Where: -* `xmpp` is your Prosody with [appropriate modules](https://git.startinblox.com/infra/prosody-modules/) configured on. +* `xmpp` is your [Prosody](https://prosody.im/) with [appropriate modules](https://git.startinblox.com/infra/prosody-modules/) configured on. * `authority` is the OpenID Provider. Usually, if you use `djangoldp-account` it's the same as your djangoldp server. * `endpoints.users` is the API endpoints for Users on your djangoldp server.