patch: conflict resolved

package-lock.json

@@ -1159,9 +1159,9 @@
       }
     },
     "@startinblox/hubl-styling-framework": {
-      "version": "1.8.0",
+      "version": "1.8.1",
-      "resolved": "https://registry.npmjs.org/@startinblox/hubl-styling-framework/-/hubl-styling-framework-1.8.0.tgz",
+      "resolved": "https://registry.npmjs.org/@startinblox/hubl-styling-framework/-/hubl-styling-framework-1.8.1.tgz",
-      "integrity": "sha512-oRyaKYE6mCZBlVLPItx1xhRoX1Dp32KJm6XoLaD3XHUopoNPIxJ1OhF0SfU4YnpQyPRYfwEqNz4zZtwOS7PGbA=="
+      "integrity": "sha512-gEuLNjIJDr5NyYHxyYAyas4B1fiA9xx0k5J/O5LZTL7hKPIwgEGLlLa7cbwiSCJNi34wMQMA9wVhEIg1I+7j/w=="
     },
     "@types/q": {
       "version": "1.5.4",

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",

src/dependencies.pug

@@ -24,6 +24,7 @@ if endpoints.get
     //- script(type="module" src="/lib/sib-resource/sib-resource.js" defer)
 
   if endpoints.get.joboffers
+<<<<<<< HEAD
     //- script(type="module" src="https://cdn.skypack.dev/@startinblox/component-job-board@beta" defer)
     script(type="module" src="/lib/solid-job-board/dist/index.js" defer)
 
@@ -34,9 +35,21 @@ if endpoints.get
   if endpoints.get.dashboards
     //- script(type="module" src="https://cdn.skypack.dev/@startinblox/component-dashboard@beta" defer)
     script(type="module" src="/lib/solid-dashboard/dist/index.js" 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@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@1.0" defer)
+    //- script(type="module" src="/lib/solid-dashboard/dist/index.js" defer)
+>>>>>>> 2c05cf1bf758ade9d44af962e3452ee8c2e61495
 
   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@2.0" defer)
     //- script(type="module" src="/lib/solid-xmpp-chat/dist/index.js" defer)
 
   if endpoints.get.polls

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"
       )

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'
       )

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'
@@ -138,11 +162,13 @@ 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'
         widget-members='hubl-project-admins'
+        action-counter="counter"
+        widget-counter="hubl-admin-project-counter"
 
         order-by="name"
       )