From 747eb622b3273cafa83faa3b55d45f320ea93fe7 Mon Sep 17 00:00:00 2001 From: gaelle morin Date: Thu, 25 Jun 2020 18:52:15 +0200 Subject: [PATCH 01/80] first try to display the picture of project on edit-page --- src/styles/base/form.scss | 3 ++- src/styles/base/main.scss | 24 ++++++++++++++++++++++++ src/views/project/page-project-edit.pug | 4 ++-- 3 files changed, 28 insertions(+), 3 deletions(-) diff --git a/src/styles/base/form.scss b/src/styles/base/form.scss index ad3c93b..9234516 100644 --- a/src/styles/base/form.scss +++ b/src/styles/base/form.scss @@ -7,6 +7,7 @@ @include breakpoint(lg) { display: flex; flex-direction: column; + margin-bottom: 0; transition: all .3s ease; } } @@ -31,7 +32,7 @@ left: 0; margin: 0; margin-left: auto; - margin-top: 109px; + margin-top: 32px; position: relative; width: auto; } diff --git a/src/styles/base/main.scss b/src/styles/base/main.scss index 23a12a6..29c3cc5 100644 --- a/src/styles/base/main.scss +++ b/src/styles/base/main.scss @@ -279,6 +279,30 @@ h5 { width: 15vw; } +.project-edit-logo { + display: flex; + height: 8.5vh; + margin-top: 20px; + margin-bottom: 30px; + + form { + display: flex; + } + + hubl-user-avatar { + width: 104px; + } + + input[type='submit'] { + @extend .button, + .text-bold, + .text-uppercase, + .button-primary, + .bordered; + align-self: center; + } +} + .content-box { @include window-style-modal(); flex-direction: column; diff --git a/src/views/project/page-project-edit.pug b/src/views/project/page-project-edit.pug index cce893a..c104fe7 100644 --- a/src/views/project/page-project-edit.pug +++ b/src/views/project/page-project-edit.pug @@ -33,11 +33,11 @@ div.content-box__info h2 Photo du projet - solid-form.form-picture( + solid-form.form-picture.project-edit-logo( bind-resources fields='customer.logo' widget-customer.logo="hubl-user-avatar" - submit-button='Edit' + submit-button='Modifier la photo' next='project-picture' ) From 179f72216c7d97a8606617b355e98dad53be0a7c Mon Sep 17 00:00:00 2001 From: gaelle morin Date: Thu, 25 Jun 2020 23:20:17 +0200 Subject: [PATCH 02/80] notification on local --- src/styles/base/header.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/styles/base/header.scss b/src/styles/base/header.scss index 1288dff..4634d8d 100644 --- a/src/styles/base/header.scss +++ b/src/styles/base/header.scss @@ -67,7 +67,7 @@ details { } /* End */ -sib-notifications { +solid-notifications { color: var(--color-bell); @include breakpoint(sm) { From cd63ab965652ba9487698eed57f4d7929ca3c9a8 Mon Sep 17 00:00:00 2001 From: gaelle morin Date: Fri, 26 Jun 2020 09:19:21 +0200 Subject: [PATCH 03/80] fix: old css replaced --- src/dependencies.pug | 2 +- src/header.pug | 2 +- src/styles/base/header.scss | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/dependencies.pug b/src/dependencies.pug index f5c7451..2f74b10 100644 --- a/src/dependencies.pug +++ b/src/dependencies.pug @@ -11,7 +11,7 @@ script(type="module" src="https://unpkg.com/@startinblox/oidc@0.9" 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.4" defer) +script(type="module" src="https://unpkg.com/@startinblox/component-notifications@0.5.0-beta.2" defer) //- script(type="module" src="/lib/sib-notifications/index.js" defer) if endpoints.events || (endpoints.get && endpoints.get.events) diff --git a/src/header.pug b/src/header.pug index 75a2806..33df8cc 100644 --- a/src/header.pug +++ b/src/header.pug @@ -2,7 +2,7 @@ solid-link(next='dashboard') img(src=`${clientLogo || '/images/logo.png'}` style=`max-height:${clientLogoHeight || '32px'}`) -sib-notifications.notLoggedIn( +solid-notifications.notLoggedIn( nested-field="inbox" bind-user ) diff --git a/src/styles/base/header.scss b/src/styles/base/header.scss index 4634d8d..9e9a011 100644 --- a/src/styles/base/header.scss +++ b/src/styles/base/header.scss @@ -74,10 +74,10 @@ solid-notifications { padding: 0; } - .sib-notifications__container { + .solid-notifications__container { position: relative; - .sib-notifications__button { + .solid-notifications__button { @include icon('bell'); font-size: 2.5rem; @@ -93,7 +93,7 @@ solid-notifications { display: none; } - .sib-notifications__counter { + .solid-notifications__counter { left: 2rem; position: absolute; top: 1px; @@ -105,7 +105,7 @@ solid-notifications { } } - .sib-notifications__list { + .solid-notifications__list { overflow-x: hidden; position: fixed; left: 0; From 70b430b39d4d41492e7a5f9afc8e22de626e2524 Mon Sep 17 00:00:00 2001 From: gaelle morin Date: Fri, 26 Jun 2020 11:17:44 +0200 Subject: [PATCH 04/80] feature: notifications__item stylized --- src/styles/abstracts/_variables.scss | 4 +++- src/styles/base/header.scss | 35 +++++++++++++++++++++++++++- 2 files changed, 37 insertions(+), 2 deletions(-) diff --git a/src/styles/abstracts/_variables.scss b/src/styles/abstracts/_variables.scss index ae485e0..5bfd85a 100644 --- a/src/styles/abstracts/_variables.scss +++ b/src/styles/abstracts/_variables.scss @@ -33,7 +33,6 @@ --color-main-text: var(--color-grey-4); --color-highlight-primary: var(--color-primary); --color-user-panel: var(--color-black); - --color-bell: var(--color-secondary); --color-avatar-background: var(--color-grey-10); --color-title: var(--color-secondary); --color-h1: var(--color-secondary); @@ -42,6 +41,9 @@ /* Header's elements */ --color-header-background: var(--color-white); --color-bell: var(--color-secondary); + --color-notification-summary: var(--color-grey-4); + --solid-notifications-theme: var(--color-primary); + --color-notification-item-border: var(--color-grey-12); --color-user-panel-header-text: var(--color-secondary); --color-user-panel-header-background: var(--color-white); --color-user-panel-header-text-open: var(--color-white); diff --git a/src/styles/base/header.scss b/src/styles/base/header.scss index 9e9a011..8ad1c6c 100644 --- a/src/styles/base/header.scss +++ b/src/styles/base/header.scss @@ -122,7 +122,40 @@ solid-notifications { left: auto; right: 0; top: 5.6rem; - width: 300px; + width: 347px; + } + + .solid-notifications__item { + border-bottom: 2px solid var(--color-notification-item-border); + + .solid-notification { + + + .solid-notification__avatar { + margin-left: 1.6rem; + margin-right: 1.4rem; + } + + .solid-notification__content { + + .solid-notification__summary { + color: var(--color-notification-summary); + font-size: 1.2rem; + line-height: 1.7rem; + margin: 1.1rem 0 1.1rem; + } + + .solid-notification__date { + display: none; + } + } + + .solid-notification__read { + read-badge[data-unread='unread'] { + + } + } + } } } } From f8c43b74f34aee0205b4d3e236423dc758059a00 Mon Sep 17 00:00:00 2001 From: gaelle morin Date: Fri, 26 Jun 2020 14:10:51 +0200 Subject: [PATCH 05/80] feature: notifications__item styling scrollbar --- src/styles/abstracts/_variables.scss | 2 ++ src/styles/base/header.scss | 25 ++++++++++++++++++++++++- 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/src/styles/abstracts/_variables.scss b/src/styles/abstracts/_variables.scss index 5bfd85a..136c6d7 100644 --- a/src/styles/abstracts/_variables.scss +++ b/src/styles/abstracts/_variables.scss @@ -44,6 +44,8 @@ --color-notification-summary: var(--color-grey-4); --solid-notifications-theme: var(--color-primary); --color-notification-item-border: var(--color-grey-12); + --color-notification-scrollbar-background: #EDF1FA; + --color-notification-scrollbar-track: var(--color-grey-8); --color-user-panel-header-text: var(--color-secondary); --color-user-panel-header-background: var(--color-white); --color-user-panel-header-text-open: var(--color-white); diff --git a/src/styles/base/header.scss b/src/styles/base/header.scss index 8ad1c6c..9d9af2e 100644 --- a/src/styles/base/header.scss +++ b/src/styles/base/header.scss @@ -106,12 +106,35 @@ solid-notifications { } .solid-notifications__list { - overflow-x: hidden; + position: fixed; left: 0; top: 4.5rem; width: 100vw; + + overflow: auto; + height: 60px; + -webkit-overflow-scrolling: touch; + -ms-overflow-style: none; + + scrollbar-width: thin; + scrollbar-color: var(--color-notification-scrollbar-track) var(--color-notification-scrollbar-background); + + &::-webkit-scrollbar-track { + background: var(--color-notification-scrollbar-background); + } + + &::-webkit-scrollbar-thumb { + background-color: var(--color-notification-scrollbar-track); + border-radius: 6px; + border: 3px solid var(--color-notification-scrollbar-background); + } + + &::-webkit-scrollbar { + width: 11px; + } + @include breakpoint(md) { border: 0; border-radius: 0; From f41970dadc1950bef866bf78f266ca0f605bbeff Mon Sep 17 00:00:00 2001 From: gaelle morin Date: Fri, 26 Jun 2020 15:09:41 +0200 Subject: [PATCH 06/80] feature: styling scrollbar end --- src/styles/base/header.scss | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/styles/base/header.scss b/src/styles/base/header.scss index 9d9af2e..a15b03c 100644 --- a/src/styles/base/header.scss +++ b/src/styles/base/header.scss @@ -106,15 +106,13 @@ solid-notifications { } .solid-notifications__list { - position: fixed; left: 0; top: 4.5rem; width: 100vw; - + /* Custom scrollbar */ overflow: auto; - height: 60px; -webkit-overflow-scrolling: touch; -ms-overflow-style: none; @@ -128,12 +126,12 @@ solid-notifications { &::-webkit-scrollbar-thumb { background-color: var(--color-notification-scrollbar-track); border-radius: 6px; - border: 3px solid var(--color-notification-scrollbar-background); } &::-webkit-scrollbar { - width: 11px; + width: 6px; } + /* End of custom scrollbar */ @include breakpoint(md) { border: 0; From a797804bdfa884d6775a649d4e76ad08bb104bae Mon Sep 17 00:00:00 2001 From: gaelle morin Date: Fri, 26 Jun 2020 15:44:02 +0200 Subject: [PATCH 07/80] feature: box-shadow added + new margins and paddongs --- src/styles/base/header.scss | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/styles/base/header.scss b/src/styles/base/header.scss index a15b03c..494b8ce 100644 --- a/src/styles/base/header.scss +++ b/src/styles/base/header.scss @@ -106,6 +106,9 @@ solid-notifications { } .solid-notifications__list { + border: none; + border-radius: 0; + box-shadow: 0 0 7px 0 rgba(92, 97, 104, 0.24); position: fixed; left: 0; top: 4.5rem; @@ -142,17 +145,19 @@ solid-notifications { position: absolute; left: auto; right: 0; - top: 5.6rem; + top: 5.7rem; width: 347px; } .solid-notifications__item { - border-bottom: 2px solid var(--color-notification-item-border); + border-bottom: 1px solid var(--color-notification-item-border); .solid-notification { - + padding: 1.2rem 0 1.5rem; .solid-notification__avatar { + height: 35px; + width: 35px; margin-left: 1.6rem; margin-right: 1.4rem; } @@ -163,7 +168,7 @@ solid-notifications { color: var(--color-notification-summary); font-size: 1.2rem; line-height: 1.7rem; - margin: 1.1rem 0 1.1rem; + margin: 1.1rem 0 0; } .solid-notification__date { From 9cb7977d3bc2515b22bf0b1d26e715cdccabe96b Mon Sep 17 00:00:00 2001 From: gaelle morin Date: Sat, 27 Jun 2020 17:23:08 +0200 Subject: [PATCH 08/80] feature: color for counter number --- src/styles/abstracts/_variables.scss | 1 + src/styles/base/header.scss | 10 ++++------ 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/styles/abstracts/_variables.scss b/src/styles/abstracts/_variables.scss index 136c6d7..03b17c9 100644 --- a/src/styles/abstracts/_variables.scss +++ b/src/styles/abstracts/_variables.scss @@ -41,6 +41,7 @@ /* Header's elements */ --color-header-background: var(--color-white); --color-bell: var(--color-secondary); + --color-notification-counter-number: var(--color-white); --color-notification-summary: var(--color-grey-4); --solid-notifications-theme: var(--color-primary); --color-notification-item-border: var(--color-grey-12); diff --git a/src/styles/base/header.scss b/src/styles/base/header.scss index 494b8ce..726a564 100644 --- a/src/styles/base/header.scss +++ b/src/styles/base/header.scss @@ -102,6 +102,10 @@ solid-notifications { left: 2.1rem; top: -3px; } + + span { + color: var(--color-notification-counter-number); + } } } @@ -175,12 +179,6 @@ solid-notifications { display: none; } } - - .solid-notification__read { - read-badge[data-unread='unread'] { - - } - } } } } From 1ce47b03dd6685ab1b566604d5e65084a716d78f Mon Sep 17 00:00:00 2001 From: gaelle morin Date: Mon, 29 Jun 2020 11:15:31 +0200 Subject: [PATCH 09/80] feature: notification responsive --- src/styles/base/header.scss | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/src/styles/base/header.scss b/src/styles/base/header.scss index 726a564..79991f0 100644 --- a/src/styles/base/header.scss +++ b/src/styles/base/header.scss @@ -122,7 +122,6 @@ solid-notifications { overflow: auto; -webkit-overflow-scrolling: touch; -ms-overflow-style: none; - scrollbar-width: thin; scrollbar-color: var(--color-notification-scrollbar-track) var(--color-notification-scrollbar-background); @@ -173,12 +172,24 @@ solid-notifications { font-size: 1.2rem; line-height: 1.7rem; margin: 1.1rem 0 0; + + @include breakpoint(320px, 388px) { + max-width: 226px; + } + + @include breakpoint(lg) { + max-width: 256px; + } } .solid-notification__date { display: none; } } + + .solid-notification__read { + display: none; + } } } } From b878ced4c85ce2cc8d99e689b62269f61e1b8a44 Mon Sep 17 00:00:00 2001 From: gaelle morin Date: Mon, 29 Jun 2020 14:30:42 +0200 Subject: [PATCH 10/80] feature: notification full height --- client.sample.happy-dev.css | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/client.sample.happy-dev.css b/client.sample.happy-dev.css index f75cb0a..2ce6bdc 100644 --- a/client.sample.happy-dev.css +++ b/client.sample.happy-dev.css @@ -27,6 +27,12 @@ /* Header's elements */ --color-header-background: var(--color-white); --color-bell: var(--color-complementary-darken); + --color-notification-counter-number: black; + --color-notification-summary: #7A7F85; + --solid-notifications-theme: var(--color-primary); + --color-notification-item-border: #E4E8ED; + --color-notification-scrollbar-background: #EDF1FA; + --color-notification-scrollbar-track: #BDC2D7; --color-user-panel-header-text: var(--color-complementary-darken); --color-user-panel-header-background: var(--color-white); --color-user-panel-header-text-open: var(--color-white); From c322b1109f20c9dc2be070b6a06877f76680ecae Mon Sep 17 00:00:00 2001 From: gaelle morin Date: Mon, 29 Jun 2020 14:33:02 +0200 Subject: [PATCH 11/80] feature: notification full height --- src/styles/base/header.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/src/styles/base/header.scss b/src/styles/base/header.scss index 79991f0..8ba3366 100644 --- a/src/styles/base/header.scss +++ b/src/styles/base/header.scss @@ -113,6 +113,7 @@ solid-notifications { border: none; border-radius: 0; box-shadow: 0 0 7px 0 rgba(92, 97, 104, 0.24); + max-height: calc(100vh - 84px); position: fixed; left: 0; top: 4.5rem; From 053a7972c584cc23724c0f9effe5cf26271cb7e9 Mon Sep 17 00:00:00 2001 From: gaelle morin Date: Mon, 29 Jun 2020 18:51:51 +0200 Subject: [PATCH 12/80] wip --- src/styles/base/header.scss | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/styles/base/header.scss b/src/styles/base/header.scss index 1288dff..a982061 100644 --- a/src/styles/base/header.scss +++ b/src/styles/base/header.scss @@ -124,6 +124,18 @@ sib-notifications { top: 5.6rem; width: 300px; } + + &::before { + display: inline-block; + content: ""; + width: 25px; + height: 25px; + background: violet; + position: absolute; + box-shadow: 0 0 7px 0 rgba(92, 97, 104, 0.24); + transform: rotate(45deg); + right: 100px; + } } } } From 5d5ae81d84bbb954b17350cfe56f8dd3ded25084 Mon Sep 17 00:00:00 2001 From: gaelle morin Date: Tue, 30 Jun 2020 13:06:39 +0200 Subject: [PATCH 13/80] fearture: project-picture-edit - positioning --- src/styles/base/main.scss | 53 +++++++++++++++++++++++++ src/views/project/page-project-edit.pug | 2 +- 2 files changed, 54 insertions(+), 1 deletion(-) diff --git a/src/styles/base/main.scss b/src/styles/base/main.scss index 29c3cc5..175d722 100644 --- a/src/styles/base/main.scss +++ b/src/styles/base/main.scss @@ -303,6 +303,59 @@ h5 { } } +.form-picture { + + form { + display: block; + text-align: center; + margin-bottom: 2.6rem; + padding-top: 1.8rem; + + @include breakpoint(lg) { + display: flex; + width: 100%; + } + + hubl-user-avatar { + display: inline-block; + max-width: 100%; + max-height: 16.5vh; + + @include breakpoint(lg) { + margin-left: 20px; + max-height: 8.5vh; + max-width: none; + width: calc(35vw - 20px); + } + + >object, + >img { + display: block; + max-height: 16.5vh !important; + + @include breakpoint(lg) { + max-height: 8.5vh !important; + } + } + } + + input { + @extend .button, + .text-bold, + .text-uppercase, + .button-primary, + .bordered; + margin: 10px 0; + width: 100%; + + @include breakpoint(lg) { + margin: auto 0 auto 2.2rem; + width: auto; + } + } + } +} + .content-box { @include window-style-modal(); flex-direction: column; diff --git a/src/views/project/page-project-edit.pug b/src/views/project/page-project-edit.pug index c104fe7..3add996 100644 --- a/src/views/project/page-project-edit.pug +++ b/src/views/project/page-project-edit.pug @@ -33,7 +33,7 @@ div.content-box__info h2 Photo du projet - solid-form.form-picture.project-edit-logo( + solid-form.form-picture( bind-resources fields='customer.logo' widget-customer.logo="hubl-user-avatar" From 7dbbe51c6eda8bc81d50fe1e45d304a3e29de69c Mon Sep 17 00:00:00 2001 From: gaelle morin Date: Tue, 30 Jun 2020 13:07:29 +0200 Subject: [PATCH 14/80] wip --- src/styles/base/header.scss | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/src/styles/base/header.scss b/src/styles/base/header.scss index a982061..1288dff 100644 --- a/src/styles/base/header.scss +++ b/src/styles/base/header.scss @@ -124,18 +124,6 @@ sib-notifications { top: 5.6rem; width: 300px; } - - &::before { - display: inline-block; - content: ""; - width: 25px; - height: 25px; - background: violet; - position: absolute; - box-shadow: 0 0 7px 0 rgba(92, 97, 104, 0.24); - transform: rotate(45deg); - right: 100px; - } } } } From c942eaf1e459ae30b7588e0eee3fcc26fb70bb8a Mon Sep 17 00:00:00 2001 From: gaelle morin Date: Tue, 30 Jun 2020 14:17:18 +0200 Subject: [PATCH 15/80] fix: project-profile: full width button to left a project on mobile --- src/views/project/page-project-profile.pug | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/project/page-project-profile.pug b/src/views/project/page-project-profile.pug index c3167df..102c24f 100644 --- a/src/views/project/page-project-profile.pug +++ b/src/views/project/page-project-profile.pug @@ -70,7 +70,7 @@ solid-router(default-route='project-profile', hidden) solid-widget(name='hubl-project-leave-button') template solid-delete( - class='button desktop-btn-margin__left text-bold text-uppercase reversed button-secondary bordered with-icon icon-close' + class='button mobile-full-width desktop-btn-margin__left text-bold text-uppercase reversed button-secondary bordered with-icon icon-close' data-src="${src}" data-label='Quitter le groupe' ) From 03dc7a4251839f5e50b0df96068692df50c17f5a Mon Sep 17 00:00:00 2001 From: gaelle morin Date: Tue, 30 Jun 2020 17:36:14 +0200 Subject: [PATCH 16/80] fix: project-picture-edit - wip --- src/styles/base/main.scss | 38 ++++++++++++++++++++++ src/views/project/page-project-picture.pug | 1 + 2 files changed, 39 insertions(+) diff --git a/src/styles/base/main.scss b/src/styles/base/main.scss index 175d722..c5b5ff9 100644 --- a/src/styles/base/main.scss +++ b/src/styles/base/main.scss @@ -356,6 +356,44 @@ h5 { } } + +.p_relative { + position: relative; +} + +.is-inline-1200 { + + @include breakpoint(lg) { + flex-direction: row; + } +} + +.flex_vertical-center { + align-items: center; +} + +.flex_column { + flex-direction: column; +} + +.pull-left-1200 { + + @include breakpoint(lg) { + float: left; + } +} + +.profile-avatar { + height: 243px; + width: 243px; + margin-left: 2rem; +} + +solid-picture { + +} + + .content-box { @include window-style-modal(); flex-direction: column; diff --git a/src/views/project/page-project-picture.pug b/src/views/project/page-project-picture.pug index 9257a73..5eb81d6 100644 --- a/src/views/project/page-project-picture.pug +++ b/src/views/project/page-project-picture.pug @@ -5,6 +5,7 @@ div.content-box__info h1 Modifier l'image du projet solid-picture( + class="pull-left-1200 avatar-display" bind-resources upload-src=`${endpoints.uploads || endpoints.post.uploads}` upload-id="solid-project-edit-picture" From 7cfea37b1e490791b1df09aa87825fc4270b3682 Mon Sep 17 00:00:00 2001 From: gaelle morin Date: Thu, 2 Jul 2020 12:23:02 +0200 Subject: [PATCH 17/80] feature: notification - typo --- src/styles/base/header.scss | 6 ++ src/styles/base/main.scss | 115 ++++++++++++++++++++++++++++++++++++ 2 files changed, 121 insertions(+) diff --git a/src/styles/base/header.scss b/src/styles/base/header.scss index 8ba3366..8365842 100644 --- a/src/styles/base/header.scss +++ b/src/styles/base/header.scss @@ -167,6 +167,12 @@ solid-notifications { } .solid-notification__content { + font-family: Open Sans, sans-serif; + + .solid-notification__title { + font-size: 1.3rem; + font-weight: 600; + } .solid-notification__summary { color: var(--color-notification-summary); diff --git a/src/styles/base/main.scss b/src/styles/base/main.scss index 23a12a6..c5b5ff9 100644 --- a/src/styles/base/main.scss +++ b/src/styles/base/main.scss @@ -279,6 +279,121 @@ h5 { width: 15vw; } +.project-edit-logo { + display: flex; + height: 8.5vh; + margin-top: 20px; + margin-bottom: 30px; + + form { + display: flex; + } + + hubl-user-avatar { + width: 104px; + } + + input[type='submit'] { + @extend .button, + .text-bold, + .text-uppercase, + .button-primary, + .bordered; + align-self: center; + } +} + +.form-picture { + + form { + display: block; + text-align: center; + margin-bottom: 2.6rem; + padding-top: 1.8rem; + + @include breakpoint(lg) { + display: flex; + width: 100%; + } + + hubl-user-avatar { + display: inline-block; + max-width: 100%; + max-height: 16.5vh; + + @include breakpoint(lg) { + margin-left: 20px; + max-height: 8.5vh; + max-width: none; + width: calc(35vw - 20px); + } + + >object, + >img { + display: block; + max-height: 16.5vh !important; + + @include breakpoint(lg) { + max-height: 8.5vh !important; + } + } + } + + input { + @extend .button, + .text-bold, + .text-uppercase, + .button-primary, + .bordered; + margin: 10px 0; + width: 100%; + + @include breakpoint(lg) { + margin: auto 0 auto 2.2rem; + width: auto; + } + } + } +} + + +.p_relative { + position: relative; +} + +.is-inline-1200 { + + @include breakpoint(lg) { + flex-direction: row; + } +} + +.flex_vertical-center { + align-items: center; +} + +.flex_column { + flex-direction: column; +} + +.pull-left-1200 { + + @include breakpoint(lg) { + float: left; + } +} + +.profile-avatar { + height: 243px; + width: 243px; + margin-left: 2rem; +} + +solid-picture { + +} + + .content-box { @include window-style-modal(); flex-direction: column; From 2b314116a40f4795500767c3494bf5b701de4c24 Mon Sep 17 00:00:00 2001 From: gaelle morin Date: Fri, 3 Jul 2020 16:47:54 +0200 Subject: [PATCH 18/80] feature: project: modify image - positioning --- src/styles/base/main.scss | 71 +++++++++++++++++++++- src/views/project/page-project-picture.pug | 1 - 2 files changed, 70 insertions(+), 2 deletions(-) diff --git a/src/styles/base/main.scss b/src/styles/base/main.scss index c5b5ff9..425174b 100644 --- a/src/styles/base/main.scss +++ b/src/styles/base/main.scss @@ -357,10 +357,77 @@ h5 { } + .p_relative { position: relative; } +.pull-left-1200 { + + @include breakpoint(lg) { + float: left; + } +} + +.flex_column { + flex-direction: column; +} + +.flex_vertical-center { + align-items: center; +} + +.is-inline-1200 { + + @include breakpoint(lg) { + flex-direction: row; + } +} + +solid-ac-checker.button-padding { + + @include breakpoint(lg) { + padding-left: 32px; + } +} + +.w90 { + + @include breakpoint(sm) { + width: 90%; + } +} + +.w100 { + + @include breakpoint(sm) { + width: 100%; + } +} + +.p_absolute { + position: absolute; + z-index: 1; +} + +.button-register-picture { + bottom: 0; + right: 0; +} + +#solid-picture-remove { + margin-top: 2em; + + @include breakpoint(lg) { + margin-top: 0; + } +} + + +/*.p_relative { + position: relative; +} + .is-inline-1200 { @include breakpoint(lg) { @@ -383,6 +450,8 @@ h5 { } } + + .profile-avatar { height: 243px; width: 243px; @@ -391,7 +460,7 @@ h5 { solid-picture { -} +}*/ .content-box { diff --git a/src/views/project/page-project-picture.pug b/src/views/project/page-project-picture.pug index 5eb81d6..9257a73 100644 --- a/src/views/project/page-project-picture.pug +++ b/src/views/project/page-project-picture.pug @@ -5,7 +5,6 @@ div.content-box__info h1 Modifier l'image du projet solid-picture( - class="pull-left-1200 avatar-display" bind-resources upload-src=`${endpoints.uploads || endpoints.post.uploads}` upload-id="solid-project-edit-picture" From 7ee2f8e14b65514d9104d81095acbd21028ab631 Mon Sep 17 00:00:00 2001 From: gaelle morin Date: Tue, 7 Jul 2020 19:42:52 +0200 Subject: [PATCH 19/80] feature: project: modify image - positioning new try --- src/styles/base/main.scss | 69 ++++++++++++---------- src/views/project/page-project-picture.pug | 2 +- 2 files changed, 40 insertions(+), 31 deletions(-) diff --git a/src/styles/base/main.scss b/src/styles/base/main.scss index 425174b..a822009 100644 --- a/src/styles/base/main.scss +++ b/src/styles/base/main.scss @@ -362,13 +362,6 @@ h5 { position: relative; } -.pull-left-1200 { - - @include breakpoint(lg) { - float: left; - } -} - .flex_column { flex-direction: column; } @@ -377,20 +370,6 @@ h5 { align-items: center; } -.is-inline-1200 { - - @include breakpoint(lg) { - flex-direction: row; - } -} - -solid-ac-checker.button-padding { - - @include breakpoint(lg) { - padding-left: 32px; - } -} - .w90 { @include breakpoint(sm) { @@ -405,21 +384,51 @@ solid-ac-checker.button-padding { } } -.p_absolute { +/*.p_absolute { position: absolute; z-index: 1; +}*/ + +.project-edit-picture { + + >div>*:not(:last-child) { + margin-bottom: 2rem; + } + + solid-display { + max-height: 8.5vh; + max-width: 35vw; + } + + solid-ac-checker:first-of-type { + display: flex; + + #solid-picture-remove { + margin-left: 2rem; + } + } + + solid-ac-checker:last-of-type { + align-self: flex-end; + } } -.button-register-picture { - bottom: 0; - right: 0; -} +.project-edit-picture hubl-user-avatar { + border-radius: 0; + max-height: 8.5vh; + max-width: 35vw; + background: antiquewhite; + display: inline-block; -#solid-picture-remove { - margin-top: 2em; + + object { + max-height: 8.5vh; + max-width: 35vw; + } - @include breakpoint(lg) { - margin-top: 0; + img { + max-height: 8.5vh; + max-width: 35vw; } } diff --git a/src/views/project/page-project-picture.pug b/src/views/project/page-project-picture.pug index 9257a73..7bea1d9 100644 --- a/src/views/project/page-project-picture.pug +++ b/src/views/project/page-project-picture.pug @@ -4,7 +4,7 @@ div.content-box__info h1 Modifier l'image du projet - solid-picture( + solid-picture.project-edit-picture( bind-resources upload-src=`${endpoints.uploads || endpoints.post.uploads}` upload-id="solid-project-edit-picture" From efae21e6c2e6da0094183aeb9ebf7a9534a021ae Mon Sep 17 00:00:00 2001 From: gaelle morin Date: Wed, 8 Jul 2020 18:26:23 +0200 Subject: [PATCH 20/80] feature: project: modify image - refactoring --- src/styles/base/main.scss | 88 ------------------- src/styles/components/_index.scss | 3 +- .../components/project-edit-picture.scss | 39 ++++++++ 3 files changed, 41 insertions(+), 89 deletions(-) create mode 100644 src/styles/components/project-edit-picture.scss diff --git a/src/styles/base/main.scss b/src/styles/base/main.scss index a822009..950b85a 100644 --- a/src/styles/base/main.scss +++ b/src/styles/base/main.scss @@ -384,94 +384,6 @@ h5 { } } -/*.p_absolute { - position: absolute; - z-index: 1; -}*/ - -.project-edit-picture { - - >div>*:not(:last-child) { - margin-bottom: 2rem; - } - - solid-display { - max-height: 8.5vh; - max-width: 35vw; - } - - solid-ac-checker:first-of-type { - display: flex; - - #solid-picture-remove { - margin-left: 2rem; - } - } - - solid-ac-checker:last-of-type { - align-self: flex-end; - } -} - -.project-edit-picture hubl-user-avatar { - border-radius: 0; - max-height: 8.5vh; - max-width: 35vw; - background: antiquewhite; - display: inline-block; - - - object { - max-height: 8.5vh; - max-width: 35vw; - } - - img { - max-height: 8.5vh; - max-width: 35vw; - } -} - - -/*.p_relative { - position: relative; -} - -.is-inline-1200 { - - @include breakpoint(lg) { - flex-direction: row; - } -} - -.flex_vertical-center { - align-items: center; -} - -.flex_column { - flex-direction: column; -} - -.pull-left-1200 { - - @include breakpoint(lg) { - float: left; - } -} - - - -.profile-avatar { - height: 243px; - width: 243px; - margin-left: 2rem; -} - -solid-picture { - -}*/ - - .content-box { @include window-style-modal(); flex-direction: column; diff --git a/src/styles/components/_index.scss b/src/styles/components/_index.scss index d13f842..9f53556 100644 --- a/src/styles/components/_index.scss +++ b/src/styles/components/_index.scss @@ -3,4 +3,5 @@ @import 'filters'; @import 'sidebar'; @import 'skills'; -@import 'tags'; \ No newline at end of file +@import 'tags'; +@import 'project-edit-picture'; diff --git a/src/styles/components/project-edit-picture.scss b/src/styles/components/project-edit-picture.scss new file mode 100644 index 0000000..e167109 --- /dev/null +++ b/src/styles/components/project-edit-picture.scss @@ -0,0 +1,39 @@ +.project-edit-picture { + + >div>*:not(:last-child) { + margin-bottom: 2rem; + } + + hubl-user-avatar { + background: transparent; + border-radius: 0; + display: inline-block; + text-align: center; + + object, img { + position: relative; + } + } + + solid-ac-checker:first-of-type { + display: block; + + @include breakpoint(lg) { + display: flex; + } + + #solid-picture-remove { + margin-left: 0; + margin-top: 2rem; + + @include breakpoint(lg) { + margin-left: 2rem; + margin-top: 0; + } + } + } + + solid-ac-checker:last-of-type { + align-self: flex-end; + } +} From 897dc336c256f95132da22c56845586b916f7c76 Mon Sep 17 00:00:00 2001 From: gaelle morin Date: Thu, 9 Jul 2020 12:30:23 +0200 Subject: [PATCH 21/80] feature: notification - top triangle ok on desktop --- src/dependencies.pug | 2 +- src/styles/base/header.scss | 37 +++++++++++++++++++++++++++++++++++-- 2 files changed, 36 insertions(+), 3 deletions(-) diff --git a/src/dependencies.pug b/src/dependencies.pug index 2f74b10..61dc886 100644 --- a/src/dependencies.pug +++ b/src/dependencies.pug @@ -11,7 +11,7 @@ script(type="module" src="https://unpkg.com/@startinblox/oidc@0.9" 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.5.0-beta.2" defer) +script(type="module" src="https://unpkg.com/@startinblox/component-notifications@0.5.0-beta.3" defer) //- script(type="module" src="/lib/sib-notifications/index.js" defer) if endpoints.events || (endpoints.get && endpoints.get.events) diff --git a/src/styles/base/header.scss b/src/styles/base/header.scss index 8365842..cee96ef 100644 --- a/src/styles/base/header.scss +++ b/src/styles/base/header.scss @@ -108,6 +108,39 @@ solid-notifications { } } } + + .solid-notifications__triangle-back { + display: none; + } + + .solid-notifications__triangle-shadow { + position: absolute; + left: auto; + right: -2.1em; + top: 5em; + height: 1rem; + background: white; + + width: 0; + transform: initial; + + z-index: 4; + + &::after { + content: ""; + position: absolute; + width: 0; + height: 0; + margin-left: -5em; + top: 0px; + left: 50%; + border: 1em solid black; + border-color: #fff #fff transparent transparent; + transform-origin: 0 0; + transform: rotate(-45deg); + box-shadow: 6px -6px 10px -3px rgba(92, 97, 104, 0.14); + } + } .solid-notifications__list { border: none; @@ -115,8 +148,8 @@ solid-notifications { box-shadow: 0 0 7px 0 rgba(92, 97, 104, 0.24); max-height: calc(100vh - 84px); position: fixed; - left: 0; - top: 4.5rem; + right: -30px !important; + top: 3.99em !important; width: 100vw; /* Custom scrollbar */ From f83b4582407028ea3679ba791e1a98912fff64a0 Mon Sep 17 00:00:00 2001 From: gaelle morin Date: Thu, 9 Jul 2020 14:31:14 +0200 Subject: [PATCH 22/80] feature: notification - ok on mobile --- src/styles/base/header.scss | 74 ++++++++++++++++++------------------- 1 file changed, 36 insertions(+), 38 deletions(-) diff --git a/src/styles/base/header.scss b/src/styles/base/header.scss index cee96ef..f1d2daf 100644 --- a/src/styles/base/header.scss +++ b/src/styles/base/header.scss @@ -114,31 +114,33 @@ solid-notifications { } .solid-notifications__triangle-shadow { - position: absolute; - left: auto; - right: -2.1em; - top: 5em; - height: 1rem; - background: white; + display: none; - width: 0; - transform: initial; - - z-index: 4; - - &::after { - content: ""; + @include breakpoint(lg) { + background: white; + display: block; position: absolute; + left: auto; + right: -2.1em; + top: 5em; + transform: initial; width: 0; - height: 0; - margin-left: -5em; - top: 0px; - left: 50%; - border: 1em solid black; - border-color: #fff #fff transparent transparent; - transform-origin: 0 0; - transform: rotate(-45deg); - box-shadow: 6px -6px 10px -3px rgba(92, 97, 104, 0.14); + z-index: 4; + + &::after { + content: ""; + position: absolute; + width: 0; + height: 0; + margin-left: -5em; + top: 0px; + left: 50%; + border: 1em solid black; + border-color: #fff #fff transparent transparent; + transform-origin: 0 0; + transform: rotate(-45deg); + box-shadow: 6px -6px 10px -3px rgba(92, 97, 104, 0.14); + } } } @@ -146,11 +148,20 @@ solid-notifications { border: none; border-radius: 0; box-shadow: 0 0 7px 0 rgba(92, 97, 104, 0.24); - max-height: calc(100vh - 84px); + max-height: calc(100vh - 50px); position: fixed; - right: -30px !important; - top: 3.99em !important; + left: 0; + top: 2.5em; width: 100vw; + + @include breakpoint(lg) { + max-height: calc(100vh - 93px); + position: absolute; + left: auto; + right: -2.3em; + top: 3.99em; + width: 347px; + } /* Custom scrollbar */ overflow: auto; @@ -173,19 +184,6 @@ solid-notifications { } /* End of custom scrollbar */ - @include breakpoint(md) { - border: 0; - border-radius: 0; - } - - @include breakpoint(lg) { - position: absolute; - left: auto; - right: 0; - top: 5.7rem; - width: 347px; - } - .solid-notifications__item { border-bottom: 1px solid var(--color-notification-item-border); From 218e74955bdc60726e92d0c7ef698aff6ca031e9 Mon Sep 17 00:00:00 2001 From: gaelle morin Date: Thu, 9 Jul 2020 15:49:56 +0200 Subject: [PATCH 23/80] feature: notification - templates for circle and private notification added --- src/header.pug | 4 + src/styles/base/header.scss | 8 +- src/styles/base/main.scss | 115 ------------------ .../circle/page-circle-notifications.pug | 8 ++ src/views/user/page-user-notifications.pug | 8 ++ 5 files changed, 24 insertions(+), 119 deletions(-) create mode 100644 src/views/circle/page-circle-notifications.pug create mode 100644 src/views/user/page-user-notifications.pug diff --git a/src/header.pug b/src/header.pug index 33df8cc..1320e54 100644 --- a/src/header.pug +++ b/src/header.pug @@ -7,6 +7,10 @@ solid-notifications.notLoggedIn( bind-user ) +//- Templates for notifications from circles and from other users +include views/circle/page-circle-notifications.pug +include views/user/page-user-notifications.pug + include templates/hubl-user-avatar.pug details#user-controls.notLoggedIn diff --git a/src/styles/base/header.scss b/src/styles/base/header.scss index f1d2daf..cfc8b82 100644 --- a/src/styles/base/header.scss +++ b/src/styles/base/header.scss @@ -203,6 +203,10 @@ solid-notifications { .solid-notification__title { font-size: 1.3rem; font-weight: 600; + + .solid-notification__title__side { + font-weight: normal; + } } .solid-notification__summary { @@ -219,10 +223,6 @@ solid-notifications { max-width: 256px; } } - - .solid-notification__date { - display: none; - } } .solid-notification__read { diff --git a/src/styles/base/main.scss b/src/styles/base/main.scss index c5b5ff9..23a12a6 100644 --- a/src/styles/base/main.scss +++ b/src/styles/base/main.scss @@ -279,121 +279,6 @@ h5 { width: 15vw; } -.project-edit-logo { - display: flex; - height: 8.5vh; - margin-top: 20px; - margin-bottom: 30px; - - form { - display: flex; - } - - hubl-user-avatar { - width: 104px; - } - - input[type='submit'] { - @extend .button, - .text-bold, - .text-uppercase, - .button-primary, - .bordered; - align-self: center; - } -} - -.form-picture { - - form { - display: block; - text-align: center; - margin-bottom: 2.6rem; - padding-top: 1.8rem; - - @include breakpoint(lg) { - display: flex; - width: 100%; - } - - hubl-user-avatar { - display: inline-block; - max-width: 100%; - max-height: 16.5vh; - - @include breakpoint(lg) { - margin-left: 20px; - max-height: 8.5vh; - max-width: none; - width: calc(35vw - 20px); - } - - >object, - >img { - display: block; - max-height: 16.5vh !important; - - @include breakpoint(lg) { - max-height: 8.5vh !important; - } - } - } - - input { - @extend .button, - .text-bold, - .text-uppercase, - .button-primary, - .bordered; - margin: 10px 0; - width: 100%; - - @include breakpoint(lg) { - margin: auto 0 auto 2.2rem; - width: auto; - } - } - } -} - - -.p_relative { - position: relative; -} - -.is-inline-1200 { - - @include breakpoint(lg) { - flex-direction: row; - } -} - -.flex_vertical-center { - align-items: center; -} - -.flex_column { - flex-direction: column; -} - -.pull-left-1200 { - - @include breakpoint(lg) { - float: left; - } -} - -.profile-avatar { - height: 243px; - width: 243px; - margin-left: 2rem; -} - -solid-picture { - -} - - .content-box { @include window-style-modal(); flex-direction: column; diff --git a/src/views/circle/page-circle-notifications.pug b/src/views/circle/page-circle-notifications.pug new file mode 100644 index 0000000..25bf825 --- /dev/null +++ b/src/views/circle/page-circle-notifications.pug @@ -0,0 +1,8 @@ +solid-notifications-template(data-rdf-type='hd:circle') + template + .solid-notification__avatar + img(src="${await author['account.foaf:depiction']}") + .solid-notification__content + .solid-notification__title ${await author.name} + span.solid-notification__title__side dans #${await object.name} + p.solid-notification__summary ${summary} diff --git a/src/views/user/page-user-notifications.pug b/src/views/user/page-user-notifications.pug new file mode 100644 index 0000000..fd4aef3 --- /dev/null +++ b/src/views/user/page-user-notifications.pug @@ -0,0 +1,8 @@ +solid-notifications-template(data-rdf-type='foaf:user') + template + .solid-notification__avatar + img(src="${await author['account.foaf:depiction']}") + .solid-notification__content + .solid-notification__title ${await author.name} + span.solid-notification__title__side en privé + p.solid-notification__summary ${summary} \ No newline at end of file From da4c1cf69c77705691cd92c13488473c99478167 Mon Sep 17 00:00:00 2001 From: gaelle morin Date: Fri, 10 Jul 2020 11:43:21 +0200 Subject: [PATCH 24/80] feature: notification - dynamic icons added --- src/styles/base/header.scss | 4 ++++ src/views/circle/page-circle-notifications.pug | 4 +++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/styles/base/header.scss b/src/styles/base/header.scss index cfc8b82..4b3b692 100644 --- a/src/styles/base/header.scss +++ b/src/styles/base/header.scss @@ -207,6 +207,10 @@ solid-notifications { .solid-notification__title__side { font-weight: normal; } + + .solid-notification__title__icon { + font-family: simple-line-icons; + } } .solid-notification__summary { diff --git a/src/views/circle/page-circle-notifications.pug b/src/views/circle/page-circle-notifications.pug index 25bf825..90b2e86 100644 --- a/src/views/circle/page-circle-notifications.pug +++ b/src/views/circle/page-circle-notifications.pug @@ -4,5 +4,7 @@ solid-notifications-template(data-rdf-type='hd:circle') img(src="${await author['account.foaf:depiction']}") .solid-notification__content .solid-notification__title ${await author.name} - span.solid-notification__title__side dans #${await object.name} + span.solid-notification__title__side dans + span.solid-notification__title__icon ${(await object.status) == 'Public' ? '#' : ''} + | ${await object.name} p.solid-notification__summary ${summary} From 4b52f0a49e67c5644e96a71127b8c0bc69eb790b Mon Sep 17 00:00:00 2001 From: gaelle morin Date: Fri, 10 Jul 2020 16:38:55 +0200 Subject: [PATCH 25/80] feature: notification - default avatar + styles added --- src/styles/base/header.scss | 5 +++++ src/views/circle/page-circle-notifications.pug | 2 +- src/views/user/page-user-notifications.pug | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/styles/base/header.scss b/src/styles/base/header.scss index 4b3b692..883cd94 100644 --- a/src/styles/base/header.scss +++ b/src/styles/base/header.scss @@ -191,10 +191,15 @@ solid-notifications { padding: 1.2rem 0 1.5rem; .solid-notification__avatar { + background: var(--color-avatar-background); + display: flex; + align-items: center; + justify-content: center; height: 35px; width: 35px; margin-left: 1.6rem; margin-right: 1.4rem; + overflow: hidden; } .solid-notification__content { diff --git a/src/views/circle/page-circle-notifications.pug b/src/views/circle/page-circle-notifications.pug index 90b2e86..19a3ebb 100644 --- a/src/views/circle/page-circle-notifications.pug +++ b/src/views/circle/page-circle-notifications.pug @@ -1,7 +1,7 @@ solid-notifications-template(data-rdf-type='hd:circle') template .solid-notification__avatar - img(src="${await author['account.foaf:depiction']}") + img(src="${await author['account.foaf:depiction']} || /../../images/alien.svg" style=`max-height:${clientLogoHeight || '18px'}`) .solid-notification__content .solid-notification__title ${await author.name} span.solid-notification__title__side dans diff --git a/src/views/user/page-user-notifications.pug b/src/views/user/page-user-notifications.pug index fd4aef3..5b31006 100644 --- a/src/views/user/page-user-notifications.pug +++ b/src/views/user/page-user-notifications.pug @@ -1,7 +1,7 @@ solid-notifications-template(data-rdf-type='foaf:user') template .solid-notification__avatar - img(src="${await author['account.foaf:depiction']}") + img(src="${await author['account.foaf:depiction']} || /../../images/alien.svg" style=`max-height:${clientLogoHeight || '18px'}`) .solid-notification__content .solid-notification__title ${await author.name} span.solid-notification__title__side en privé From 2fbd5095ae9fafb056e94be0434dfdc65d546552 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Pasquier Date: Wed, 15 Jul 2020 14:13:32 +0000 Subject: [PATCH 26/80] Update dependencies.pug --- src/dependencies.pug | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/dependencies.pug b/src/dependencies.pug index c0c460c..0d9e144 100644 --- a/src/dependencies.pug +++ b/src/dependencies.pug @@ -11,7 +11,7 @@ script(type="module" src="https://unpkg.com/@startinblox/oidc@0.9" 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.5.0-beta.3" defer) +script(type="module" src="https://unpkg.com/@startinblox/component-notifications@0.5" defer) //- script(type="module" src="/lib/sib-notifications/index.js" defer) if endpoints.events || (endpoints.get && endpoints.get.events) From 729b15dc04d9af076fdd3dcc60e090a9d1a3734c Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Pasquier Date: Wed, 15 Jul 2020 14:49:57 +0000 Subject: [PATCH 27/80] Update page-circle-notifications.pug --- src/views/circle/page-circle-notifications.pug | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/circle/page-circle-notifications.pug b/src/views/circle/page-circle-notifications.pug index 19a3ebb..39590a7 100644 --- a/src/views/circle/page-circle-notifications.pug +++ b/src/views/circle/page-circle-notifications.pug @@ -1,7 +1,7 @@ solid-notifications-template(data-rdf-type='hd:circle') template .solid-notification__avatar - img(src="${await author['account.foaf:depiction']} || /../../images/alien.svg" style=`max-height:${clientLogoHeight || '18px'}`) + img(src="${await author['account.foaf:depiction'] || '/images/alien.svg'}" style=`max-height:${clientLogoHeight || '18px'}`) .solid-notification__content .solid-notification__title ${await author.name} span.solid-notification__title__side dans From e56e2880d7f3a371d2f1ca892c8740b00cc77f1a Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Pasquier Date: Wed, 15 Jul 2020 14:50:02 +0000 Subject: [PATCH 28/80] Update page-user-notifications.pug --- src/views/user/page-user-notifications.pug | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/user/page-user-notifications.pug b/src/views/user/page-user-notifications.pug index 5b31006..7ae707b 100644 --- a/src/views/user/page-user-notifications.pug +++ b/src/views/user/page-user-notifications.pug @@ -1,7 +1,7 @@ solid-notifications-template(data-rdf-type='foaf:user') template .solid-notification__avatar - img(src="${await author['account.foaf:depiction']} || /../../images/alien.svg" style=`max-height:${clientLogoHeight || '18px'}`) + img(src="${await author['account.foaf:depiction'] || '/images/alien.svg'}" style=`max-height:${clientLogoHeight || '18px'}`) .solid-notification__content .solid-notification__title ${await author.name} span.solid-notification__title__side en privé From 014cfaa5c874ce9e736cfc811c53adc0f1417982 Mon Sep 17 00:00:00 2001 From: gaelle morin Date: Wed, 15 Jul 2020 19:21:49 +0200 Subject: [PATCH 29/80] feature: notification - default avatar + styles added (bis) --- src/views/circle/page-circle-notifications.pug | 2 +- src/views/user/page-user-notifications.pug | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/circle/page-circle-notifications.pug b/src/views/circle/page-circle-notifications.pug index 39590a7..2ebc1ea 100644 --- a/src/views/circle/page-circle-notifications.pug +++ b/src/views/circle/page-circle-notifications.pug @@ -1,7 +1,7 @@ solid-notifications-template(data-rdf-type='hd:circle') template .solid-notification__avatar - img(src="${await author['account.foaf:depiction'] || '/images/alien.svg'}" style=`max-height:${clientLogoHeight || '18px'}`) + img(src="${await author['account.foaf:depiction'] || '/images/alien.svg'}" style="${await author['account.foaf:depiction'] ? 'max-height:100%' : 'max-height:18px'}") .solid-notification__content .solid-notification__title ${await author.name} span.solid-notification__title__side dans diff --git a/src/views/user/page-user-notifications.pug b/src/views/user/page-user-notifications.pug index 7ae707b..56fdd8f 100644 --- a/src/views/user/page-user-notifications.pug +++ b/src/views/user/page-user-notifications.pug @@ -1,7 +1,7 @@ solid-notifications-template(data-rdf-type='foaf:user') template .solid-notification__avatar - img(src="${await author['account.foaf:depiction'] || '/images/alien.svg'}" style=`max-height:${clientLogoHeight || '18px'}`) + img(src="${await author['account.foaf:depiction'] || '/images/alien.svg'}" style="${await author['account.foaf:depiction'] ? 'max-height:100%' : 'max-height:18px'}") .solid-notification__content .solid-notification__title ${await author.name} span.solid-notification__title__side en privé From a6727d37916ba1213a24611a480bd6dcbce78c19 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Pasquier Date: Thu, 16 Jul 2020 08:36:53 +0000 Subject: [PATCH 30/80] fix: add hubl-reactivity from post url to sources url --- src/index.pug | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/index.pug b/src/index.pug index 492ed20..7a12da8 100644 --- a/src/index.pug +++ b/src/index.pug @@ -35,6 +35,10 @@ html(lang="en") if endpoints.joboffers || (endpoints.get && endpoints.get.joboffers) #job-offers(hidden).no-sidebar.with-padding + if (endpoints.post && endpoints.post.joboffers) && (endpoints.get && endpoints.get.joboffers) + hubl-reactivity(data-src=`${endpoints.post.joboffers}current/` target-src=`${endpoints.get.joboffers}`) + hubl-reactivity(data-src=`${endpoints.post.joboffers}expired/` target-src=`${endpoints.get.joboffers}`) + hubl-reactivity(data-src=`${endpoints.post.joboffers}` target-src=`${endpoints.get.joboffers}`) 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}expired/` target-src=`${endpoints.joboffers || endpoints.get.joboffers}`) From 8ff7994089aaf9ba42f8594f5ef0c461a756b289 Mon Sep 17 00:00:00 2001 From: gaelle morin Date: Thu, 16 Jul 2020 13:51:52 +0200 Subject: [PATCH 31/80] feature: notification - default avatar + styles added (ter) --- src/styles/base/header.scss | 21 ++++++++++++++++--- .../circle/page-circle-notifications.pug | 2 +- src/views/user/page-user-notifications.pug | 2 +- 3 files changed, 20 insertions(+), 5 deletions(-) diff --git a/src/styles/base/header.scss b/src/styles/base/header.scss index 883cd94..7966a19 100644 --- a/src/styles/base/header.scss +++ b/src/styles/base/header.scss @@ -191,15 +191,30 @@ solid-notifications { padding: 1.2rem 0 1.5rem; .solid-notification__avatar { + align-items: center; background: var(--color-avatar-background); display: flex; - align-items: center; - justify-content: center; height: 35px; - width: 35px; + justify-content: center; margin-left: 1.6rem; margin-right: 1.4rem; overflow: hidden; + position: relative; + vertical-align: middle; + width: 35px; + + img { + background-color: var(--color-grey-10); + height: 100%; + object-fit: cover; + object-position: center center; + width: 100%; + } + + object { + height: 45%; + width: 45%; + } } .solid-notification__content { diff --git a/src/views/circle/page-circle-notifications.pug b/src/views/circle/page-circle-notifications.pug index 2ebc1ea..239c674 100644 --- a/src/views/circle/page-circle-notifications.pug +++ b/src/views/circle/page-circle-notifications.pug @@ -1,7 +1,7 @@ solid-notifications-template(data-rdf-type='hd:circle') template .solid-notification__avatar - img(src="${await author['account.foaf:depiction'] || '/images/alien.svg'}" style="${await author['account.foaf:depiction'] ? 'max-height:100%' : 'max-height:18px'}") + | ${await author['account.foaf:depiction'] ? `` : ``} .solid-notification__content .solid-notification__title ${await author.name} span.solid-notification__title__side dans diff --git a/src/views/user/page-user-notifications.pug b/src/views/user/page-user-notifications.pug index 56fdd8f..ee785d9 100644 --- a/src/views/user/page-user-notifications.pug +++ b/src/views/user/page-user-notifications.pug @@ -1,7 +1,7 @@ solid-notifications-template(data-rdf-type='foaf:user') template .solid-notification__avatar - img(src="${await author['account.foaf:depiction'] || '/images/alien.svg'}" style="${await author['account.foaf:depiction'] ? 'max-height:100%' : 'max-height:18px'}") + | ${await author['account.foaf:depiction'] ? `` : ``} .solid-notification__content .solid-notification__title ${await author.name} span.solid-notification__title__side en privé From 497b1d1cad2f0380914c785dc8122b287e889252 Mon Sep 17 00:00:00 2001 From: Rachel Date: Mon, 13 Jul 2020 08:22:59 +0000 Subject: [PATCH 32/80] Issue template for new instances. --- .gitlab/issue_templates/new_instance | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 .gitlab/issue_templates/new_instance diff --git a/.gitlab/issue_templates/new_instance b/.gitlab/issue_templates/new_instance new file mode 100644 index 0000000..5685164 --- /dev/null +++ b/.gitlab/issue_templates/new_instance @@ -0,0 +1,22 @@ +# Please fill all these info: + +## General info + +- Name of the instance: +- Domain: + +## Settings: + +- Does the instance allow people to sign up? +- Does the instance want new people to get a welcome email? +- Which modules the client needs (default = dashboard, circles, analytics - later: user directory, job board, projects) + +## Federation: + +**Provide here the list of instances the new instance wants to be federated with. Please confirm if this new instance is also ok with those instances accessing their public data.** + +## Cosmetics + +Logo: +Favicon: +A set of 2/3/4 colors: \ No newline at end of file From 49a70b27704aa34e3d05b5606bb6bfdc557b07e4 Mon Sep 17 00:00:00 2001 From: Rachel Date: Mon, 13 Jul 2020 13:49:16 +0000 Subject: [PATCH 33/80] Fix module part --- .gitlab/issue_templates/new_instance | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab/issue_templates/new_instance b/.gitlab/issue_templates/new_instance index 5685164..f1c1e24 100644 --- a/.gitlab/issue_templates/new_instance +++ b/.gitlab/issue_templates/new_instance @@ -9,7 +9,7 @@ - Does the instance allow people to sign up? - Does the instance want new people to get a welcome email? -- Which modules the client needs (default = dashboard, circles, analytics - later: user directory, job board, projects) +- Which modules the client needs (dashboard, circles, analytics, user directory, job board, projects...) ## Federation: From 69faca7c9ff1223489678e1d2766235b38aa1fe6 Mon Sep 17 00:00:00 2001 From: Rachel Date: Mon, 13 Jul 2020 15:38:22 +0000 Subject: [PATCH 34/80] Update .gitlab/issue_templates/new_instance --- .gitlab/issue_templates/new_instance | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/.gitlab/issue_templates/new_instance b/.gitlab/issue_templates/new_instance index f1c1e24..75aeaa2 100644 --- a/.gitlab/issue_templates/new_instance +++ b/.gitlab/issue_templates/new_instance @@ -13,10 +13,28 @@ ## Federation: -**Provide here the list of instances the new instance wants to be federated with. Please confirm if this new instance is also ok with those instances accessing their public data.** +- Which current instance should see this new instance data? Please provide the info module by module. +- Do those current instances agree to share their public data with this new instance? Please provide the info module by module. + +Example: + +*Instance G is the new kid in town* +*Instance G wants to only see their dashboard, but want to access the circles of A, B, C, D, E & F.* +*Instance G wants to be able to chat with users from A, B, C, D, E & F.* +*Instance G wants to be able to see A and B job offers* + +*A, B, C, D, E & F are ok to share their data, but they don't want to see F's circles. But they are interested in all other F's modules. This means that F circles' would not be available for federation*. + +Let's say every instances agree to this scenario, the issue should describe the following: +- Dashboard: F **Not available for federation**. +- Circles: A, B, C, D, E & F. **Not available for federation** +- Job offers: A, B, F **Available for federation** +- Users: A, B, C, D, E & F. **Available for federation** +- Profile directory: A, B, C, D, E & F. **Available for federation** +- Projects: No federation in any sense. ## Cosmetics Logo: Favicon: -A set of 2/3/4 colors: \ No newline at end of file +A set of 2/3/4 colors + where they should belong: \ No newline at end of file From cf147cdba9f544ce1fab0e56bd778ea0e4c73026 Mon Sep 17 00:00:00 2001 From: Rachel Date: Wed, 15 Jul 2020 13:29:20 +0000 Subject: [PATCH 35/80] Improve federation example --- .gitlab/issue_templates/new_instance | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/.gitlab/issue_templates/new_instance b/.gitlab/issue_templates/new_instance index 75aeaa2..dd7f464 100644 --- a/.gitlab/issue_templates/new_instance +++ b/.gitlab/issue_templates/new_instance @@ -14,7 +14,7 @@ ## Federation: - Which current instance should see this new instance data? Please provide the info module by module. -- Do those current instances agree to share their public data with this new instance? Please provide the info module by module. +- Do those current instances agree to share their public data with this new instance? Yes / No => this can only be asked once per instance. Example: @@ -23,15 +23,13 @@ Example: *Instance G wants to be able to chat with users from A, B, C, D, E & F.* *Instance G wants to be able to see A and B job offers* -*A, B, C, D, E & F are ok to share their data, but they don't want to see F's circles. But they are interested in all other F's modules. This means that F circles' would not be available for federation*. - Let's say every instances agree to this scenario, the issue should describe the following: -- Dashboard: F **Not available for federation**. -- Circles: A, B, C, D, E & F. **Not available for federation** -- Job offers: A, B, F **Available for federation** -- Users: A, B, C, D, E & F. **Available for federation** -- Profile directory: A, B, C, D, E & F. **Available for federation** -- Projects: No federation in any sense. +- Dashboard: G +- Circles: A, B, C, D, E, F & G +- Job offers: A, B, F, G +- Users: A, B, C, D, E, F & G +- Profile directory: A, B, C, D, E, F & G +- G agrees that any new instance can see their public data. ## Cosmetics From 7762b0745c68fa903662e8233401b34cb2b27c56 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Pasquier Date: Fri, 17 Jul 2020 15:47:05 +0000 Subject: [PATCH 36/80] Update new_instance --- .gitlab/issue_templates/new_instance | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/.gitlab/issue_templates/new_instance b/.gitlab/issue_templates/new_instance index dd7f464..db3cd07 100644 --- a/.gitlab/issue_templates/new_instance +++ b/.gitlab/issue_templates/new_instance @@ -9,11 +9,10 @@ - Does the instance allow people to sign up? - Does the instance want new people to get a welcome email? -- Which modules the client needs (dashboard, circles, analytics, user directory, job board, projects...) ## Federation: -- Which current instance should see this new instance data? Please provide the info module by module. +- Which current instance should see this new instance data? Please provide the info module by module and include the instance itself. - Do those current instances agree to share their public data with this new instance? Yes / No => this can only be asked once per instance. Example: @@ -33,6 +32,6 @@ Let's say every instances agree to this scenario, the issue should describe the ## Cosmetics -Logo: -Favicon: -A set of 2/3/4 colors + where they should belong: \ No newline at end of file +Logo: +Favicon: +A set of 4 colors + where they should belong: \ No newline at end of file From dc0e03acf500e781c13a67f279e4593e1179d80f Mon Sep 17 00:00:00 2001 From: Rachel Date: Fri, 17 Jul 2020 16:23:27 +0000 Subject: [PATCH 37/80] Add .md extension --- .gitlab/issue_templates/{new_instance => new_instance.md} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .gitlab/issue_templates/{new_instance => new_instance.md} (100%) diff --git a/.gitlab/issue_templates/new_instance b/.gitlab/issue_templates/new_instance.md similarity index 100% rename from .gitlab/issue_templates/new_instance rename to .gitlab/issue_templates/new_instance.md From 1d4b94286964747890dda9f61af71f5920d5906f Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Pasquier Date: Tue, 21 Jul 2020 09:53:18 +0000 Subject: [PATCH 38/80] cicd: add casaco --- .gitlab-ci.yml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a660e45..d3ed9c6 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -300,3 +300,21 @@ playground: when: manual tags: - deploy + +casaco: + stage: deployment + environment: + name: casaco + url: https://casaco.hubl.world + before_script: + - npm ci --cache .npm --prefer-offline --only=production + script: + - echo "$APP_CONFIG_CASACO" > 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/* casaco@astral.startinblox.com:~/front/ + only: + - master + when: manual + tags: + - deploy From ea45807ccbb20987cd4e20b335ce45952ee793d5 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Pasquier Date: Mon, 27 Jul 2020 12:08:29 +0000 Subject: [PATCH 39/80] cicd: fnk, opteos, labriqueterie --- .gitlab-ci.yml | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d3ed9c6..d298b55 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -318,3 +318,57 @@ casaco: when: manual tags: - deploy + +opteos: + stage: deployment + environment: + name: opteos + url: https://opteos.hubl.world + before_script: + - npm ci --cache .npm --prefer-offline --only=production + script: + - echo "$APP_CONFIG_OPTEOS" > 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/* opteos@astral.startinblox.com:~/front/ + only: + - master + when: manual + tags: + - deploy + +fnk: + stage: deployment + environment: + name: fnk + url: https://fnk.hubl.world + before_script: + - npm ci --cache .npm --prefer-offline --only=production + script: + - echo "$APP_CONFIG_FNK" > 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/* fnk@astral.startinblox.com:~/front/ + only: + - master + when: manual + tags: + - deploy + +labriqueterie: + stage: deployment + environment: + name: labriqueterie + url: https://labriqueterie.hubl.world + before_script: + - npm ci --cache .npm --prefer-offline --only=production + script: + - echo "$APP_CONFIG_LABRIQUETERIE" > 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/* labriqueterie@astral.startinblox.com:~/front/ + only: + - master + when: manual + tags: + - deploy \ No newline at end of file From 6e9d313d12f044051baeba4057d354f680a4e4e7 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Pasquier Date: Tue, 28 Jul 2020 10:13:49 +0000 Subject: [PATCH 40/80] fix new instance template --- .gitlab/issue_templates/new_instance.md | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/.gitlab/issue_templates/new_instance.md b/.gitlab/issue_templates/new_instance.md index db3cd07..a93fe19 100644 --- a/.gitlab/issue_templates/new_instance.md +++ b/.gitlab/issue_templates/new_instance.md @@ -1,3 +1,5 @@ +/label ~"New Instance" + # Please fill all these info: ## General info @@ -7,22 +9,23 @@ ## Settings: -- Does the instance allow people to sign up? -- Does the instance want new people to get a welcome email? +- Does the instance allow people to sign up? **Yes / No** +- Does the instance want new people to get a welcome email? **Yes / No** ## Federation: -- Which current instance should see this new instance data? Please provide the info module by module and include the instance itself. -- Do those current instances agree to share their public data with this new instance? Yes / No => this can only be asked once per instance. +- Which current instance should see this new instance data? **Please provide the info module by module and include the instance itself.** +- Do those current instances agree to share their public data with this new instance? **Yes / No** Example: -*Instance G is the new kid in town* -*Instance G wants to only see their dashboard, but want to access the circles of A, B, C, D, E & F.* -*Instance G wants to be able to chat with users from A, B, C, D, E & F.* -*Instance G wants to be able to see A and B job offers* +- *Instance G is the new kid in town* +- *Instance G wants to only see their dashboard, but want to access the circles of A, B, C, D, E & F.* +- *Instance G wants to be able to chat with users from A, B, C, D, E & F.* +- *Instance G wants to be able to see A and B job offers* Let's say every instances agree to this scenario, the issue should describe the following: + - Dashboard: G - Circles: A, B, C, D, E, F & G - Job offers: A, B, F, G @@ -32,6 +35,6 @@ Let's say every instances agree to this scenario, the issue should describe the ## Cosmetics -Logo: -Favicon: -A set of 4 colors + where they should belong: \ No newline at end of file +- Logo: +- Favicon: +- 4 Colors: \ No newline at end of file From c80da046e430b97bc87e8157ed28d707a285420b Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Pasquier Date: Tue, 28 Jul 2020 11:49:12 +0000 Subject: [PATCH 41/80] fix: reactivity of circles and projects on federation --- src/index.pug | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/index.pug b/src/index.pug index 7a12da8..f0c607c 100644 --- a/src/index.pug +++ b/src/index.pug @@ -49,6 +49,9 @@ html(lang="en") if endpoints.projects || (endpoints.get && endpoints.get.projects) #project(hidden).with-sidebar + if (endpoints.post && endpoints.post.projects) && (endpoints.get && endpoints.get.projects) + hubl-reactivity(data-src=`${endpoints.post.projects}joinable/` target-src=`${endpoints.get.projects}`) + hubl-reactivity(data-src=`${endpoints.post.projects}` target-src=`${endpoints.get.projects}`) hubl-reactivity(data-src=`${endpoints.projects || endpoints.get.projects}joinable/` target-src=`${endpoints.projects || endpoints.get.projects}`) 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/`) @@ -56,6 +59,9 @@ html(lang="en") if endpoints.circles || (endpoints.get && endpoints.get.circles) #circle(hidden).with-sidebar + if (endpoints.post && endpoints.post.circles) && (endpoints.get && endpoints.get.circles) + hubl-reactivity(data-src=`${endpoints.post.circles}joinable/` target-src=`${endpoints.get.circles}`) + hubl-reactivity(data-src=`${endpoints.post.circles}` target-src=`${endpoints.get.circles}`) hubl-reactivity(data-src=`${endpoints.circles || endpoints.get.circles}joinable/` target-src=`${endpoints.circles || endpoints.get.circles}`) 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/`) From 7286fb74f7c8f5c461fc8d8827fd4858b0452e26 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Pasquier Date: Thu, 30 Jul 2020 12:30:41 +0000 Subject: [PATCH 42/80] cicd: remove etuc --- .gitlab-ci.yml | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d298b55..8abe23e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -175,24 +175,6 @@ community: tags: - deploy -etuc: - stage: deployment - environment: - name: etuc - url: https://app.digitalplatformobservatory.org - before_script: - - npm ci --cache .npm --prefer-offline --only=production - script: - - echo "$APP_CONFIG_DIGITALPLATFORMOBSERVATORY" > 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/* etuc@ssh-etuc.happy-dev.fr:~/sib/www/ - only: - - master - when: manual - tags: - - deploy - nantes: stage: deployment environment: From d10e689676dbc19523271ccd8eb24fc5dbe28996 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Pasquier Date: Thu, 30 Jul 2020 12:49:17 +0000 Subject: [PATCH 43/80] fix: url for users --- src/index.pug | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/index.pug b/src/index.pug index f0c607c..7f2880c 100644 --- a/src/index.pug +++ b/src/index.pug @@ -52,6 +52,8 @@ html(lang="en") if (endpoints.post && endpoints.post.projects) && (endpoints.get && endpoints.get.projects) hubl-reactivity(data-src=`${endpoints.post.projects}joinable/` target-src=`${endpoints.get.projects}`) hubl-reactivity(data-src=`${endpoints.post.projects}` target-src=`${endpoints.get.projects}`) + hubl-reactivity(bind-user nested-field="projects" target-src=`${endpoints.post.projects}`) + hubl-reactivity(bind-user nested-field="projects" target-src=`${endpoints.post.projects}joinable/`) hubl-reactivity(data-src=`${endpoints.projects || endpoints.get.projects}joinable/` target-src=`${endpoints.projects || endpoints.get.projects}`) 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/`) @@ -62,6 +64,8 @@ html(lang="en") if (endpoints.post && endpoints.post.circles) && (endpoints.get && endpoints.get.circles) hubl-reactivity(data-src=`${endpoints.post.circles}joinable/` target-src=`${endpoints.get.circles}`) hubl-reactivity(data-src=`${endpoints.post.circles}` target-src=`${endpoints.get.circles}`) + hubl-reactivity(bind-user nested-field="circles" target-src=`${endpoints.post.circles}`) + hubl-reactivity(bind-user nested-field="circles" target-src=`${endpoints.post.circles}joinable/`) hubl-reactivity(data-src=`${endpoints.circles || endpoints.get.circles}joinable/` target-src=`${endpoints.circles || endpoints.get.circles}`) 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/`) From 566802d801d066ab125716b88dc45e880c8f9a56 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Pasquier Date: Tue, 4 Aug 2020 09:12:21 +0000 Subject: [PATCH 44/80] bugfix: rename solid-fix-badge to solid-badge --- src/menu-left.pug | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/menu-left.pug b/src/menu-left.pug index 89ddf39..b7e91cb 100644 --- a/src/menu-left.pug +++ b/src/menu-left.pug @@ -1,6 +1,6 @@ solid-widget(name='hubl-counter') template - solid-fix-badge(data-src="${value == 'badge' ? src : value}") + solid-badge(data-src="${value == 'badge' ? src : value}") solid-widget(name='hubl-menu-jabberid') template From b44c950c1addebda6fdae50a59baf95a87acf8db Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Pasquier Date: Wed, 5 Aug 2020 12:21:58 +0000 Subject: [PATCH 45/80] cicd: add cotech & facttic --- .gitlab-ci.yml | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8abe23e..27792f7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -352,5 +352,41 @@ labriqueterie: only: - master when: manual + tags: + - deploy + +facttic: + stage: deployment + environment: + name: facttic + url: https://facttic.hubl.world + before_script: + - npm ci --cache .npm --prefer-offline --only=production + script: + - echo "$APP_CONFIG_FACTTIC" > 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/* facttic@astral.startinblox.com:~/front/ + only: + - master + when: manual + tags: + - deploy + +cotech: + stage: deployment + environment: + name: cotech + url: https://hubl.coops.tech + before_script: + - npm ci --cache .npm --prefer-offline --only=production + script: + - echo "$APP_CONFIG_COTECH" > 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/* cotech@astral.startinblox.com:~/front/ + only: + - master + when: manual tags: - deploy \ No newline at end of file From e897c78ba930400cb7757c7a6e020d49e67da5f1 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Pasquier Date: Wed, 5 Aug 2020 13:43:05 +0000 Subject: [PATCH 46/80] bugfix: solid-fix-badge to solid-badge --- src/scripts/unreads-menu.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/scripts/unreads-menu.js b/src/scripts/unreads-menu.js index 66b18b5..bd6abc7 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(`solid-fix-badge[data-src="${event.detail.resource['@id']}"]`); + const badge = document.querySelector(`solid-badge[data-src="${event.detail.resource['@id']}"]`); if (badge) badge.parentElement.parentElement.classList.remove('unread'); } }); From 07d63ce426b92f16779f5e2b0336992a3126fb2f Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Pasquier Date: Wed, 5 Aug 2020 13:46:48 +0000 Subject: [PATCH 47/80] fix: remove unused sib-notifications.js --- src/scripts/sib-notifications.js | 60 -------------------------------- 1 file changed, 60 deletions(-) delete mode 100644 src/scripts/sib-notifications.js diff --git a/src/scripts/sib-notifications.js b/src/scripts/sib-notifications.js deleted file mode 100644 index a6c9ddb..0000000 --- a/src/scripts/sib-notifications.js +++ /dev/null @@ -1,60 +0,0 @@ -//- Update badges from notifications list -async function updateBadges(element) { - const unreadNotifications = new Map(); - const notifications = element.component.resource; - if (!notifications) return; - // Generate unread map - for (let notification of notifications['ldp:contains']) { - if (await notification['unread']) { - const object = await notification['object']; - unreadNotifications.set(object['@id'], (unreadNotifications.get(object['@id']) || 0) + 1); - } - } - // update badges - unreadNotifications.forEach((notifNumber, objectId) => { - const badge = document.querySelector(`solid-fix-badge[data-src="${objectId}"]`); - if (badge) { - badge.innerText = notifNumber || ''; - badge.style.display = notifNumber ? 'block' : 'none'; - } - }) -} -document.addEventListener("DOMContentLoaded", function (event) { - - //- Fix badges performances - // on load time - const checkNotificationMenuExist = setInterval(function () { // wait for notification menu to exist - const notifsMenu = document.getElementById('notifications-list'); - if (notifsMenu) { - clearInterval(checkNotificationMenuExist); - notifsMenu.addEventListener('populate', (event) => { - const checkExist = setInterval(function () { // wait for left menus to exist - const subMenus = document.querySelectorAll('.sub-menu > solid-display > div'); - if (subMenus.length >= 2) { - updateBadges(event.target); - clearInterval(checkExist); - } - }, 500); - }, { - once: true - }); - } - }, 500); - - // on refresh notification list - window.addEventListener('notificationsRefresh', () => { - document.getElementById('notifications-list').addEventListener('populate', (event) => { - updateBadges(event.target); - }, { - once: true - }); - }); - - // on read notification - window.addEventListener('read', (event) => { - if (event.detail && event.detail.resource && event.detail.resource['@id']) { - const badge = document.querySelector(`solid-fix-badge[data-src="${event.detail.resource['@id']}"]`); - if (badge) badge.style.display = "none"; - } - }); -}); \ No newline at end of file From 59f2b4414f2a5eeaf362e03cba0fe40b91e920a0 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Pasquier Date: Wed, 5 Aug 2020 13:47:05 +0000 Subject: [PATCH 48/80] fix: remove solid-fix-badge --- src/styles/base/menu-left.scss | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/src/styles/base/menu-left.scss b/src/styles/base/menu-left.scss index 7b070ed..47b207d 100644 --- a/src/styles/base/menu-left.scss +++ b/src/styles/base/menu-left.scss @@ -292,20 +292,3 @@ } } } - -// Temporary fix for badges -solid-fix-badge { - display: none; - box-sizing: border-box; - font-family: sans-serif; - font-size: 12px; - background-color: var(--sib-notifications-theme, gray); - color: #36383a; - border-radius: 50%; - line-height: 20px; - width: 20px; - height: 20px; - text-align: center; - font-weight: bold; - padding-bottom: 0; -} From 82f8575d64f7762897ddc9b5470ec0369e5d91f7 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Pasquier Date: Fri, 7 Aug 2020 12:25:39 +0000 Subject: [PATCH 49/80] update: increase reactivity of federated circles & projects --- src/views/admin/page-admin-circles.pug | 6 ++++++ src/views/admin/page-admin-projects.pug | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/src/views/admin/page-admin-circles.pug b/src/views/admin/page-admin-circles.pug index d6c1e01..c0f1833 100644 --- a/src/views/admin/page-admin-circles.pug +++ b/src/views/admin/page-admin-circles.pug @@ -56,6 +56,9 @@ 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}') + if (endpoints.post && endpoints.post.circles) && (endpoints.get && endpoints.get.circles) + hubl-reactivity(data-src=`${endpoints.post.circles}joinable/` target-src=`${src}`) + hubl-reactivity(data-src=`${endpoints.post.circles}` target-src=`${src}`) solid-display( class='table-body' @@ -89,6 +92,9 @@ 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}') + if (endpoints.post && endpoints.post.circles) && (endpoints.get && endpoints.get.circles) + hubl-reactivity(data-src=`${endpoints.post.circles}joinable/` target-src=`${value}`) + hubl-reactivity(data-src=`${endpoints.post.circles}` target-src=`${value}`) solid-display( class='table-body' diff --git a/src/views/admin/page-admin-projects.pug b/src/views/admin/page-admin-projects.pug index a5b066d..56da86e 100644 --- a/src/views/admin/page-admin-projects.pug +++ b/src/views/admin/page-admin-projects.pug @@ -40,6 +40,9 @@ 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}') + if (endpoints.post && endpoints.post.projects) && (endpoints.get && endpoints.get.projects) + hubl-reactivity(data-src=`${endpoints.post.projects}joinable/` target-src=`${src}`) + hubl-reactivity(data-src=`${endpoints.post.projects}` target-src=`${src}`) solid-widget(name='hubl-project-captain') template @@ -109,6 +112,9 @@ 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}') + if (endpoints.post && endpoints.post.projects) && (endpoints.get && endpoints.get.projects) + hubl-reactivity(data-src=`${endpoints.post.projects}joinable/` target-src=`${value}`) + hubl-reactivity(data-src=`${endpoints.post.projects}` target-src=`${value}`) solid-display( class='table-body' From 3f2bb73f782852114f6facb8bbb5e1176180f864 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Pasquier Date: Mon, 10 Aug 2020 16:14:15 +0000 Subject: [PATCH 50/80] cicd: lelaptop virtualassembly ouisharequebec nouvelleaquitaine paca strasbourg bretagne lemans --- .gitlab-ci.yml | 146 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 145 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 27792f7..fdb9d4d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -389,4 +389,148 @@ cotech: - master when: manual tags: - - deploy \ No newline at end of file + - deploy + +lelaptop: + stage: deployment + environment: + name: lelaptop + url: https://lelaptop.hubl.world + before_script: + - npm ci --cache .npm --prefer-offline --only=production + script: + - echo "$APP_CONFIG_LELAPTOP" > 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/* lelaptop@astral.startinblox.com:~/front/ + only: + - master + when: manual + tags: + - deploy + +virtualassembly: + stage: deployment + environment: + name: virtualassembly + url: https://virtual-assembly.hubl.world + before_script: + - npm ci --cache .npm --prefer-offline --only=production + script: + - echo "$APP_CONFIG_VIRTUAL_ASS" > 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/* virtual-assembly@astral.startinblox.com:~/front/ + only: + - master + when: manual + tags: + - deploy + +ouisharequebec: + stage: deployment + environment: + name: ouisharequebec + url: https://ouishare-quebec.hubl.world + before_script: + - npm ci --cache .npm --prefer-offline --only=production + script: + - echo "$APP_CONFIG_OUISHARE" > 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/* ouishare-quebec@astral.startinblox.com:~/front/ + only: + - master + when: manual + tags: + - deploy + +nouvelleaquitaine: + stage: deployment + environment: + name: nouvelleaquitaine + url: https://app.nouvelle-aquitaine.happy-dev.fr + before_script: + - npm ci --cache .npm --prefer-offline --only=production + script: + - echo "$APP_CONFIG_NVLE_AQ" > 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/* nouvelle-aquitaine@ssh-nouvelle-aquitaine.happy-dev.fr:~/front/ + only: + - master + when: manual + tags: + - deploy + +paca: + stage: deployment + environment: + name: paca + url: https://app.paca.happy-dev.fr + before_script: + - npm ci --cache .npm --prefer-offline --only=production + script: + - echo "$APP_CONFIG_PACA" > 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/* paca@ssh-paca.happy-dev.fr:~/front/ + only: + - master + when: manual + tags: + - deploy + +strasbourg: + stage: deployment + environment: + name: strasbourg + url: https://app.strasbourg.happy-dev.fr + before_script: + - npm ci --cache .npm --prefer-offline --only=production + script: + - echo "$APP_CONFIG_STRASBOURG" > 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/* strasbourg@ssh-strasbourg.happy-dev.fr:~/front/ + only: + - master + when: manual + tags: + - deploy + +bretagne: + stage: deployment + environment: + name: bretagne + url: https://app.bretagne.happy-dev.fr + before_script: + - npm ci --cache .npm --prefer-offline --only=production + script: + - echo "$APP_CONFIG_BRETAGNE" > 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/* bretagne@ssh-bretagne.happy-dev.fr:~/front/ + only: + - master + when: manual + tags: + - deploy + +lemans: + stage: deployment + environment: + name: lemans + url: https://app.lemans.happy-dev.fr + before_script: + - npm ci --cache .npm --prefer-offline --only=production + script: + - echo "$APP_CONFIG_LEMANS" > 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/* lemans@ssh-lemans.happy-dev.fr:~/front/ + only: + - master + when: manual + tags: + - deploy From d8059e84aad469957fce3d874f0c0c4e82088e53 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Pasquier Date: Mon, 10 Aug 2020 17:08:33 +0000 Subject: [PATCH 51/80] cicd: rename toulouse to smarttoulouse --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index fdb9d4d..001117e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -211,10 +211,10 @@ paris: tags: - deploy -toulouse: +smarttoulouse: stage: deployment environment: - name: toulouse + name: smarttoulouse url: https://smart-toulouse.happy-dev.fr before_script: - npm ci --cache .npm --prefer-offline --only=production From 86656447be3aaaef44d4578fbf176285f6236aa7 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Pasquier Date: Tue, 11 Aug 2020 08:47:45 +0000 Subject: [PATCH 52/80] fix: remove username input --- src/views/admin/page-admin-users-edit.pug | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/views/admin/page-admin-users-edit.pug b/src/views/admin/page-admin-users-edit.pug index d372cb3..7873cc4 100644 --- a/src/views/admin/page-admin-users-edit.pug +++ b/src/views/admin/page-admin-users-edit.pug @@ -11,16 +11,14 @@ div.content-box__info.flex solid-form.form.button-register( bind-resources='' - fields='line-1(first_name, last_name), line-2(username, email)' + fields='line-1(first_name, last_name), line-2(email)' class-first_name='form-label is-light is-half-width input-text-like' class-last_name='form-label is-light is-half-width input-text-like' - class-username='form-label is-light is-half-width input-text-like' - class-email='form-label is-light is-half-width input-text-like' + class-email='form-label is-light is-full-width input-text-like' label-first_name='Prénom *' label-last_name='Nom *' - label-username='Nom d\'utilisateur *' label-email='E-mail *' next='admin-user-list' From aacfd6d82de3d3e455ab9d1812f6019061bc73d4 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Pasquier Date: Tue, 11 Aug 2020 20:33:06 +0000 Subject: [PATCH 53/80] fix: notification@0.6.2 --- src/dependencies.pug | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/dependencies.pug b/src/dependencies.pug index 0d9e144..526a65f 100644 --- a/src/dependencies.pug +++ b/src/dependencies.pug @@ -11,7 +11,7 @@ script(type="module" src="https://unpkg.com/@startinblox/oidc@0.9" 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.5" defer) +script(type="module" src="https://unpkg.com/@startinblox/component-notifications@0.6.2" defer) //- script(type="module" src="/lib/sib-notifications/index.js" defer) if endpoints.events || (endpoints.get && endpoints.get.events) From 4e9d58452f09e7d651753e5052545738cef59836 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Pasquier Date: Wed, 12 Aug 2020 15:52:43 +0000 Subject: [PATCH 54/80] cicd: add apidays --- .gitlab-ci.yml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 001117e..2069f20 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -534,3 +534,21 @@ lemans: when: manual tags: - deploy + +apidays: + stage: deployment + environment: + name: apidays + url: https://apidays.hubl.world + before_script: + - npm ci --cache .npm --prefer-offline --only=production + script: + - echo "$APP_CONFIG_APIDAYS" > 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/* apidays@astral.startinblox.com:~/front/ + only: + - master + when: manual + tags: + - deploy From e2fcacf951ec0925a38f91b0618f4e8e8769b977 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Pasquier Date: Mon, 24 Aug 2020 13:13:48 +0200 Subject: [PATCH 55/80] update: replace channel/channels with circle/circles --- src/menu-left.pug | 4 ++-- src/page-admin.pug | 2 +- src/views/admin/page-admin-circles-create.pug | 8 ++++---- src/views/admin/page-admin-circles.pug | 4 ++-- src/views/admin/page-admin-projects-create.pug | 2 +- src/views/circle/page-circle-edit.pug | 8 ++++---- src/views/circle/page-circle-left.pug | 2 +- src/views/circle/page-circle-profile.pug | 6 +++--- src/views/project/page-project-edit.pug | 2 +- 9 files changed, 19 insertions(+), 19 deletions(-) diff --git a/src/menu-left.pug b/src/menu-left.pug index b7e91cb..771db32 100644 --- a/src/menu-left.pug +++ b/src/menu-left.pug @@ -96,7 +96,7 @@ solid-router#navbar-router(default-route='dashboard') div.menu div.menu-chevron div.menu-icon.icon-arrow-right-circle - div.menu-label Canaux + div.menu-label Cercles div.menu-icon.icon-folder-alt solid-route(name='circle', rdf-type='hd:circle', use-id='', hidden) div.sub-menu.menu-notification @@ -105,7 +105,7 @@ solid-router#navbar-router(default-route='dashboard') nested-field='circles' fields='circle' empty-widget='hubl-create' - empty-value='canal' + empty-value='cercle' widget-circle='hubl-menu-fix-url-circle' order-by='circle.name' next='circle' diff --git a/src/page-admin.pug b/src/page-admin.pug index 54e08f9..87697f8 100644 --- a/src/page-admin.pug +++ b/src/page-admin.pug @@ -20,7 +20,7 @@ nav.jsRightMenu(role='navigation') if endpoints.circles || (endpoints.get && endpoints.get.circles) solid-route(name='admin-circles') li - a Canaux + a Cercles if endpoints.projects || (endpoints.get && endpoints.get.projects) solid-route(name='admin-projects') li diff --git a/src/views/admin/page-admin-circles-create.pug b/src/views/admin/page-admin-circles-create.pug index 2e94345..ee876f5 100644 --- a/src/views/admin/page-admin-circles-create.pug +++ b/src/views/admin/page-admin-circles-create.pug @@ -1,7 +1,7 @@ div.content-box__info.flex solid-link(class="backlink right", next='admin-circle-list') Retour - h1.centered Créer un canal + h1.centered Créer un cercle solid-form.form.button-register( data-src=`${endpoints.circles || endpoints.post.circles}` @@ -12,9 +12,9 @@ div.content-box__info.flex class-name='form-label is-light is-full-width input-text-like' class-description='form-label is-light is-full-width input-text-like' - label-status='Statut du canal' - label-name='Nom du canal *' - label-description='Sous-titre du canal *' + label-status='Statut du cercle' + label-name='Nom du cercle *' + label-description='Sous-titre du cercle *' widget-status='hubl-status' diff --git a/src/views/admin/page-admin-circles.pug b/src/views/admin/page-admin-circles.pug index c0f1833..3e6c2ef 100644 --- a/src/views/admin/page-admin-circles.pug +++ b/src/views/admin/page-admin-circles.pug @@ -31,12 +31,12 @@ div.admin-header.flex - h3 Canaux + h3 Cercles solid-link( class='button text-bold text-uppercase reversed button-primary bordered with-icon icon-plus' next='admin-circle-create' - ) Créer un canal + ) Créer un cercle .table-wrapper .table diff --git a/src/views/admin/page-admin-projects-create.pug b/src/views/admin/page-admin-projects-create.pug index 57c9748..de5e6d6 100644 --- a/src/views/admin/page-admin-projects-create.pug +++ b/src/views/admin/page-admin-projects-create.pug @@ -19,7 +19,7 @@ div.content-box__info.flex fields='status, line-1(customer.name, name), description, line-2(captain), logo' - label-status='Statut du canal*' + label-status='Statut du cercle*' widget-status='hubl-status' class-status='form-label is-light is-full-width' diff --git a/src/views/circle/page-circle-edit.pug b/src/views/circle/page-circle-edit.pug index 979ec1c..0b30466 100644 --- a/src/views/circle/page-circle-edit.pug +++ b/src/views/circle/page-circle-edit.pug @@ -44,7 +44,7 @@ div.content-box__info solid-link(class="backlink right", bind-resources, next='circle-profile') Retour solid-ac-checker(permission='acl:Write', bind-resources) - h1 Modifie ton canal + h1 Modifie ton cercle solid-form.form.button-register( bind-resources @@ -52,12 +52,12 @@ div.content-box__info fields='status, line-1(name, owner), description' range-owner=`${endpoints.users || endpoints.get.users}` - label-status='Statut du canal' + label-status='Statut du cercle' widget-status='hubl-status' - label-name='Nom du canal' + label-name='Nom du cercle' label-owner='Administrateur ou administratrice' - label-description='Sous-titre du canal *' + label-description='Sous-titre du cercle *' class-name='form-label is-light is-half-width input-text-like' class-owner='form-label is-light is-half-width member-select color' diff --git a/src/views/circle/page-circle-left.pug b/src/views/circle/page-circle-left.pug index 0a6b700..5ecf22c 100644 --- a/src/views/circle/page-circle-left.pug +++ b/src/views/circle/page-circle-left.pug @@ -1,5 +1,5 @@ #circle-left(hidden) div.content-box__info.flex(style="padding: 15px") - p Tu as quitté ce canal. + p Tu as quitté ce cercle. 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 df4f59e..5d37887 100644 --- a/src/views/circle/page-circle-profile.pug +++ b/src/views/circle/page-circle-profile.pug @@ -27,7 +27,7 @@ solid-router(default-route='circle-profile', hidden) 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' + data-label='Supprimer le cercle' ) solid-widget(name='hubl-circle-leave-button') @@ -35,7 +35,7 @@ solid-router(default-route='circle-profile', hidden) 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' + data-label='Quitter le cercle' ) solid-widget(name='hubl-circle-join-button') @@ -52,7 +52,7 @@ solid-router(default-route='circle-profile', hidden) hubl-inherit-bind-user2input="input[name='user.@id']" - submit-button='Rejoindre le canal' + submit-button='Rejoindre le cercle' ) solid-display( diff --git a/src/views/project/page-project-edit.pug b/src/views/project/page-project-edit.pug index cce893a..01a350a 100644 --- a/src/views/project/page-project-edit.pug +++ b/src/views/project/page-project-edit.pug @@ -11,7 +11,7 @@ div.content-box__info fields='status, line-1(customer.name, name), description' - label-status='Statut du canal*' + label-status='Statut du cercle*' widget-status='hubl-status' class-status='form-label is-light is-full-width member-select color' From acb6d0726deb7246fbd91f95410cdf8893519567 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Pasquier Date: Mon, 24 Aug 2020 13:40:35 +0200 Subject: [PATCH 56/80] feature: add keyboard shortcut hubl#524 --- src/components/hubl-search-users.js | 2 +- src/scripts/keyboard-shortcuts.js | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 src/scripts/keyboard-shortcuts.js diff --git a/src/components/hubl-search-users.js b/src/components/hubl-search-users.js index ab4300e..c65e58e 100644 --- a/src/components/hubl-search-users.js +++ b/src/components/hubl-search-users.js @@ -5,7 +5,7 @@ const HublSearchUsers = widgetFactory( ` input').focus(); + e.preventDefault(); + } +}); \ No newline at end of file From c44c2d6f5322eece0cf754cb802ae0519a91f327 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Pasquier Date: Mon, 24 Aug 2020 13:45:01 +0200 Subject: [PATCH 57/80] update: color of the left menu font --- src/styles/base/menu-left.scss | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/styles/base/menu-left.scss b/src/styles/base/menu-left.scss index 47b207d..a018b5d 100644 --- a/src/styles/base/menu-left.scss +++ b/src/styles/base/menu-left.scss @@ -162,7 +162,7 @@ width: calc(80vw - 71px); display: block; background-color: var(--color-secondary); - color: var(--color-grey-6); + color: var(--color-white); border: 1px solid var(--color-grey-4); border-radius: 3px; padding: 4px; @@ -182,7 +182,7 @@ grid-template-areas: "left middle right"; >* { - color: var(--color-grey-6); + color: var(--color-white); } >[data-id="prev"] { @@ -227,7 +227,7 @@ } >div { - color: var(--color-grey-6); + color: var(--color-white); cursor: pointer; >hubl-menu-fix-url-circle>solid-display>div, From ad88494af873c9b50fad2c3daaf8e4eb14205550 Mon Sep 17 00:00:00 2001 From: gaelle morin Date: Wed, 26 Aug 2020 17:41:14 +0200 Subject: [PATCH 58/80] feature: add loader to left-menu > members --- src/menu-left.pug | 7 ++++ src/styles/base/main.scss | 73 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 80 insertions(+) diff --git a/src/menu-left.pug b/src/menu-left.pug index 771db32..5ddfc4f 100644 --- a/src/menu-left.pug +++ b/src/menu-left.pug @@ -120,9 +120,16 @@ solid-router#navbar-router(default-route='dashboard') div.menu-icon.icon-envelope-letter solid-route(name='messages', rdf-type='foaf:user', use-id='', hidden) div.sub-menu.menu-notification + #loader.loader I am coming...! + div.lds-ellipsis + div + div + div + div solid-display.nosub.message-tab( data-src=`${endpoints.users || (endpoints.get && endpoints.get.users)}` fields='name, chatProfile.jabberID, badge' + loader-id='loader' search-fields="name" search-label-name="Rechercher..." search-widget-name="hubl-search-users" diff --git a/src/styles/base/main.scss b/src/styles/base/main.scss index 23a12a6..9af4c97 100644 --- a/src/styles/base/main.scss +++ b/src/styles/base/main.scss @@ -279,6 +279,79 @@ h5 { width: 15vw; } + + +.loader { + display: inline-block; + position: relative; + width: 80px; + height: 80px; +} + +.loader div { + position: absolute; + top: 33px; + width: 13px; + height: 13px; + border-radius: 50%; + background: #fff; + animation-timing-function: cubic-bezier(0, 1, 1, 0); +} + +.loader div:nth-child(1) { + left: 8px; + animation: lds-ellipsis1 0.6s infinite; +} + +.loader div:nth-child(2) { + left: 8px; + animation: lds-ellipsis2 0.6s infinite; +} + +.loader div:nth-child(3) { + left: 32px; + animation: lds-ellipsis2 0.6s infinite; +} + +.loader div:nth-child(4) { + left: 56px; + animation: lds-ellipsis3 0.6s infinite; +} + +@keyframes lds-ellipsis1 { + 0% { + transform: scale(0); + } + + 100% { + transform: scale(1); + } +} + +@keyframes lds-ellipsis3 { + 0% { + transform: scale(1); + } + + 100% { + transform: scale(0); + } +} + +@keyframes lds-ellipsis2 { + 0% { + transform: translate(0, 0); + } + + 100% { + transform: translate(24px, 0); + } +} + + + + + .content-box { @include window-style-modal(); flex-direction: column; From 70418f75b3e93952d59e63773b05bf487b9c7511 Mon Sep 17 00:00:00 2001 From: gaelle morin Date: Fri, 28 Aug 2020 09:39:59 +0200 Subject: [PATCH 59/80] loader for left-menu members added --- src/menu-left.pug | 3 +-- src/styles/base/main.scss | 10 +++++----- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/menu-left.pug b/src/menu-left.pug index 5ddfc4f..e8a28f6 100644 --- a/src/menu-left.pug +++ b/src/menu-left.pug @@ -120,8 +120,7 @@ solid-router#navbar-router(default-route='dashboard') div.menu-icon.icon-envelope-letter solid-route(name='messages', rdf-type='foaf:user', use-id='', hidden) div.sub-menu.menu-notification - #loader.loader I am coming...! - div.lds-ellipsis + div#loader.loader div div div diff --git a/src/styles/base/main.scss b/src/styles/base/main.scss index 9af4c97..c29f078 100644 --- a/src/styles/base/main.scss +++ b/src/styles/base/main.scss @@ -282,19 +282,19 @@ h5 { .loader { - display: inline-block; + margin: 0 auto; position: relative; width: 80px; - height: 80px; + height: 20px; } .loader div { position: absolute; top: 33px; - width: 13px; - height: 13px; + width: 8px; + height: 8px; border-radius: 50%; - background: #fff; + background: var(--color-white); animation-timing-function: cubic-bezier(0, 1, 1, 0); } From 4379359bffd9eb2b006bb9d1c084a88caea38766 Mon Sep 17 00:00:00 2001 From: gaelle morin Date: Fri, 28 Aug 2020 11:31:11 +0200 Subject: [PATCH 60/80] loader for circle admin list added --- src/menu-left.pug | 4 ++-- src/styles/base/main.scss | 13 +++++++++---- src/views/admin/page-admin-circles.pug | 7 +++++++ 3 files changed, 18 insertions(+), 6 deletions(-) diff --git a/src/menu-left.pug b/src/menu-left.pug index e8a28f6..9667003 100644 --- a/src/menu-left.pug +++ b/src/menu-left.pug @@ -120,7 +120,7 @@ solid-router#navbar-router(default-route='dashboard') div.menu-icon.icon-envelope-letter solid-route(name='messages', rdf-type='foaf:user', use-id='', hidden) div.sub-menu.menu-notification - div#loader.loader + div#loader-messages.loader.loader-color-menu div div div @@ -128,7 +128,7 @@ solid-router#navbar-router(default-route='dashboard') solid-display.nosub.message-tab( data-src=`${endpoints.users || (endpoints.get && endpoints.get.users)}` fields='name, chatProfile.jabberID, badge' - loader-id='loader' + loader-id='loader-messages' search-fields="name" search-label-name="Rechercher..." search-widget-name="hubl-search-users" diff --git a/src/styles/base/main.scss b/src/styles/base/main.scss index c29f078..9431d7b 100644 --- a/src/styles/base/main.scss +++ b/src/styles/base/main.scss @@ -290,12 +290,17 @@ h5 { .loader div { position: absolute; - top: 33px; + width: 13px; + height: 13px; + border-radius: 50%; + background: var(--color-menu-background); + animation-timing-function: cubic-bezier(0, 1, 1, 0); +} + +.loader.loader-menu div { width: 8px; height: 8px; - border-radius: 50%; - background: var(--color-white); - animation-timing-function: cubic-bezier(0, 1, 1, 0); + background: var(--color-menu-text); } .loader div:nth-child(1) { diff --git a/src/views/admin/page-admin-circles.pug b/src/views/admin/page-admin-circles.pug index 3e6c2ef..ab39956 100644 --- a/src/views/admin/page-admin-circles.pug +++ b/src/views/admin/page-admin-circles.pug @@ -37,6 +37,12 @@ class='button text-bold text-uppercase reversed button-primary bordered with-icon icon-plus' next='admin-circle-create' ) Créer un cercle + + div#loader-admin-circle.loader + div + div + div + div .table-wrapper .table @@ -66,6 +72,7 @@ bind-user nested-field='circles' fields='circle.name, circle.owner, leaveButton' + loader-id='loader-admin-circle' class-circle.name='w280 border cell-with-name' class-circle.owner='w280 border cell-with-id-card' From db2f343518783411d66dd63c4104f6e6bf03ce43 Mon Sep 17 00:00:00 2001 From: gaelle morin Date: Fri, 28 Aug 2020 13:46:25 +0200 Subject: [PATCH 61/80] loader for left-menu projects and circles added --- src/menu-left.pug | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/src/menu-left.pug b/src/menu-left.pug index 9667003..6538c09 100644 --- a/src/menu-left.pug +++ b/src/menu-left.pug @@ -79,10 +79,16 @@ solid-router#navbar-router(default-route='dashboard') div.menu-icon.icon-folder-alt solid-route(name='project', rdf-type='hd:project', use-id='', hidden) div.sub-menu.menu-notification + div#loader-projects.loader.loader-menu + div + div + div + div solid-display.project-tab( bind-user nested-field='projects' fields='project' + loader-id='loader-projects' empty-widget='hubl-create' empty-value='projet' widget-project='hubl-menu-fix-url-project' @@ -100,10 +106,16 @@ solid-router#navbar-router(default-route='dashboard') div.menu-icon.icon-folder-alt solid-route(name='circle', rdf-type='hd:circle', use-id='', hidden) div.sub-menu.menu-notification + div#loader-circles.loader.loader-menu + div + div + div + div solid-display.circle-tab( bind-user nested-field='circles' fields='circle' + loader-id='loader-circles' empty-widget='hubl-create' empty-value='cercle' widget-circle='hubl-menu-fix-url-circle' @@ -120,7 +132,7 @@ solid-router#navbar-router(default-route='dashboard') div.menu-icon.icon-envelope-letter solid-route(name='messages', rdf-type='foaf:user', use-id='', hidden) div.sub-menu.menu-notification - div#loader-messages.loader.loader-color-menu + div#loader-messages.loader.loader-menu div div div From 31091c16cef42e68d1451b12b5c16e40ada0e3c7 Mon Sep 17 00:00:00 2001 From: gaelle morin Date: Fri, 28 Aug 2020 14:06:27 +0200 Subject: [PATCH 62/80] loader for users and projects panels added --- src/views/admin/page-admin-circles.pug | 4 ++-- src/views/admin/page-admin-projects.pug | 8 ++++++++ src/views/admin/page-admin-users.pug | 6 ++++++ 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/src/views/admin/page-admin-circles.pug b/src/views/admin/page-admin-circles.pug index ab39956..a8e26de 100644 --- a/src/views/admin/page-admin-circles.pug +++ b/src/views/admin/page-admin-circles.pug @@ -38,7 +38,7 @@ next='admin-circle-create' ) Créer un cercle - div#loader-admin-circle.loader + div#loader-admin-circles.loader div div div @@ -72,7 +72,7 @@ bind-user nested-field='circles' fields='circle.name, circle.owner, leaveButton' - loader-id='loader-admin-circle' + loader-id='loader-admin-circles' class-circle.name='w280 border cell-with-name' class-circle.owner='w280 border cell-with-id-card' diff --git a/src/views/admin/page-admin-projects.pug b/src/views/admin/page-admin-projects.pug index 56da86e..72f3f8b 100644 --- a/src/views/admin/page-admin-projects.pug +++ b/src/views/admin/page-admin-projects.pug @@ -82,6 +82,7 @@ bind-user nested-field="projects" fields='project.name, project.members, project.captain, leaveButton' + loader-id='loader-admin-projects' class-project.name='w280 cell border cell-with-name' class-project.members='w280 cell border cell-with-id-card' @@ -121,6 +122,7 @@ data-src=`${endpoints.projects || endpoints.get.projects}joinable/` fields='name, members, captain, joinButton' + loader-id='loader-admin-projects' class-name='w280 cell border cell-with-name' class-members='w280 cell border cell-with-id-card' @@ -136,5 +138,11 @@ order-by="name" ) + div#loader-admin-projects.loader + div + div + div + div + #admin-project-create(hidden) include page-admin-projects-create.pug \ No newline at end of file diff --git a/src/views/admin/page-admin-users.pug b/src/views/admin/page-admin-users.pug index 84cd0e7..d56540d 100644 --- a/src/views/admin/page-admin-users.pug +++ b/src/views/admin/page-admin-users.pug @@ -38,6 +38,7 @@ class='table-body' data-src=`${endpoints.users || endpoints.get.users}` fields='cell-1(user-thumb(account.picture, sup(name), sub(username))), actions' + loader-id='loader-admin-users' class-account.picture='avatar user-thumb__picture' class-name='user-thumb__name' @@ -53,6 +54,11 @@ order-by='username' ) + div#loader-admin-users.loader + div + div + div + div #admin-users-create.content-box__height(hidden) include page-admin-users-create.pug From 0d9f14905416b5904e3703ccd1020c966ae21802 Mon Sep 17 00:00:00 2001 From: gaelle morin Date: Mon, 31 Aug 2020 10:24:12 +0200 Subject: [PATCH 63/80] loaders for admin pages moved --- src/styles/base/main.scss | 62 +++++++++++++------------ src/views/admin/page-admin-circles.pug | 11 ++--- src/views/admin/page-admin-projects.pug | 2 +- src/views/admin/page-admin-users.pug | 2 +- 4 files changed, 40 insertions(+), 37 deletions(-) diff --git a/src/styles/base/main.scss b/src/styles/base/main.scss index 9431d7b..1484def 100644 --- a/src/styles/base/main.scss +++ b/src/styles/base/main.scss @@ -286,41 +286,45 @@ h5 { position: relative; width: 80px; height: 20px; -} -.loader div { - position: absolute; - width: 13px; - height: 13px; - border-radius: 50%; - background: var(--color-menu-background); - animation-timing-function: cubic-bezier(0, 1, 1, 0); -} + &.loader-top { + top: 30px; + } -.loader.loader-menu div { - width: 8px; - height: 8px; - background: var(--color-menu-text); -} + div { + position: absolute; + width: 13px; + height: 13px; + border-radius: 50%; + background: var(--color-menu-background); + animation-timing-function: cubic-bezier(0, 1, 1, 0); + } -.loader div:nth-child(1) { - left: 8px; - animation: lds-ellipsis1 0.6s infinite; -} + &.loader-menu div { + width: 8px; + height: 8px; + background: var(--color-menu-text); + } -.loader div:nth-child(2) { - left: 8px; - animation: lds-ellipsis2 0.6s infinite; -} + div:nth-child(1) { + left: 8px; + animation: lds-ellipsis1 0.6s infinite; + } -.loader div:nth-child(3) { - left: 32px; - animation: lds-ellipsis2 0.6s infinite; -} + div:nth-child(2) { + left: 8px; + animation: lds-ellipsis2 0.6s infinite; + } -.loader div:nth-child(4) { - left: 56px; - animation: lds-ellipsis3 0.6s infinite; + div:nth-child(3) { + left: 32px; + animation: lds-ellipsis2 0.6s infinite; + } + + div:nth-child(4) { + left: 56px; + animation: lds-ellipsis3 0.6s infinite; + } } @keyframes lds-ellipsis1 { diff --git a/src/views/admin/page-admin-circles.pug b/src/views/admin/page-admin-circles.pug index a8e26de..166c9b6 100644 --- a/src/views/admin/page-admin-circles.pug +++ b/src/views/admin/page-admin-circles.pug @@ -37,12 +37,6 @@ class='button text-bold text-uppercase reversed button-primary bordered with-icon icon-plus' next='admin-circle-create' ) Créer un cercle - - div#loader-admin-circles.loader - div - div - div - div .table-wrapper .table @@ -119,6 +113,11 @@ order-by="name" ) + div#loader-admin-circles.loader.loader-top + div + div + div + div #admin-circle-create.content-box__height(hidden) include page-admin-circles-create.pug diff --git a/src/views/admin/page-admin-projects.pug b/src/views/admin/page-admin-projects.pug index 72f3f8b..c0268b6 100644 --- a/src/views/admin/page-admin-projects.pug +++ b/src/views/admin/page-admin-projects.pug @@ -138,7 +138,7 @@ order-by="name" ) - div#loader-admin-projects.loader + div#loader-admin-projects.loader.loader-top div div div diff --git a/src/views/admin/page-admin-users.pug b/src/views/admin/page-admin-users.pug index d56540d..5494220 100644 --- a/src/views/admin/page-admin-users.pug +++ b/src/views/admin/page-admin-users.pug @@ -54,7 +54,7 @@ order-by='username' ) - div#loader-admin-users.loader + div#loader-admin-users.loader.loader-top div div div From 430ab36dc7f3503f087eb0fc97af5e8c7faf68d5 Mon Sep 17 00:00:00 2001 From: gaelle morin Date: Mon, 31 Aug 2020 11:15:10 +0200 Subject: [PATCH 64/80] loaders for admin-create and -edit added --- src/views/admin/page-admin-circles-create.pug | 7 +++++++ src/views/admin/page-admin-projects-create.pug | 7 +++++++ src/views/admin/page-admin-users-create.pug | 7 +++++++ src/views/admin/page-admin-users-edit.pug | 8 ++++++++ 4 files changed, 29 insertions(+) diff --git a/src/views/admin/page-admin-circles-create.pug b/src/views/admin/page-admin-circles-create.pug index ee876f5..0572b8f 100644 --- a/src/views/admin/page-admin-circles-create.pug +++ b/src/views/admin/page-admin-circles-create.pug @@ -3,10 +3,17 @@ div.content-box__info.flex h1.centered Créer un cercle + div#loader-circles-create.loader.loader-top + div + div + div + div + solid-form.form.button-register( data-src=`${endpoints.circles || endpoints.post.circles}` fields='status, name, description' + loader-id='loader-circles-create' class-status='form-label is-light is-full-width color' class-name='form-label is-light is-full-width input-text-like' diff --git a/src/views/admin/page-admin-projects-create.pug b/src/views/admin/page-admin-projects-create.pug index de5e6d6..6125964 100644 --- a/src/views/admin/page-admin-projects-create.pug +++ b/src/views/admin/page-admin-projects-create.pug @@ -14,10 +14,17 @@ div.content-box__info.flex h1.centered Créer un nouveau projet + div#loader-projects-create.loader.loader-top + div + div + div + div + solid-form.form.button-register( data-src=`${endpoints.projects || endpoints.post.projects}` fields='status, line-1(customer.name, name), description, line-2(captain), logo' + loader-id='loader-projects-create' label-status='Statut du cercle*' widget-status='hubl-status' diff --git a/src/views/admin/page-admin-users-create.pug b/src/views/admin/page-admin-users-create.pug index f52dc81..03b4661 100644 --- a/src/views/admin/page-admin-users-create.pug +++ b/src/views/admin/page-admin-users-create.pug @@ -3,10 +3,17 @@ div.content-box__info.flex h1.centered Ajouter un utilisateur à la plateforme + div#loader-users-create.loader.loader-top + div + div + div + div + 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)' + loader-id='loader-users-create' class-first_name='form-label is-light is-half-width input-text-like' class-last_name='form-label is-light is-half-width input-text-like' diff --git a/src/views/admin/page-admin-users-edit.pug b/src/views/admin/page-admin-users-edit.pug index 7873cc4..99ef0df 100644 --- a/src/views/admin/page-admin-users-edit.pug +++ b/src/views/admin/page-admin-users-edit.pug @@ -3,6 +3,13 @@ div.content-box__info.flex h1.centered span Modifier un utilisateur + + div#loader-users-edit.loader.loader-top + div + div + div + div + solid-display( bind-resources='' fields='name' @@ -12,6 +19,7 @@ div.content-box__info.flex bind-resources='' fields='line-1(first_name, last_name), line-2(email)' + loader-id='loader-users-edit' class-first_name='form-label is-light is-half-width input-text-like' class-last_name='form-label is-light is-half-width input-text-like' From cf6777ae3f4d193d1b79c2bfea344b2d556100a4 Mon Sep 17 00:00:00 2001 From: gaelle morin Date: Mon, 31 Aug 2020 12:04:51 +0200 Subject: [PATCH 65/80] loaders for circle pages added --- src/views/circle/page-circle-edit.pug | 7 +++++++ src/views/circle/page-circle-profile.pug | 8 ++++++++ 2 files changed, 15 insertions(+) diff --git a/src/views/circle/page-circle-edit.pug b/src/views/circle/page-circle-edit.pug index 0b30466..41e4903 100644 --- a/src/views/circle/page-circle-edit.pug +++ b/src/views/circle/page-circle-edit.pug @@ -46,6 +46,12 @@ div.content-box__info solid-ac-checker(permission='acl:Write', bind-resources) h1 Modifie ton cercle + div#loader-circle-edit.loader.loader-top + div + div + div + div + solid-form.form.button-register( bind-resources @@ -99,6 +105,7 @@ div.content-box__info class='table-body' bind-resources fields='members' + loader-id='loader-circle-edit' multiple-members='' widget-members='hubl-team-template-edit' diff --git a/src/views/circle/page-circle-profile.pug b/src/views/circle/page-circle-profile.pug index 5d37887..f92cbb5 100644 --- a/src/views/circle/page-circle-profile.pug +++ b/src/views/circle/page-circle-profile.pug @@ -7,10 +7,17 @@ solid-router(default-route='circle-profile', hidden) .content-box__info.flex + div#loader-circle-profile.loader + div + div + div + div + .flex.space-between.with-padding.mobile-vertical-align solid-display.mobile-margin__bottom( bind-resources fields='creationDateSet(title, creationDate)' + loader-id='loader-circle-profile' class-title='word-spacing-right' @@ -74,6 +81,7 @@ solid-router(default-route='circle-profile', hidden) solid-display.block( bind-resources fields='members' + loader-id='loader-circle-profile' multiple-members='' widget-members='hubl-circle-team-template' From ed76354912a1899a540674beed942234e61a6476 Mon Sep 17 00:00:00 2001 From: gaelle morin Date: Mon, 31 Aug 2020 15:55:31 +0200 Subject: [PATCH 66/80] loader moved to components --- src/styles/base/main.scss | 82 ----------------------- src/styles/components/loader.scss | 75 +++++++++++++++++++++ src/styles/index.scss | 1 + src/views/admin/page-admin-circles.pug | 1 + src/views/admin/page-admin-users-edit.pug | 1 + 5 files changed, 78 insertions(+), 82 deletions(-) create mode 100644 src/styles/components/loader.scss diff --git a/src/styles/base/main.scss b/src/styles/base/main.scss index 1484def..23a12a6 100644 --- a/src/styles/base/main.scss +++ b/src/styles/base/main.scss @@ -279,88 +279,6 @@ h5 { width: 15vw; } - - -.loader { - margin: 0 auto; - position: relative; - width: 80px; - height: 20px; - - &.loader-top { - top: 30px; - } - - div { - position: absolute; - width: 13px; - height: 13px; - border-radius: 50%; - background: var(--color-menu-background); - animation-timing-function: cubic-bezier(0, 1, 1, 0); - } - - &.loader-menu div { - width: 8px; - height: 8px; - background: var(--color-menu-text); - } - - div:nth-child(1) { - left: 8px; - animation: lds-ellipsis1 0.6s infinite; - } - - div:nth-child(2) { - left: 8px; - animation: lds-ellipsis2 0.6s infinite; - } - - div:nth-child(3) { - left: 32px; - animation: lds-ellipsis2 0.6s infinite; - } - - div:nth-child(4) { - left: 56px; - animation: lds-ellipsis3 0.6s infinite; - } -} - -@keyframes lds-ellipsis1 { - 0% { - transform: scale(0); - } - - 100% { - transform: scale(1); - } -} - -@keyframes lds-ellipsis3 { - 0% { - transform: scale(1); - } - - 100% { - transform: scale(0); - } -} - -@keyframes lds-ellipsis2 { - 0% { - transform: translate(0, 0); - } - - 100% { - transform: translate(24px, 0); - } -} - - - - - .content-box { @include window-style-modal(); flex-direction: column; diff --git a/src/styles/components/loader.scss b/src/styles/components/loader.scss new file mode 100644 index 0000000..eef86ae --- /dev/null +++ b/src/styles/components/loader.scss @@ -0,0 +1,75 @@ +.loader { + margin: 0 auto; + position: relative; + width: 80px; + height: 20px; + + &.loader-top { + top: 30px; + } + + div { + position: absolute; + width: 13px; + height: 13px; + border-radius: 50%; + background: var(--color-menu-background); + animation-timing-function: cubic-bezier(0, 1, 1, 0); + } + + &.loader-menu div { + width: 8px; + height: 8px; + background: var(--color-menu-text); + } + + div:nth-child(1) { + left: 8px; + animation: lds-ellipsis1 0.6s infinite; + } + + div:nth-child(2) { + left: 8px; + animation: lds-ellipsis2 0.6s infinite; + } + + div:nth-child(3) { + left: 32px; + animation: lds-ellipsis2 0.6s infinite; + } + + div:nth-child(4) { + left: 56px; + animation: lds-ellipsis3 0.6s infinite; + } +} + +@keyframes lds-ellipsis1 { + 0% { + transform: scale(0); + } + + 100% { + transform: scale(1); + } +} + +@keyframes lds-ellipsis3 { + 0% { + transform: scale(1); + } + + 100% { + transform: scale(0); + } +} + +@keyframes lds-ellipsis2 { + 0% { + transform: translate(0, 0); + } + + 100% { + transform: translate(24px, 0); + } +} diff --git a/src/styles/index.scss b/src/styles/index.scss index 1458359..e92bc08 100644 --- a/src/styles/index.scss +++ b/src/styles/index.scss @@ -6,6 +6,7 @@ @import 'abstracts/fonts'; @import 'abstracts/variables'; @import 'abstracts/mixins'; +@import 'components/loader'; @import 'components/icons/index'; @import 'base/main'; @import 'base/about'; diff --git a/src/views/admin/page-admin-circles.pug b/src/views/admin/page-admin-circles.pug index 166c9b6..b545c7b 100644 --- a/src/views/admin/page-admin-circles.pug +++ b/src/views/admin/page-admin-circles.pug @@ -102,6 +102,7 @@ data-src=`${endpoints.circles || endpoints.get.circles}joinable/` fields='name, owner, members' + loader-id='loader-admin-circles' class-name='w280 border cell-with-name' class-owner='w280 border cell-with-id-card' diff --git a/src/views/admin/page-admin-users-edit.pug b/src/views/admin/page-admin-users-edit.pug index 99ef0df..13a9e9a 100644 --- a/src/views/admin/page-admin-users-edit.pug +++ b/src/views/admin/page-admin-users-edit.pug @@ -13,6 +13,7 @@ div.content-box__info.flex solid-display( bind-resources='' fields='name' + loader-id='loader-users-edit' ) solid-form.form.button-register( From b28a2da35229dc1c544868765a796915e607d054 Mon Sep 17 00:00:00 2001 From: senza Date: Tue, 1 Sep 2020 12:45:39 +0200 Subject: [PATCH 67/80] remove logo from creation form #631 --- src/views/admin/page-admin-projects-create.pug | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/views/admin/page-admin-projects-create.pug b/src/views/admin/page-admin-projects-create.pug index de5e6d6..8caad09 100644 --- a/src/views/admin/page-admin-projects-create.pug +++ b/src/views/admin/page-admin-projects-create.pug @@ -17,7 +17,7 @@ div.content-box__info.flex solid-form.form.button-register( data-src=`${endpoints.projects || endpoints.post.projects}` - fields='status, line-1(customer.name, name), description, line-2(captain), logo' + fields='status, line-1(customer.name, name), description, line-2(captain)' label-status='Statut du cercle*' widget-status='hubl-status' @@ -39,10 +39,6 @@ div.content-box__info.flex widget-captain='solid-form-auto-completion' class='input-text-like' - widget-logo="solid-form-file" - label-logo="Télécharger un logo" - class-logo='select-add' - upload-url-logo=`${endpoints.uploads || endpoints.post.uploads}` next='admin-project-list' From 4a0447f5aeb4d87f2e98ccb2547e3072830bd057 Mon Sep 17 00:00:00 2001 From: senza Date: Tue, 1 Sep 2020 12:47:01 +0200 Subject: [PATCH 68/80] remove logo from edit form #631 --- src/views/project/page-project-edit.pug | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/src/views/project/page-project-edit.pug b/src/views/project/page-project-edit.pug index 84525fe..7ad1327 100644 --- a/src/views/project/page-project-edit.pug +++ b/src/views/project/page-project-edit.pug @@ -31,16 +31,6 @@ div.content-box__info next='project-information' ) - h2 Photo du projet - - solid-form.form-picture( - bind-resources - fields='customer.logo' - widget-customer.logo="hubl-user-avatar" - submit-button='Modifier la photo' - next='project-picture' - ) - h2 Liste des membres : solid-form.block.select-add( From 91e89852b3366d5743b8b1b68fba2e677ec75e0c Mon Sep 17 00:00:00 2001 From: senza Date: Tue, 1 Sep 2020 12:59:39 +0200 Subject: [PATCH 69/80] make projects always private #631 --- src/views/admin/page-admin-projects-create.pug | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/views/admin/page-admin-projects-create.pug b/src/views/admin/page-admin-projects-create.pug index 8caad09..4007644 100644 --- a/src/views/admin/page-admin-projects-create.pug +++ b/src/views/admin/page-admin-projects-create.pug @@ -20,8 +20,9 @@ div.content-box__info.flex fields='status, line-1(customer.name, name), description, line-2(captain)' label-status='Statut du cercle*' - widget-status='hubl-status' + widget-status='solid-form-hidden' class-status='form-label is-light is-full-width' + value-status="Private" label-description='Description du projet' class-description='form-label is-light is-full-width input-text-like' From 1957c79d2dbecc7c04f5a52a61879adfe37d56d5 Mon Sep 17 00:00:00 2001 From: senza Date: Tue, 1 Sep 2020 12:59:59 +0200 Subject: [PATCH 70/80] remove status field in edition form --- src/views/project/page-project-edit.pug | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/views/project/page-project-edit.pug b/src/views/project/page-project-edit.pug index 7ad1327..74568bf 100644 --- a/src/views/project/page-project-edit.pug +++ b/src/views/project/page-project-edit.pug @@ -9,11 +9,8 @@ div.content-box__info solid-form.form.button-register( bind-resources - fields='status, line-1(customer.name, name), description' + fields='line-1(customer.name, name), description' - label-status='Statut du cercle*' - widget-status='hubl-status' - class-status='form-label is-light is-full-width member-select color' label-name='Nom du projet*' class-name='form-label is-light is-half-width input-text-like' From bc1830a9b3839f6906ce5125f5a6676304c64066 Mon Sep 17 00:00:00 2001 From: gaelle morin Date: Wed, 2 Sep 2020 14:57:30 +0200 Subject: [PATCH 71/80] loader: beta version of directory, dashboard and job-board --- src/dependencies.pug | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/dependencies.pug b/src/dependencies.pug index 526a65f..ee54ba7 100644 --- a/src/dependencies.pug +++ b/src/dependencies.pug @@ -19,15 +19,15 @@ 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.5" 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="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="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) From a48d854de60583e539cb704c69b5aec0f2d4ae82 Mon Sep 17 00:00:00 2001 From: gaelle morin Date: Wed, 2 Sep 2020 16:48:55 +0200 Subject: [PATCH 72/80] minor: up dependancies (loaders) --- src/dependencies.pug | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/dependencies.pug b/src/dependencies.pug index ee54ba7..9453adb 100644 --- a/src/dependencies.pug +++ b/src/dependencies.pug @@ -19,15 +19,15 @@ 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.6" 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.3" defer) //- script(type="module" src="/lib/solid-dashboard/dist/index.js" defer) if endpoints.users || (endpoints.get && endpoints.get.users) From 5ffe0b63ab931eb29ad2116b30daef83c9e1d1db Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Pasquier Date: Wed, 2 Sep 2020 15:29:27 +0000 Subject: [PATCH 73/80] cicd: add georgetown-uni --- .gitlab-ci.yml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2069f20..abdd685 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -552,3 +552,21 @@ apidays: when: manual tags: - deploy + +georgetownuni: + stage: deployment + environment: + name: georgetownuni + url: https://georgetown-uni.hubl.world + before_script: + - npm ci --cache .npm --prefer-offline --only=production + script: + - echo "$APP_CONFIG_GEORGETOWNUNI" > config.json + - echo "$SSH_DEPLOY_KEY" | tr -d '\r' > gitlab.key && chmod 600 gitlab.key + - npm run build + - scp -i gitlab.key -o StrictHostKeyChecking=no -r dist/* georgetown-uni@astral.startinblox.com:~/front/ + only: + - master + when: manual + tags: + - deploy From e28cbd980591addbd1f2357c8df26be5a45d5aa8 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Pasquier Date: Wed, 2 Sep 2020 17:22:29 +0000 Subject: [PATCH 74/80] fix: version --- src/dependencies.pug | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/dependencies.pug b/src/dependencies.pug index 9453adb..a688ab5 100644 --- a/src/dependencies.pug +++ b/src/dependencies.pug @@ -23,7 +23,7 @@ if endpoints.joboffers || (endpoints.get && endpoints.get.joboffers) //- 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.6" defer) + script(type="module" src="https://unpkg.com/@startinblox/component-directory@0.7" defer) //- script(type="module" src="/lib/solid-directory/dist/index.js" defer) if endpoints.dashboards || (endpoints.get && endpoints.get.dashboards) From b61bcc54befa15747c42f1d5742728f3d51a4840 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Pasquier Date: Thu, 3 Sep 2020 12:15:47 +0200 Subject: [PATCH 75/80] update: fix project and circles --- src/styles/base/user-thumb.scss | 1 + src/views/admin/page-admin-circles-create.pug | 2 +- .../admin/page-admin-projects-create.pug | 4 +- src/views/circle/page-circle-profile.pug | 28 ++++---- src/views/project/page-project-edit.pug | 61 +++++++++------- src/views/project/page-project-left.pug | 2 +- src/views/project/page-project-profile.pug | 72 +++++++++++-------- 7 files changed, 96 insertions(+), 74 deletions(-) diff --git a/src/styles/base/user-thumb.scss b/src/styles/base/user-thumb.scss index 2541099..8814efb 100644 --- a/src/styles/base/user-thumb.scss +++ b/src/styles/base/user-thumb.scss @@ -38,6 +38,7 @@ } .user-thumb__admin:not(:empty) { + display: block !important; @extend %tag-admin; } diff --git a/src/views/admin/page-admin-circles-create.pug b/src/views/admin/page-admin-circles-create.pug index 0572b8f..4ce3474 100644 --- a/src/views/admin/page-admin-circles-create.pug +++ b/src/views/admin/page-admin-circles-create.pug @@ -25,7 +25,7 @@ div.content-box__info.flex widget-status='hubl-status' - next='admin-circle-list' + next='circle' submit-button='Enregistrer' ) diff --git a/src/views/admin/page-admin-projects-create.pug b/src/views/admin/page-admin-projects-create.pug index 0198aa4..52af542 100644 --- a/src/views/admin/page-admin-projects-create.pug +++ b/src/views/admin/page-admin-projects-create.pug @@ -48,7 +48,7 @@ div.content-box__info.flex class='input-text-like' - next='admin-project-list' + next='project' - submit-button='Enregistrer et ajouter des membres' + submit-button='Enregistrer' ) diff --git a/src/views/circle/page-circle-profile.pug b/src/views/circle/page-circle-profile.pug index f92cbb5..3a699ed 100644 --- a/src/views/circle/page-circle-profile.pug +++ b/src/views/circle/page-circle-profile.pug @@ -26,7 +26,10 @@ solid-router(default-route='circle-profile', hidden) widget-creationDate='solid-display-date' ) solid-ac-checker(permission='acl:Append', bind-resources, nested-field='members') - solid-link(class='button mobile-full-width text-bold text-uppercase reversed button-primary bordered with-icon icon-pencil' next='circle-edit' bind-resources) Modifier et ajouter un membre + solid-ac-checker(permission='acl:Delete', bind-resources) + solid-link(class='button mobile-full-width text-bold text-uppercase reversed button-primary bordered with-icon icon-pencil' next='circle-edit' bind-resources) Modifier et ajouter un membre + solid-ac-checker(no-permission='acl:Delete', bind-resources) + solid-link(class='button mobile-full-width text-bold text-uppercase reversed button-primary bordered with-icon icon-pencil' next='circle-edit' bind-resources) Ajouter un membre div.flex.desktop-button__end @@ -39,11 +42,13 @@ solid-router(default-route='circle-profile', hidden) solid-widget(name='hubl-circle-leave-button') template - solid-delete( - class='button mobile-full-width desktop-btn-margin__left text-bold text-uppercase reversed button-secondary bordered with-icon icon-close' - data-src="${src}" - data-label='Quitter le cercle' - ) + solid-ac-checker(no-permission='acl:Delete', data-src="${src}", nested-field="circle") + solid-delete( + class='button mobile-full-width desktop-btn-margin__left text-bold text-uppercase reversed button-secondary bordered with-icon icon-close' + data-src="${src}" + data-label='Quitter le cercle' + next='circle-left' + ) solid-widget(name='hubl-circle-join-button') template @@ -52,12 +57,9 @@ solid-router(default-route='circle-profile', hidden) data-src='' nested-field='members' - fields='user.@id' - label-user.@id='' - value-user.@id='' - widget-user.@id='solid-form-hidden' - - hubl-inherit-bind-user2input="input[name='user.@id']" + fields='user.username' + value-user.username='hubl-workaround-493' + widget-user.username='solid-form-hidden' submit-button='Rejoindre le cercle' ) @@ -87,7 +89,5 @@ solid-router(default-route='circle-profile', hidden) widget-members='hubl-circle-team-template' ) - - #circle-edit.content-box__height(hidden) include page-circle-edit.pug diff --git a/src/views/project/page-project-edit.pug b/src/views/project/page-project-edit.pug index 74568bf..7ab7e0a 100644 --- a/src/views/project/page-project-edit.pug +++ b/src/views/project/page-project-edit.pug @@ -4,44 +4,52 @@ div.content-box__info solid-link(class='backlink right', bind-resources, next='project-profile') Retour - h1 Modifie ton projet + solid-ac-checker(permission='acl:Write', bind-resources) + h1 Modifie ton projet - solid-form.form.button-register( - bind-resources - - fields='line-1(customer.name, name), description' + div#loader-project-edit.loader.loader-top + div + div + div + div + + solid-form.form.button-register( + bind-resources + + fields='line-1(customer.name, name), description' - label-name='Nom du projet*' - class-name='form-label is-light is-half-width input-text-like' + label-name='Nom du projet*' + class-name='form-label is-light is-half-width input-text-like' - label-customer.name='Nom du client*' - class-customer.name='form-label is-light is-half-width input-text-like' + label-customer.name='Nom du client*' + class-customer.name='form-label is-light is-half-width input-text-like' - label-description='Description du projet' - class-description='form-label is-light is-full-width input-text-like' - widget-description='solid-form-textarea' + label-description='Description du projet' + class-description='form-label is-light is-full-width input-text-like' + widget-description='solid-form-textarea' - partial="" + partial="" - submit-button='Enregistrer' - next='project-information' - ) + submit-button='Enregistrer' + next='project-information' + ) h2 Liste des membres : - solid-form.block.select-add( - bind-resources - nested-field='members' - fields='user' - range-user=`${endpoints.users || endpoints.get.users}` + solid-ac-checker(permission='acl:Append', bind-resources, nested-field='members') + solid-form.block.select-add( + bind-resources + nested-field='members' + fields='user' + range-user=`${endpoints.users || endpoints.get.users}` - class-user='team form-label is-light' - label-user='' - widget-user='solid-form-auto-completion' + class-user='team form-label is-light' + label-user='' + widget-user='solid-form-auto-completion' - submit-button='Ajouter un membre' - ) + submit-button='Ajouter un membre' + ) .table-wrapper .table @@ -54,6 +62,7 @@ div.content-box__info class='table-body' bind-resources fields='members' + loader-id='loader-project-edit' multiple-members='' widget-members='hubl-team-template-edit' diff --git a/src/views/project/page-project-left.pug b/src/views/project/page-project-left.pug index 0283db4..baac307 100644 --- a/src/views/project/page-project-left.pug +++ b/src/views/project/page-project-left.pug @@ -2,4 +2,4 @@ div.content-box__info.flex(style="padding: 15px") p Tu as quitté ce projet. - p Ceci est un groupe privé. Pour le rejoindre, rends-toi dans le panneau administration et demande une invitation. + p Ceci est un projet privé. Pour le rejoindre, rends-toi dans le panneau administration et demande une invitation. diff --git a/src/views/project/page-project-profile.pug b/src/views/project/page-project-profile.pug index 102c24f..a81fd3e 100644 --- a/src/views/project/page-project-profile.pug +++ b/src/views/project/page-project-profile.pug @@ -4,15 +4,21 @@ solid-router(default-route='project-profile', hidden) #project-profile(hidden) include ../../templates/hubl-captain.pug - include ../../templates/hubl-circle-team.pug include ../../templates/hubl-project-team.pug .content-box__info.flex + div#loader-project-profile.loader + div + div + div + div + .flex.space-between.with-padding.mobile-vertical-align solid-display.mobile-margin__bottom( bind-resources fields='creationDateSet(title, creationDate)' + loader-id='loader-project-profile' class-title='word-spacing-right' @@ -21,23 +27,43 @@ solid-router(default-route='project-profile', hidden) widget-creationDate='solid-display-date' ) solid-ac-checker(permission='acl:Append', bind-resources, nested-field='members') - solid-link(class='button mobile-full-width text-bold text-uppercase reversed button-primary bordered with-icon icon-pencil' next='project-edit' bind-resources) Modifier et ajouter un membre + solid-ac-checker(permission='acl:Delete', bind-resources) + solid-link(class='button mobile-full-width text-bold text-uppercase reversed button-primary bordered with-icon icon-pencil' next='project-edit' bind-resources) Modifier et ajouter un membre + solid-ac-checker(no-permission='acl:Delete', bind-resources) + solid-link(class='button mobile-full-width text-bold text-uppercase reversed button-primary bordered with-icon icon-pencil' next='project-edit' bind-resources) Ajouter un membre - solid-display( - class='flex desktop-button__end' - bind-resources - nested-field='members' - fields='relation' + div.flex.desktop-button__end + solid-ac-checker(permission='acl:Delete', bind-resources) + solid-delete( + class='button mobile-full-width text-bold text-uppercase button-primary bordered with-icon icon-trash' + bind-resources + data-label='Supprimer le projet' + ) - action-relation='relation' - widget-relation='hubl-project-leave-button' + solid-widget(name='hubl-project-leave-button') + template + solid-delete( + class='button mobile-full-width desktop-btn-margin__left text-bold text-uppercase reversed button-secondary bordered with-icon icon-close' + data-src="${src}" + data-label='Quitter le projet' + next='project-left' + ) - search-fields='user' - search-widget-user='solid-form-hidden' - search-value-user="" + solid-ac-checker(no-permission='acl:Delete', bind-resources) + solid-display( + bind-resources + nested-field='members' + fields='relation' - hubl-inherit-user-id="search-value-user" - ) + action-relation='relation' + widget-relation='hubl-project-leave-button' + + search-fields='user' + search-widget-user='solid-form-hidden' + search-value-user="" + + hubl-inherit-user-id="search-value-user" + ) .flex.space-between solid-display( @@ -48,13 +74,8 @@ solid-router(default-route='project-profile', hidden) class-label-captain='h2-like' widget-captain='hubl-captain' ) - solid-display( - class='customer-logo' - bind-resources - fields='customer.logo' - - widget-customer.logo='solid-display-img' - ) + + br h2 Equipe : @@ -66,14 +87,5 @@ solid-router(default-route='project-profile', hidden) widget-members='hubl-project-team' ) - - solid-widget(name='hubl-project-leave-button') - template - solid-delete( - class='button mobile-full-width desktop-btn-margin__left text-bold text-uppercase reversed button-secondary bordered with-icon icon-close' - data-src="${src}" - data-label='Quitter le groupe' - ) - #project-edit.content-box__height(hidden) include page-project-edit.pug From f93b6bc2aa5f2fb24d6470b8180796f8aae4801c Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Pasquier Date: Thu, 3 Sep 2020 12:00:59 +0000 Subject: [PATCH 76/80] cicd: rename georgetown-uni to ejp --- .gitlab-ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index abdd685..47230a2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -553,15 +553,15 @@ apidays: tags: - deploy -georgetownuni: +ejp: stage: deployment environment: - name: georgetownuni - url: https://georgetown-uni.hubl.world + name: ejp + url: https://ejp.hubl.world before_script: - npm ci --cache .npm --prefer-offline --only=production script: - - echo "$APP_CONFIG_GEORGETOWNUNI" > config.json + - echo "$APP_CONFIG_EJP" > config.json - echo "$SSH_DEPLOY_KEY" | tr -d '\r' > gitlab.key && chmod 600 gitlab.key - npm run build - scp -i gitlab.key -o StrictHostKeyChecking=no -r dist/* georgetown-uni@astral.startinblox.com:~/front/ From 1172fdba26f20e41d49f7f6aabbd85128ba4fe44 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Pasquier Date: Thu, 3 Sep 2020 15:40:10 +0200 Subject: [PATCH 77/80] fix: remove project description --- src/views/admin/page-admin-projects-create.pug | 6 +----- src/views/project/page-project-edit.pug | 6 +----- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/src/views/admin/page-admin-projects-create.pug b/src/views/admin/page-admin-projects-create.pug index 52af542..1bec5c3 100644 --- a/src/views/admin/page-admin-projects-create.pug +++ b/src/views/admin/page-admin-projects-create.pug @@ -23,7 +23,7 @@ div.content-box__info.flex solid-form.form.button-register( data-src=`${endpoints.projects || endpoints.post.projects}` - fields='status, line-1(customer.name, name), description, line-2(captain)' + fields='status, line-1(customer.name, name), line-2(captain)' loader-id='loader-projects-create' label-status='Statut du cercle*' @@ -31,10 +31,6 @@ div.content-box__info.flex class-status='form-label is-light is-full-width' value-status="Private" - label-description='Description du projet' - class-description='form-label is-light is-full-width input-text-like' - widget-description='solid-form-textarea' - label-customer.name='Nom du client*' class-customer.name='form-label is-light is-half-width input-text-like' diff --git a/src/views/project/page-project-edit.pug b/src/views/project/page-project-edit.pug index 7ab7e0a..82a6c1a 100644 --- a/src/views/project/page-project-edit.pug +++ b/src/views/project/page-project-edit.pug @@ -16,7 +16,7 @@ div.content-box__info solid-form.form.button-register( bind-resources - fields='line-1(customer.name, name), description' + fields='line-1(customer.name, name)' label-name='Nom du projet*' @@ -25,10 +25,6 @@ div.content-box__info label-customer.name='Nom du client*' class-customer.name='form-label is-light is-half-width input-text-like' - label-description='Description du projet' - class-description='form-label is-light is-full-width input-text-like' - widget-description='solid-form-textarea' - partial="" submit-button='Enregistrer' From 26af9fbcc016e8db64c94d63b486890e137fe5d2 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Pasquier Date: Tue, 8 Sep 2020 10:11:55 +0000 Subject: [PATCH 78/80] cicd: add hd toulouse & fichemetier.fr --- .gitlab-ci.yml | 38 +++++++++++++++++++++++++++++++++++++- 1 file changed, 37 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 47230a2..7d7d03e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -219,7 +219,7 @@ smarttoulouse: before_script: - npm ci --cache .npm --prefer-offline --only=production script: - - echo "$APP_CONFIG_TOULOUSE" > config.json + - echo "$APP_CONFIG_SMARTTOULOUSE" > 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/* smart-toulouse@ssh-smart-toulouse.happy-dev.fr:~/www/ @@ -570,3 +570,39 @@ ejp: when: manual tags: - deploy + +fichemetierfr: + stage: deployment + environment: + name: fichemetierfr + url: https://fichemetier.fr.hubl.world + before_script: + - npm ci --cache .npm --prefer-offline --only=production + script: + - echo "$APP_CONFIG_FICHEMETIERFR" > 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/* fichemetierfr@astral.startinblox.com:~/front/ + only: + - master + when: manual + tags: + - deploy + +toulouse: + stage: deployment + environment: + name: toulouse + url: https://app.toulouse.happy-dev.fr + before_script: + - npm ci --cache .npm --prefer-offline --only=production + script: + - echo "$APP_CONFIG_TOUOUSE" > 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/* toulouse@ssh-toulouse.happy-dev.fr:~/front/ + only: + - master + when: manual + tags: + - deploy From 7f4115de4044858a28e161cb379630cf307c70be Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Pasquier Date: Tue, 8 Sep 2020 10:17:44 +0000 Subject: [PATCH 79/80] cicd: toulouse --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7d7d03e..cbb9c8a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -597,7 +597,7 @@ toulouse: before_script: - npm ci --cache .npm --prefer-offline --only=production script: - - echo "$APP_CONFIG_TOUOUSE" > config.json + - echo "$APP_CONFIG_TOULOUSE" > 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/* toulouse@ssh-toulouse.happy-dev.fr:~/front/ From 18bb5a53ee4aa40f928431768e9eaa0f205d4f16 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Pasquier Date: Tue, 15 Sep 2020 10:32:36 +0200 Subject: [PATCH 80/80] update: toggle the user list on chevron --- src/scripts/menu-toggle.js | 11 +++++++++++ src/styles/base/main.scss | 2 +- src/styles/base/menu-left.scss | 18 +++++++++++++----- 3 files changed, 25 insertions(+), 6 deletions(-) create mode 100644 src/scripts/menu-toggle.js diff --git a/src/scripts/menu-toggle.js b/src/scripts/menu-toggle.js new file mode 100644 index 0000000..8f96670 --- /dev/null +++ b/src/scripts/menu-toggle.js @@ -0,0 +1,11 @@ +document.addEventListener("DOMContentLoaded", () => { + 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"); + }); + }); +}); \ No newline at end of file diff --git a/src/styles/base/main.scss b/src/styles/base/main.scss index 950b85a..835e8db 100644 --- a/src/styles/base/main.scss +++ b/src/styles/base/main.scss @@ -61,7 +61,7 @@ solid-dashboard section { position: sticky; top: 0; overflow-x: hidden; - overflow-y: auto; + overflow-y: scroll; } &.jsLeftMenu { diff --git a/src/styles/base/menu-left.scss b/src/styles/base/menu-left.scss index a018b5d..6996fb6 100644 --- a/src/styles/base/menu-left.scss +++ b/src/styles/base/menu-left.scss @@ -13,13 +13,21 @@ solid-router { .menu-wrapper { - &.is-closed { - .sub-menu { - display: none; + .menu-icon.icon-arrow-up { + visibility: hidden; + } + @include breakpoint(lg) { + .menu-icon.icon-arrow-up { + visibility: visible; } + &.is-closed { + .sub-menu { + display: none; + } - .menu-chevron { - transform: rotate(180deg); + .menu-chevron { + transform: rotate(180deg); + } } } }