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

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

This commit is contained in:
Gaelle Morin 2018-12-12 11:13:54 +01:00
parent 496036ee52 6e67a598c0
commit a6975bb0f2
13 changed files with 46 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -14,7 +14,7 @@ install: node_modules copy_lib copy_samples submodules
submodules:
git submodule init
git submodule update
git submodule update --recursive --remote
build: $(DIST_DIR)/index.html $(DIST_DIR)/styles/index.css $(SCRIPT_DEST)

11
src/header.pug
View File

@ -15,8 +15,9 @@ details
#notifications
include page-notifications.pug
#profile
img(src="/images/user.jpg")
span
| Profile
span.icon-arrow-down
sib-display#profile(
data-fields='first_name,member.avatar',
widget-member.avatar='sib-display-img',
bind-user
)

2
src/index.pug
View File

@ -19,6 +19,8 @@ html(lang="en")
include page-dashboard.pug
#members(hidden)
include page-members.pug
#member-chat(hidden)
include page-member-chat.pug
#member(hidden)
include page-member.pug
#job-offers(hidden)

4
src/menu.pug
View File

@ -48,11 +48,11 @@ nav#navbar
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/`)
sib-route(hidden, name='member-chat', id-prefix=`${sdn}/members/`)
div.sub-menu
sib-display(
data-src=`${sdn}/members/`,
data-fields='pseudo',
next='chat'
next='member-chat'
)
div.divider

19
src/page-member-chat.pug
View File

@ -1,9 +1,10 @@
.chat-view
sib-chat(
data-authentication='login',
data-auto-login='true',
data-bosh-service-url=xmpp,
data-debug='false',
data-locales-url='en',
bind-resources
)
div
.chat-view
sib-chat(
data-authentication='login',
data-auto-login='true',
data-bosh-service-url=xmpp,
data-debug='false',
data-locales-url='en',
bind-resources
)

6
src/page-member-profile.pug
View File

@ -1,10 +1,14 @@
template#chat-link
sib-link(next="member-chat") ${value}
sib-display#member-info(
data-fields='available, header, name, pseudonym, infos, skills',
set-header='avatar',
set-infos='cell, roles, user.email, number, foaf:homepage',
set-infos='cell, roles,send, user.email, number, foaf:homepage',
set-name='user.first_name, user.last_name',
set-pseudonym='before-pseudo, pseudo',
value-before-pseudo='@',
value-send='SEND A MESSAGE',
template-send='chat-link',
widget-available='hdapp-available',
widget-avatar='sib-display-img',
widget-user='hdapp-userinfo',

4
src/page-member.pug
View File

@ -1,7 +1,5 @@
sib-router#member-router(default-route='member-profile')
sib-route(name='member-chat')
div Chat
sib-route(name='member-profile')
div Profile
sib-ac-checker(permission='change' bind-resources)
@ -10,8 +8,6 @@ sib-router#member-router(default-route='member-profile')
#member-views-container
sib-trigger(next="members" class="back") Back to directory
div
#member-chat
include page-member-chat.pug
#member-profile
include page-member-profile.pug
#member-edit

5
src/page-members.pug
View File

@ -1,8 +1,8 @@
div.grid-layer
template#read-more-link
sib-link(next="member") ${value}
template#read-more-link
sib-link(next="member") ${value}
template#chat-link
sib-link(next="member-chat") ${value}
div.grid-layer-main.containerV
h1 Members
sib-display#profiles-list(
@ -16,6 +16,7 @@ div.grid-layer
value-more='read more...',
template-more='hdapp-link-more',
value-send='SEND A MESSAGE',
template-send='chat-link',
widget-avatar='sib-display-img',
widget-user='hdapp-userinfo',
widget-foaf:hompage='hdapp-hyperlink',

13
src/styles/content.scss
View File

@ -363,6 +363,19 @@ hdapp-available {
}
}
sib-link[next='member-chat'] {
border-style: solid;
margin: 1em;
display: flex;
border-radius: 25px;
border-style: solid;
border-color: $color-blue-light;
color: $color-blue-light;
margin: 1em;
padding: 1em;
text-decoration:none;
}
div[name='pseudonym'] {
margin-top: -1em;
margin-bottom: 1em;

2
www/lib/sib-chat

@ -1 +1 @@
Subproject commit f6d3c2d846eabb3e3b236f218ec5878b81597967
Subproject commit 7c841f1f972b6bbe35608a5c980101dbe117741c

2
www/lib/sib-core

@ -1 +1 @@
Subproject commit 4162a4cc2d68ab76290a1691760a740634eee953
Subproject commit 56e754a6c80259ec7a274375044687db42a023e5

2
www/lib/sib-oidc

@ -1 +1 @@
Subproject commit 34a75986f9a5d8d4e95e4c8e04743f1be362b752
Subproject commit d29cf792ad5f818eea604176df83604bf2c2b9e2

2
www/lib/sib-router

@ -1 +1 @@
Subproject commit e46f24ad020d5eeb38a40b42a0f95b9f08a88dd6
Subproject commit d44e9c0c1cff4cd588be8955d43c35bffcdfa185