From 82b131405e33ac04c21846ca3fe65c62b517abd9 Mon Sep 17 00:00:00 2001 From: Gaelle Morin Date: Wed, 5 Dec 2018 23:05:50 +0100 Subject: [PATCH 1/5] new chat section added --- src/menu.pug | 12 ++++++++++++ src/page-chat.pug | 0 src/page-project.pug | 2 +- 3 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 src/page-chat.pug diff --git a/src/menu.pug b/src/menu.pug index 070d94f..067d48b 100644 --- a/src/menu.pug +++ b/src/menu.pug @@ -36,3 +36,15 @@ nav#navbar data-fields='name', next='group' ) + div + div.menu + div.menu-notification + div.menu-label Chat + div.menu-icon.icon-envelope-letter + sib-route(hidden, name='chat', id-prefix=`${sdn}/members/`) + div.sub-menu + sib-display( + data-src=`${sdn}/members/`, + data-fields='name', + next='chat' + ) diff --git a/src/page-chat.pug b/src/page-chat.pug new file mode 100644 index 0000000..e69de29 diff --git a/src/page-project.pug b/src/page-project.pug index 39d3995..7aed5c4 100644 --- a/src/page-project.pug +++ b/src/page-project.pug @@ -1,4 +1,4 @@ -sib-router#project-router(default-route='project-profile') +sib-router#project-router(default-route='project-chat') sib-route(name='project-chat') div Chat sib-route(name='project-profile') From 627b84b6e2b05050bd4a679ff3724cee367eb024 Mon Sep 17 00:00:00 2001 From: Gaelle Morin Date: Thu, 6 Dec 2018 10:38:33 +0100 Subject: [PATCH 2/5] wip --- src/menu.pug | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/menu.pug b/src/menu.pug index 067d48b..523179f 100644 --- a/src/menu.pug +++ b/src/menu.pug @@ -41,10 +41,10 @@ nav#navbar div.menu-notification div.menu-label Chat div.menu-icon.icon-envelope-letter - sib-route(hidden, name='chat', id-prefix=`${sdn}/members/`) + sib-route(hidden, name='chat', id-prefix=`${sdn}/users/`) div.sub-menu sib-display( - data-src=`${sdn}/members/`, - data-fields='name', + data-src=`${sdn}/users/`, + data-fields='username', next='chat' ) From 1f6c83339c218bbe62b59a3e9b86c839d4ea83f3 Mon Sep 17 00:00:00 2001 From: Gaelle Morin Date: Thu, 6 Dec 2018 21:33:14 +0100 Subject: [PATCH 3/5] pseudo displayed in side menu --- src/menu.pug | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/menu.pug b/src/menu.pug index 523179f..8a699a3 100644 --- a/src/menu.pug +++ b/src/menu.pug @@ -41,10 +41,10 @@ nav#navbar div.menu-notification div.menu-label Chat div.menu-icon.icon-envelope-letter - sib-route(hidden, name='chat', id-prefix=`${sdn}/users/`) + sib-route(hidden, name='chat', id-prefix=`${sdn}/members/`) div.sub-menu sib-display( - data-src=`${sdn}/users/`, - data-fields='username', + data-src=`${sdn}/members/`, + data-fields='pseudo', next='chat' ) From 17f3420a23fd8989f58310737c76d7b4cf92ca38 Mon Sep 17 00:00:00 2001 From: Gaelle Morin Date: Thu, 6 Dec 2018 22:20:08 +0100 Subject: [PATCH 4/5] fix --- src/menu.pug.orig | 59 ----------------------------------------------- 1 file changed, 59 deletions(-) delete mode 100644 src/menu.pug.orig diff --git a/src/menu.pug.orig b/src/menu.pug.orig deleted file mode 100644 index f03cd58..0000000 --- a/src/menu.pug.orig +++ /dev/null @@ -1,59 +0,0 @@ -nav#navbar - sib-router#navbar-router(default-route='members') - sib-route.menu(name='members') - div.menu-notification - div 0 - div.menu-label Members - div.menu-icon.icon-people - sib-route.menu(hidden, name='member', id-prefix=`${sdn}/members/`) - div.divider - sib-route.menu(name='job-offers') - div.menu-notification - div 2 - div.menu-label Job offers - div.menu-icon.icon-briefcase - sib-route(hidden, name='job-offer-create') - div.divider - div.menu-wrapper - div.menu - div.menu-chevron - div.menu-icon.icon-arrow-down - div.menu-label Projects - div.menu-icon.icon-folder-alt - sib-route(hidden,name='project', id-prefix=`${sdn}/projects/`) - div.sub-menu - sib-display( - data-src=`${sdn}/projects/`, - data-fields='name', - next='project' - ) - div.divider - div.menu-wrapper - div.menu - div.menu-chevron - div.menu-icon.icon-arrow-down - div.menu-label Groups - div.menu-icon.icon-globe - sib-route(hidden, name='group', id-prefix=`${sdn}/channels/`) - div.sub-menu - sib-display( - data-src=`${sdn}/channels/`, - data-fields='name', - next='group' - ) -<<<<<<< HEAD - div.divider -======= - div - div.menu - div.menu-notification - div.menu-label Chat - div.menu-icon.icon-envelope-letter - sib-route(hidden, name='chat', id-prefix=`${sdn}/members/`) - div.sub-menu - sib-display( - data-src=`${sdn}/members/`, - data-fields='pseudo', - next='chat' - ) ->>>>>>> gm-chat From 06a019ac20cc52aca1e899ace01327bec0896a5a Mon Sep 17 00:00:00 2001 From: jblemee Date: Fri, 7 Dec 2018 01:16:06 +0100 Subject: [PATCH 5/5] update: README: link to the client_id generation documentation --- .gitignore | 3 ++- README.md | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 5e6e5fb..2a939eb 100644 --- a/.gitignore +++ b/.gitignore @@ -8,4 +8,5 @@ !/www/lib/sib-core !/www/lib/sib-router !/www/lib/sib-chat -!/www/lib/sib-oidc \ No newline at end of file +!/www/lib/sib-oidc +*.iml \ No newline at end of file diff --git a/README.md b/README.md index 8b22d4f..1489beb 100644 --- a/README.md +++ b/README.md @@ -54,7 +54,7 @@ clone then: * `make install` Edit the created `./src/config.pug` file to : - - update the `client_id` you generated on the server / OIDC provider + - update the `client_id` [you generated on the server](https://git.happy-dev.fr/startinblox/applications/sib-app-data-server/blob/master/README.md#openidconnect-configuration) / OIDC provider - update the `sdn` / Server Domain Name to match yours ## Build