From 44c25b2a555bc2e747a5bb2bf4cf6ee96e60221e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= Date: Thu, 2 Jun 2022 13:16:06 +0200 Subject: [PATCH] section dashboard & sidebar --- .../src/backoffice/backoffice.element.ts | 2 +- .../{ => sections}/content/content-editor.element.ts | 6 +++--- .../{ => sections}/content/content-section.element.ts | 6 +++--- .../{ => sections}/content/content-tree.element.ts | 2 +- .../{ => sections}/settings/settings-section.element.ts | 4 ++-- src/Umbraco.Web.UI.Client/src/index.ts | 4 ++-- .../section-dashboards.element.ts} | 9 +++++---- .../section-sidebar.element.ts} | 6 +++--- 8 files changed, 20 insertions(+), 19 deletions(-) rename src/Umbraco.Web.UI.Client/src/extensions/{ => sections}/content/content-editor.element.ts (95%) rename src/Umbraco.Web.UI.Client/src/extensions/{ => sections}/content/content-section.element.ts (90%) rename src/Umbraco.Web.UI.Client/src/extensions/{ => sections}/content/content-tree.element.ts (95%) rename src/Umbraco.Web.UI.Client/src/extensions/{ => sections}/settings/settings-section.element.ts (97%) rename src/Umbraco.Web.UI.Client/src/{extensions/content/content-dashboards.element.ts => section/section-dashboards.element.ts} (92%) rename src/Umbraco.Web.UI.Client/src/{backoffice/backoffice-sidebar.element.ts => section/section-sidebar.element.ts} (79%) diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/backoffice.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/backoffice.element.ts index 10a59c78ff..2e7b096183 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/backoffice.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/backoffice.element.ts @@ -3,7 +3,7 @@ import { UUITextStyles } from '@umbraco-ui/uui-css/lib'; import { css, html, LitElement } from 'lit'; import './backoffice-header.element'; -import './backoffice-sidebar.element'; +import '../section/section-sidebar.element'; import './backoffice-main.element'; @defineElement('umb-backoffice') diff --git a/src/Umbraco.Web.UI.Client/src/extensions/content/content-editor.element.ts b/src/Umbraco.Web.UI.Client/src/extensions/sections/content/content-editor.element.ts similarity index 95% rename from src/Umbraco.Web.UI.Client/src/extensions/content/content-editor.element.ts rename to src/Umbraco.Web.UI.Client/src/extensions/sections/content/content-editor.element.ts index 6670a1f6ba..b2886ab528 100644 --- a/src/Umbraco.Web.UI.Client/src/extensions/content/content-editor.element.ts +++ b/src/Umbraco.Web.UI.Client/src/extensions/sections/content/content-editor.element.ts @@ -1,10 +1,10 @@ import { css, html, LitElement } from 'lit'; import { UUITextStyles } from '@umbraco-ui/uui-css/lib'; import { customElement, property, state } from 'lit/decorators.js'; -import { UmbContextConsumerMixin } from '../../core/context'; -import { UmbNodeStore } from '../../core/stores/node.store'; +import { UmbContextConsumerMixin } from '../../../core/context'; +import { UmbNodeStore } from '../../../core/stores/node.store'; import { Subscription } from 'rxjs'; -import { DocumentNode } from '../../mocks/data/content.data'; +import { DocumentNode } from '../../../mocks/data/content.data'; @customElement('umb-content-editor') export class UmbContentEditor extends UmbContextConsumerMixin(LitElement) { diff --git a/src/Umbraco.Web.UI.Client/src/extensions/content/content-section.element.ts b/src/Umbraco.Web.UI.Client/src/extensions/sections/content/content-section.element.ts similarity index 90% rename from src/Umbraco.Web.UI.Client/src/extensions/content/content-section.element.ts rename to src/Umbraco.Web.UI.Client/src/extensions/sections/content/content-section.element.ts index 905f038504..df52a2bbb5 100644 --- a/src/Umbraco.Web.UI.Client/src/extensions/content/content-section.element.ts +++ b/src/Umbraco.Web.UI.Client/src/extensions/sections/content/content-section.element.ts @@ -23,7 +23,7 @@ export class UmbContentSection extends LitElement { private _routes: Array = [ { path: 'dashboard', - component: () => import('./content-dashboards.element'), + component: () => import('../../../section/section-dashboards.element'), }, { path: 'node/:nodeId', @@ -45,9 +45,9 @@ export class UmbContentSection extends LitElement { render() { return html` - + - + `; } diff --git a/src/Umbraco.Web.UI.Client/src/extensions/content/content-tree.element.ts b/src/Umbraco.Web.UI.Client/src/extensions/sections/content/content-tree.element.ts similarity index 95% rename from src/Umbraco.Web.UI.Client/src/extensions/content/content-tree.element.ts rename to src/Umbraco.Web.UI.Client/src/extensions/sections/content/content-tree.element.ts index 5ad0d139e6..cdb06835b6 100644 --- a/src/Umbraco.Web.UI.Client/src/extensions/content/content-tree.element.ts +++ b/src/Umbraco.Web.UI.Client/src/extensions/sections/content/content-tree.element.ts @@ -1,7 +1,7 @@ import { css, html, LitElement } from 'lit'; import { customElement, state, property } from 'lit/decorators.js'; import { UUITextStyles } from '@umbraco-ui/uui-css/lib'; -import { data } from '../../mocks/data/content.data'; +import { data } from '../../../mocks/data/content.data'; @customElement('umb-content-tree') class UmbContentTree extends LitElement { diff --git a/src/Umbraco.Web.UI.Client/src/extensions/settings/settings-section.element.ts b/src/Umbraco.Web.UI.Client/src/extensions/sections/settings/settings-section.element.ts similarity index 97% rename from src/Umbraco.Web.UI.Client/src/extensions/settings/settings-section.element.ts rename to src/Umbraco.Web.UI.Client/src/extensions/sections/settings/settings-section.element.ts index 2dbad6c07a..72720dcd15 100644 --- a/src/Umbraco.Web.UI.Client/src/extensions/settings/settings-section.element.ts +++ b/src/Umbraco.Web.UI.Client/src/extensions/sections/settings/settings-section.element.ts @@ -2,8 +2,8 @@ import { UUITextStyles } from '@umbraco-ui/uui-css/lib'; import { css, html, LitElement } from 'lit'; import { customElement, state } from 'lit/decorators.js'; import { Subscription } from 'rxjs'; -import { UmbContextConsumerMixin } from '../../core/context'; -import { UmbExtensionManifest, UmbExtensionRegistry } from '../../core/extension'; +import { UmbContextConsumerMixin } from '../../../core/context'; +import { UmbExtensionManifest, UmbExtensionRegistry } from '../../../core/extension'; @customElement('umb-settings-section') export class UmbSettingsSection extends UmbContextConsumerMixin(LitElement) { diff --git a/src/Umbraco.Web.UI.Client/src/index.ts b/src/Umbraco.Web.UI.Client/src/index.ts index 9525aee31c..0cf58460be 100644 --- a/src/Umbraco.Web.UI.Client/src/index.ts +++ b/src/Umbraco.Web.UI.Client/src/index.ts @@ -32,7 +32,7 @@ const registerInternalManifests = async () => { alias: 'Umb.Section.Content', name: 'Content', elementName: 'umb-content-section', - js: () => import('./extensions/content/content-section.element'), + js: () => import('./extensions/sections/content/content-section.element'), meta: { pathname: 'content', // TODO: how to we want to support pretty urls? weight: 50, @@ -53,7 +53,7 @@ const registerInternalManifests = async () => { alias: 'Umb.Section.Settings', name: 'Settings', elementName: 'umb-settings-section', - js: () => import('./extensions/settings/settings-section.element'), + js: () => import('./extensions/sections/settings/settings-section.element'), meta: { pathname: 'settings', // TODO: how to we want to support pretty urls? weight: 20, diff --git a/src/Umbraco.Web.UI.Client/src/extensions/content/content-dashboards.element.ts b/src/Umbraco.Web.UI.Client/src/section/section-dashboards.element.ts similarity index 92% rename from src/Umbraco.Web.UI.Client/src/extensions/content/content-dashboards.element.ts rename to src/Umbraco.Web.UI.Client/src/section/section-dashboards.element.ts index d658ac23f0..79bc6b2c96 100644 --- a/src/Umbraco.Web.UI.Client/src/extensions/content/content-dashboards.element.ts +++ b/src/Umbraco.Web.UI.Client/src/section/section-dashboards.element.ts @@ -12,8 +12,8 @@ import { createExtensionElement, } from '../core/extension'; -@customElement('umb-content-dashboards') -export class UmbContentDashboards extends UmbContextConsumerMixin(LitElement) { +@customElement('umb-section-dashboards') +export class UmbSectionDashboards extends UmbContextConsumerMixin(LitElement) { static styles = [ UUITextStyles, css` @@ -90,6 +90,7 @@ export class UmbContentDashboards extends UmbContextConsumerMixin(LitElement) { } private _handleTabClick(e: PointerEvent, dashboard: UmbExtensionManifestDashboard) { + // TODO: generate URL from context/location. Or use Router-link concept? history.pushState(null, '', `/section/content/dashboard/${dashboard.meta.pathname}`); this._current = dashboard.name; } @@ -116,10 +117,10 @@ export class UmbContentDashboards extends UmbContextConsumerMixin(LitElement) { } } -export default UmbContentDashboards; +export default UmbSectionDashboards; declare global { interface HTMLElementTagNameMap { - 'umb-content-dashboards': UmbContentDashboards; + 'umb-section-dashboards': UmbSectionDashboards; } } diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/backoffice-sidebar.element.ts b/src/Umbraco.Web.UI.Client/src/section/section-sidebar.element.ts similarity index 79% rename from src/Umbraco.Web.UI.Client/src/backoffice/backoffice-sidebar.element.ts rename to src/Umbraco.Web.UI.Client/src/section/section-sidebar.element.ts index 946485cc1b..c93cdb3161 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/backoffice-sidebar.element.ts +++ b/src/Umbraco.Web.UI.Client/src/section/section-sidebar.element.ts @@ -2,8 +2,8 @@ import { UUITextStyles } from '@umbraco-ui/uui-css/lib'; import { css, html, LitElement } from 'lit'; import { customElement } from 'lit/decorators.js'; -@customElement('umb-backoffice-sidebar') -export class UmbBackofficeSidebar extends LitElement { +@customElement('umb-section-sidebar') +export class UmbSectionSidebar extends LitElement { static styles = [ UUITextStyles, css` @@ -26,6 +26,6 @@ export class UmbBackofficeSidebar extends LitElement { declare global { interface HTMLElementTagNameMap { - 'umb-backoffice-sidebar': UmbBackofficeSidebar; + 'umb-section-sidebar': UmbSectionSidebar; } }