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

feature: circle + admin - right sidebar

This commit is contained in:
gaelle morin 2020-12-29 17:54:17 +01:00
parent ffeff51e96
commit fb4aa7f1f5
No known key found for this signature in database
GPG Key ID: 028426702B95CF9C
6 changed files with 87 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/index.pug
View File

@ -101,29 +101,29 @@ html(lang="en")
//- hubl-reactivity(bind-user nested-field="joboffers" target-src=`${endpoints.joboffers || endpoints.get.joboffers}current/`) //- hubl-reactivity(bind-user nested-field="joboffers" target-src=`${endpoints.joboffers || endpoints.get.joboffers}current/`)
//- include views/page-job-offers.pug //- include views/page-job-offers.pug
if endpoints.get.projects //- if endpoints.get.projects
#project(hidden, data-view="project", no-render).segment.lg-full.with-sidebar //- #project(hidden, data-view="project", no-render).segment.lg-full.with-sidebar
hubl-reactivity(bind-user nested-field='inbox' target-src="store://user.projects") //- 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}joinable/` target-src=`${endpoints.get.projects}`)
hubl-reactivity(data-src=`${endpoints.post.projects}` 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}`)
hubl-reactivity(bind-user nested-field="projects" target-src=`${endpoints.post.projects}joinable/`) //- 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(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}`)
hubl-reactivity(bind-user nested-field="projects" target-src=`${endpoints.projects || endpoints.get.projects}joinable/`) //- hubl-reactivity(bind-user nested-field="projects" target-src=`${endpoints.projects || endpoints.get.projects}joinable/`)
include views/page-project.pug //- include views/page-project.pug
//- if endpoints.get.circles if endpoints.get.circles
//- #circle(hidden, data-view="circle").segment.lg-full.with-sidebar #circle(hidden, data-view="circle").segment.lg-full.with-sidebar
//- hubl-reactivity(bind-user nested-field='inbox' target-src="store://user.circles") 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}joinable/` target-src=`${endpoints.get.circles}`)
//- hubl-reactivity(data-src=`${endpoints.post.circles}` 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}`)
//- hubl-reactivity(bind-user nested-field="circles" target-src=`${endpoints.post.circles}joinable/`) 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(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}`)
//- hubl-reactivity(bind-user nested-field="circles" target-src=`${endpoints.circles || endpoints.get.circles}joinable/`) hubl-reactivity(bind-user nested-field="circles" target-src=`${endpoints.circles || endpoints.get.circles}joinable/`)
//- include views/page-circle.pug include views/page-circle.pug
//- if endpoints.get.users //- if endpoints.get.users
//- #messages(hidden, data-view="messages", no-render).with-sidebar //- #messages(hidden, data-view="messages", no-render).with-sidebar

8
src/styles/index.scss
View File

@ -10,14 +10,6 @@ main {
white-space: normal; white-space: normal;
} }
.whitespace-nowrap {
white-space: nowrap;
}
.segment {
white-space: normal !important;
}
@import 'header/_index'; @import 'header/_index';
@import 'left-nav/_index'; @import 'left-nav/_index';
@import 'content/_index'; @import 'content/_index';

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

@ -8,24 +8,24 @@
if (endpoints.users || (endpoints.get && endpoints.get.users)) if (endpoints.users || (endpoints.get && endpoints.get.users))
#admin-communities(hidden, data-view="admin-communities") #admin-communities(hidden, data-view="admin-communities")
include partials/admin/page-admin-communities.pug include partials/admin/page-admin-communities.pug
nav.jsRightMenu(role='navigation') nav.jsRightMenu.sidebar.whitespace-normal(role='navigation')
solid-router.text-color-heading.text-bold(default-route='admin-circles') solid-router.segment.whitespace-normal.text-color-heading.text-bold(default-route='admin-circles')
ul ul
li.segment.padding-small.text-right.text-normal.jsOffsiteToggle li.segment.lg-full.padding-small.text-right.text-normal.jsOffsiteToggle
span.icon.icon-arrow-right.xxsmall.margin-right-xxsmall span.icon.icon-arrow-right.xxsmall.margin-right-xxsmall
a(data-trans='admin.menuRight.fold') a(data-trans='admin.menuRight.fold')
if (endpoints.users || (endpoints.get && endpoints.get.users)) if (endpoints.users || (endpoints.get && endpoints.get.users))
solid-route(name='admin-communities') solid-route.segment.lg-full(name='admin-communities')
li.segment.padding-medium li.segment.lg-full.padding-medium
span.icon.ci-networking.icon-xlarge.margin-right-small span.icon.ci-networking.icon-xlarge.margin-right-small
a(data-trans='admin.menuRight.community') a(data-trans='admin.menuRight.community')
if endpoints.circles || (endpoints.get && endpoints.get.circles) if endpoints.circles || (endpoints.get && endpoints.get.circles)
solid-route(name='admin-circles') solid-route.segment.lg-full(name='admin-circles')
li.segment.padding-medium li.segment.lg-full.padding-medium
span.icon.ci-bubble-add.icon-xlarge.margin-right-small span.icon.ci-bubble-add.icon-xlarge.margin-right-small
a(data-trans='admin.menuRight.circles') a(data-trans='admin.menuRight.circles')
if endpoints.projects || (endpoints.get && endpoints.get.projects) if endpoints.projects || (endpoints.get && endpoints.get.projects)
solid-route(name='admin-projects') solid-route.segment.lg-full(name='admin-projects')
li.segment.padding-medium li.segment.lg-full.padding-medium
span.icon.ci-add.icon-xlarge.margin-right-small span.icon.ci-add.icon-xlarge.margin-right-small
a(data-trans='admin.menuRight.projects') a(data-trans='admin.menuRight.projects')

