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

feature: project-profile - labelled elements on members and captain

Browse Source
This commit is contained in:
gaelle morin 2021-01-05 13:22:25 +01:00
parent 09e7e2daa2
commit 250b89b0de
No known key found for this signature in database
GPG Key ID: 028426702B95CF9C
5 changed files with 41 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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.14", "@startinblox/hubl-styling-framework": "^1.0.18",
"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.14", "version": "1.0.18",
"resolved": "https://registry.npmjs.org/@startinblox/hubl-styling-framework/-/hubl-styling-framework-1.0.14.tgz", "resolved": "https://registry.npmjs.org/@startinblox/hubl-styling-framework/-/hubl-styling-framework-1.0.18.tgz",
"integrity": "sha512-ikNXqwPK/Y7ZyinpY2xH31Bp+A0in0qyy8EnjuwqCxipd5qv7Glp0HxuHRi/k60kNKonSS06wmalysYMIPG9WA==" "integrity": "sha512-ZMm7M8DPyqq+oyapcS1N3Zzp+Kz86RuTGljVe3cxm2DrYDs8bweQmv/QjUGFUJ1b5U3vEnWO7BYL46u+wo/K4A=="
}, },
"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.14", "version": "1.0.18",
"resolved": "https://registry.npmjs.org/@startinblox/hubl-styling-framework/-/hubl-styling-framework-1.0.14.tgz", "resolved": "https://registry.npmjs.org/@startinblox/hubl-styling-framework/-/hubl-styling-framework-1.0.18.tgz",
"integrity": "sha512-ikNXqwPK/Y7ZyinpY2xH31Bp+A0in0qyy8EnjuwqCxipd5qv7Glp0HxuHRi/k60kNKonSS06wmalysYMIPG9WA==" "integrity": "sha512-ZMm7M8DPyqq+oyapcS1N3Zzp+Kz86RuTGljVe3cxm2DrYDs8bweQmv/QjUGFUJ1b5U3vEnWO7BYL46u+wo/K4A=="
}, },
"@types/q": { "@types/q": {
"version": "1.5.4", "version": "1.5.4",

2
package.json
View File

@ -45,7 +45,7 @@
] ]
}, },
"dependencies": { "dependencies": {
"@startinblox/hubl-styling-framework": "^1.0.14", "@startinblox/hubl-styling-framework": "^1.0.18",
"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",

4
src/styles/index.scss
View File

@ -14,6 +14,10 @@ main {
display: block; display: block;
} }
solid-display>div {
display: contents !important;
}
@import 'header/_index'; @import 'header/_index';
@import 'left-nav/_index'; @import 'left-nav/_index';
@import 'content/_index'; @import 'content/_index';

31
src/views/partials/project/page-project-profile.pug
View File

@ -23,7 +23,7 @@ solid-router(default-route='project-profile', hidden)
solid-widget(name='hubl-project-team-contact') solid-widget(name='hubl-project-team-contact')
template template
solid-link(data-src='\${value}', next='messages') solid-link.icon.icon-secondary.hover.icon-speech(data-src='\${value}', next='messages')
div.segment.lg-full.padding-large div.segment.lg-full.padding-large
div#loader-project-profile.loader div#loader-project-profile.loader
@ -87,37 +87,36 @@ solid-router(default-route='project-profile', hidden)
hubl-inherit-user-id="search-value-user" hubl-inherit-user-id="search-value-user"
) )
h3.text-color-heading.text-bold.text-letter-spacing-large(data-trans:'project.profile.captain') h3.text-color-heading.text-bold.text-letter-spacing-large(data-trans='project.profile.captain')
solid-display( solid-display(
bind-resources bind-resources
fields='captain' fields='captain'
widget-captain='hubl-captain' widget-captain='hubl-captain'
) )
//-
br
h3.text-color-heading.text-bold.text-letter-spacing-large(data-trans:'project.profile.subTitle') h3.text-color-heading.text-bold.text-letter-spacing-large(data-trans='project.profile.subTitle')
solid-display.user-thumb( solid-display.segment.lg-full.labelled-avatar.two-lines.whitespace-normal.children.lg-children-full.children-margin-bottom-medium(
bind-resources bind-resources
nested-field='members' nested-field='members'
fields='user.account.picture, content(name-and-icon(user.name, user), sub(atom, user.communities, name))' fields='segment1(user.account.picture), segment2(line1(user.name, user), line2(atom, user.communities))'
widget-user='hubl-project-team-contact' class-segment1='segment'
class-user.account.picture='avatar'
class-user.account.picture='user-thumb-avatar' class-segment2='segment lg-three-quarter margin-left-xsmall'
class-content='user-thumb-content' class-line1='block'
class-name-and-icon='user-thumb-content__name-and-icon' class-user.name='text-semibold text-color-heading text-sub word-spacing-right'
class-user.name='name' class-line2='block'
class-user='icon top-align icon-secondary hover icon-speech' class-atom='icon icon-large icon-third mdi-atom'
class-sub='user-thumb-content__sub-text community' class-user.communities='lg-full word-spacing-left'
class-atom='icon icon-third mdi-atom'
multiple-user.communities multiple-user.communities
multiple-user.communities-fields="community.name" multiple-user.communities-fields="community.name"
widget-classGroup='solid-set-div'
widget-user.account.picture='hubl-user-avatar' widget-user.account.picture='hubl-user-avatar'
widget-user='hubl-project-team-contact'
) )
#project-edit(hidden, data-view="project-edit") #project-edit(hidden, data-view="project-edit")

23
src/views/partials/widgets/hubl-captain.pug
View File

@ -1,25 +1,30 @@
solid-widget(name='hubl-captain-contact')
template
solid-link.icon.icon-secondary.hover.icon-speech(data-src='\${value}', next='messages')
solid-widget(name='hubl-captain') solid-widget(name='hubl-captain')
template template
solid-display.labelled-avatar.two-lines( solid-display.segment.lg-full.margin-bottom-large.labelled-avatar.two-lines(
data-src="${value}" data-src="${value}"
fields='segment1(account.picture), segment2(block1(name, user), block2(atom, communities))' fields='segment1(account.picture), segment2(line1(name, user), line2(atom, communities))'
class-segment1='segment' class-segment1='segment'
class-account.picture='avatar' class-account.picture='avatar'
class-segment2='segment margin-left-xsmall' class-segment2='segment lg-three-quarter margin-left-xsmall'
class-block1='block' class-line1='block'
class-name='text-semibold text-color-heading text-sub word-spacing-right' class-name='text-semibold text-color-heading text-sub word-spacing-right'
class-user='icon icon-secondary hover icon-speech sup-icon' class-line2='block'
class-block2='block' class-atom='icon icon-large icon-third mdi-atom'
class-atom='icon icon-large icon-third mdi-atom sub-icon' class-communities='lg-full word-spacing-left'
class-communities='text-top-align word-spacing-left'
value-user='${value}'
multiple-communities multiple-communities
multiple-communities-fields='community.name' multiple-communities-fields='community.name'
widget-account.picture='hubl-user-avatar' widget-account.picture='hubl-user-avatar'
widget-user='hubl-captain-contact'
) )
//- To remove from translate file : //- To remove from translate file :