Merge branch 'master' of git.happy-dev.fr:startinblox/applications/sib-app into gm-header

This commit is contained in:
Gaelle Morin 2018-12-07 10:13:26 +01:00
commit 0a9401fd09
5 changed files with 19 additions and 4 deletions

1
.gitignore vendored
View File

@ -9,3 +9,4 @@
!/www/lib/sib-router !/www/lib/sib-router
!/www/lib/sib-chat !/www/lib/sib-chat
!/www/lib/sib-oidc !/www/lib/sib-oidc
*.iml

View File

@ -54,7 +54,7 @@ clone then:
* `make install` * `make install`
Edit the created `./src/config.pug` file to : 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 - update the `sdn` / Server Domain Name to match yours
## Build ## Build

View File

@ -2,7 +2,7 @@ nav#navbar
sib-router#navbar-router(default-route='members') sib-router#navbar-router(default-route='members')
sib-route.menu(name='members') sib-route.menu(name='members')
div.menu-notification div.menu-notification
div 0 div 1
div.menu-label Members div.menu-label Members
div.menu-icon.icon-people div.menu-icon.icon-people
sib-route.menu(hidden, name='member', id-prefix=`${sdn}/members/`) sib-route.menu(hidden, name='member', id-prefix=`${sdn}/members/`)
@ -42,3 +42,17 @@ nav#navbar
next='group' next='group'
) )
div.divider div.divider
div.menu-wrapper
div.menu
div.menu-chevron
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/`)
div.sub-menu
sib-display(
data-src=`${sdn}/members/`,
data-fields='pseudo',
next='chat'
)
div.divider

0
src/page-chat.pug Normal file
View File

View File

@ -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') sib-route(name='project-chat')
div Chat div Chat
sib-route(name='project-profile') sib-route(name='project-profile')