Skip to content
Snippets Groups Projects
Commit 443298e0 authored by Marjolaine Le Bon's avatar Marjolaine Le Bon
Browse files

Merge branch 'feature/resource-component' of...

Merge branch 'feature/resource-component' of https://git.startinblox.com/applications/hubl into feature/resource-component
parents 8da51ec9 026dc48f
No related branches found
No related tags found
1 merge request!172First integration to Hubl of the resource component
Pipeline #6664 passed
......@@ -87,7 +87,7 @@ On `config.json`:
Where:
* `xmpp` is your Prosody with [appropriate modules](https://git.startinblox.com/infra/prosody-modules/) configured on.
* `xmpp` is your [Prosody](https://prosody.im/) with [appropriate modules](https://git.startinblox.com/infra/prosody-modules/) configured on.
* `authority` is the OpenID Provider. Usually, if you use `djangoldp-account` it's the same as your djangoldp server.
* `endpoints.users` is the API endpoints for Users on your djangoldp server.
......
......@@ -16,6 +16,10 @@
include views/circle/page-circle-chat.pug
#circle-information.content-box__height(hidden)
include views/circle/page-circle-profile.pug
#circle-events(hidden)
include views/circle/page-circle-events.pug
#circle-resources(hidden)
include views/circle/page-circle-resources.pug
nav.jsRightMenu(role='navigation')
solid-router(default-route='circle-chat')
......@@ -28,3 +32,10 @@ nav.jsRightMenu(role='navigation')
solid-route(name='circle-information')
li
a Information
sib-route(name='circle-events' use-id)
li
a Events
sib-route(name='circle-resources' use-id)
li
a Resources
sib-display(
class='w700'
bind-resources
nested-field="events"
fields='name, shortDescription, startDate'
)
\ No newline at end of file
sib-display(
class='w700'
bind-resources
nested-field="resources"
fields='name, shortdesc, keywords'
)
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment