From 260cfb20bad08dae897f6c3f934a066023c62f6a Mon Sep 17 00:00:00 2001 From: simon louvet Date: Sat, 8 Dec 2018 23:42:59 +0100 Subject: [PATCH 1/4] ui : chat page plug to menu --- src/index.pug | 2 ++ src/menu.pug | 4 ++-- src/page-member-chat.pug | 19 ++++++++++--------- src/page-member.pug | 4 ---- src/page-members.pug | 5 +++-- 5 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/index.pug b/src/index.pug index 21d2192..60d534a 100644 --- a/src/index.pug +++ b/src/index.pug @@ -19,6 +19,8 @@ html(lang="en") include page-dashboard.pug #members(hidden) include page-members.pug + #member-chat(hidden) + include page-member-chat.pug #member(hidden) include page-member.pug #job-offers(hidden) diff --git a/src/menu.pug b/src/menu.pug index 15d2566..25b7d14 100644 --- a/src/menu.pug +++ b/src/menu.pug @@ -48,11 +48,11 @@ nav#navbar div.menu-icon.icon-arrow-down div.menu-label Chat div.menu-icon.icon-envelope-letter - sib-route(hidden, name='chat', id-prefix=`${sdn}/members/`) + sib-route(hidden, name='member-chat', id-prefix=`${sdn}/members/`) div.sub-menu sib-display( data-src=`${sdn}/members/`, data-fields='pseudo', - next='chat' + next='member-chat' ) div.divider diff --git a/src/page-member-chat.pug b/src/page-member-chat.pug index 59730e7..a082cf0 100644 --- a/src/page-member-chat.pug +++ b/src/page-member-chat.pug @@ -1,9 +1,10 @@ -.chat-view - sib-chat( - data-authentication='login', - data-auto-login='true', - data-bosh-service-url=xmpp, - data-debug='false', - data-locales-url='en', - bind-resources - ) +div + .chat-view + sib-chat( + data-authentication='login', + data-auto-login='true', + data-bosh-service-url=xmpp, + data-debug='false', + data-locales-url='en', + bind-resources + ) diff --git a/src/page-member.pug b/src/page-member.pug index cc5bcfe..ef0c0ff 100644 --- a/src/page-member.pug +++ b/src/page-member.pug @@ -1,7 +1,5 @@ sib-router#member-router(default-route='member-profile') - sib-route(name='member-chat') - div Chat sib-route(name='member-profile') div Profile sib-ac-checker(permission='change' bind-resources) @@ -10,8 +8,6 @@ sib-router#member-router(default-route='member-profile') #member-views-container sib-trigger(next="members" class="back") Back to directory div - #member-chat - include page-member-chat.pug #member-profile include page-member-profile.pug #member-edit diff --git a/src/page-members.pug b/src/page-members.pug index b156226..1c38109 100644 --- a/src/page-members.pug +++ b/src/page-members.pug @@ -1,8 +1,8 @@ div.grid-layer template#read-more-link sib-link(next="member") ${value} - template#read-more-link - sib-link(next="member") ${value} + template#chat-link + sib-link(next="member-chat") ${value} div.grid-layer-main.containerV h1 Members sib-display#profiles-list( @@ -16,6 +16,7 @@ div.grid-layer value-more='read more...', template-more='hdapp-link-more', value-send='SEND A MESSAGE', + template-send='chat-link', widget-avatar='sib-display-img', widget-user='hdapp-userinfo', widget-foaf:hompage='hdapp-hyperlink', From af36edefe46f01885a78a253c6b0cfb88cc6e8f3 Mon Sep 17 00:00:00 2001 From: simon louvet Date: Sun, 9 Dec 2018 14:41:48 +0100 Subject: [PATCH 2/4] ui : initilisation of sen a message from member-profil (not ready) --- src/page-member-profile.pug | 6 +++++- src/styles/content.scss | 13 +++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/src/page-member-profile.pug b/src/page-member-profile.pug index 47b82a0..04d14ba 100644 --- a/src/page-member-profile.pug +++ b/src/page-member-profile.pug @@ -1,10 +1,14 @@ +template#chat-link + sib-link(next="member-chat") ${value} sib-display#member-info( data-fields='available, header, name, pseudonym, infos, skills', set-header='avatar', - set-infos='cell, roles, user.email, number, foaf:homepage', + set-infos='cell, roles,send, user.email, number, foaf:homepage', set-name='user.first_name, user.last_name', set-pseudonym='before-pseudo, pseudo', value-before-pseudo='@', + value-send='SEND A MESSAGE', + template-send='chat-link', widget-available='hdapp-available', widget-avatar='sib-display-img', widget-user='hdapp-userinfo', diff --git a/src/styles/content.scss b/src/styles/content.scss index 7605e89..10d941f 100644 --- a/src/styles/content.scss +++ b/src/styles/content.scss @@ -363,6 +363,19 @@ hdapp-available { } } + sib-link[next='member-chat'] { + border-style: solid; + margin: 1em; + display: flex; + border-radius: 25px; + border-style: solid; + border-color: $color-blue-light; + color: $color-blue-light; + margin: 1em; + padding: 1em; + text-decoration:none; + } + div[name='pseudonym'] { margin-top: -1em; margin-bottom: 1em; From 35c94dc44b79fefdbdb38a66920e3b9cbc07b5dd Mon Sep 17 00:00:00 2001 From: jblemee Date: Mon, 10 Dec 2018 13:30:15 +0100 Subject: [PATCH 3/4] feature: #39 Display user info in upper right corner --- Makefile | 2 +- src/header.pug | 12 +++++++----- www/lib/sib-chat | 2 +- www/lib/sib-core | 2 +- www/lib/sib-oidc | 2 +- www/lib/sib-router | 2 +- 6 files changed, 12 insertions(+), 10 deletions(-) diff --git a/Makefile b/Makefile index d7a8fb3..6bbdda3 100644 --- a/Makefile +++ b/Makefile @@ -14,7 +14,7 @@ install: node_modules copy_lib copy_samples submodules submodules: git submodule init - git submodule update + git submodule update --recursive --remote build: $(DIST_DIR)/index.html $(DIST_DIR)/styles/index.css $(SCRIPT_DEST) diff --git a/src/header.pug b/src/header.pug index a20b981..4ad6114 100644 --- a/src/header.pug +++ b/src/header.pug @@ -15,8 +15,10 @@ details #notifications include page-notifications.pug -#profile - img(src="/images/user.jpg") - span - | Profile - span.icon-arrow-down +sib-display#profile( + data-fields='username,member.user,member.avatar', + widget-member.avatar='sib-display-img', + widget-member.user='hdapp-userinfo', + bind-user + ) + diff --git a/www/lib/sib-chat b/www/lib/sib-chat index f6d3c2d..7c841f1 160000 --- a/www/lib/sib-chat +++ b/www/lib/sib-chat @@ -1 +1 @@ -Subproject commit f6d3c2d846eabb3e3b236f218ec5878b81597967 +Subproject commit 7c841f1f972b6bbe35608a5c980101dbe117741c diff --git a/www/lib/sib-core b/www/lib/sib-core index 4162a4c..56e754a 160000 --- a/www/lib/sib-core +++ b/www/lib/sib-core @@ -1 +1 @@ -Subproject commit 4162a4cc2d68ab76290a1691760a740634eee953 +Subproject commit 56e754a6c80259ec7a274375044687db42a023e5 diff --git a/www/lib/sib-oidc b/www/lib/sib-oidc index 34a7598..d29cf79 160000 --- a/www/lib/sib-oidc +++ b/www/lib/sib-oidc @@ -1 +1 @@ -Subproject commit 34a75986f9a5d8d4e95e4c8e04743f1be362b752 +Subproject commit d29cf792ad5f818eea604176df83604bf2c2b9e2 diff --git a/www/lib/sib-router b/www/lib/sib-router index e46f24a..d44e9c0 160000 --- a/www/lib/sib-router +++ b/www/lib/sib-router @@ -1 +1 @@ -Subproject commit e46f24ad020d5eeb38a40b42a0f95b9f08a88dd6 +Subproject commit d44e9c0c1cff4cd588be8955d43c35bffcdfa185 From 6e67a598c06c1ef98795c17a5e3b48a6e8747df8 Mon Sep 17 00:00:00 2001 From: jblemee Date: Mon, 10 Dec 2018 14:18:12 +0100 Subject: [PATCH 4/4] bugfix: #39 use rights data-fields --- src/header.pug | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/header.pug b/src/header.pug index 4ad6114..63b1b49 100644 --- a/src/header.pug +++ b/src/header.pug @@ -16,9 +16,8 @@ details include page-notifications.pug sib-display#profile( - data-fields='username,member.user,member.avatar', + data-fields='first_name,member.avatar', widget-member.avatar='sib-display-img', - widget-member.user='hdapp-userinfo', bind-user )