autonomic-cooperative/hubl
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix chat

Browse Source
This commit is contained in:
Clément 2018-09-22 14:11:37 +02:00
parent 689e8009ed
commit a0c1cab2ba
6 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -1,7 +1,7 @@
default: build default: build
config.pug: config.pug:
cp -n config-sample.pug config.pug @cp -n config-sample.pug config.pug
node_modules: node_modules:
npm install npm install

20
preprod.sh
View File

@ -1,12 +1,18 @@
#!/bin/bash #!/bin/bash
export DN="http://staging-app.happy-dev.fr" export DN="https://staging-app.happy-dev.fr"
export SDN="https://test-paris.happy-dev.fr" export SDN="https://test-paris.happy-dev.fr"
export CDN="http://staging-app.happy-dev.fr/dist/lib" export CDN="https://staging-app.happy-dev.fr/dist/lib"
make prod
# ssh staging-app@ssh-staging-app.happy-dev.fr "rm -R staging-app.happy-dev.fr; mkdir staging-app.happy-dev.fr; cd staging-app.happy-dev.fr; mkdir -p src/fonts; mkdir -p dist/css;" make -B build
# ssh staging-app@ssh-staging-app.happy-dev.fr "rm -R staging-app.happy-dev.fr"
ssh staging-app@ssh-staging-app.happy-dev.fr "mkdir -p staging-app.happy-dev.fr/src/fonts; cd staging-app.happy-dev.fr; mkdir -p dist/css;"
echo sync...
rsync -u index.html staging-app@ssh-staging-app.happy-dev.fr:~/staging-app.happy-dev.fr/ rsync -u index.html staging-app@ssh-staging-app.happy-dev.fr:~/staging-app.happy-dev.fr/
rsync -u .htaccess staging-app@ssh-staging-app.happy-dev.fr:~/staging-app.happy-dev.fr/ rsync -u .htaccess staging-app@ssh-staging-app.happy-dev.fr:~/staging-app.happy-dev.fr/
rsync -u oidc-client-preprod-config.json staging-app@ssh-staging-app.happy-dev.fr:~/staging-app.happy-dev.fr/oidc-client-config.json rsync -u oidc-client-preprod-config.json staging-app@ssh-staging-app.happy-dev.fr:~/staging-app.happy-dev.fr/oidc-client-config.json
rsync -zr dist/ staging-app@ssh-staging-app.happy-dev.fr:~/staging-app.happy-dev.fr/ rsync -r dist/* staging-app@ssh-staging-app.happy-dev.fr:~/staging-app.happy-dev.fr/dist/
rsync -zr src/fonts/ staging-app@ssh-staging-app.happy-dev.fr:~/staging-app.happy-dev.fr/src/ rsync -r src/fonts/* staging-app@ssh-staging-app.happy-dev.fr:~/staging-app.happy-dev.fr/src/fonts/
rsync -zr src/js/ staging-app@ssh-staging-app.happy-dev.fr:~/staging-app.happy-dev.fr/src/ rsync -r src/js/* staging-app@ssh-staging-app.happy-dev.fr:~/staging-app.happy-dev.fr/src/js/
echo ...done

5
src/pug/html.pug
View File

@ -6,7 +6,7 @@ html(lang='fr')
meta(http-equiv='X-UA-Compatible', content='ie=edge') meta(http-equiv='X-UA-Compatible', content='ie=edge')
title Happy Dev App title Happy Dev App
//- Prod/Dev setup //- Prod/Dev setup
if (['http://app.happy-dev.fr', 'http://staging-app.happy-dev.fr'].includes(dn)) if (['https://app.happy-dev.fr', 'https://staging-app.happy-dev.fr'].includes(dn))
include dependencies-prod.pug include dependencies-prod.pug
else else
include dependencies-dev.pug include dependencies-dev.pug
@ -26,7 +26,7 @@ html(lang='fr')
include channel.pug include channel.pug
//- include search.pug //- include search.pug
sib-chat#chat-singleton(data-authentication='login', data-auto-login='true', data-bosh-service-url='https://jabber.happy-dev.fr/http-bind/', data-debug='false', data-locales-url='en', bind-resources='') sib-chat#chat-singleton(data-authentication='login', data-auto-login='true', data-bosh-service-url='https://jabber.happy-dev.fr/http-bind/', data-debug='false', data-locales-url='en', bind-resources='')
//- script. script.
// Move the chat singleton to the right view on "page load" // Move the chat singleton to the right view on "page load"
window.onload = function() { window.onload = function() {
if (window.location.pathname.indexOf("-chat") !== -1) { if (window.location.pathname.indexOf("-chat") !== -1) {
@ -34,6 +34,7 @@ html(lang='fr')
var pathnameParts = window.location.pathname.split("/"); var pathnameParts = window.location.pathname.split("/");
var viewName = pathnameParts[pathnameParts.length - 1]; var viewName = pathnameParts[pathnameParts.length - 1];
var view = document.getElementById(viewName); var view = document.getElementById(viewName);
console.log({chatSingleton,pathnameParts,viewName,view});
view.appendChild(chatSingleton); view.appendChild(chatSingleton);
chatSingleton.dataset.src = view.dataset.src; chatSingleton.dataset.src = view.dataset.src;

9
src/pug/menu.pug
View File

@ -6,6 +6,7 @@ div
div(hidden) div(hidden)
sib-route(name='member', id-prefix=`${sdn}/members/`) sib-route(name='member', id-prefix=`${sdn}/members/`)
sib-route(name='project', id-prefix=`${sdn}/projects/`) sib-route(name='project', id-prefix=`${sdn}/projects/`)
sib-route(name='channel', id-prefix=`${sdn}/channels/`)
div#menu-items div#menu-items
sib-route(name='members') sib-route(name='members')
div div
@ -33,14 +34,6 @@ div
data-fields='name', data-fields='name',
next='channel' next='channel'
) )
//- sib-route(name='projects')
i.fa.fa-tasks(aria-hidden='true')
| Projets
//- sib-route(name='client-create') //- sib-route(name='client-create')
i.fa.fa-plus(aria-hidden='true') i.fa.fa-plus(aria-hidden='true')
| New client | New client
//- sib-route(name='channels')
i.fa.fa-comments(aria-hidden='true')
| Network
//- sib-route(name='channel', id-prefix=`${sdn}/channels/`)

12
src/scss/_chat.scss
View File

@ -1,17 +1,17 @@
sib-chat { sib-chat {
//position: absolute; //position: absolute;
border: 1px dotted red; border: 5px dotted red;
top: $menu-height; top: 0;
bottom: 0px; bottom: 0;
left: 0px; left: 0;
right: 0px; right: 0;
margin: auto; margin: auto;
display: none; display: none;
min-height: 300px;
} }
.chat-view { .chat-view {
sib-chat { sib-chat {
display: block; display: block;
top: $menu-height + 30px;
} }
} }

2
src/scss/_menu.scss
View File

@ -38,7 +38,7 @@
background-image: linear-gradient( background-image: linear-gradient(
to right, to right,
rgba(0, 0, 0, $shadow-opacity), rgba(0, 0, 0, $shadow-opacity),
#0000 transparent
); );
} }
} }