fix: admin with route false

This commit is contained in:
Jean-Baptiste Pasquier 2021-04-06 17:04:05 +02:00
parent 0ebb4a922b
commit c3e9bb42c9
2 changed files with 77 additions and 75 deletions

View File

@ -1,60 +1,61 @@
.with-sidebar.whitespace-normal.bg-color-white.only-on-admin(hidden) .with-sidebar.whitespace-normal.bg-color-white.only-on-admin(hidden)
.scrollbar-content.views-container.sidebar-is-closed .scrollbar-content.views-container.sidebar-is-closed
for component of components for component of components
if component.type == "circles" if component.route
div( if component.type == "circles"
id=`admin-${component.route}` div(
hidden id=`admin-${component.route}`
data-view=`admin-${component.route}` hidden
no-render data-view=`admin-${component.route}`
) no-render
- var page = 'join'; )
include partials/admin/page-admin-circles-join.pug - var page = 'join';
div.text-disable-selection( include partials/admin/page-admin-circles-join.pug
id=`admin-${component.route}-leave` div.text-disable-selection(
hidden id=`admin-${component.route}-leave`
data-view=`admin-${component.route}-leave` hidden
no-render data-view=`admin-${component.route}-leave`
) no-render
- var page = 'leave'; )
include partials/admin/page-admin-circles-leave.pug - var page = 'leave';
div.text-disable-selection( include partials/admin/page-admin-circles-leave.pug
id=`admin-${component.route}-create` div.text-disable-selection(
hidden id=`admin-${component.route}-create`
data-view=`admin-${component.route}-create` hidden
no-render data-view=`admin-${component.route}-create`
) no-render
include partials/admin/page-admin-circles-create.pug )
if component.type == "projects" include partials/admin/page-admin-circles-create.pug
div( if component.type == "projects"
id=`admin-${component.route}` div(
hidden id=`admin-${component.route}`
data-view=`admin-${component.route}` hidden
no-render data-view=`admin-${component.route}`
) no-render
include partials/admin/page-admin-projects.pug )
div( include partials/admin/page-admin-projects.pug
id=`admin-${component.route}-create` div(
hidden id=`admin-${component.route}-create`
data-view=`admin-${component.route}-create` hidden
no-render data-view=`admin-${component.route}-create`
) no-render
include partials/admin/page-admin-projects-create.pug )
if component.type == "chat" && componentSet.has('communities') include partials/admin/page-admin-projects-create.pug
div( if component.type == "chat" && componentSet.has('communities')
id=`admin-${component.route}` div(
hidden id=`admin-${component.route}`
data-view=`admin-${component.route}` hidden
no-render data-view=`admin-${component.route}`
) no-render
include partials/admin/page-admin-chat.pug )
div( include partials/admin/page-admin-chat.pug
id=`admin-${component.route}-create` div(
hidden id=`admin-${component.route}-create`
data-view=`admin-${component.route}-create` hidden
no-render data-view=`admin-${component.route}-create`
) no-render
include partials/admin/page-admin-chat-create.pug )
include partials/admin/page-admin-chat-create.pug
nav.jsRightMenu.text-disable-selection.sidebar.whitespace-normal(role='navigation') nav.jsRightMenu.text-disable-selection.sidebar.whitespace-normal(role='navigation')
.segment.whitespace-normal.text-color-heading.text-bold .segment.whitespace-normal.text-color-heading.text-bold
@ -65,18 +66,19 @@
span.icon.icon-arrow-right.icon-xsmall.margin-right-xxsmall span.icon.icon-arrow-right.icon-xsmall.margin-right-xxsmall
a(data-trans='admin.menuRight.fold') a(data-trans='admin.menuRight.fold')
for component of components for component of components
if component.type == "circles" if component.route
solid-link.segment.full(next=`admin-${component.route}`) if component.type == "circles"
li.segment.full.padding-medium solid-link.segment.full(next=`admin-${component.route}`)
span.icon.ci-bubble-add.icon-xlarge.margin-right-medium li.segment.full.padding-medium
a(data-trans='admin.menuRight.circles') span.icon.ci-bubble-add.icon-xlarge.margin-right-medium
if component.type == "projects" a(data-trans='admin.menuRight.circles')
solid-link.segment.full(next=`admin-${component.route}`) if component.type == "projects"
li.segment.full.padding-medium solid-link.segment.full(next=`admin-${component.route}`)
span.icon.ci-add.icon-xlarge.margin-right-medium li.segment.full.padding-medium
a(data-trans='admin.menuRight.projects') span.icon.ci-add.icon-xlarge.margin-right-medium
if component.type == "chat" a(data-trans='admin.menuRight.projects')
solid-link.segment.full(next=`admin-${component.route}`) if component.type == "chat"
li.segment.full.padding-medium solid-link.segment.full(next=`admin-${component.route}`)
span.icon.ci-networking.icon-xlarge.margin-right-medium li.segment.full.padding-medium
a(data-trans='admin.menuRight.community') span.icon.ci-networking.icon-xlarge.margin-right-medium
a(data-trans='admin.menuRight.community')

