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

features: notifications fix + tests fix + menu/router fixes

Browse Source
This commit is contained in:
Jean-Baptiste Pasquier
2021-01-22 14:21:25 +01:00
parent bc64019b63
commit b541d9e6d7
36 changed files with 561 additions and 529 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
src/views/page-admin.pug
View File

@ -1,31 +1,42 @@
.scrollbar-content.views-container.sidebar-is-closed
if endpoints.circles || (endpoints.get && endpoints.get.circles)
#admin-circles(hidden, data-view="admin-circles")
include partials/admin/page-admin-circles.pug
if endpoints.projects || (endpoints.get && endpoints.get.projects)
#admin-projects(hidden, data-view="admin-projects")
include partials/admin/page-admin-projects.pug
if (endpoints.users || (endpoints.get && endpoints.get.users))
#admin-communities(hidden, data-view="admin-communities")
include partials/admin/page-admin-communities.pug
nav.jsRightMenu.sidebar.whitespace-normal(role='navigation')
solid-router.segment.whitespace-normal.text-color-heading.text-bold(default-route='admin-circles')
ul
li.segment.lg-full.sm-full.padding-small.text-right.text-normal.jsOffsiteToggle
span.icon.icon-arrow-right.xxsmall.margin-right-xxsmall
a(data-trans='admin.menuRight.fold')
if (endpoints.users || (endpoints.get && endpoints.get.users))
solid-route.segment.lg-full.sm-full(name='admin-communities')
li.segment.lg-full.sm-full.padding-medium
span.icon.ci-networking.icon-xlarge.margin-right-medium
a(data-trans='admin.menuRight.community')
if endpoints.circles || (endpoints.get && endpoints.get.circles)
solid-route.segment.lg-full.sm-full(name='admin-circles')
li.segment.lg-full.sm-full.padding-medium
span.icon.ci-bubble-add.icon-xlarge.margin-right-medium
a(data-trans='admin.menuRight.circles')
if endpoints.projects || (endpoints.get && endpoints.get.projects)
solid-route.segment.lg-full.sm-full(name='admin-projects')
li.segment.lg-full.sm-full.padding-medium
span.icon.ci-add.icon-xlarge.margin-right-medium
a(data-trans='admin.menuRight.projects')
.with-sidebar.whitespace-normal.only-on-admin(hidden)
.scrollbar-content.views-container.sidebar-is-closed
if endpoints.circles || (endpoints.get && endpoints.get.circles)
#admin-circles(hidden, data-view="admin-circles", no-render)
include partials/admin/page-admin-circles.pug
#circle-left(hidden, data-view="circle-left", no-render)
include partials/circle/page-circle-left.pug
#admin-circles-create(hidden, data-view="admin-circles-create", no-render)
include partials/admin/page-admin-circles-create.pug
if endpoints.projects || (endpoints.get && endpoints.get.projects)
#admin-projects(hidden, data-view="admin-projects", no-render)
include partials/admin/page-admin-projects.pug
#admin-projects-create(hidden, data-view="admin-projects-create", no-render)
include partials/admin/page-admin-projects-create.pug
#project-left(hidden, data-view="project-left", no-render)
include partials/project/page-project-left.pug
if (endpoints.users || (endpoints.get && endpoints.get.users))
#admin-communities(hidden, data-view="admin-communities")
include partials/admin/page-admin-communities.pug
#admin-users-create(hidden, data-view="admin-users-create", no-render)
include partials/admin/page-admin-users-create.pug
nav.jsRightMenu.sidebar.whitespace-normal(role='navigation')
.segment.whitespace-normal.text-color-heading.text-bold
ul
li.segment.lg-full.sm-full.padding-small.text-right.text-normal.jsOffsiteToggle
span.icon.icon-arrow-right.xxsmall.margin-right-xxsmall
a(data-trans='admin.menuRight.fold')
if (endpoints.users || (endpoints.get && endpoints.get.users))
solid-link.segment.lg-full.sm-full(next='admin-communities')
li.segment.lg-full.sm-full.padding-medium
span.icon.ci-networking.icon-xlarge.margin-right-medium
a(data-trans='admin.menuRight.community')
if endpoints.circles || (endpoints.get && endpoints.get.circles)
solid-link.segment.lg-full.sm-full(next='admin-circles')
li.segment.lg-full.sm-full.padding-medium
span.icon.ci-bubble-add.icon-xlarge.margin-right-medium
a(data-trans='admin.menuRight.circles')
if endpoints.projects || (endpoints.get && endpoints.get.projects)
solid-link.segment.lg-full.sm-full(next='admin-projects')
li.segment.lg-full.sm-full.padding-medium
span.icon.ci-add.icon-xlarge.margin-right-medium
a(data-trans='admin.menuRight.projects')

2
src/views/partials/admin/page-admin-circles-create.pug
View File

@ -2,7 +2,7 @@ div.segment.lg-full.sm-full.padding-large.sm-padding-top-small.sm-padding-right-
div.segment.lg-half
h2.margin-none.text-uppercase.text-xlarge.text-letter-spacing-large(data-trans='circle.create.title')
div.segment.lg-half.sm-hidden.text-right
solid-link(class="backlink", bind-resources, next='admin-circle-list' data-trans='circle.create.backlink')
solid-link(class="backlink", bind-resources, next='admin-circles' data-trans='circle.create.backlink')
div.segment.lg-full.sm-full.padding-large.sm-padding-xsmall.sm-padding-top-medium.whitespace-normal
div#loader-circles-create.loader.loader-top

