From 81b1b33bce5da0b9c5fd56faaf97e06a0d1c41cd Mon Sep 17 00:00:00 2001 From: gaelle morin Date: Tue, 15 Sep 2020 15:24:45 +0200 Subject: [PATCH 1/6] feature: circle - private message to member of a circle --- src/styles/base/user-thumb.scss | 15 +++++++++++++++ src/templates/hubl-circle-team.pug | 6 +++++- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/src/styles/base/user-thumb.scss b/src/styles/base/user-thumb.scss index 8814efb..487a5de 100644 --- a/src/styles/base/user-thumb.scss +++ b/src/styles/base/user-thumb.scss @@ -37,6 +37,21 @@ margin-right: 1rem; } +.user-thumb__send { + position: relative; + bottom: 7px; + left: -5px; + + solid-link { + @include icon('speech'); + + &::before { + display: inline-block; + color: #FF6765; + } + } +} + .user-thumb__admin:not(:empty) { display: block !important; @extend %tag-admin; diff --git a/src/templates/hubl-circle-team.pug b/src/templates/hubl-circle-team.pug index 2aff831..f3e2f88 100644 --- a/src/templates/hubl-circle-team.pug +++ b/src/templates/hubl-circle-team.pug @@ -4,11 +4,15 @@ solid-widget(name='hubl-circle-team-template') template solid-display.user-thumb.is-spaced( data-src='${await value.user}' - fields='account.picture, sup(name, isadmin), sub(profile.city)' + fields='account.picture, sup(name, send, isadmin), sub(profile.city)' value-isadmin='${await value.is_admin}' + action-send="messages" + label-send="" + class-account.picture='avatar user-thumb__picture' class-name='user-thumb__name' + class-send='user-thumb__send' class-isadmin='user-thumb__admin' class-profile.city='user-thumb__city' From 91dec8717b73240657fd9661dd8e35afff1b626a Mon Sep 17 00:00:00 2001 From: gaelle morin Date: Wed, 16 Sep 2020 14:27:39 +0200 Subject: [PATCH 2/6] feature: circle - private message to member of a project --- src/templates/hubl-project-team.pug | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/templates/hubl-project-team.pug b/src/templates/hubl-project-team.pug index f8334c7..8125a41 100644 --- a/src/templates/hubl-project-team.pug +++ b/src/templates/hubl-project-team.pug @@ -4,12 +4,15 @@ solid-widget(name='hubl-project-team') template solid-display.user-thumb.is-spaced( data-src='${await value}' - fields='user.account.picture, sup(user.name, isadmin), sub(user.profile.city, name)' + fields='user.account.picture, sup(user.name, send, isadmin), sub(user.profile.city, name)' value-isadmin='${await value.is_admin}' - class-user.account.picture='avatar user-thumb__picture' + action-send="messages" + label-send="" + class-user.account.picture='avatar user-thumb__picture' class-user.name='user-thumb__name' + class-send='user-thumb__send' class-isadmin='user-thumb__admin' class-user.profile.city='user-thumb__city' class-name='user-thumb__lead' From 8729e8b6311005f62dbddbd466139768165b1316 Mon Sep 17 00:00:00 2001 From: gaelle morin Date: Wed, 16 Sep 2020 17:19:28 +0200 Subject: [PATCH 3/6] feature: circle - private message to member of a project: widget added --- src/templates/hubl-project-team.pug | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/templates/hubl-project-team.pug b/src/templates/hubl-project-team.pug index 8125a41..76c02c4 100644 --- a/src/templates/hubl-project-team.pug +++ b/src/templates/hubl-project-team.pug @@ -1,18 +1,21 @@ include hubl-user-avatar.pug +solid-widget(name='hubl-project-team-contact') + template + solid-link(data-src='\${value}', next='messages') + solid-widget(name='hubl-project-team') template solid-display.user-thumb.is-spaced( data-src='${await value}' - fields='user.account.picture, sup(user.name, send, isadmin), sub(user.profile.city, name)' + fields='user.account.picture, sup(user.name, user, isadmin), sub(user.profile.city, name)' value-isadmin='${await value.is_admin}' - action-send="messages" - label-send="" + widget-user='hubl-project-team-contact' class-user.account.picture='avatar user-thumb__picture' class-user.name='user-thumb__name' - class-send='user-thumb__send' + class-user='user-thumb__send' class-isadmin='user-thumb__admin' class-user.profile.city='user-thumb__city' class-name='user-thumb__lead' From 01cea418a481faf1318898bd740b86dc2782133d Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Pasquier Date: Wed, 16 Sep 2020 21:31:26 +0200 Subject: [PATCH 4/6] feature: solid-xmpp-chat Converse IndexedDB Websocket --- src/dependencies.pug | 2 +- src/scripts/unreads-menu.js | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/dependencies.pug b/src/dependencies.pug index a688ab5..685d6da 100644 --- a/src/dependencies.pug +++ b/src/dependencies.pug @@ -31,7 +31,7 @@ if endpoints.dashboards || (endpoints.get && endpoints.get.dashboards) //- script(type="module" src="/lib/solid-dashboard/dist/index.js" defer) if endpoints.users || (endpoints.get && endpoints.get.users) - script(type="module" src="https://unpkg.com/@startinblox/component-chat@0.8" defer) + script(type="module" src="https://unpkg.com/@startinblox/component-chat@1.0" defer) //- script(type="module" src="/lib/solid-xmpp-chat/dist/index.js" defer) script(src="/scripts/index.js" defer) diff --git a/src/scripts/unreads-menu.js b/src/scripts/unreads-menu.js index bd6abc7..ae5dc2c 100644 --- a/src/scripts/unreads-menu.js +++ b/src/scripts/unreads-menu.js @@ -1,7 +1,7 @@ document.addEventListener("DOMContentLoaded", function (event) { window.addEventListener('newMessage', event => { let jid = event.detail.jid; - Array.from(document.querySelectorAll('[data-jabberID="'+jid+'"]')).forEach(el => { + Array.from(document.querySelectorAll('[data-jabberID="' + jid + '"]')).forEach(el => { el.parentElement.parentElement.classList.add('unread'); }); }); @@ -9,7 +9,12 @@ document.addEventListener("DOMContentLoaded", function (event) { window.addEventListener('read', (event) => { if (event.detail && event.detail.resource && event.detail.resource['@id']) { const badge = document.querySelector(`solid-badge[data-src="${event.detail.resource['@id']}"]`); - if (badge) badge.parentElement.parentElement.classList.remove('unread'); + if (badge) { + badge.parentElement.parentElement.classList.remove('unread'); + const project = badge.parentElement.parentElement.querySelector('.unread'); + if (project) project.classList.remove('unread'); + } + } }); }); \ No newline at end of file From 7adfce37ec9de2ed2893631b5fd36b22fe66650a Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Pasquier Date: Thu, 17 Sep 2020 12:08:42 +0200 Subject: [PATCH 6/6] cicd: don't create cypress video --- cypress.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cypress.json b/cypress.json index 2f9683b..533f1db 100644 --- a/cypress.json +++ b/cypress.json @@ -3,5 +3,6 @@ "defaultCommandTimeout": 60000, "chromeWebSecurity": false, "viewportWidth": 1920, - "viewportHeight": 1080 + "viewportHeight": 1080, + "video": false }