From ac9fba3c3161e6ff10f4888f29fc6b9537bf9e92 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment?= <cpartiot@gmail.com>
Date: Thu, 18 Oct 2018 20:06:43 +0200
Subject: [PATCH] fix chat
---
Makefile | 1 +
src/dependencies.pug | 2 +-
src/page-member.pug | 4 ++--
src/page-members.pug | 2 +-
src/scripts/index.js | 12 ++++++++++++
src/styles/content.scss | 6 ++++--
src/styles/main.scss | 2 +-
src/styles/menu.scss | 6 ++----
www/lib/sib-core | 2 +-
www/test.html | 4 ++--
10 files changed, 27 insertions(+), 14 deletions(-)
diff --git a/Makefile b/Makefile
index d69ef48e..9341e868 100644
--- a/Makefile
+++ b/Makefile
@@ -68,5 +68,6 @@ pull:
sync:
rsync -rv www/* staging-app@ssh-staging-app.happy-dev.fr:~/staging-app.happy-dev.fr/ --exclude=www/oidc-client-config.json
+ rsync -v www/.htaccess staging-app@ssh-staging-app.happy-dev.fr:~/staging-app.happy-dev.fr/
.PHONY: default install submodules copy_lib copy_samples build watch serve clean sync buildprod pull deploy
\ No newline at end of file
diff --git a/src/dependencies.pug b/src/dependencies.pug
index fd9f07aa..e9a65d65 100644
--- a/src/dependencies.pug
+++ b/src/dependencies.pug
@@ -30,7 +30,7 @@ link(href="https://fonts.googleapis.com/css?family=Open+Sans:300,300i,400,400i,6
//- local
link(rel='import', href='/lib/sib-core/sib-display.html')
link(rel='import', href='/lib/sib-router/sib-router.html')
-//- link(rel='import', href='/lib/sib-chat/sib-chat.html')
+link(rel='import', href='/lib/sib-chat/sib-chat.html')
//- cdn
link(rel='import', href="https://cdn.happy-dev.fr/sib-core/sib-display.html")
diff --git a/src/page-member.pug b/src/page-member.pug
index 926aed68..410dbd58 100644
--- a/src/page-member.pug
+++ b/src/page-member.pug
@@ -8,10 +8,10 @@ sib-router#member-router(default-route='member-chat')
div Éditer
#member-views-container
sib-trigger(next="members" class="back") Back to directory
- .limiter
+ div
#member-chat
include page-member-chat.pug
- #member-profile
+ #member-profile.limiter
include page-member-profile.pug
#member-edit
include page-member-edit.pug
\ No newline at end of file
diff --git a/src/page-members.pug b/src/page-members.pug
index 265c6bad..4df63838 100644
--- a/src/page-members.pug
+++ b/src/page-members.pug
@@ -65,7 +65,7 @@ div
widget-cell='hdapp-usercell',
widget-roles='sib-display-lookuplist',
widget-skills='sib-display-lookuplist',
- set-searchset='user.first_name, user.last_name',
+ set-searchset='pseudo',
search-fields='searchset',
next='member'
)
diff --git a/src/scripts/index.js b/src/scripts/index.js
index 78b0c18b..a8538cc6 100644
--- a/src/scripts/index.js
+++ b/src/scripts/index.js
@@ -11,4 +11,16 @@ document.addEventListener('DOMContentLoaded', function(event) {
window.addEventListener('click', e => {
navBar.classList.remove('open');
});
+
+ function resize() {
+ setTimeout(()=>
+ Array.from(document.querySelectorAll('.chat-view')).forEach(elm => {
+ elm.style.setProperty('--pos-top', elm.offsetTop + 'px');
+ }));
+ }
+ window.addEventListener('resize', resize);
+ window.addEventListener('navigate', resize);
+ document.addEventListener('load', resize);
+ document.addEventListener('WebComponentsReady', resize);
+ resize();
});
diff --git a/src/styles/content.scss b/src/styles/content.scss
index aa2bba9e..e3c2ce5e 100644
--- a/src/styles/content.scss
+++ b/src/styles/content.scss
@@ -52,9 +52,11 @@ sib-display-lookuplist[name='skills'] {
.chat-view {
padding: 1em;
- border: 1px dashed green;
position: relative;
- min-height: 300px;
+ background-color: #fff;
+ @extend %shadow;
+ height: calc(100vh - 143px - 5em);
+ height: calc(100vh - var(--pos-top, 143px) - 5em);
> sib-chat {
@include pos();
}
diff --git a/src/styles/main.scss b/src/styles/main.scss
index d767dd6f..f88559ad 100644
--- a/src/styles/main.scss
+++ b/src/styles/main.scss
@@ -24,6 +24,7 @@ h5,
h6 {
color: $color-black;
font-weight: 600;
+ padding: 0;
margin: 0.67em 0;
span {
font-weight: 400;
@@ -97,7 +98,6 @@ h3 {
#subContainer {
display: flex;
- min-height: 100%;
}
#mainContainer {
diff --git a/src/styles/menu.scss b/src/styles/menu.scss
index 8cef1eeb..1e131646 100644
--- a/src/styles/menu.scss
+++ b/src/styles/menu.scss
@@ -5,10 +5,8 @@
background-color: $color-white;
color: $color-grey;
max-width: 16rem;
- position: sticky;
- top: 0;
- height: 100%;
- max-height: 100vh;
+ position: relative;
+ min-height: 100%;
&.open {
transform: translateX(0);
}
diff --git a/www/lib/sib-core b/www/lib/sib-core
index bed0a4d7..97e4d277 160000
--- a/www/lib/sib-core
+++ b/www/lib/sib-core
@@ -1 +1 @@
-Subproject commit bed0a4d7b743d3e35ec016c880101e8496bc224f
+Subproject commit 97e4d2773deb81d28ccbe6c65d82d316bb7ee022
diff --git a/www/test.html b/www/test.html
index c3057439..1f95e273 100644
--- a/www/test.html
+++ b/www/test.html
@@ -41,8 +41,8 @@
<h1>Members</h1>
<sib-display id="profiles-list"
data-src="https://test-paris.happy-dev.fr/members/"
- data-fields="pseudo, user.member.user.member.user.member.bio, a.b"
- set-a.b="user.first_name, user.last_name"
+ data-fields="pseudo, user.member.user.member.user.member.bio, ab"
+ set-ab="user.first_name, user.last_name"
></sib-display>
</div>
<!-- <div>
--
GitLab