225
src/views/partials/admin/page-admin-circles.pug
View File

@ -1,137 +1,124 @@
solid-router(default-route='admin-circle-list', hidden)
solid-route(name='admin-circle-list')
solid-route(name='admin-circle-create')
solid-route(name='circle-left')
solid-widget(name='hubl-circle-owner')
template
solid-display.labelled-avatar.two-lines(
data-src='${await value}'
fields='segment1(account.picture), segment2(line1(name), line2(at, username))'
#circle-left(hidden, data-view="circle-left")
include ../circle/page-circle-left.pug
class-segment1='segment'
class-account.picture='avatar'
#admin-circle-list(hidden, data-view="admin-circle-list")
class-segment2='segment lg-three-quarter margin-left-xsmall'
class-line1='block'
class-name='text-small text-semibold text-color-heading text-sub'
class-line2='block text-xsmall'
solid-widget(name='hubl-circle-owner')
template
solid-display.labelled-avatar.two-lines(
data-src='${await value}'
fields='segment1(account.picture), segment2(line1(name), line2(at, username))'
widget-account.picture='hubl-user-avatar'
class-segment1='segment'
class-account.picture='avatar'
value-at='@'
)
class-segment2='segment lg-three-quarter margin-left-xsmall'
class-line1='block'
class-name='text-small text-semibold text-color-heading text-sub'
class-line2='block text-xsmall'
div.segment.lg-full.sm-full.padding-large.sm-padding-top-small.sm-padding-right-xsmall.sm-padding-bottom-small.sm-padding-left-xsmall.border-bottom.border-color-grey.whitespace-normal
h2.margin-none.text-uppercase.text-xlarge.text-letter-spacing-large(data-trans='circle.list.title')
widget-account.picture='hubl-user-avatar'
div.segment.lg-full.sm-full.padding-large.sm-padding-xsmall.sm-padding-top-normal.whitespace-normal
value-at='@'
div#loader-admin-circles.loader.loader-top
div
div
div
div
div.segment.lg-full.sm-full.margin-bottom-xlarge.whitespace-normal
div.segment.lg-half.sm-full
h3.text-color-heading.text-semibold.text-letter-spacing-large(data-trans='circle.list.subTitle')
div.segment.lg-half.sm-full.text-right
solid-ac-checker(data-src=`${endpoints.circles || (endpoints.post && endpoints.post.circles)}`, permission='acl:Append')
solid-link(
class='segment sm-full button text-xsmall text-bold text-uppercase text-center reversed color-secondary bordered icon icon-plus'
next='admin-circles-create'
data-trans='circle.list.buttonCreate'
)
.segment.table-wrapper
.table
div.table-header.bg-color-third.text-color-heading
div.segment.table-cell.lg-third(data-trans='circle.list.tableHeader1')
div.segment.table-cell.lg-third(data-trans='circle.list.tableHeader2')
div.segment.table-cell.lg-third(data-trans='circle.list.tableHeader3')
solid-widget(name='hubl-admin-circle-leave-button')
template
solid-delete(
class='button text-xsmall text-bold text-uppercase color-secondary bordered'
data-src="${src}"
data-label=''
data-trans='data-label=circle.list.buttonQuit'
)
hubl-reactivity(data-src=`${endpoints.circles || endpoints.get.circles}` target-src='${src}')
hubl-reactivity(data-src=`${endpoints.circles || endpoints.get.circles}joinable/` target-src='${src}')
hubl-reactivity(bind-user nested-field="circles" target-src='${src}')
if (endpoints.post && endpoints.post.circles) && (endpoints.get && endpoints.get.circles)
hubl-reactivity(data-src=`${endpoints.post.circles}joinable/` target-src=`${src}`)
hubl-reactivity(data-src=`${endpoints.post.circles}` target-src=`${src}`)
solid-display(
class='table-body'
bind-user
nested-field='circles'
fields='cell1(circle.name, circle.subtitle), cell2(circle.owner), cell3(leaveButton)'
loader-id='loader-admin-circles'
class-cell1='segment table-cell lg-third whitespace-normal'
class-cell2='segment table-cell lg-third text-center text-left'
class-cell3='segment table-cell lg-third text-center'
class-circle.name='segment block margin-bottom-xxsmall text-xlarge text-color-heading text-semibold text-letter-spacing-large text-underline ellipsis'
class-circle.subtitle='segment lg-full sm-full'
action-leaveButton="joinButton"
widget-leaveButton="hubl-admin-circle-leave-button"
widget-circle.owner='hubl-circle-owner'
order-by="circle.name"
)
div.segment.lg-full.sm-full.padding-large.sm-padding-top-small.sm-padding-right-xsmall.sm-padding-bottom-small.sm-padding-left-xsmall.border-bottom.border-color-grey.whitespace-normal
h2.margin-none.text-uppercase.text-xlarge.text-letter-spacing-large(data-trans='circle.list.title')
solid-widget(name='hubl-admin-circle-join-button')
template
solid-form(
class='button text-xsmall text-bold text-uppercase reversed color-secondary bordered icon icon-arrow-right-circle'
data-src='${value}'
div.segment.lg-full.sm-full.padding-large.sm-padding-xsmall.sm-padding-top-normal.whitespace-normal
fields='user.username'
value-user.username='hubl-workaround-493'
widget-user.username='solid-form-hidden'
div#loader-admin-circles.loader.loader-top
div
div
div
div
div.segment.lg-full.sm-full.margin-bottom-xlarge.whitespace-normal
div.segment.lg-half.sm-full
h3.text-color-heading.text-semibold.text-letter-spacing-large(data-trans='circle.list.subTitle')
div.segment.lg-half.sm-full.text-right
solid-ac-checker(data-src=`${endpoints.circles || (endpoints.post && endpoints.post.circles)}`, permission='acl:Append')
solid-link(
class='segment sm-full button text-xsmall text-bold text-uppercase text-center reversed color-secondary bordered icon icon-plus'
next='admin-circle-create'
data-trans='circle.list.buttonCreate'
submit-button=''
data-trans='submit-button=circle.list.buttonJoin'
)
hubl-reactivity(data-src=`${endpoints.circles || endpoints.get.circles}` target-src='${value}')
hubl-reactivity(data-src=`${endpoints.circles || endpoints.get.circles}joinable/` target-src='${value}')
hubl-reactivity(bind-user nested-field="circles" target-src='${value}')
if (endpoints.post && endpoints.post.circles) && (endpoints.get && endpoints.get.circles)
hubl-reactivity(data-src=`${endpoints.post.circles}joinable/` target-src=`${value}`)
hubl-reactivity(data-src=`${endpoints.post.circles}` target-src=`${value}`)
.segment.table-wrapper
.table
solid-display(
class='table-body'
div.table-header.bg-color-third.text-color-heading
div.segment.table-cell.lg-third(data-trans='circle.list.tableHeader1')
div.segment.table-cell.lg-third(data-trans='circle.list.tableHeader2')
div.segment.table-cell.lg-third(data-trans='circle.list.tableHeader3')
data-src=`${endpoints.circles || endpoints.get.circles}joinable/`
fields='cell1(name, subtitle), cell2(owner), cell3(members)'
loader-id='loader-admin-circles'
solid-widget(name='hubl-admin-circle-leave-button')
template
solid-delete(
class='button text-xsmall text-bold text-uppercase color-secondary bordered'
data-src="${src}"
data-label=''
data-trans='data-label=circle.list.buttonQuit'
)
hubl-reactivity(data-src=`${endpoints.circles || endpoints.get.circles}` target-src='${src}')
hubl-reactivity(data-src=`${endpoints.circles || endpoints.get.circles}joinable/` target-src='${src}')
hubl-reactivity(bind-user nested-field="circles" target-src='${src}')
if (endpoints.post && endpoints.post.circles) && (endpoints.get && endpoints.get.circles)
hubl-reactivity(data-src=`${endpoints.post.circles}joinable/` target-src=`${src}`)
hubl-reactivity(data-src=`${endpoints.post.circles}` target-src=`${src}`)
class-cell1='segment table-cell lg-third whitespace-normal'
class-cell2='segment table-cell lg-third text-center text-left'
class-cell3='segment table-cell lg-third text-center'
solid-display(
class='table-body'
bind-user
nested-field='circles'
fields='cell1(circle.name, circle.subtitle), cell2(circle.owner), cell3(leaveButton)'
loader-id='loader-admin-circles'
class-name='segment block margin-bottom-xxsmall text-xlarge text-color-heading text-semibold text-letter-spacing-large text-underline ellipsis'
class-subtitle='segment lg-full sm-full'
class-cell1='segment table-cell lg-third whitespace-normal'
class-cell2='segment table-cell lg-third text-center text-left'
class-cell3='segment table-cell lg-third text-center'
widget-owner='hubl-circle-owner'
widget-members="hubl-admin-circle-join-button"
class-circle.name='segment block margin-bottom-xxsmall text-xlarge text-color-heading text-semibold text-letter-spacing-large text-underline ellipsis'
class-circle.subtitle='segment lg-full sm-full'
action-leaveButton="joinButton"
widget-leaveButton="hubl-admin-circle-leave-button"
widget-circle.owner='hubl-circle-owner'
order-by="circle.name"
)
solid-widget(name='hubl-admin-circle-join-button')
template
solid-form(
class='button text-xsmall text-bold text-uppercase reversed color-secondary bordered icon icon-arrow-right-circle'
data-src='${value}'
fields='user.username'
value-user.username='hubl-workaround-493'
widget-user.username='solid-form-hidden'
submit-button=''
data-trans='submit-button=circle.list.buttonJoin'
)
hubl-reactivity(data-src=`${endpoints.circles || endpoints.get.circles}` target-src='${value}')
hubl-reactivity(data-src=`${endpoints.circles || endpoints.get.circles}joinable/` target-src='${value}')
hubl-reactivity(bind-user nested-field="circles" target-src='${value}')
if (endpoints.post && endpoints.post.circles) && (endpoints.get && endpoints.get.circles)
hubl-reactivity(data-src=`${endpoints.post.circles}joinable/` target-src=`${value}`)
hubl-reactivity(data-src=`${endpoints.post.circles}` target-src=`${value}`)
solid-display(
class='table-body'
data-src=`${endpoints.circles || endpoints.get.circles}joinable/`
fields='cell1(name, subtitle), cell2(owner), cell3(members)'
loader-id='loader-admin-circles'
class-cell1='segment table-cell lg-third whitespace-normal'
class-cell2='segment table-cell lg-third text-center text-left'
class-cell3='segment table-cell lg-third text-center'
class-name='segment block margin-bottom-xxsmall text-xlarge text-color-heading text-semibold text-letter-spacing-large text-underline ellipsis'
class-subtitle='segment lg-full sm-full'
widget-owner='hubl-circle-owner'
widget-members="hubl-admin-circle-join-button"
order-by="name"
)
#admin-circle-create(hidden, data-view="admin-circle-create")
include page-admin-circles-create.pug
order-by="name"
)

64
src/views/partials/admin/page-admin-communities.pug
View File

@ -1,7 +1,3 @@
solid-router(default-route='admin-communities-list', hidden)
solid-route(name='admin-communities-list')
solid-route(name='admin-users-create', use-id)
solid-widget(name='hubl-action-community')
template
solid-ac-checker(data-src="${value}", nested-field="members", permission='acl:Append')
@ -14,42 +10,38 @@ solid-widget(name='hubl-action-community')
solid-ac-checker(data-src="${value}", nested-field="members", no-permission='acl:Append')
div.button.button-disabled(data-trans='communities.noPermission')
#admin-communities-list(hidden, data-view="admin-communities-list")
div.segment.lg-full.sm-full.padding-large.sm-padding-top-small.sm-padding-right-xsmall.sm-padding-bottom-small.sm-padding-left-xsmall.border-bottom.border-color-grey.whitespace-normal
h2.margin-none.text-uppercase.text-xlarge.text-letter-spacing-large(data-trans='communities.title')
div.segment.lg-full.sm-full.padding-large.sm-padding-top-small.sm-padding-right-xsmall.sm-padding-bottom-small.sm-padding-left-xsmall.border-bottom.border-color-grey.whitespace-normal
h2.margin-none.text-uppercase.text-xlarge.text-letter-spacing-large(data-trans='communities.title')
div.segment.lg-full.sm-full.padding-large.sm-padding-xsmall.sm-padding-top-medium.whitespace-normal
div.segment.lg-full.sm-full.padding-large.sm-padding-xsmall.sm-padding-top-medium.whitespace-normal
div.segment.lg-full.margin-bottom-xlarge
h3.text-color-heading.text-semibold.text-letter-spacing-large(data-trans='communities.subTitle')
div.segment.lg-full.margin-bottom-xlarge
h3.text-color-heading.text-semibold.text-letter-spacing-large(data-trans='communities.subTitle')
.segment.table-wrapper
.table
div.table-header.bg-color-third.text-color-heading
div.segment.table-cell.table-cell.lg-half(data-trans='communities.tableHeader1')
div.segment.table-cell.table-cell.lg-half(data-trans='communities.tableHeader2')
solid-display(
class='table-body'
bind-user
nested-field='communities'
fields='cell1(community.name), cell2(community)'
loader-id='loader-admin-community'
.segment.table-wrapper
.table
div.table-header.bg-color-third.text-color-heading
div.segment.table-cell.table-cell.lg-half(data-trans='communities.tableHeader1')
div.segment.table-cell.table-cell.lg-half(data-trans='communities.tableHeader2')
solid-display(
class='table-body'
bind-user
nested-field='communities'
fields='cell1(community.name), cell2(community)'
loader-id='loader-admin-community'
class-cell1='segment table-cell lg-half text-center'
class-cell2='segment table-cell lg-half text-center'
class-cell1='segment table-cell lg-half text-center'
class-cell2='segment table-cell lg-half text-center'
class-community.name='text-xlarge text-color-heading text-semibold text-letter-spacing-large ellipsis'
widget-community='hubl-action-community'
class-community.name='text-xlarge text-color-heading text-semibold text-letter-spacing-large ellipsis'
widget-community='hubl-action-community'
order-asc='community.name'
)
order-asc='community.name'
)
div#loader-admin-community.loader.loader-top
div
div
div
div
#admin-users-create(hidden, data-view="admin-users-create")
include page-admin-users-create.pug
div#loader-admin-community.loader.loader-top
div
div
div
div

2
src/views/partials/admin/page-admin-projects-create.pug
View File

@ -2,7 +2,7 @@ div.segment.lg-full.sm-full.padding-large.sm-padding-top-small.sm-padding-right-
div.segment.lg-half
h2.margin-none.text-uppercase.text-xlarge.text-letter-spacing-large(data-trans='project.create.title')
div.segment.lg-half.sm-hidden.text-right
solid-link(class="backlink right", next='admin-project-list' data-trans='project.create.backlink')
solid-link(class="backlink right", next='admin-projects' data-trans='project.create.backlink')
div.segment.lg-full.sm-full.padding-large.sm-padding-xsmall.sm-padding-top-medium.whitespace-normal
div#loader-projects-create.loader.loader-top

268
src/views/partials/admin/page-admin-projects.pug
View File

@ -1,167 +1,155 @@
solid-router(default-route='admin-project-list', hidden)
solid-route(name='admin-project-list')
solid-route(name='admin-project-create')
solid-route(name='project-left')
div.segment.lg-full.sm-full.padding-large.sm-padding-top-small.sm-padding-right-xsmall.sm-padding-bottom-small.sm-padding-left-xsmall.border-bottom.border-color-grey.whitespace-normal
h2.margin-none.text-uppercase.text-xlarge.text-letter-spacing-large(data-trans='project.list.title')
#project-left(hidden, data-view="project-left")
include ../project/page-project-left.pug
div.segment.lg-full.sm-full.padding-large.sm-padding-xsmall.sm-padding-top-medium.whitespace-normal
#admin-project-list(hidden, data-view="admin-project-list")
div.segment.lg-full.sm-full.margin-bottom-xlarge.whitespace-normal
div.segment.lg-half.sm-full
h3.text-color-heading.text-semibold.text-letter-spacing-large(data-trans='project.list.subTitle')
div.segment.lg-half.sm-full.text-right
solid-ac-checker(data-src=`${endpoints.projects || (endpoints.post && endpoints.post.projects)}`, permission='acl:Append')
solid-link(
class='segment sm-full button text-xsmall text-bold text-uppercase text-center reversed color-secondary bordered icon icon-plus'
next='admin-projects-create'
data-trans='project.list.buttonCreate'
)
div.segment.lg-full.sm-full.padding-large.sm-padding-top-small.sm-padding-right-xsmall.sm-padding-bottom-small.sm-padding-left-xsmall.border-bottom.border-color-grey.whitespace-normal
h2.margin-none.text-uppercase.text-xlarge.text-letter-spacing-large(data-trans='project.list.title')
.segment.table-wrapper
.table
div.segment.lg-full.sm-full.padding-large.sm-padding-xsmall.sm-padding-top-medium.whitespace-normal
div.table-header.bg-color-third.text-color-heading
div.segment.table-cell.lg-quarter(data-trans='project.list.tableHeader1')
div.segment.table-cell.lg-quarter(data-trans='project.list.tableHeader2')
div.segment.table-cell.lg-quarter(data-trans='project.list.tableHeader3')
div.segment.table-cell.lg-quarter(data-trans='project.list.tableHeader4')
div.segment.lg-full.sm-full.margin-bottom-xlarge.whitespace-normal
div.segment.lg-half.sm-full
h3.text-color-heading.text-semibold.text-letter-spacing-large(data-trans='project.list.subTitle')
div.segment.lg-half.sm-full.text-right
solid-ac-checker(data-src=`${endpoints.projects || (endpoints.post && endpoints.post.projects)}`, permission='acl:Append')
solid-link(
class='segment sm-full button text-xsmall text-bold text-uppercase text-center reversed color-secondary bordered icon icon-plus'
next='admin-project-create'
data-trans='project.list.buttonCreate'
solid-widget(name="hubl-admin-project-leave-button")
template
solid-delete(
class='button text-xsmall text-bold text-uppercase color-secondary bordered'
data-src="${src}"
data-label=''
data-trans='data-label=project.list.buttonQuit'
)
hubl-reactivity(data-src=`${endpoints.projects || endpoints.get.projects}` target-src='${src}')
hubl-reactivity(data-src=`${endpoints.projects || endpoints.get.projects}joinable/` target-src='${src}')
hubl-reactivity(bind-user nested-field="projects" target-src='${src}')
if (endpoints.post && endpoints.post.projects) && (endpoints.get && endpoints.get.projects)
hubl-reactivity(data-src=`${endpoints.post.projects}joinable/` target-src=`${src}`)
hubl-reactivity(data-src=`${endpoints.post.projects}` target-src=`${src}`)
solid-widget(name='hubl-project-captain')
template
solid-display.labelled-avatar.two-lines(
data-src='${await value}'
fields='segment1(account.picture), segment2(line1(name), line2(at, username))'
class-segment1='segment'
class-account.picture='avatar'
class-segment2='segment lg-three-quarter margin-left-xsmall'
class-line1='block'
class-name='text-small text-semibold text-color-heading text-sub'
class-line2='block text-xsmall'
widget-account.picture='hubl-user-avatar'
value-at='@'
)
.segment.table-wrapper
.table
solid-widget(name='hubl-project-admins')
template
solid-display(
data-src='${value}'
fields='user'
search-fields='is_admin'
search-value-is_admin='true'
search-widget-is_admin='solid-form-hidden'
widget-user='hubl-project-captain'
)
div.table-header.bg-color-third.text-color-heading
div.segment.table-cell.lg-quarter(data-trans='project.list.tableHeader1')
div.segment.table-cell.lg-quarter(data-trans='project.list.tableHeader2')
div.segment.table-cell.lg-quarter(data-trans='project.list.tableHeader3')
div.segment.table-cell.lg-quarter(data-trans='project.list.tableHeader4')
solid-widget(name='hubl-admin-project-leave-button')
template
solid-delete(
class='button text-xsmall text-bold text-uppercase color-secondary bordered'
data-src="${src}"
data-label=''
data-trans='data-label=project.list.buttonQuit'
)
solid-widget(name="hubl-admin-project-leave-button")
template
solid-delete(
class='button text-xsmall text-bold text-uppercase color-secondary bordered'
data-src="${src}"
data-label=''
data-trans='data-label=project.list.buttonQuit'
)
hubl-reactivity(data-src=`${endpoints.projects || endpoints.get.projects}` target-src='${src}')
hubl-reactivity(data-src=`${endpoints.projects || endpoints.get.projects}joinable/` target-src='${src}')
hubl-reactivity(bind-user nested-field="projects" target-src='${src}')
if (endpoints.post && endpoints.post.projects) && (endpoints.get && endpoints.get.projects)
hubl-reactivity(data-src=`${endpoints.post.projects}joinable/` target-src=`${src}`)
hubl-reactivity(data-src=`${endpoints.post.projects}` target-src=`${src}`)
solid-display(
class='table-body'
solid-widget(name='hubl-project-captain')
template
solid-display.labelled-avatar.two-lines(
data-src='${await value}'
fields='segment1(account.picture), segment2(line1(name), line2(at, username))'
bind-user
nested-field="projects"
fields='cell1(project.customer.name, project.name), cell2(project.members), cell3(project.captain), cell4(leaveButton)'
loader-id='loader-admin-projects'
class-segment1='segment'
class-account.picture='avatar'
class-cell1='segment table-cell lg-quarter text-left whitespace-normal'
class-cell2='segment table-cell lg-quarter text-left'
class-cell3='segment table-cell lg-quarter text-left'
class-cell4='segment table-cell lg-quarter text-center'
class-segment2='segment lg-three-quarter margin-left-xsmall'
class-line1='block'
class-name='text-small text-semibold text-color-heading text-sub'
class-line2='block text-xsmall'
class-project.customer.name='segment block margin-bottom-xxsmall text-xlarge text-color-heading text-semibold text-letter-spacing-large text-underline ellipsis'
class-project.name='segment lg-full sm-full'
widget-account.picture='hubl-user-avatar'
action-leaveButton="joinButton"
widget-leaveButton="hubl-admin-project-leave-button"
value-at='@'
)
widget-project.captain='hubl-project-captain'
widget-project.members='hubl-project-admins'
solid-widget(name='hubl-project-admins')
template
solid-display(
data-src='${value}'
fields='user'
search-fields='is_admin'
search-value-is_admin='true'
search-widget-is_admin='solid-form-hidden'
widget-user='hubl-project-captain'
)
order-by="project.name"
)
solid-widget(name='hubl-admin-project-leave-button')
template
solid-delete(
class='button text-xsmall text-bold text-uppercase color-secondary bordered'
data-src="${src}"
data-label=''
data-trans='data-label=project.list.buttonQuit'
)
solid-widget(name='hubl-admin-project-join-button')
template
solid-form(
class='button text-xsmall text-bold text-uppercase reversed color-secondary bordered icon icon-arrow-right-circle'
data-src='${src}'
nested-field="members"
solid-display(
class='table-body'
fields='user.username'
value-user.username='hubl-workaround-493'
widget-user.username='solid-form-hidden'
bind-user
nested-field="projects"
fields='cell1(project.customer.name, project.name), cell2(project.members), cell3(project.captain), cell4(leaveButton)'
loader-id='loader-admin-projects'
submit-button=''
data-trans='submit-button=project.list.buttonJoin'
)
hubl-reactivity(data-src=`${endpoints.projects || endpoints.get.projects}` target-src='${src}')
hubl-reactivity(data-src=`${endpoints.projects || endpoints.get.projects}joinable/` target-src='${src}')
hubl-reactivity(bind-user nested-field="projects" target-src='${src}')
if (endpoints.post && endpoints.post.projects) && (endpoints.get && endpoints.get.projects)
hubl-reactivity(data-src=`${endpoints.post.projects}joinable/` target-src=`${value}`)
hubl-reactivity(data-src=`${endpoints.post.projects}` target-src=`${value}`)
class-cell1='segment table-cell lg-quarter text-left whitespace-normal'
class-cell2='segment table-cell lg-quarter text-left'
class-cell3='segment table-cell lg-quarter text-left'
class-cell4='segment table-cell lg-quarter text-center'
solid-display(
class='table-body'
class-project.customer.name='segment block margin-bottom-xxsmall text-xlarge text-color-heading text-semibold text-letter-spacing-large text-underline ellipsis'
class-project.name='segment lg-full sm-full'
data-src=`${endpoints.projects || endpoints.get.projects}joinable/`
fields='cell1(customer.name, name), cell2(members), cell3(captain), cell4(joinButton)'
loader-id='loader-admin-projects'
action-leaveButton="joinButton"
widget-leaveButton="hubl-admin-project-leave-button"
class-cell1='segment table-cell lg-quarter text-left whitespace-normal'
class-cell2='segment table-cell lg-quarter text-left'
class-cell3='segment table-cell lg-quarter text-left'
class-cell4='segment table-cell lg-quarter text-center'
widget-project.captain='hubl-project-captain'
widget-project.members='hubl-project-admins'
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 lg-full sm-full'
order-by="project.name"
)
action-joinButton="joinButton" # Workaround: I need members two times
widget-joinButton="hubl-admin-project-join-button"
solid-widget(name='hubl-admin-project-join-button')
template
solid-form(
class='button text-xsmall text-bold text-uppercase reversed color-secondary bordered icon icon-arrow-right-circle'
data-src='${src}'
nested-field="members"
widget-captain='hubl-project-captain'
widget-members='hubl-project-admins'
fields='user.username'
value-user.username='hubl-workaround-493'
widget-user.username='solid-form-hidden'
order-by="name"
)
submit-button=''
data-trans='submit-button=project.list.buttonJoin'
)
hubl-reactivity(data-src=`${endpoints.projects || endpoints.get.projects}` target-src='${src}')
hubl-reactivity(data-src=`${endpoints.projects || endpoints.get.projects}joinable/` target-src='${src}')
hubl-reactivity(bind-user nested-field="projects" target-src='${src}')
if (endpoints.post && endpoints.post.projects) && (endpoints.get && endpoints.get.projects)
hubl-reactivity(data-src=`${endpoints.post.projects}joinable/` target-src=`${value}`)
hubl-reactivity(data-src=`${endpoints.post.projects}` target-src=`${value}`)
div#loader-admin-projects.loader.loader-top
div
div
div
div
solid-display(
class='table-body'
data-src=`${endpoints.projects || endpoints.get.projects}joinable/`
fields='cell1(customer.name, name), cell2(members), cell3(captain), cell4(joinButton)'
loader-id='loader-admin-projects'
class-cell1='segment table-cell lg-quarter text-left whitespace-normal'
class-cell2='segment table-cell lg-quarter text-left'
class-cell3='segment table-cell lg-quarter text-left'
class-cell4='segment table-cell lg-quarter text-center'
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 lg-full sm-full'
action-joinButton="joinButton" # Workaround: I need members two times
widget-joinButton="hubl-admin-project-join-button"
widget-captain='hubl-project-captain'
widget-members='hubl-project-admins'
order-by="name"
)
div#loader-admin-projects.loader.loader-top
div
div
div
div
#admin-project-create(hidden, data-view="admin-project-create")
include page-admin-projects-create.pug

12
src/views/partials/admin/page-admin-users-create.pug
View File

@ -2,7 +2,7 @@ div.segment.lg-full.sm-full.padding-large.sm-padding-top-small.sm-padding-right-
div.segment.lg-half
h2.margin-none.text-uppercase.text-xlarge.text-letter-spacing-large(data-trans='communities.title')
div.segment.lg-half.sm-hidden.text-right
solid-link(class="backlink", bind-resources, next='admin-communities-list' data-trans='circle.create.backlink')
solid-link(class="backlink", bind-resources, next='admin-communities' data-trans='circle.create.backlink')
div.segment.lg-full.sm-full.padding-large.sm-padding-xsmall.sm-padding-top-medium.whitespace-normal
@ -31,7 +31,13 @@ div.segment.lg-full.sm-full.padding-large.sm-padding-xsmall.sm-padding-top-mediu
div.segment.margin-bottom-medium
div.segment
p.text-color-heading.text-semibold.text-xlarge.text-letter-spacing-large(data-trans='user.create.title', loader-id='loader-users-title')
solid-display.text-color-heading.text-semibold.text-xlarge.text-letter-spacing-large(
bind-resources
fields='text, name'
value-text=''
data-trans='value-text=user.create.title'
loader-id='loader-users-title'
)
solid-form.form#selected-community(
bind-resources
@ -59,7 +65,7 @@ div.segment.lg-full.sm-full.padding-large.sm-padding-xsmall.sm-padding-top-mediu
widget-user.username='hubl-username-field'
widget-user.email='hubl-email-field'
next='admin-communities-list'
next='admin-communities'
submit-button=''
data-trans='label-user.first_name=user.create.labelFirstname;label-user.last_name=user.create.labelLastname;label-user.username=user.create.labelUsername;label-user.email=user.create.labelEmail;submit-button=user.create.buttonSubmit'

2
src/views/partials/circle/page-circle-left.pug
View File

@ -6,6 +6,6 @@ div.text-center
p
span(data-trans='circle.left.paragraphJoin')
span  
solid-link.link(next="admin-circle-list" data-trans='circle.left.admin')
solid-link.link(next="admin-circles" data-trans='circle.left.admin')
span  
span(data-trans='circle.left.paragraphContact')

16
src/views/partials/header.pug
View File

@ -3,13 +3,13 @@ div
solid-link.segment.sm-hidden(next='dashboard')
img.logo(src=`${clientLogo || '/images/logo.webp'}`)
button.notLoggedIn.segment.lg-hidden.icon-menu#toggleMainMenu
button.segment.lg-hidden.icon-menu#toggleMainMenu
span.tag.reversed.text-semibold(data-trans='header.beta')
div
solid-notifications.segment.sm-margin-right-xlarge.notLoggedIn(
solid-notifications.segment.sm-margin-right-xlarge(
nested-field="inbox"
bind-user
)
@ -24,7 +24,7 @@ div
)
//- User menu visible on large screens
details.segment.sm-hidden.notLoggedIn
details.segment.sm-hidden.user-controls
summary.text-right
solid-display.labelled-avatar.padding-top-xsmall(
fields='segment1(account.picture), segment2(first_name), segment3(button)'
@ -51,7 +51,7 @@ div
li.segment.padding-top-small
a.icon.icon-people.icon-third.icon-small.icon-margin-right-xsmall(data-trans='admin.menuRight.community')
if endpoints.get.circles
solid-link.text-hover(next='admin')
solid-link.text-hover(next='admin-circles')
li.segment.padding-top-small
a.icon.icon-globe.icon-third.icon-small.icon-margin-right-xsmall(data-trans='admin.menuRight.circles')
if endpoints.get.projects
@ -63,7 +63,7 @@ div
li
button.segment.padding-small.text-hover.text-bold.text-color-heading(role='log out' onclick="document.querySelector('sib-auth').logout();" data-trans='header.logOut')
button.notLoggedIn.segment.lg-hidden.icon-menu#toggleMainMenu
button.segment.lg-hidden.icon-menu#toggleMainMenu
sib-auth(style='display:none!important', auto-login)
sib-auth-provider(
@ -73,7 +73,7 @@ div
)
//- User menu visible on small screens
details.user-menu.segment.lg-hidden.notLoggedIn
details.user-menu.segment.lg-hidden.user-controls
summary
solid-display.labelled-avatar(
fields='segment1(account.picture), segment3(button)'
@ -109,7 +109,7 @@ div
li.segment.padding-top-small.sm-padding-top-medium
a.icon.icon-people.icon-third.icon-small.icon-margin-right-xsmall(data-trans='admin.menuRight.community')
if endpoints.get.circles
solid-link.text-hover(next='admin')
solid-link.text-hover(next='admin-circles')
li.segment.padding-top-small.sm-padding-top-medium
a.icon.icon-globe.icon-third.icon-small.icon-margin-right-xsmall(data-trans='admin.menuRight.circles')
if endpoints.get.projects
@ -121,7 +121,7 @@ div
li
button.segment.padding-small.sm-padding-medium.sm-padding-left-xlarge.text-hover.text-bold.text-color-heading(role='log out' onclick="document.querySelector('sib-auth').logout();" data-trans='header.logOut')
button.notLoggedIn.segment.lg-hidden.icon-menu#toggleMainMenu
button.segment.lg-hidden.icon-menu#toggleMainMenu
sib-auth(style='display:none!important', auto-login)
sib-auth-provider(

16
src/views/partials/menu-left.pug
View File

@ -140,13 +140,15 @@ solid-router#navbar-router(default-route='dashboard')
div.divider
if endpoints.get.projects
div.menu-wrapper
solid-link.menu.segment.lg-full.sm-full.padding-small.text-semibold.text-color-white.heading-active.bg-color-heading.hover.active(next='admin-projects')
solid-route.menu.segment.lg-full.sm-full.padding-small.text-semibold.text-color-white.heading-active.bg-color-heading.hover.active(name='admin-projects')
div.segment.margin-right-xxsmall
div.segment.icon.icon-small.icon-folder-alt
div.segment.lg-three-quarter.sm-three-quarter.text-uppercase.text-letter-spacing-large(data-trans="menuLeft.projects")
div.menu-chevron.segment
div.icon-arrow-right-circle
solid-route(name='project', rdf-type='hd:project', use-id='', hidden)
solid-route(name='admin-projects-create', hidden)
solid-route(name='project-left', hidden)
div.sub-menu.menu-notification
div#loader-projects.loader.loader-menu
div
@ -167,13 +169,15 @@ solid-router#navbar-router(default-route='dashboard')
div.divider
if endpoints.get.circles
div.menu-wrapper
solid-link.menu.segment.lg-full.sm-full.padding-small.text-semibold.text-color-white.heading-active.bg-color-heading.hover.active(next='admin')
solid-route.menu.segment.lg-full.sm-full.padding-small.text-semibold.text-color-white.heading-active.bg-color-heading.hover.active(name='admin-circles')
div.segment.margin-right-xxsmall
div.segment.icon.icon-small.icon-folder-alt
div.segment.lg-three-quarter.sm-three-quarter.text-uppercase.text-letter-spacing-large(data-trans="menuLeft.circles")
div.menu-chevron.segment
div.menu-icon.icon-arrow-right-circle
solid-route(name='circle', rdf-type='hd:circle', use-id='', hidden)
solid-route(name='admin-circles-create')
solid-route(name='circle-left')
div.sub-menu.menu-notification
div#loader-circles.loader.loader-menu
div
@ -193,12 +197,13 @@ solid-router#navbar-router(default-route='dashboard')
)
div.divider
div.menu-wrapper
div.menu.segment.lg-full.sm-full.padding-small.text-semibold.text-color-white.heading-active.bg-color-heading.hover.active
solid-route.menu.segment.lg-full.sm-full.padding-small.text-semibold.text-color-white.heading-active.bg-color-heading.hover.active(name='admin-communities')
div.segment.margin-right-xxsmall
div.segment.icon.icon-small.icon-envelope-letter
div.segment.icon.icon-small.icon-folder-alt
div.segment.lg-three-quarter.sm-three-quarter.text-uppercase.text-letter-spacing-large(data-trans="menuLeft.messages")
div.menu-chevron.segment
div.icon-arrow-up
div.menu-icon.icon-arrow-right-circle
solid-route(name='admin-users-create', use-id='', hidden)
solid-route(name='messages', rdf-type='foaf:user', use-id='', hidden)
div.sub-menu.menu-notification
div#loader-messages.loader.loader-menu
@ -222,6 +227,5 @@ solid-router#navbar-router(default-route='dashboard')
)
div.divider
solid-route(name='admin', hidden)
solid-route.menu(name='profile', hidden)
solid-route(name='about', hidden)

1
src/views/partials/notifications.pug
View File

@ -1,4 +1,5 @@
//- Templates for notifications
include notifications/message-circle.pug
include notifications/message-project.pug
include notifications/message-private.pug

11
src/views/partials/notifications/message-project.pug Normal file
View File

@ -0,0 +1,11 @@
solid-notifications-template(data-rdf-type='hd:project')
template
.solid-notification__avatar
| ${await author['account.foaf:depiction'] ? `<img src="${await author['account.foaf:depiction']}" style="max-width:100%; max-height: 100%;" />` : `<img src="/images/alien.webp" />`}
.solid-notification__content
.solid-notification__title ${await author.name}
span.solid-notification__title__side
span(data-trans='notification.circle.in')
span.solid-notification__title__icon ${(await object.status) == 'Public' ? '#' : ''}
| ${await object.name}
p.solid-notification__summary ${summary}

2
src/views/partials/project/page-project-left.pug
View File

@ -7,6 +7,6 @@
p
span(data-trans='project.left.paragraphJoin')
span &nbsp;
solid-link.link(next="admin-project-list" data-trans='project.left.admin')
solid-link.link(next="admin-projects" data-trans='project.left.admin')
span &nbsp;
span(data-trans='project.left.paragraphContact')