Merge branch 'jbpasquier/rdf' into 'staging'

feature: rdf_type & fix: router user panel

See merge request startinblox/applications/sib-app!26
This commit is contained in:
Gaëlle Morin 2019-05-10 14:35:11 +00:00
commit 5eff8ffcec
4 changed files with 11 additions and 8 deletions

View File

@ -26,7 +26,7 @@ link(rel='stylesheet', href='https://fonts.googleapis.com/css?family=Open+Sans:3
script(type="module" src="https://unpkg.com/@startinblox/core@0.7.15") script(type="module" src="https://unpkg.com/@startinblox/core@0.7.15")
script(type="module" src="https://unpkg.com/@startinblox/router@0.7.2") script(type="module" src="https://unpkg.com/@startinblox/router@0.7.2")
script(type="module" src="https://unpkg.com/@startinblox/component-chat@0.1.7") script(type="module" src="https://unpkg.com/@startinblox/component-chat@0.1.7")
script(type="module" src="https://unpkg.com/@startinblox/component-notifications@0.1.11") script(type="module" src="https://unpkg.com/@startinblox/component-notifications@0.1.12")
script(type="module" src="https://unpkg.com/@startinblox/component-conversation@0.2.1") script(type="module" src="https://unpkg.com/@startinblox/component-conversation@0.2.1")
script(type="module" src="https://unpkg.com/@startinblox/component-directory@0.1.10") script(type="module" src="https://unpkg.com/@startinblox/component-directory@0.1.10")

View File

@ -28,6 +28,9 @@ html(lang="en")
include page-job-offer-create.pug include page-job-offer-create.pug
#project(hidden) #project(hidden)
include page-project.pug include page-project.pug
#user-profile(hidden)
#user-settings(hidden)
#user-admin(hidden)
//- #client-creation(hidden) //- #client-creation(hidden)
include page-client-creation.pug include page-client-creation.pug
//-#groups(hidden) //-#groups(hidden)

View File

@ -10,7 +10,7 @@ nav#navbar
div.menu-label Members div.menu-label Members
div.menu-icon.icon-people div.menu-icon.icon-people
div.divider div.divider
sib-route.menu(name='job-offers') sib-route.menu(name='job-offers', rdf-type='hd:joboffer')
div.menu-notification div.menu-notification
sib-display( sib-display(
data-src=`${sdn}/job-offers/`, data-src=`${sdn}/job-offers/`,
@ -27,7 +27,7 @@ nav#navbar
div.menu-icon.icon-arrow-up div.menu-icon.icon-arrow-up
div.menu-label Projects div.menu-label Projects
div.menu-icon.icon-folder-alt div.menu-icon.icon-folder-alt
sib-route(hidden,name='project', id-prefix=`${sdn}/projects/`, use-id) sib-route(hidden,name='project', id-prefix=`${sdn}/projects/`, rdf-type='hd:project', use-id='')
div.sub-menu div.sub-menu
sib-display( sib-display(
data-src=`${sdn}/projects/`, data-src=`${sdn}/projects/`,
@ -43,7 +43,7 @@ nav#navbar
div.menu-icon.icon-arrow-up div.menu-icon.icon-arrow-up
div.menu-label Cercles div.menu-label Cercles
div.menu-icon.icon-globe div.menu-icon.icon-globe
sib-route(hidden, name='circle', id-prefix=`${sdn}/circles/`) sib-route(hidden, name='circle', id-prefix=`${sdn}/circles/`, rdf-type='hd:circle')
div.sub-menu div.sub-menu
sib-display( sib-display(
data-src=`${sdn}/circles/`, data-src=`${sdn}/circles/`,
@ -58,7 +58,7 @@ nav#navbar
div.menu-icon.icon-arrow-up div.menu-icon.icon-arrow-up
div.menu-label Chat div.menu-label Chat
div.menu-icon.icon-envelope-letter div.menu-icon.icon-envelope-letter
sib-route(hidden, name='member-chat', id-prefix=`${sdn}/members/`, use-id='') sib-route(hidden, name='member-chat', id-prefix=`${sdn}/members/`, rdf-type='foaf:user', use-id='')
div.sub-menu div.sub-menu
sib-display( sib-display(
data-src=`${sdn}/members/`, data-src=`${sdn}/members/`,

View File

@ -1,13 +1,13 @@
nav(role="user's functionalities menu") nav(role="user's functionalities menu")
sib-router sib-router
ul ul
sib-route(name='') sib-route(name='user-profile')
li li
a(href='#') My profile a(href='#') My profile
sib-route(name='') sib-route(name='user-settings')
li li
a(href='#') Settings a(href='#') Settings
sib-route(name='') sib-route(name='user-admin')
li li
a Admin a Admin
button(role='log out' onclick="document.querySelector('sib-auth').logout();") Log out button(role='log out' onclick="document.querySelector('sib-auth').logout();") Log out