View File

@ -45,15 +45,15 @@ div
li.segment.padding-small.border-bottom.border-color-grey li.segment.padding-small.border-bottom.border-color-grey
div(data-trans='header.admin') div(data-trans='header.admin')
ul.text-normal ul.text-normal
if componentSet.has("communities") if componentSet.has("communities") && getComponent("chat").route
solid-link.text-hover(next=`admin-${getRoute("chat", true)}`) solid-link.text-hover(next=`admin-${getRoute("chat", true)}`)
li.segment.padding-top-small li.segment.padding-top-small
a.icon.icon-people.icon-third.icon-small.icon-margin-right-xsmall(data-trans='admin.menuRight.community') a.icon.icon-people.icon-third.icon-small.icon-margin-right-xsmall(data-trans='admin.menuRight.community')
if componentSet.has("circles") if componentSet.has("circles") && getComponent("circles").route
solid-link.text-hover(next=`admin-${getRoute("circles", true)}`) solid-link.text-hover(next=`admin-${getRoute("circles", true)}`)
li.segment.padding-top-small li.segment.padding-top-small
a.icon.icon-globe.icon-third.icon-small.icon-margin-right-xsmall(data-trans='admin.menuRight.circles') a.icon.icon-globe.icon-third.icon-small.icon-margin-right-xsmall(data-trans='admin.menuRight.circles')
if componentSet.has("projects") if componentSet.has("projects") && getComponent("projects").route
solid-link.text-hover(next=`admin-${getRoute("projects", true)}`) solid-link.text-hover(next=`admin-${getRoute("projects", true)}`)
li.segment.padding-top-small li.segment.padding-top-small
a.icon.icon-folder-alt.icon-third.icon-small.icon-margin-right-xsmall(data-trans='admin.menuRight.projects') a.icon.icon-folder-alt.icon-third.icon-small.icon-margin-right-xsmall(data-trans='admin.menuRight.projects')
@ -96,15 +96,15 @@ div
li.segment.padding-small.sm-padding-medium.sm-padding-left-xlarge.border-bottom.border-color-grey li.segment.padding-small.sm-padding-medium.sm-padding-left-xlarge.border-bottom.border-color-grey
div(data-trans='header.admin') div(data-trans='header.admin')
ul.text-normal ul.text-normal
if componentSet.has("communities") if componentSet.has("communities") && getComponent("chat").route
solid-link.text-hover(next=`admin-${getRoute("chat", true)}`) solid-link.text-hover(next=`admin-${getRoute("chat", true)}`)
li.segment.padding-top-small.sm-padding-top-medium 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') a.icon.icon-people.icon-third.icon-small.icon-margin-right-xsmall(data-trans='admin.menuRight.community')
if componentSet.has("circles") if componentSet.has("circles") && getComponent("circles").route
solid-link.text-hover(next=`admin-${getRoute("circles", true)}`) solid-link.text-hover(next=`admin-${getRoute("circles", true)}`)
li.segment.padding-top-small.sm-padding-top-medium 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') a.icon.icon-globe.icon-third.icon-small.icon-margin-right-xsmall(data-trans='admin.menuRight.circles')
if componentSet.has("projects") if componentSet.has("projects") && getComponent("projects").route
solid-link.text-hover(next=`admin-${getRoute("projects", true)}`) solid-link.text-hover(next=`admin-${getRoute("projects", true)}`)
li.segment.padding-top-small.sm-padding-top-medium li.segment.padding-top-small.sm-padding-top-medium
a.icon.icon-folder-alt.icon-third.icon-small.icon-margin-right-xsmall(data-trans='admin.menuRight.projects') a.icon.icon-folder-alt.icon-third.icon-small.icon-margin-right-xsmall(data-trans='admin.menuRight.projects')