28
src/views/page-circle.pug
View File

@ -2,7 +2,7 @@
solid-ac-checker(permission='acl:Read', bind-resources) solid-ac-checker(permission='acl:Read', bind-resources)
#circle-chat(hidden, data-view="circle-chat") #circle-chat(hidden, data-view="circle-chat")
include partials/circle/page-circle-chat.pug include partials/circle/page-circle-chat.pug
#circle-information.content-box__height(hidden, data-view="circle-information") #circle-information(hidden, data-view="circle-information")
include partials/circle/page-circle-profile.pug include partials/circle/page-circle-profile.pug
#circle-events(hidden, data-view="circle-events") #circle-events(hidden, data-view="circle-events")
include partials/circle/page-circle-events.pug include partials/circle/page-circle-events.pug
@ -11,33 +11,33 @@
#circle-polls(hidden, data-view="circle-polls") #circle-polls(hidden, data-view="circle-polls")
include partials/circle/page-circle-polls.pug include partials/circle/page-circle-polls.pug
nav.jsRightMenu(role='navigation') nav.jsRightMenu.sidebar.whitespace-normal(role='navigation')
solid-router.text-color-heading.text-bold(default-route='circle-chat') solid-router.segment.whitespace-normal.text-color-heading.text-bold(default-route='circle-chat')
ul ul
li.segment.padding-small.text-right.text-normal.jsOffsiteToggle li.segment.lg-full.padding-small.text-right.text-normal.jsOffsiteToggle
span.icon.icon-arrow-right.xxsmall.margin-right-xxsmall span.icon.icon-arrow-right.xxsmall.margin-right-xxsmall
a(data-trans='circle.menuRight.fold') a(data-trans='circle.menuRight.fold')
solid-route(name='circle-chat') solid-route.segment.lg-full(name='circle-chat')
li.segment.padding-medium li.segment.lg-full.padding-medium
span.icon.ci-chat.icon-xlarge.margin-right-small span.icon.ci-chat.icon-xlarge.margin-right-small
a(data-trans='circle.menuRight.chat') a(data-trans='circle.menuRight.chat')
solid-route(name='circle-information') solid-route.segment.lg-full(name='circle-information')
li.segment.padding-medium li.segment.lg-full.padding-medium
span.icon.ci-information.icon-xlarge.margin-right-small span.icon.ci-information.icon-xlarge.margin-right-small
a(data-trans='circle.menuRight.information') a(data-trans='circle.menuRight.information')
if (endpoints.resources || (endpoints.get && endpoints.get.resources)) && (endpoints.resourceskeywords || (endpoints.get && endpoints.get.resourceskeywords)) && (endpoints.resourcestypes || (endpoints.get && endpoints.get.resourcestypes)) if (endpoints.resources || (endpoints.get && endpoints.get.resources)) && (endpoints.resourceskeywords || (endpoints.get && endpoints.get.resourceskeywords)) && (endpoints.resourcestypes || (endpoints.get && endpoints.get.resourcestypes))
solid-route(name='circle-resources' use-id) solid-route.segment.lg-full(name='circle-resources' use-id)
li.segment.padding-medium li.segment.lg-full.padding-medium
span.icon.ci-networking.icon-xlarge.margin-right-small span.icon.ci-networking.icon-xlarge.margin-right-small
a(data-trans='circle.menuRight.resources') a(data-trans='circle.menuRight.resources')
if (endpoints.events || (endpoints.get && endpoints.get.events)) && (endpoints.typeevents || (endpoints.get && endpoints.get.typeevents)) if (endpoints.events || (endpoints.get && endpoints.get.events)) && (endpoints.typeevents || (endpoints.get && endpoints.get.typeevents))
solid-route(name='circle-events' use-id) solid-route.segment.lg-full(name='circle-events' use-id)
li.segment.padding-medium li.segment.lg-full.padding-medium
span.icon.ci-networking.icon-xlarge.margin-right-small span.icon.ci-networking.icon-xlarge.margin-right-small
a(data-trans='circle.menuRight.events') a(data-trans='circle.menuRight.events')
if endpoints.polls || (endpoints.get && endpoints.get.polls) if endpoints.polls || (endpoints.get && endpoints.get.polls)
solid-route(name='circle-polls' use-id) solid-route.segment.lg-full(name='circle-polls' use-id)
li.segment.padding-medium li.segment.lg-full.padding-medium
span.icon.ci-networking.icon-xlarge.margin-right-small span.icon.ci-networking.icon-xlarge.margin-right-small
a(data-trans='circle.menuRight.polls') a(data-trans='circle.menuRight.polls')

