From fb4aa7f1f5c458d8b5739f804ce9bdeadea57c34 Mon Sep 17 00:00:00 2001
From: gaelle morin <gmorin.dev@gmail.com>
Date: Tue, 29 Dec 2020 17:54:17 +0100
Subject: [PATCH] feature: circle + admin - right sidebar
---
src/index.pug | 46 +++++------
src/styles/index.scss | 8 --
src/views/page-admin.pug | 18 ++---
src/views/page-circle.pug | 28 +++----
.../partials/circle/page-circle-profile.pug | 4 +-
src/views/partials/menu-left.pug | 80 +++++++++----------
6 files changed, 88 insertions(+), 96 deletions(-)
diff --git a/src/index.pug b/src/index.pug
index a657a40a..d49e67f2 100644
--- a/src/index.pug
+++ b/src/index.pug
@@ -101,29 +101,29 @@ html(lang="en")
//- hubl-reactivity(bind-user nested-field="joboffers" target-src=`${endpoints.joboffers || endpoints.get.joboffers}current/`)
//- include views/page-job-offers.pug
- if endpoints.get.projects
- #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(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(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(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}joinable/`)
- include views/page-project.pug
-
- //- if endpoints.get.circles
- //- #circle(hidden, data-view="circle").segment.lg-full.with-sidebar
- //- 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}` 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}joinable/`)
- //- 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}joinable/`)
- //- include views/page-circle.pug
+ //- if endpoints.get.projects
+ //- #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(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(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(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}joinable/`)
+ //- include views/page-project.pug
+
+ if endpoints.get.circles
+ #circle(hidden, data-view="circle").segment.lg-full.with-sidebar
+ 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}` 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}joinable/`)
+ 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}joinable/`)
+ include views/page-circle.pug
//- if endpoints.get.users
//- #messages(hidden, data-view="messages", no-render).with-sidebar
diff --git a/src/styles/index.scss b/src/styles/index.scss
index 0e07eaf5..3cd687cf 100644
--- a/src/styles/index.scss
+++ b/src/styles/index.scss
@@ -10,14 +10,6 @@ main {
white-space: normal;
}
-.whitespace-nowrap {
- white-space: nowrap;
-}
-
-.segment {
- white-space: normal !important;
-}
-
@import 'header/_index';
@import 'left-nav/_index';
@import 'content/_index';
\ No newline at end of file
diff --git a/src/views/page-admin.pug b/src/views/page-admin.pug
index ef6baad5..4dca227e 100644
--- a/src/views/page-admin.pug
+++ b/src/views/page-admin.pug
@@ -8,24 +8,24 @@
if (endpoints.users || (endpoints.get && endpoints.get.users))
#admin-communities(hidden, data-view="admin-communities")
include partials/admin/page-admin-communities.pug
-nav.jsRightMenu(role='navigation')
- solid-router.text-color-heading.text-bold(default-route='admin-circles')
+nav.jsRightMenu.sidebar.whitespace-normal(role='navigation')
+ solid-router.segment.whitespace-normal.text-color-heading.text-bold(default-route='admin-circles')
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
a(data-trans='admin.menuRight.fold')
if (endpoints.users || (endpoints.get && endpoints.get.users))
- solid-route(name='admin-communities')
- li.segment.padding-medium
+ solid-route.segment.lg-full(name='admin-communities')
+ li.segment.lg-full.padding-medium
span.icon.ci-networking.icon-xlarge.margin-right-small
a(data-trans='admin.menuRight.community')
if endpoints.circles || (endpoints.get && endpoints.get.circles)
- solid-route(name='admin-circles')
- li.segment.padding-medium
+ solid-route.segment.lg-full(name='admin-circles')
+ li.segment.lg-full.padding-medium
span.icon.ci-bubble-add.icon-xlarge.margin-right-small
a(data-trans='admin.menuRight.circles')
if endpoints.projects || (endpoints.get && endpoints.get.projects)
- solid-route(name='admin-projects')
- li.segment.padding-medium
+ solid-route.segment.lg-full(name='admin-projects')
+ li.segment.lg-full.padding-medium
span.icon.ci-add.icon-xlarge.margin-right-small
a(data-trans='admin.menuRight.projects')
diff --git a/src/views/page-circle.pug b/src/views/page-circle.pug
index 53d1a8f5..497c87b6 100644
--- a/src/views/page-circle.pug
+++ b/src/views/page-circle.pug
@@ -2,7 +2,7 @@
solid-ac-checker(permission='acl:Read', bind-resources)
#circle-chat(hidden, data-view="circle-chat")
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
#circle-events(hidden, data-view="circle-events")
include partials/circle/page-circle-events.pug
@@ -11,33 +11,33 @@
#circle-polls(hidden, data-view="circle-polls")
include partials/circle/page-circle-polls.pug
-nav.jsRightMenu(role='navigation')
- solid-router.text-color-heading.text-bold(default-route='circle-chat')
+nav.jsRightMenu.sidebar.whitespace-normal(role='navigation')
+ solid-router.segment.whitespace-normal.text-color-heading.text-bold(default-route='circle-chat')
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
a(data-trans='circle.menuRight.fold')
- solid-route(name='circle-chat')
- li.segment.padding-medium
+ solid-route.segment.lg-full(name='circle-chat')
+ li.segment.lg-full.padding-medium
span.icon.ci-chat.icon-xlarge.margin-right-small
a(data-trans='circle.menuRight.chat')
- solid-route(name='circle-information')
- li.segment.padding-medium
+ solid-route.segment.lg-full(name='circle-information')
+ li.segment.lg-full.padding-medium
span.icon.ci-information.icon-xlarge.margin-right-small
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))
- solid-route(name='circle-resources' use-id)
- li.segment.padding-medium
+ solid-route.segment.lg-full(name='circle-resources' use-id)
+ li.segment.lg-full.padding-medium
span.icon.ci-networking.icon-xlarge.margin-right-small
a(data-trans='circle.menuRight.resources')
if (endpoints.events || (endpoints.get && endpoints.get.events)) && (endpoints.typeevents || (endpoints.get && endpoints.get.typeevents))
- solid-route(name='circle-events' use-id)
- li.segment.padding-medium
+ solid-route.segment.lg-full(name='circle-events' use-id)
+ li.segment.lg-full.padding-medium
span.icon.ci-networking.icon-xlarge.margin-right-small
a(data-trans='circle.menuRight.events')
if endpoints.polls || (endpoints.get && endpoints.get.polls)
- solid-route(name='circle-polls' use-id)
- li.segment.padding-medium
+ solid-route.segment.lg-full(name='circle-polls' use-id)
+ li.segment.lg-full.padding-medium
span.icon.ci-networking.icon-xlarge.margin-right-small
a(data-trans='circle.menuRight.polls')
diff --git a/src/views/partials/circle/page-circle-profile.pug b/src/views/partials/circle/page-circle-profile.pug
index effe696b..e74fee53 100644
--- a/src/views/partials/circle/page-circle-profile.pug
+++ b/src/views/partials/circle/page-circle-profile.pug
@@ -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-edit')
-#circle-profile(hidden, data-view="circle-profile")
+//-#circle-profile(hidden, data-view="circle-profile")
solid-ac-checker(permission='acl:Read', bind-resources)
div.segment.padding-large.border-bottom.border-color-grey.clearfix
solid-display.text-xxlarge.text-letter-spacing-large(
diff --git a/src/views/partials/menu-left.pug b/src/views/partials/menu-left.pug
index 61daf4f9..4c8434b9 100644
--- a/src/views/partials/menu-left.pug
+++ b/src/views/partials/menu-left.pug
@@ -131,63 +131,63 @@ solid-router#navbar-router(default-route='dashboard')
//- div.segment.icon.icon-small.icon-calendar
//- div.segment.text-uppercase.text-letter-spacing-large(data-trans="menuLeft.events")
//- div.divider
- 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)
+ //-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-circle-list')
+ //- //- (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.circles")
+ //- 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='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#loader-circles.loader.loader-menu
+ //- div#loader-projects.loader.loader-menu
//- div
//- div
//- div
//- div
//- solid-display.ellipsis(
//- bind-user
- //- nested-field='circles'
- //- fields='circle'
- //- loader-id='loader-circles'
+ //- nested-field='projects'
+ //- fields='project'
+ //- loader-id='loader-projects'
//- empty-widget='hubl-create'
//- empty-value=''
- //- data-trans="empty-value=menuLeft.emptyCircleProject.circle"
- //- widget-circle='hubl-menu-fix-url-circle'
- //- order-asc="circle.name"
+ //- 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
+ 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.menu-wrapper
//- div.menu.segment.lg-full.padding-small.text-semibold.text-color-white.heading-active.bg-color-heading.hover.active
--
GitLab