From bbb8e0a24cf6e67f8e189bcb752e2f46ff244f2c Mon Sep 17 00:00:00 2001 From: Alexandre Bourlier Date: Tue, 31 Jul 2018 23:42:43 +0200 Subject: [PATCH] feature - chat component on the right view --- .gitignore | 1 + dist/lib/sib-chat | 2 +- dist/lib/sib-router | 2 +- index.php | 20 ++++++++++++++++++++ oidc-client-config.json | 10 ++++++++++ preprod.sh | 16 +++++++++------- src/html/channel-chat.html | 4 +--- src/html/channel-create.html | 2 +- src/html/client-creation.html | 2 +- src/html/dependencies-dev.php | 4 ++-- src/html/dependencies-prod.php | 11 ++++++----- src/html/member-chat.html | 13 +------------ src/html/member-edit.html | 4 ++-- src/html/menu.html | 1 - src/html/project-chat.html | 4 +--- src/html/project-create.html | 4 ++-- src/html/project-edit.html | 2 +- src/scss/_chat.scss | 2 +- 18 files changed, 61 insertions(+), 43 deletions(-) create mode 100644 oidc-client-config.json diff --git a/.gitignore b/.gitignore index 1eb686b..fb71fd6 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ dist/html/* index.html config.php issues.md +oidc-client-preprod-config.json diff --git a/dist/lib/sib-chat b/dist/lib/sib-chat index ab4fc15..b00af6a 160000 --- a/dist/lib/sib-chat +++ b/dist/lib/sib-chat @@ -1 +1 @@ -Subproject commit ab4fc15f5f4476e111dfb5bbdb43c7b88af18bf9 +Subproject commit b00af6aa4e2412468d5ca7b293d7f2517f1b0c28 diff --git a/dist/lib/sib-router b/dist/lib/sib-router index 6109962..3914e37 160000 --- a/dist/lib/sib-router +++ b/dist/lib/sib-router @@ -1 +1 @@ -Subproject commit 6109962852d523b23d47fb344083e77917ec1a9c +Subproject commit 3914e3736e66a96c42fb9a20c5412ed948eabf86 diff --git a/index.php b/index.php index 8c9fab9..ab3ee5f 100644 --- a/index.php +++ b/index.php @@ -36,5 +36,25 @@ + + + + diff --git a/oidc-client-config.json b/oidc-client-config.json new file mode 100644 index 0000000..7f4d9dd --- /dev/null +++ b/oidc-client-config.json @@ -0,0 +1,10 @@ +{ + "authority": "https://test-paris.happy-dev.fr/openid/", + "client_id": "125356", + "redirect_uri": "http://hd-app.local", + "response_type": "id_token token", + "scope": "openid profile email", + "automaticSilentRenew": true, + "silent_redirect_uri": "http://hd-app.local", + "loadUserInfo": true +} diff --git a/preprod.sh b/preprod.sh index e20418d..59d699b 100755 --- a/preprod.sh +++ b/preprod.sh @@ -1,11 +1,13 @@ #!/bin/bash export DN="https://staging-app.happy-dev.fr" -export SDN="https://staging-hd-app-server.happy-dev.fr" +export SDN="https://test-paris.happy-dev.fr" +export CDN="https://cdn.happy-dev.fr" php index.php > index.html grunt -ssh hd-app@ssh-hd-app.alwaysdata.net "rm -R staging-hd-app; mkdir staging-hd-app; cd staging-hd-app; mkdir -p src/fonts; mkdir -p dist/css;" -scp index.html hd-app@ssh-hd-app.alwaysdata.net:~/staging-hd-app/ -scp .htaccess hd-app@ssh-hd-app.alwaysdata.net:~/staging-hd-app/ -scp -r dist/css/ hd-app@ssh-hd-app.alwaysdata.net:~/staging-hd-app/dist/ -scp -r src/fonts/ hd-app@ssh-hd-app.alwaysdata.net:~/staging-hd-app/src/ -scp -r src/js/ hd-app@ssh-hd-app.alwaysdata.net:~/staging-hd-app/src/ +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;" +scp index.html staging-app@ssh-staging-app.happy-dev.fr:~/staging-app.happy-dev.fr/ +scp .htaccess staging-app@ssh-staging-app.happy-dev.fr:~/staging-app.happy-dev.fr/ +scp oidc-client-preprod-config.json staging-app@ssh-staging-app.happy-dev.fr:~/staging-app.happy-dev.fr/oidc-client-config.json +scp -r dist/css/ staging-app@ssh-staging-app.happy-dev.fr:~/staging-app.happy-dev.fr/dist/ +scp -r src/fonts/ staging-app@ssh-staging-app.happy-dev.fr:~/staging-app.happy-dev.fr/src/ +scp -r src/js/ staging-app@ssh-staging-app.happy-dev.fr:~/staging-app.happy-dev.fr/src/ diff --git a/src/html/channel-chat.html b/src/html/channel-chat.html index eadce53..e6d99da 100644 --- a/src/html/channel-chat.html +++ b/src/html/channel-chat.html @@ -1,4 +1,2 @@ - + diff --git a/src/html/channel-create.html b/src/html/channel-create.html index ef9e711..5364a41 100644 --- a/src/html/channel-create.html +++ b/src/html/channel-create.html @@ -1,6 +1,6 @@ diff --git a/src/html/dependencies-dev.php b/src/html/dependencies-dev.php index 5bf958c..1cefc27 100644 --- a/src/html/dependencies-dev.php +++ b/src/html/dependencies-dev.php @@ -1,8 +1,8 @@ - + @@ -15,5 +15,5 @@ - + diff --git a/src/html/dependencies-prod.php b/src/html/dependencies-prod.php index c633b3e..d3d1db7 100644 --- a/src/html/dependencies-prod.php +++ b/src/html/dependencies-prod.php @@ -1,7 +1,7 @@ - + @@ -10,9 +10,10 @@ - + + - - - + + + diff --git a/src/html/member-chat.html b/src/html/member-chat.html index 01db9a0..177f1eb 100644 --- a/src/html/member-chat.html +++ b/src/html/member-chat.html @@ -1,12 +1 @@ - + diff --git a/src/html/member-edit.html b/src/html/member-edit.html index 60e51af..b484708 100644 --- a/src/html/member-edit.html +++ b/src/html/member-edit.html @@ -18,9 +18,9 @@
diff --git a/src/html/project-chat.html b/src/html/project-chat.html index 272d2f4..0831813 100644 --- a/src/html/project-chat.html +++ b/src/html/project-chat.html @@ -1,3 +1 @@ - + diff --git a/src/html/project-create.html b/src/html/project-create.html index 0128229..9139602 100644 --- a/src/html/project-create.html +++ b/src/html/project-create.html @@ -1,8 +1,8 @@ diff --git a/src/html/project-edit.html b/src/html/project-edit.html index 7b554dd..c2471fc 100644 --- a/src/html/project-edit.html +++ b/src/html/project-edit.html @@ -2,7 +2,7 @@ diff --git a/src/scss/_chat.scss b/src/scss/_chat.scss index 7577454..7349936 100644 --- a/src/scss/_chat.scss +++ b/src/scss/_chat.scss @@ -8,7 +8,7 @@ sib-chat { display: none; } -#member-chat { +.chat-view { sib-chat { display: block; top: $menu-height + 30px;