From c469606dca46f256719ea5c23ff82b135184ab4c Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Pasquier Date: Mon, 25 Jan 2021 11:56:34 +0100 Subject: [PATCH 1/6] feature: add counter on circles --- src/dependencies.pug | 2 +- .../partials/admin/page-admin-circles.pug | 30 +++++++++++++++++-- 2 files changed, 29 insertions(+), 3 deletions(-) diff --git a/src/dependencies.pug b/src/dependencies.pug index aa2cedc..2980e13 100644 --- a/src/dependencies.pug +++ b/src/dependencies.pug @@ -36,7 +36,7 @@ if endpoints.get //- script(type="module" src="/lib/solid-dashboard/dist/index.js" defer) if endpoints.get.users - script(type="module" src="https://cdn.skypack.dev/@startinblox/component-chat@1.7" defer) + script(type="module" src="https://cdn.skypack.dev/@startinblox/component-chat@beta" defer) //- script(type="module" src="/lib/solid-xmpp-chat/dist/index.js" defer) if endpoints.get.polls diff --git a/src/views/partials/admin/page-admin-circles.pug b/src/views/partials/admin/page-admin-circles.pug index 4c93ec5..ae65822 100644 --- a/src/views/partials/admin/page-admin-circles.pug +++ b/src/views/partials/admin/page-admin-circles.pug @@ -39,6 +39,28 @@ div.segment.full.padding-large.sm-padding-xsmall.sm-padding-top-normal.whitespac data-trans='circle.list.buttonCreate' ) + solid-widget(name='hubl-admin-circle-counter') + template + div(style='float:right') + solid-display( + fields='' + data-src="${src}" + nested-field="members" + counter-template="\\\${counter}" + ) + span.icon.icon-people.icon-xsmall.margin-right-xxsmall + + solid-widget(name='hubl-admin-circle-counter-alternate') + template + div(style='float:right') + solid-display( + fields='' + data-src="${src}" + nested-field="circle.members" + counter-template="\\\${counter}" + ) + span.icon.icon-people.icon-xsmall.margin-right-xxsmall + .segment.table-wrapper .table @@ -66,7 +88,7 @@ div.segment.full.padding-large.sm-padding-xsmall.sm-padding-top-normal.whitespac class='table-body' bind-user nested-field='circles' - fields='cell1(circle.name, circle.subtitle), cell2(circle.owner), cell3(leaveButton)' + fields='cell1(circle.name, counter, circle.subtitle), cell2(circle.owner), cell3(leaveButton)' loader-id='loader-admin-circles' class-cell1='segment table-cell third whitespace-normal' @@ -79,6 +101,8 @@ div.segment.full.padding-large.sm-padding-xsmall.sm-padding-top-normal.whitespac action-leaveButton="joinButton" widget-leaveButton="hubl-admin-circle-leave-button" widget-circle.owner='hubl-circle-owner' + action-counter="counter" + widget-counter="hubl-admin-circle-counter-alternate" order-by="circle.name" ) @@ -107,7 +131,7 @@ div.segment.full.padding-large.sm-padding-xsmall.sm-padding-top-normal.whitespac class='table-body' data-src=`${endpoints.circles || endpoints.get.circles}joinable/` - fields='cell1(name, subtitle), cell2(owner), cell3(members)' + fields='cell1(name, counter, subtitle), cell2(owner), cell3(members)' loader-id='loader-admin-circles' class-cell1='segment table-cell third whitespace-normal' @@ -119,6 +143,8 @@ div.segment.full.padding-large.sm-padding-xsmall.sm-padding-top-normal.whitespac widget-owner='hubl-circle-owner' widget-members="hubl-admin-circle-join-button" + action-counter="counter" + widget-counter="hubl-admin-circle-counter" order-by="name" ) From 56f2ad647bbceefaf7716339cb50d8e4272e5455 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Pasquier Date: Mon, 25 Jan 2021 12:01:16 +0100 Subject: [PATCH 2/6] feature: add counter on projects & communities --- .../partials/admin/page-admin-communities.pug | 19 ++++++++++-- .../partials/admin/page-admin-projects.pug | 30 +++++++++++++++++-- 2 files changed, 44 insertions(+), 5 deletions(-) diff --git a/src/views/partials/admin/page-admin-communities.pug b/src/views/partials/admin/page-admin-communities.pug index b958033..06fa213 100644 --- a/src/views/partials/admin/page-admin-communities.pug +++ b/src/views/partials/admin/page-admin-communities.pug @@ -18,6 +18,17 @@ div.segment.full.padding-large.sm-padding-xsmall.sm-padding-top-medium.whitespac div.segment.full.margin-bottom-xlarge h3.text-color-heading.text-semibold.text-letter-spacing-large(data-trans='communities.subTitle') + solid-widget(name='hubl-admin-community-counter') + template + div(style='float:right') + solid-display( + fields='' + data-src="${src}" + nested-field="community.members" + counter-template="\\\${counter}" + ) + span.icon.icon-people.icon-xsmall.margin-right-xxsmall + .segment.table-wrapper .table div.table-header.bg-color-third.text-color-heading @@ -28,14 +39,16 @@ div.segment.full.padding-large.sm-padding-xsmall.sm-padding-top-medium.whitespac class='table-body' bind-user nested-field='communities' - fields='cell1(community.name), cell2(community)' + fields='cell1(community.name, counter), cell2(community)' loader-id='loader-admin-community' - class-cell1='segment table-cell half text-center' + class-cell1='segment table-cell half' class-cell2='segment table-cell half text-center' - class-community.name='text-xlarge text-color-heading text-semibold text-letter-spacing-large ellipsis' + class-community.name='segment block margin-bottom-xxsmall text-xlarge text-color-heading text-semibold text-letter-spacing-large ellipsis' widget-community='hubl-action-community' + action-counter="counter" + widget-counter="hubl-admin-community-counter" order-asc='community.name' ) diff --git a/src/views/partials/admin/page-admin-projects.pug b/src/views/partials/admin/page-admin-projects.pug index 9502747..32a80cd 100644 --- a/src/views/partials/admin/page-admin-projects.pug +++ b/src/views/partials/admin/page-admin-projects.pug @@ -14,6 +14,28 @@ div.segment.full.padding-large.sm-padding-xsmall.sm-padding-top-medium.whitespac data-trans='project.list.buttonCreate' ) + solid-widget(name='hubl-admin-project-counter') + template + div(style='float:right') + solid-display( + fields='' + data-src="${src}" + nested-field="members" + counter-template="\\\${counter}" + ) + span.icon.icon-people.icon-xsmall.margin-right-xxsmall + + solid-widget(name='hubl-admin-project-counter-alternate') + template + div(style='float:right') + solid-display( + fields='' + data-src="${src}" + nested-field="project.members" + counter-template="\\\${counter}" + ) + span.icon.icon-people.icon-xsmall.margin-right-xxsmall + .segment.table-wrapper .table @@ -82,7 +104,7 @@ div.segment.full.padding-large.sm-padding-xsmall.sm-padding-top-medium.whitespac bind-user nested-field="projects" - fields='cell1(project.customer.name, project.name), cell2(project.members), cell3(project.captain), cell4(leaveButton)' + fields='cell1(project.customer.name, counter, project.name), cell2(project.members), cell3(project.captain), cell4(leaveButton)' loader-id='loader-admin-projects' class-cell1='segment table-cell quarter text-left whitespace-normal' @@ -98,6 +120,8 @@ div.segment.full.padding-large.sm-padding-xsmall.sm-padding-top-medium.whitespac widget-project.captain='hubl-project-captain' widget-project.members='hubl-project-admins' + action-counter="counter" + widget-counter="hubl-admin-project-counter-alternate" order-by="project.name" ) @@ -127,7 +151,7 @@ div.segment.full.padding-large.sm-padding-xsmall.sm-padding-top-medium.whitespac class='table-body' data-src=`${endpoints.projects || endpoints.get.projects}joinable/` - fields='cell1(customer.name, name), cell2(members), cell3(captain), cell4(joinButton)' + fields='cell1(customer.name, counter, name), cell2(members), cell3(captain), cell4(joinButton)' loader-id='loader-admin-projects' class-cell1='segment table-cell quarter text-left whitespace-normal' @@ -143,6 +167,8 @@ div.segment.full.padding-large.sm-padding-xsmall.sm-padding-top-medium.whitespac widget-captain='hubl-project-captain' widget-members='hubl-project-admins' + action-counter="counter" + widget-counter="hubl-admin-project-counter" order-by="name" ) From 4a176871bb4ea3af5b34511b3db085b52452e873 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Pasquier Date: Mon, 25 Jan 2021 12:21:25 +0100 Subject: [PATCH 3/6] minor: bump version --- src/components/hubl-reactivity.js | 2 +- src/components/hubl-search-users.js | 2 +- src/components/hubl-status.js | 2 +- src/dependencies.pug | 26 +++++++++++++++----------- 4 files changed, 18 insertions(+), 14 deletions(-) diff --git a/src/components/hubl-reactivity.js b/src/components/hubl-reactivity.js index 2806781..e661bfe 100644 --- a/src/components/hubl-reactivity.js +++ b/src/components/hubl-reactivity.js @@ -1,4 +1,4 @@ -import { store, Sib, StoreMixin } from 'https://cdn.skypack.dev/@startinblox/core@0.14'; +import { store, Sib, StoreMixin } from 'https://cdn.skypack.dev/@startinblox/core@0.15'; export const HublReactivity = { name: 'hubl-reactivity', diff --git a/src/components/hubl-search-users.js b/src/components/hubl-search-users.js index 1891a90..acc5e7d 100644 --- a/src/components/hubl-search-users.js +++ b/src/components/hubl-search-users.js @@ -1,4 +1,4 @@ -import { widgetFactory } from 'https://cdn.skypack.dev/@startinblox/core@0.14'; +import { widgetFactory } from 'https://cdn.skypack.dev/@startinblox/core@0.15'; const HublSearchUsers = widgetFactory( 'hubl-search-users', diff --git a/src/components/hubl-status.js b/src/components/hubl-status.js index c8647aa..0be89d1 100644 --- a/src/components/hubl-status.js +++ b/src/components/hubl-status.js @@ -1,4 +1,4 @@ -import { widgetFactory, Helpers } from 'https://cdn.skypack.dev/@startinblox/core@0.14'; +import { widgetFactory, Helpers } from 'https://cdn.skypack.dev/@startinblox/core@0.15'; import SlimSelect from 'https://cdn.skypack.dev/slim-select@1.23'; const HublStatus = widgetFactory( diff --git a/src/dependencies.pug b/src/dependencies.pug index 2980e13..4b840b1 100644 --- a/src/dependencies.pug +++ b/src/dependencies.pug @@ -1,13 +1,13 @@ -script(type="module" src="https://cdn.skypack.dev/@startinblox/core@0.14" defer) +script(type="module" src="https://cdn.skypack.dev/@startinblox/core@0.15" defer) //- script(type="module" src="/lib/sib-core/dist/index.js" defer) -script(type="module" src="https://cdn.skypack.dev/@startinblox/oidc@0.13.2" defer) +script(type="module" src="https://cdn.skypack.dev/@startinblox/oidc@0.13" defer) //- script(type="module" src="/lib/sib-auth/index.js" defer) script(type="module" src="https://cdn.skypack.dev/@startinblox/router@0.11" defer) //- script(type="module" src="/lib/sib-router/src/index.js" defer) -script(type="module" src="https://cdn.skypack.dev/@startinblox/component-notifications@0.9" defer) +script(type="module" src="https://cdn.skypack.dev/@startinblox/component-notifications@0.10" defer) //- script(type="module" src="/lib/sib-notifications/index.js" defer) if themeChecker @@ -15,12 +15,14 @@ if themeChecker link(rel='stylesheet', href='https://cdn.jsdelivr.net/npm/@simonwep/pickr/dist/themes/nano.min.css') if endpoints.get - if endpoints.get.events && endpoints.get.typeevents - script(type="module" src="https://cdn.skypack.dev/@startinblox/component-event@1.4" defer) + //- Disabled, core@0.15 required + //- if endpoints.get.events && endpoints.get.typeevents + //- script(type="module" src="https://cdn.skypack.dev/@startinblox/component-event@1.4" defer) //- script(type="module" src="/lib/sib-event-component/sib-event.js" defer) - if endpoints.get.resources && endpoints.get.resourceskeywords && endpoints.get.resourcestypes - script(type="module" src="https://cdn.skypack.dev/@startinblox/component-resource@1.2" defer) + //- Disabled, core@0.15 required + //- if endpoints.get.resources && endpoints.get.resourceskeywords && endpoints.get.resourcestypes + //- script(type="module" src="https://cdn.skypack.dev/@startinblox/component-resource@1.2" defer) //- script(type="module" src="/lib/sib-resource/sib-resource.js" defer) if endpoints.get.joboffers @@ -39,9 +41,11 @@ if endpoints.get script(type="module" src="https://cdn.skypack.dev/@startinblox/component-chat@beta" defer) //- script(type="module" src="/lib/solid-xmpp-chat/dist/index.js" defer) - if endpoints.get.polls - script(type="module" src="https://cdn.skypack.dev/@startinblox/component-poll@1.2" defer) + //- Disabled, core@0.15 required + //- if endpoints.get.polls + //- script(type="module" src="https://cdn.skypack.dev/@startinblox/component-poll@1.2" defer) //- script(type="module" src="/lib/sib-polls-component/index.js" defer) - if endpoints.get.polls || endpoints.get.events || endpoints.get.resources - script(type="module" src="https://cdn.skypack.dev/@startinblox/component-conversation@0.8" defer) + //- Disabled, core@0.15 required + //- if endpoints.get.polls || endpoints.get.events || endpoints.get.resources + //- script(type="module" src="https://cdn.skypack.dev/@startinblox/component-conversation@0.8" defer) From 5df1412244659e677c4390668c07090f447bcad3 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Pasquier Date: Mon, 25 Jan 2021 12:49:45 +0100 Subject: [PATCH 4/6] fix: revert version --- package-lock.json | 6 +++--- package.json | 2 +- src/components/hubl-reactivity.js | 2 +- src/components/hubl-search-users.js | 2 +- src/components/hubl-status.js | 2 +- src/dependencies.pug | 26 +++++++++++--------------- 6 files changed, 18 insertions(+), 22 deletions(-) diff --git a/package-lock.json b/package-lock.json index b83e722..d84ae80 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1159,9 +1159,9 @@ } }, "@startinblox/hubl-styling-framework": { - "version": "1.8.0", - "resolved": "https://registry.npmjs.org/@startinblox/hubl-styling-framework/-/hubl-styling-framework-1.8.0.tgz", - "integrity": "sha512-oRyaKYE6mCZBlVLPItx1xhRoX1Dp32KJm6XoLaD3XHUopoNPIxJ1OhF0SfU4YnpQyPRYfwEqNz4zZtwOS7PGbA==" + "version": "1.8.1", + "resolved": "https://registry.npmjs.org/@startinblox/hubl-styling-framework/-/hubl-styling-framework-1.8.1.tgz", + "integrity": "sha512-gEuLNjIJDr5NyYHxyYAyas4B1fiA9xx0k5J/O5LZTL7hKPIwgEGLlLa7cbwiSCJNi34wMQMA9wVhEIg1I+7j/w==" }, "@types/q": { "version": "1.5.4", diff --git a/package.json b/package.json index 53f1e09..ef7da21 100644 --- a/package.json +++ b/package.json @@ -45,7 +45,7 @@ ] }, "dependencies": { - "@startinblox/hubl-styling-framework": "^1.8.0", + "@startinblox/hubl-styling-framework": "^1.8.1", "cross-env": "^7.0.3", "fs-extra": "^9.0.1", "normalize.css": "^8.0.1", diff --git a/src/components/hubl-reactivity.js b/src/components/hubl-reactivity.js index e661bfe..2806781 100644 --- a/src/components/hubl-reactivity.js +++ b/src/components/hubl-reactivity.js @@ -1,4 +1,4 @@ -import { store, Sib, StoreMixin } from 'https://cdn.skypack.dev/@startinblox/core@0.15'; +import { store, Sib, StoreMixin } from 'https://cdn.skypack.dev/@startinblox/core@0.14'; export const HublReactivity = { name: 'hubl-reactivity', diff --git a/src/components/hubl-search-users.js b/src/components/hubl-search-users.js index acc5e7d..1891a90 100644 --- a/src/components/hubl-search-users.js +++ b/src/components/hubl-search-users.js @@ -1,4 +1,4 @@ -import { widgetFactory } from 'https://cdn.skypack.dev/@startinblox/core@0.15'; +import { widgetFactory } from 'https://cdn.skypack.dev/@startinblox/core@0.14'; const HublSearchUsers = widgetFactory( 'hubl-search-users', diff --git a/src/components/hubl-status.js b/src/components/hubl-status.js index 0be89d1..c8647aa 100644 --- a/src/components/hubl-status.js +++ b/src/components/hubl-status.js @@ -1,4 +1,4 @@ -import { widgetFactory, Helpers } from 'https://cdn.skypack.dev/@startinblox/core@0.15'; +import { widgetFactory, Helpers } from 'https://cdn.skypack.dev/@startinblox/core@0.14'; import SlimSelect from 'https://cdn.skypack.dev/slim-select@1.23'; const HublStatus = widgetFactory( diff --git a/src/dependencies.pug b/src/dependencies.pug index 4b840b1..2980e13 100644 --- a/src/dependencies.pug +++ b/src/dependencies.pug @@ -1,13 +1,13 @@ -script(type="module" src="https://cdn.skypack.dev/@startinblox/core@0.15" defer) +script(type="module" src="https://cdn.skypack.dev/@startinblox/core@0.14" defer) //- script(type="module" src="/lib/sib-core/dist/index.js" defer) -script(type="module" src="https://cdn.skypack.dev/@startinblox/oidc@0.13" defer) +script(type="module" src="https://cdn.skypack.dev/@startinblox/oidc@0.13.2" defer) //- script(type="module" src="/lib/sib-auth/index.js" defer) script(type="module" src="https://cdn.skypack.dev/@startinblox/router@0.11" defer) //- script(type="module" src="/lib/sib-router/src/index.js" defer) -script(type="module" src="https://cdn.skypack.dev/@startinblox/component-notifications@0.10" defer) +script(type="module" src="https://cdn.skypack.dev/@startinblox/component-notifications@0.9" defer) //- script(type="module" src="/lib/sib-notifications/index.js" defer) if themeChecker @@ -15,14 +15,12 @@ if themeChecker link(rel='stylesheet', href='https://cdn.jsdelivr.net/npm/@simonwep/pickr/dist/themes/nano.min.css') if endpoints.get - //- Disabled, core@0.15 required - //- if endpoints.get.events && endpoints.get.typeevents - //- script(type="module" src="https://cdn.skypack.dev/@startinblox/component-event@1.4" defer) + if endpoints.get.events && endpoints.get.typeevents + script(type="module" src="https://cdn.skypack.dev/@startinblox/component-event@1.4" defer) //- script(type="module" src="/lib/sib-event-component/sib-event.js" defer) - //- Disabled, core@0.15 required - //- if endpoints.get.resources && endpoints.get.resourceskeywords && endpoints.get.resourcestypes - //- script(type="module" src="https://cdn.skypack.dev/@startinblox/component-resource@1.2" defer) + if endpoints.get.resources && endpoints.get.resourceskeywords && endpoints.get.resourcestypes + script(type="module" src="https://cdn.skypack.dev/@startinblox/component-resource@1.2" defer) //- script(type="module" src="/lib/sib-resource/sib-resource.js" defer) if endpoints.get.joboffers @@ -41,11 +39,9 @@ if endpoints.get script(type="module" src="https://cdn.skypack.dev/@startinblox/component-chat@beta" defer) //- script(type="module" src="/lib/solid-xmpp-chat/dist/index.js" defer) - //- Disabled, core@0.15 required - //- if endpoints.get.polls - //- script(type="module" src="https://cdn.skypack.dev/@startinblox/component-poll@1.2" defer) + if endpoints.get.polls + script(type="module" src="https://cdn.skypack.dev/@startinblox/component-poll@1.2" defer) //- script(type="module" src="/lib/sib-polls-component/index.js" defer) - //- Disabled, core@0.15 required - //- if endpoints.get.polls || endpoints.get.events || endpoints.get.resources - //- script(type="module" src="https://cdn.skypack.dev/@startinblox/component-conversation@0.8" defer) + if endpoints.get.polls || endpoints.get.events || endpoints.get.resources + script(type="module" src="https://cdn.skypack.dev/@startinblox/component-conversation@0.8" defer) From 0cfc635ad74f9bc772daac3a564980caa2b4cf66 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Pasquier Date: Mon, 25 Jan 2021 13:46:34 +0100 Subject: [PATCH 5/6] fix: versions --- src/dependencies.pug | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/dependencies.pug b/src/dependencies.pug index 2980e13..1b22f1c 100644 --- a/src/dependencies.pug +++ b/src/dependencies.pug @@ -24,19 +24,19 @@ if endpoints.get //- script(type="module" src="/lib/sib-resource/sib-resource.js" defer) if endpoints.get.joboffers - script(type="module" src="https://cdn.skypack.dev/@startinblox/component-job-board@beta" defer) + script(type="module" src="https://cdn.skypack.dev/@startinblox/component-job-board@2.0" defer) //- script(type="module" src="/lib/solid-job-board/dist/index.js" defer) if endpoints.get.uploads && endpoints.get.skills && endpoints.get.users - script(type="module" src="https://cdn.skypack.dev/@startinblox/component-directory@beta" defer) + script(type="module" src="https://cdn.skypack.dev/@startinblox/component-directory@2.0" defer) //- script(type="module" src="/lib/solid-directory/dist/index.js" defer) if endpoints.get.dashboards - script(type="module" src="https://cdn.skypack.dev/@startinblox/component-dashboard@beta" defer) + script(type="module" src="https://cdn.skypack.dev/@startinblox/component-dashboard@1.0" defer) //- script(type="module" src="/lib/solid-dashboard/dist/index.js" defer) if endpoints.get.users - script(type="module" src="https://cdn.skypack.dev/@startinblox/component-chat@beta" defer) + script(type="module" src="https://cdn.skypack.dev/@startinblox/component-chat@2.0" defer) //- script(type="module" src="/lib/solid-xmpp-chat/dist/index.js" defer) if endpoints.get.polls From 2c05cf1bf758ade9d44af962e3452ee8c2e61495 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Pasquier Date: Mon, 25 Jan 2021 13:49:02 +0100 Subject: [PATCH 6/6] fix: comment --- src/views/partials/admin/page-admin-projects.pug | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/partials/admin/page-admin-projects.pug b/src/views/partials/admin/page-admin-projects.pug index 32a80cd..5f00f8f 100644 --- a/src/views/partials/admin/page-admin-projects.pug +++ b/src/views/partials/admin/page-admin-projects.pug @@ -162,7 +162,7 @@ div.segment.full.padding-large.sm-padding-xsmall.sm-padding-top-medium.whitespac class-customer.name='segment block margin-bottom-xxsmall text-xlarge text-color-heading text-semibold text-letter-spacing-large text-underline ellpsis' class-name='segment full' - action-joinButton="joinButton" # Workaround: I need members two times + action-joinButton="joinButton" widget-joinButton="hubl-admin-project-join-button" widget-captain='hubl-project-captain'