feature: labelled item for Hubl-captain

This commit is contained in:
gaelle morin 2021-01-04 15:26:53 +01:00
parent fb4aa7f1f5
commit 09e7e2daa2
No known key found for this signature in database
GPG Key ID: 028426702B95CF9C
6 changed files with 84 additions and 69 deletions

14
package-lock.json generated
View File

@ -8,7 +8,7 @@
"version": "1.0.0", "version": "1.0.0",
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"@startinblox/hubl-styling-framework": "^1.0.13", "@startinblox/hubl-styling-framework": "^1.0.14",
"fs-extra": "^9.0.1", "fs-extra": "^9.0.1",
"normalize.css": "^8.0.1", "normalize.css": "^8.0.1",
"parcel-bundler": "^1.12.4", "parcel-bundler": "^1.12.4",
@ -1442,9 +1442,9 @@
} }
}, },
"node_modules/@startinblox/hubl-styling-framework": { "node_modules/@startinblox/hubl-styling-framework": {
"version": "1.0.13", "version": "1.0.14",
"resolved": "https://registry.npmjs.org/@startinblox/hubl-styling-framework/-/hubl-styling-framework-1.0.13.tgz", "resolved": "https://registry.npmjs.org/@startinblox/hubl-styling-framework/-/hubl-styling-framework-1.0.14.tgz",
"integrity": "sha512-bbRTrfH6GgecA/hLiMhphjxdBBPtnIZ88Sd5zSF9kyk/IZ2CptUQVpkYw0eZGhPaWisuqLZ6p/aE4sw1HTWc/w==" "integrity": "sha512-ikNXqwPK/Y7ZyinpY2xH31Bp+A0in0qyy8EnjuwqCxipd5qv7Glp0HxuHRi/k60kNKonSS06wmalysYMIPG9WA=="
}, },
"node_modules/@types/q": { "node_modules/@types/q": {
"version": "1.5.4", "version": "1.5.4",
@ -10603,9 +10603,9 @@
} }
}, },
"@startinblox/hubl-styling-framework": { "@startinblox/hubl-styling-framework": {
"version": "1.0.13", "version": "1.0.14",
"resolved": "https://registry.npmjs.org/@startinblox/hubl-styling-framework/-/hubl-styling-framework-1.0.13.tgz", "resolved": "https://registry.npmjs.org/@startinblox/hubl-styling-framework/-/hubl-styling-framework-1.0.14.tgz",
"integrity": "sha512-bbRTrfH6GgecA/hLiMhphjxdBBPtnIZ88Sd5zSF9kyk/IZ2CptUQVpkYw0eZGhPaWisuqLZ6p/aE4sw1HTWc/w==" "integrity": "sha512-ikNXqwPK/Y7ZyinpY2xH31Bp+A0in0qyy8EnjuwqCxipd5qv7Glp0HxuHRi/k60kNKonSS06wmalysYMIPG9WA=="
}, },
"@types/q": { "@types/q": {
"version": "1.5.4", "version": "1.5.4",

View File

@ -45,7 +45,7 @@
] ]
}, },
"dependencies": { "dependencies": {
"@startinblox/hubl-styling-framework": "^1.0.13", "@startinblox/hubl-styling-framework": "^1.0.14",
"fs-extra": "^9.0.1", "fs-extra": "^9.0.1",
"normalize.css": "^8.0.1", "normalize.css": "^8.0.1",
"parcel-bundler": "^1.12.4", "parcel-bundler": "^1.12.4",

View File

@ -51,6 +51,16 @@ html(lang="en")
include views/partials/menu-left.pug include views/partials/menu-left.pug
main#content.segment.lg-three-quarter.text-top.notLoggedIn main#content.segment.lg-three-quarter.text-top.notLoggedIn
#project(hidden, data-view="project", no-render).with-sidebar
hubl-reactivity(bind-user nested-field='inbox' target-src="store://user.projects")
hubl-reactivity(data-src=`${endpoints.post.projects}joinable/` target-src=`${endpoints.get.projects}`)
hubl-reactivity(data-src=`${endpoints.post.projects}` target-src=`${endpoints.get.projects}`)
hubl-reactivity(bind-user nested-field="projects" target-src=`${endpoints.post.projects}`)
hubl-reactivity(bind-user nested-field="projects" target-src=`${endpoints.post.projects}joinable/`)
hubl-reactivity(data-src=`${endpoints.projects || endpoints.get.projects}joinable/` target-src=`${endpoints.projects || endpoints.get.projects}`)
hubl-reactivity(bind-user nested-field="projects" target-src=`${endpoints.projects || endpoints.get.projects}`)
hubl-reactivity(bind-user nested-field="projects" target-src=`${endpoints.projects || endpoints.get.projects}joinable/`)
include views/page-project.pug
//- if endpoints.get.dashboards //- if endpoints.get.dashboards
//- #dashboard(hidden, data-view="dashboard") //- #dashboard(hidden, data-view="dashboard")
@ -113,17 +123,17 @@ html(lang="en")
//- hubl-reactivity(bind-user nested-field="projects" target-src=`${endpoints.projects || endpoints.get.projects}joinable/`) //- hubl-reactivity(bind-user nested-field="projects" target-src=`${endpoints.projects || endpoints.get.projects}joinable/`)
//- include views/page-project.pug //- include views/page-project.pug
if endpoints.get.circles //- if endpoints.get.circles
#circle(hidden, data-view="circle").segment.lg-full.with-sidebar //- #circle(hidden, data-view="circle").segment.lg-full.with-sidebar
hubl-reactivity(bind-user nested-field='inbox' target-src="store://user.circles") //- hubl-reactivity(bind-user nested-field='inbox' target-src="store://user.circles")
hubl-reactivity(data-src=`${endpoints.post.circles}joinable/` target-src=`${endpoints.get.circles}`) //- hubl-reactivity(data-src=`${endpoints.post.circles}joinable/` target-src=`${endpoints.get.circles}`)
hubl-reactivity(data-src=`${endpoints.post.circles}` target-src=`${endpoints.get.circles}`) //- hubl-reactivity(data-src=`${endpoints.post.circles}` target-src=`${endpoints.get.circles}`)
hubl-reactivity(bind-user nested-field="circles" target-src=`${endpoints.post.circles}`) //- hubl-reactivity(bind-user nested-field="circles" target-src=`${endpoints.post.circles}`)
hubl-reactivity(bind-user nested-field="circles" target-src=`${endpoints.post.circles}joinable/`) //- hubl-reactivity(bind-user nested-field="circles" target-src=`${endpoints.post.circles}joinable/`)
hubl-reactivity(data-src=`${endpoints.circles || endpoints.get.circles}joinable/` target-src=`${endpoints.circles || endpoints.get.circles}`) //- hubl-reactivity(data-src=`${endpoints.circles || endpoints.get.circles}joinable/` target-src=`${endpoints.circles || endpoints.get.circles}`)
hubl-reactivity(bind-user nested-field="circles" target-src=`${endpoints.circles || endpoints.get.circles}`) //- hubl-reactivity(bind-user nested-field="circles" target-src=`${endpoints.circles || endpoints.get.circles}`)
hubl-reactivity(bind-user nested-field="circles" target-src=`${endpoints.circles || endpoints.get.circles}joinable/`) //- hubl-reactivity(bind-user nested-field="circles" target-src=`${endpoints.circles || endpoints.get.circles}joinable/`)
include views/page-circle.pug //- include views/page-circle.pug
//- if endpoints.get.users //- if endpoints.get.users
//- #messages(hidden, data-view="messages", no-render).with-sidebar //- #messages(hidden, data-view="messages", no-render).with-sidebar

View File

@ -10,6 +10,10 @@ main {
white-space: normal; white-space: normal;
} }
.block {
display: block;
}
@import 'header/_index'; @import 'header/_index';
@import 'left-nav/_index'; @import 'left-nav/_index';
@import 'content/_index'; @import 'content/_index';

View File

@ -131,63 +131,63 @@ solid-router#navbar-router(default-route='dashboard')
//- div.segment.icon.icon-small.icon-calendar //- div.segment.icon.icon-small.icon-calendar
//- div.segment.text-uppercase.text-letter-spacing-large(data-trans="menuLeft.events") //- div.segment.text-uppercase.text-letter-spacing-large(data-trans="menuLeft.events")
//- div.divider //- div.divider
//-if endpoints.projects || (endpoints.get && endpoints.get.projects) if endpoints.projects || (endpoints.get && endpoints.get.projects)
//- div.menu-wrapper
//- solid-link.menu.segment.lg-full.padding-small.text-semibold.text-color-white.heading-active.bg-color-heading.hover.active
//- //- (next='admin-project-list')
//- div.segment.margin-right-xxsmall
//- div.segment.icon.icon-small.icon-folder-alt
//- div.segment.lg-three-quarter.text-uppercase.text-letter-spacing-large(data-trans="menuLeft.projects")
//- div.menu-chevron.segment
//- div.icon-arrow-up
//- //- div.menu-icon.icon-arrow-right-circle
//- solid-route(name='project', rdf-type='hd:project', use-id='', hidden)
//- div.sub-menu.menu-notification
//- div#loader-projects.loader.loader-menu
//- div
//- div
//- div
//- div
//- solid-display.ellipsis(
//- bind-user
//- nested-field='projects'
//- fields='project'
//- loader-id='loader-projects'
//- empty-widget='hubl-create'
//- empty-value=''
//- data-trans="empty-value=menuLeft.emptyCircleProject.project"
//- widget-project='hubl-menu-fix-url-project'
//- order-asc="project.customer.name"
//- )
div.divider
if endpoints.circles || (endpoints.get && endpoints.get.circles)
div.menu-wrapper div.menu-wrapper
solid-link.menu.segment.lg-full.padding-small.text-semibold.text-color-white.heading-active.bg-color-heading.hover.active solid-link.menu.segment.lg-full.padding-small.text-semibold.text-color-white.heading-active.bg-color-heading.hover.active
//- (next='admin-circle-list') //- (next='admin-project-list')
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.lg-three-quarter.text-uppercase.text-letter-spacing-large(data-trans="menuLeft.circles") div.segment.lg-three-quarter.text-uppercase.text-letter-spacing-large(data-trans="menuLeft.projects")
div.menu-chevron.segment div.menu-chevron.segment
div.icon-arrow-up div.icon-arrow-up
//- div.menu-icon.icon-arrow-right-circle //- div.menu-icon.icon-arrow-right-circle
solid-route(name='circle', rdf-type='hd:circle', use-id='', hidden) solid-route(name='project', rdf-type='hd:project', use-id='', hidden)
div.sub-menu.menu-notification div.sub-menu.menu-notification
div#loader-circles.loader.loader-menu div#loader-projects.loader.loader-menu
div div
div div
div div
div div
solid-display.ellipsis( solid-display.ellipsis(
bind-user bind-user
nested-field='circles' nested-field='projects'
fields='circle' fields='project'
loader-id='loader-circles' loader-id='loader-projects'
empty-widget='hubl-create' empty-widget='hubl-create'
empty-value='' empty-value=''
data-trans="empty-value=menuLeft.emptyCircleProject.circle" data-trans="empty-value=menuLeft.emptyCircleProject.project"
widget-circle='hubl-menu-fix-url-circle' widget-project='hubl-menu-fix-url-project'
order-asc="circle.name" order-asc="project.customer.name"
) )
div.divider
//-if endpoints.circles || (endpoints.get && endpoints.get.circles)
//- div.menu-wrapper
//- solid-link.menu.segment.lg-full.padding-small.text-semibold.text-color-white.heading-active.bg-color-heading.hover.active
//- //- (next='admin-circle-list')
//- div.segment.margin-right-xxsmall
//- div.segment.icon.icon-small.icon-folder-alt
//- div.segment.lg-three-quarter.text-uppercase.text-letter-spacing-large(data-trans="menuLeft.circles")
//- div.menu-chevron.segment
//- div.icon-arrow-up
//- //- div.menu-icon.icon-arrow-right-circle
//- solid-route(name='circle', rdf-type='hd:circle', use-id='', hidden)
//- div.sub-menu.menu-notification
//- div#loader-circles.loader.loader-menu
//- div
//- div
//- div
//- div
//- solid-display.ellipsis(
//- bind-user
//- nested-field='circles'
//- fields='circle'
//- loader-id='loader-circles'
//- empty-widget='hubl-create'
//- empty-value=''
//- data-trans="empty-value=menuLeft.emptyCircleProject.circle"
//- widget-circle='hubl-menu-fix-url-circle'
//- order-asc="circle.name"
//- )
//- div.divider //- div.divider
//- div.menu-wrapper //- div.menu-wrapper
//- div.menu.segment.lg-full.padding-small.text-semibold.text-color-white.heading-active.bg-color-heading.hover.active //- div.menu.segment.lg-full.padding-small.text-semibold.text-color-white.heading-active.bg-color-heading.hover.active

View File

@ -1,19 +1,20 @@
solid-widget(name='hubl-captain') solid-widget(name='hubl-captain')
template template
solid-display.labelled-avatar( solid-display.labelled-avatar.two-lines(
data-src="${value}" data-src="${value}"
fields='segment1(account.picture), segment2(name, user, is_lead), segment3(atom, communities)' fields='segment1(account.picture), segment2(block1(name, user), block2(atom, communities))'
class-segment1='segment' class-segment1='segment'
class-segment2='segment margin-left-small'
class-segment3='segment margin-left-small'
class-account.picture='avatar' class-account.picture='avatar'
class-name='text-semibold text-color-heading'
class-user='icon top-align icon-secondary hover icon-speech' class-segment2='segment margin-left-xsmall'
class-block1='block'
class-atom='icon top-align icon-third mdi-atom' class-name='text-semibold text-color-heading text-sub word-spacing-right'
class-user='icon icon-secondary hover icon-speech sup-icon'
class-block2='block'
class-atom='icon icon-large icon-third mdi-atom sub-icon'
class-communities='text-top-align word-spacing-left'
multiple-communities multiple-communities
multiple-communities-fields='community.name' multiple-communities-fields='community.name'