From 5642525840d5266f2ce137f3a7ff6893825f9f6b Mon Sep 17 00:00:00 2001
From: Jean-Baptiste <bleme@pm.me>
Date: Mon, 25 Mar 2019 15:11:25 +0100
Subject: [PATCH] update: remove HDAppUserInfo and HDAppAuthor
---
src/dependencies.pug | 6 ++--
src/page-members.pug | 3 +-
src/page-project-profile.pug | 3 +-
src/scripts/hd-widgets.js | 57 +-----------------------------------
4 files changed, 6 insertions(+), 63 deletions(-)
diff --git a/src/dependencies.pug b/src/dependencies.pug
index 20b63eba..e73a0f37 100644
--- a/src/dependencies.pug
+++ b/src/dependencies.pug
@@ -5,7 +5,7 @@
script(src="/lib/oidc-client.js")
script(
- src="https://cdn.happy-dev.fr/sib-oidc/sib-oidc.js"
+ src="https://unpkg.com/@startinblox/oidc"
data-authority=`${sdn}/openid/`,
data-client_id=`${client_id}`,
data-response_type='id_token token',
@@ -34,8 +34,8 @@ link(rel='stylesheet', href='https://fonts.googleapis.com/css?family=Open+Sans:3
//- cdn
//- don't forget to change version in hd-widgets.js
-script(type="module" src="https://unpkg.com/@startinblox/core@0.5.24")
-script(type="module" src="https://unpkg.com/@startinblox/router@latest")
+script(type="module" src="https://unpkg.com/@startinblox/core@0.6")
+script(type="module" src="https://unpkg.com/@startinblox/router@0.6")
script(type="module" src="https://unpkg.com/@startinblox/component-chat@0.1")
script(type="module" src="/scripts/hd-widgets.js")
diff --git a/src/page-members.pug b/src/page-members.pug
index eae23b1f..ae9acb26 100644
--- a/src/page-members.pug
+++ b/src/page-members.pug
@@ -9,9 +9,8 @@ div.grid-layer
data-fields='header, infos',
paginate-by='3',
- set-header='user.account.picture, user, pseudonym, bio, send',
+ set-header='user.account.picture, user.first_name, user.last_name, pseudonym, bio, send',
widget-user.account.picture='sib-display-img',
- widget-user='hdapp-userinfo',
set-pseudonym='before-pseudo,user.username',
value-before-pseudo='@',
value-send='SEND A MESSAGE',
diff --git a/src/page-project-profile.pug b/src/page-project-profile.pug
index 40e7e9b3..61c3c90d 100644
--- a/src/page-project-profile.pug
+++ b/src/page-project-profile.pug
@@ -54,10 +54,9 @@
id-suffix='members',
data-fields='teammate-img, teammate-profile, teammate-job',
set-teammate-img='user.account.picture',
- set-teammate-profile='user, user.groups',
+ set-teammate-profile='user.first_name, user.last_name, user.groups',
set-teammate-job='name',
widget-user.account.picture='sib-display-img',
- widget-user='hdapp-userinfo',
widget-user.groups='sib-display-lookuplist',
next='profile',
bind-resources,
diff --git a/src/scripts/hd-widgets.js b/src/scripts/hd-widgets.js
index e27fc33d..27dc50e4 100644
--- a/src/scripts/hd-widgets.js
+++ b/src/scripts/hd-widgets.js
@@ -1,32 +1,4 @@
-import {Helpers, SIBWidget, SIBDisplayLookupList, store} from 'https://unpkg.com/@startinblox/core@0.5';
-
-class HDAppUserInfo extends SIBDisplayLookupList {
- get parentElement() {
- return 'div';
- }
-
- getTemplate(value, index) {
- var firstname, lastname, email;
-
- if (typeof value == 'object')
- if (Object.keys(value).length > 1) {
- firstname = value.first_name;
- lastname = value.last_name;
- email = value.email;
- } else {
- store.get(value).then(resource => {
- this.value.push(resource);
- this.render();
- });
- if (Array.isArray(this.value))
- this.value.splice(this.value.indexOf(value), 1);
- else this.value = [];
- return '';
- }
- return `<div>${firstname} ${lastname}</div>`;
- // + `<div id="${email}">${email}</div>`;
- }
-}
+import {Helpers, SIBWidget, store} from 'https://unpkg.com/@startinblox/core@0.6';
class HDAppMail extends SIBWidget {
get template() {
@@ -51,31 +23,6 @@ class HDAppMember extends SIBWidget {
}
}
-class HDAppAuthor extends SIBDisplayLookupList {
- get parentElement() {
- return 'div';
- }
-
- getTemplate(value, index) {
- var firstname, lastname;
- if (typeof value == 'object')
- if (Object.keys(value).length > 1) {
- firstname = value.user.first_name;
- lastname = value.user.last_name;
- } else {
- store.get(value).then(resource => {
- this.value.push(resource);
- this.render();
- });
- if (Array.isArray(this.value))
- this.value.splice(this.value.indexOf(value), 1);
- else this.value = [];
- return '';
- }
- return `${firstname} ${lastname}`;
- }
-}
-
class HDAppClosingDate extends SIBWidget {
get template() {
return this.value
@@ -137,10 +84,8 @@ class HDAppFormText extends SIBWidget {
}
}
-customElements.define('hdapp-userinfo', HDAppUserInfo);
customElements.define('hdapp-mail', HDAppMail);
customElements.define('hdapp-member', HDAppMember);
-customElements.define('hdapp-author', HDAppAuthor);
customElements.define('hdapp-closing-date', HDAppClosingDate);
customElements.define('hdapp-available', HDAppAvailable);
customElements.define('hdapp-hyperlink', HDAppHyperlink);
--
GitLab