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

Merge remote-tracking branch 'origin/feature/multi-dashboard-fixes' into feature/uniq-behavior-change

Browse Source
This commit is contained in:
Jean-Baptiste Pasquier 2021-02-26 15:56:01 +01:00
commit a515da9b48
4 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
README.md
View File

@ -98,7 +98,7 @@ On `config.json`:
"client": { "client": {
"name": "Localhost", "name": "Localhost",
"logo": "/images/logo.webp" "logo": "/images/logo.webp"
} },
"components": [] "components": []
} }
``` ```
@ -124,7 +124,7 @@ On `config.json`:
Where: Where:
* `client.avicon` is an URL to a distant favicon * `client.favicon` is an URL to a distant favicon
* `client.css` is an URL to a distant CSS that'll be the last one loaded by the Hubl * `client.css` is an URL to a distant CSS that'll be the last one loaded by the Hubl
### Allow to login to your application ### Allow to login to your application
@ -302,6 +302,9 @@ Module declaration, on `config.json`:
"type": "dashboard", "type": "dashboard",
"endpoints": { "endpoints": {
"get": "http://server.url/dashboards/" "get": "http://server.url/dashboards/"
},
"parameters": {
"target": "default"
} }
} }
``` ```

2
src/views/page-dashboard.pug
View File

@ -2,4 +2,4 @@ div.padding-top-xlarge.padding-right-xsmall.padding-bottom-xlarge.padding-left-x
solid-dashboard( solid-dashboard(
data-src=component.endpoints.get data-src=component.endpoints.get
uniq=component.uniq uniq=component.uniq
) )&attributes({target:component.parameters?.target})

4
src/views/partials/circle/page-circle-events.pug
View File

@ -2,9 +2,9 @@ solid-event(
class='w700' class='w700'
bind-resources bind-resources
nested-field="events" nested-field="events"
range-event-type=`${extension.get('events').endpoints.typeevents}` range-event-type=`${component.extensions.find(c => c.type=='events').endpoints.typeevents}`
range-event-circle=`${component.endpoints.get}` range-event-circle=`${component.endpoints.get}`
upload-dir=`${extension.get('events').endpoints.uploads}` upload-dir=`${component.extensions.find(c => c.type=='events').endpoints.uploads}`
id-prefix=`${component.route}` id-prefix=`${component.route}`
uniq=component.uniq uniq=component.uniq
) )

6
src/views/partials/menu-left.pug
View File

@ -7,7 +7,7 @@ solid-router#navbar-router(default-route='dashboard')
solid-route.menu.segment.full.padding-small.text-semibold.text-color-white.heading-active.bg-color-heading.hover.active(name=component.route) solid-route.menu.segment.full.padding-small.text-semibold.text-color-white.heading-active.bg-color-heading.hover.active(name=component.route)
div.segment.margin-right-xxsmall div.segment.margin-right-xxsmall
div.icon.icon-small.icon-home div.icon.icon-small.icon-home
div.segment.text-uppercase.text-letter-spacing-large(data-trans="menuLeft.dashboard") div.segment.text-uppercase.text-letter-spacing-large(data-trans=`${component.name?component.name:"menuLeft.dashboard"}`)
div.divider div.divider
if component.type == "circles" if component.type == "circles"
div.menu-wrapper div.menu-wrapper
@ -50,7 +50,7 @@ solid-router#navbar-router(default-route='dashboard')
solid-route.menu.segment.full.padding-small.text-semibold.text-color-white.heading-active.bg-color-heading.hover.active(name=`admin-${component.route}`) solid-route.menu.segment.full.padding-small.text-semibold.text-color-white.heading-active.bg-color-heading.hover.active(name=`admin-${component.route}`)
div.segment.margin-right-xxsmall div.segment.margin-right-xxsmall
div.segment.icon.icon-small.icon-folder-alt div.segment.icon.icon-small.icon-folder-alt
div.segment.three-quarter.text-uppercase.text-letter-spacing-large(data-trans="menuLeft.messages") div.segment.three-quarter.text-uppercase.text-letter-spacing-large(data-trans=`${component.name?component.name:"menuLeft.messages"}`)
div.menu-chevron.segment div.menu-chevron.segment
div.menu-icon.icon-arrow-right-circle div.menu-icon.icon-arrow-right-circle
solid-route(name=`admin-${component.route}-create`, use-id='', hidden) solid-route(name=`admin-${component.route}-create`, use-id='', hidden)
@ -58,7 +58,7 @@ solid-router#navbar-router(default-route='dashboard')
div.menu.segment.full.padding-small.text-semibold.text-color-white.heading-active.bg-color-heading div.menu.segment.full.padding-small.text-semibold.text-color-white.heading-active.bg-color-heading
div.segment.margin-right-xxsmall div.segment.margin-right-xxsmall
div.segment.icon.icon-small.icon-folder-alt div.segment.icon.icon-small.icon-folder-alt
div.segment.three-quarter.text-uppercase.text-letter-spacing-large(data-trans="menuLeft.messages") div.segment.three-quarter.text-uppercase.text-letter-spacing-large(data-trans=`${component.name?component.name:"menuLeft.messages"}`)
solid-route(name=component.route, rdf-type='foaf:user', use-id='', hidden) solid-route(name=component.route, rdf-type='foaf:user', use-id='', hidden)
div.sub-menu.menu-notification div.sub-menu.menu-notification
div.loader.loader-menu(id=`loader-${component.route}`) div.loader.loader-menu(id=`loader-${component.route}`)