From 09e7e2daa2465520b160f836932c3ef4947c7a1e Mon Sep 17 00:00:00 2001
From: gaelle morin <gmorin.dev@gmail.com>
Date: Mon, 4 Jan 2021 15:26:53 +0100
Subject: [PATCH] feature: labelled item for Hubl-captain
---
package-lock.json | 14 ++--
package.json | 2 +-
src/index.pug | 32 ++++++---
src/styles/index.scss | 4 ++
src/views/partials/menu-left.pug | 80 ++++++++++-----------
src/views/partials/widgets/hubl-captain.pug | 21 +++---
6 files changed, 84 insertions(+), 69 deletions(-)
diff --git a/package-lock.json b/package-lock.json
index 6769693f..ad013848 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -8,7 +8,7 @@
"version": "1.0.0",
"license": "MIT",
"dependencies": {
- "@startinblox/hubl-styling-framework": "^1.0.13",
+ "@startinblox/hubl-styling-framework": "^1.0.14",
"fs-extra": "^9.0.1",
"normalize.css": "^8.0.1",
"parcel-bundler": "^1.12.4",
@@ -1442,9 +1442,9 @@
}
},
"node_modules/@startinblox/hubl-styling-framework": {
- "version": "1.0.13",
- "resolved": "https://registry.npmjs.org/@startinblox/hubl-styling-framework/-/hubl-styling-framework-1.0.13.tgz",
- "integrity": "sha512-bbRTrfH6GgecA/hLiMhphjxdBBPtnIZ88Sd5zSF9kyk/IZ2CptUQVpkYw0eZGhPaWisuqLZ6p/aE4sw1HTWc/w=="
+ "version": "1.0.14",
+ "resolved": "https://registry.npmjs.org/@startinblox/hubl-styling-framework/-/hubl-styling-framework-1.0.14.tgz",
+ "integrity": "sha512-ikNXqwPK/Y7ZyinpY2xH31Bp+A0in0qyy8EnjuwqCxipd5qv7Glp0HxuHRi/k60kNKonSS06wmalysYMIPG9WA=="
},
"node_modules/@types/q": {
"version": "1.5.4",
@@ -10603,9 +10603,9 @@
}
},
"@startinblox/hubl-styling-framework": {
- "version": "1.0.13",
- "resolved": "https://registry.npmjs.org/@startinblox/hubl-styling-framework/-/hubl-styling-framework-1.0.13.tgz",
- "integrity": "sha512-bbRTrfH6GgecA/hLiMhphjxdBBPtnIZ88Sd5zSF9kyk/IZ2CptUQVpkYw0eZGhPaWisuqLZ6p/aE4sw1HTWc/w=="
+ "version": "1.0.14",
+ "resolved": "https://registry.npmjs.org/@startinblox/hubl-styling-framework/-/hubl-styling-framework-1.0.14.tgz",
+ "integrity": "sha512-ikNXqwPK/Y7ZyinpY2xH31Bp+A0in0qyy8EnjuwqCxipd5qv7Glp0HxuHRi/k60kNKonSS06wmalysYMIPG9WA=="
},
"@types/q": {
"version": "1.5.4",
diff --git a/package.json b/package.json
index 346732aa..c1bab23d 100644
--- a/package.json
+++ b/package.json
@@ -45,7 +45,7 @@
]
},
"dependencies": {
- "@startinblox/hubl-styling-framework": "^1.0.13",
+ "@startinblox/hubl-styling-framework": "^1.0.14",
"fs-extra": "^9.0.1",
"normalize.css": "^8.0.1",
"parcel-bundler": "^1.12.4",
diff --git a/src/index.pug b/src/index.pug
index d49e67f2..7fe0bae0 100644
--- a/src/index.pug
+++ b/src/index.pug
@@ -51,6 +51,16 @@ html(lang="en")
include views/partials/menu-left.pug
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
//- #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/`)
//- include views/page-project.pug
- if endpoints.get.circles
- #circle(hidden, data-view="circle").segment.lg-full.with-sidebar
- 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}` 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}joinable/`)
- 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}joinable/`)
- include views/page-circle.pug
+ //- if endpoints.get.circles
+ //- #circle(hidden, data-view="circle").segment.lg-full.with-sidebar
+ //- 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}` 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}joinable/`)
+ //- 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}joinable/`)
+ //- include views/page-circle.pug
//- if endpoints.get.users
//- #messages(hidden, data-view="messages", no-render).with-sidebar
diff --git a/src/styles/index.scss b/src/styles/index.scss
index 3cd687cf..e094d4cf 100644
--- a/src/styles/index.scss
+++ b/src/styles/index.scss
@@ -10,6 +10,10 @@ main {
white-space: normal;
}
+.block {
+ display: block;
+}
+
@import 'header/_index';
@import 'left-nav/_index';
@import 'content/_index';
\ No newline at end of file
diff --git a/src/views/partials/menu-left.pug b/src/views/partials/menu-left.pug
index 4c8434b9..61daf4f9 100644
--- a/src/views/partials/menu-left.pug
+++ b/src/views/partials/menu-left.pug
@@ -131,63 +131,63 @@ solid-router#navbar-router(default-route='dashboard')
//- div.segment.icon.icon-small.icon-calendar
//- div.segment.text-uppercase.text-letter-spacing-large(data-trans="menuLeft.events")
//- div.divider
- //-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)
+ 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-circle-list')
+ //- (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.circles")
+ 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='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#loader-circles.loader.loader-menu
+ div#loader-projects.loader.loader-menu
div
div
div
div
solid-display.ellipsis(
bind-user
- nested-field='circles'
- fields='circle'
- loader-id='loader-circles'
+ nested-field='projects'
+ fields='project'
+ loader-id='loader-projects'
empty-widget='hubl-create'
empty-value=''
- data-trans="empty-value=menuLeft.emptyCircleProject.circle"
- widget-circle='hubl-menu-fix-url-circle'
- order-asc="circle.name"
+ 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
+ //- 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.menu-wrapper
//- div.menu.segment.lg-full.padding-small.text-semibold.text-color-white.heading-active.bg-color-heading.hover.active
diff --git a/src/views/partials/widgets/hubl-captain.pug b/src/views/partials/widgets/hubl-captain.pug
index c5e16154..d72b95b3 100644
--- a/src/views/partials/widgets/hubl-captain.pug
+++ b/src/views/partials/widgets/hubl-captain.pug
@@ -1,19 +1,20 @@
solid-widget(name='hubl-captain')
template
- solid-display.labelled-avatar(
+ solid-display.labelled-avatar.two-lines(
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-segment2='segment margin-left-small'
- class-segment3='segment margin-left-small'
+ class-segment1='segment'
class-account.picture='avatar'
- class-name='text-semibold text-color-heading'
-
- class-user='icon top-align icon-secondary hover icon-speech'
-
- class-atom='icon top-align icon-third mdi-atom'
+
+ class-segment2='segment margin-left-xsmall'
+ class-block1='block'
+ 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-fields='community.name'
--
GitLab