4
src/views/partials/circle/page-circle-profile.pug
View File

@ -1,8 +1,8 @@
solid-router(default-route='circle-profile', hidden) //-solid-router(default-route='circle-profile', hidden)
solid-route(name='circle-profile') solid-route(name='circle-profile')
solid-route(name='circle-edit') solid-route(name='circle-edit')
#circle-profile(hidden, data-view="circle-profile") //-#circle-profile(hidden, data-view="circle-profile")
solid-ac-checker(permission='acl:Read', bind-resources) solid-ac-checker(permission='acl:Read', bind-resources)
div.segment.padding-large.border-bottom.border-color-grey.clearfix div.segment.padding-large.border-bottom.border-color-grey.clearfix
solid-display.text-xxlarge.text-letter-spacing-large( solid-display.text-xxlarge.text-letter-spacing-large(

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

@ -131,63 +131,63 @@ solid-router#navbar-router(default-route='dashboard')
//- div.segment.icon.icon-small.icon-calendar //- div.segment.icon.icon-small.icon-calendar
//- div.segment.text-uppercase.text-letter-spacing-large(data-trans="menuLeft.events") //- div.segment.text-uppercase.text-letter-spacing-large(data-trans="menuLeft.events")
//- div.divider //- div.divider
if endpoints.projects || (endpoints.get && endpoints.get.projects) //-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)
//- div.menu-wrapper //- div.menu-wrapper
//- solid-link.menu.segment.lg-full.padding-small.text-semibold.text-color-white.heading-active.bg-color-heading.hover.active //- 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.margin-right-xxsmall
//- div.segment.icon.icon-small.icon-folder-alt //- 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.menu-chevron.segment
//- div.icon-arrow-up //- div.icon-arrow-up
//- //- div.menu-icon.icon-arrow-right-circle //- //- 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.sub-menu.menu-notification
//- div#loader-circles.loader.loader-menu //- div#loader-projects.loader.loader-menu
//- div //- div
//- div //- div
//- div //- div
//- div //- div
//- solid-display.ellipsis( //- solid-display.ellipsis(
//- bind-user //- bind-user
//- nested-field='circles' //- nested-field='projects'
//- fields='circle' //- fields='project'
//- loader-id='loader-circles' //- loader-id='loader-projects'
//- empty-widget='hubl-create' //- empty-widget='hubl-create'
//- empty-value='' //- empty-value=''
//- data-trans="empty-value=menuLeft.emptyCircleProject.circle" //- data-trans="empty-value=menuLeft.emptyCircleProject.project"
//- widget-circle='hubl-menu-fix-url-circle' //- widget-project='hubl-menu-fix-url-project'
//- order-asc="circle.name" //- 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.divider
//- div.menu-wrapper //- div.menu-wrapper
//- div.menu.segment.lg-full.padding-small.text-semibold.text-color-white.heading-active.bg-color-heading.hover.active //- div.menu.segment.lg-full.padding-small.text-semibold.text-color-white.heading-active.bg-color-heading.hover.active