From 7ed8d3e545adf0479c411322a2c6aeaf65e29429 Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Tue, 16 May 2023 21:40:38 +0200 Subject: [PATCH] move backoffice component into backoffice app --- .../backoffice}/backoffice.context.ts | 0 .../src/apps/backoffice/backoffice.element.ts | 5 +---- .../components}/backoffice-header-apps.element.ts | 0 .../components}/backoffice-header-sections.element.ts | 4 ++-- .../backoffice/components}/backoffice-header.element.ts | 0 .../backoffice/components}/backoffice-main.element.ts | 2 +- .../backoffice-modal-container.element.ts | 0 .../backoffice-notification-container.element.ts | 0 .../src/packages/core/components/index.ts | 8 ++++---- src/Umbraco.Web.UI.Client/src/packages/core/index.ts | 4 ++-- 10 files changed, 10 insertions(+), 13 deletions(-) rename src/Umbraco.Web.UI.Client/src/{packages/core/components/backoffice-frame => apps/backoffice}/backoffice.context.ts (100%) rename src/Umbraco.Web.UI.Client/src/{packages/core/components/backoffice-frame => apps/backoffice/components}/backoffice-header-apps.element.ts (100%) rename src/Umbraco.Web.UI.Client/src/{packages/core/components/backoffice-frame => apps/backoffice/components}/backoffice-header-sections.element.ts (96%) rename src/Umbraco.Web.UI.Client/src/{packages/core/components/backoffice-frame => apps/backoffice/components}/backoffice-header.element.ts (100%) rename src/Umbraco.Web.UI.Client/src/{packages/core/components/backoffice-frame => apps/backoffice/components}/backoffice-main.element.ts (99%) rename src/Umbraco.Web.UI.Client/src/packages/core/components/{backoffice-frame => backoffice-modal-container}/backoffice-modal-container.element.ts (100%) rename src/Umbraco.Web.UI.Client/src/packages/core/components/{backoffice-frame => backoffice-notification-container}/backoffice-notification-container.element.ts (100%) diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/components/backoffice-frame/backoffice.context.ts b/src/Umbraco.Web.UI.Client/src/apps/backoffice/backoffice.context.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/core/components/backoffice-frame/backoffice.context.ts rename to src/Umbraco.Web.UI.Client/src/apps/backoffice/backoffice.context.ts diff --git a/src/Umbraco.Web.UI.Client/src/apps/backoffice/backoffice.element.ts b/src/Umbraco.Web.UI.Client/src/apps/backoffice/backoffice.element.ts index 84213df83e..67728b7141 100644 --- a/src/Umbraco.Web.UI.Client/src/apps/backoffice/backoffice.element.ts +++ b/src/Umbraco.Web.UI.Client/src/apps/backoffice/backoffice.element.ts @@ -4,10 +4,7 @@ import { css, html } from 'lit'; import { UmbEntryPointExtensionInitializer } from '@umbraco-cms/backoffice/extension-api'; import { umbExtensionsRegistry } from '@umbraco-cms/backoffice/extension-registry'; import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; -import { - UmbBackofficeContext, - UMB_BACKOFFICE_CONTEXT_TOKEN, -} from '../../packages/core/components/backoffice-frame/backoffice.context'; +import { UmbBackofficeContext, UMB_BACKOFFICE_CONTEXT_TOKEN } from './backoffice.context'; import { UmbExtensionInitializer } from '../../packages/packages/repository/server-extension.controller'; const CORE_PACKAGES = [ diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/components/backoffice-frame/backoffice-header-apps.element.ts b/src/Umbraco.Web.UI.Client/src/apps/backoffice/components/backoffice-header-apps.element.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/core/components/backoffice-frame/backoffice-header-apps.element.ts rename to src/Umbraco.Web.UI.Client/src/apps/backoffice/components/backoffice-header-apps.element.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/components/backoffice-frame/backoffice-header-sections.element.ts b/src/Umbraco.Web.UI.Client/src/apps/backoffice/components/backoffice-header-sections.element.ts similarity index 96% rename from src/Umbraco.Web.UI.Client/src/packages/core/components/backoffice-frame/backoffice-header-sections.element.ts rename to src/Umbraco.Web.UI.Client/src/apps/backoffice/components/backoffice-header-sections.element.ts index 9213d41558..88e14b10a5 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/components/backoffice-frame/backoffice-header-sections.element.ts +++ b/src/Umbraco.Web.UI.Client/src/apps/backoffice/components/backoffice-header-sections.element.ts @@ -2,8 +2,8 @@ import { UUITextStyles } from '@umbraco-ui/uui-css/lib'; import { css, CSSResultGroup, html } from 'lit'; import { customElement, state } from 'lit/decorators.js'; import { when } from 'lit/directives/when.js'; -import { UMB_BACKOFFICE_CONTEXT_TOKEN } from './backoffice.context'; -import type { UmbBackofficeContext } from './backoffice.context'; +import { UMB_BACKOFFICE_CONTEXT_TOKEN } from '../backoffice.context'; +import type { UmbBackofficeContext } from '../backoffice.context'; import type { ManifestSection } from '@umbraco-cms/backoffice/extension-registry'; import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/components/backoffice-frame/backoffice-header.element.ts b/src/Umbraco.Web.UI.Client/src/apps/backoffice/components/backoffice-header.element.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/core/components/backoffice-frame/backoffice-header.element.ts rename to src/Umbraco.Web.UI.Client/src/apps/backoffice/components/backoffice-header.element.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/components/backoffice-frame/backoffice-main.element.ts b/src/Umbraco.Web.UI.Client/src/apps/backoffice/components/backoffice-main.element.ts similarity index 99% rename from src/Umbraco.Web.UI.Client/src/packages/core/components/backoffice-frame/backoffice-main.element.ts rename to src/Umbraco.Web.UI.Client/src/apps/backoffice/components/backoffice-main.element.ts index a31fa21fe8..f2d41b9c3e 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/components/backoffice-frame/backoffice-main.element.ts +++ b/src/Umbraco.Web.UI.Client/src/apps/backoffice/components/backoffice-main.element.ts @@ -3,7 +3,7 @@ import { UUITextStyles } from '@umbraco-ui/uui-css/lib'; import { css, html } from 'lit'; import { state } from 'lit/decorators.js'; import { UmbSectionContext, UMB_SECTION_CONTEXT_TOKEN } from '@umbraco-cms/backoffice/section'; -import { UmbBackofficeContext, UMB_BACKOFFICE_CONTEXT_TOKEN } from './backoffice.context'; +import { UmbBackofficeContext, UMB_BACKOFFICE_CONTEXT_TOKEN } from '../backoffice.context'; import type { UmbRoute } from '@umbraco-cms/backoffice/router'; import type { UmbRouterSlotChangeEvent } from '@umbraco-cms/internal/router'; import type { ManifestSection, UmbSectionExtensionElement } from '@umbraco-cms/backoffice/extension-registry'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/components/backoffice-frame/backoffice-modal-container.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/components/backoffice-modal-container/backoffice-modal-container.element.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/core/components/backoffice-frame/backoffice-modal-container.element.ts rename to src/Umbraco.Web.UI.Client/src/packages/core/components/backoffice-modal-container/backoffice-modal-container.element.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/components/backoffice-frame/backoffice-notification-container.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/components/backoffice-notification-container/backoffice-notification-container.element.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/core/components/backoffice-frame/backoffice-notification-container.element.ts rename to src/Umbraco.Web.UI.Client/src/packages/core/components/backoffice-notification-container/backoffice-notification-container.element.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/components/index.ts b/src/Umbraco.Web.UI.Client/src/packages/core/components/index.ts index de595743ea..77399d9d60 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/components/index.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/components/index.ts @@ -21,10 +21,10 @@ import './entity-action/entity-action.element'; import './entity-bulk-action/entity-bulk-action.element'; -import './backoffice-frame/backoffice-header.element'; -import './backoffice-frame/backoffice-main.element'; -import './backoffice-frame/backoffice-modal-container.element'; -import './backoffice-frame/backoffice-notification-container.element'; +import '../../../apps/backoffice/components/backoffice-header.element'; +import '../../../apps/backoffice/components/backoffice-main.element'; +import './backoffice-modal-container/backoffice-modal-container.element'; +import './backoffice-notification-container/backoffice-notification-container.element'; import './collection/collection.element'; import './collection/collection-toolbar.element'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/index.ts b/src/Umbraco.Web.UI.Client/src/packages/core/index.ts index 552cc96385..18419c9f1a 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/index.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/index.ts @@ -3,8 +3,8 @@ import { manifests as propertyActionManifests } from './property-actions/manifes import { manifests as propertyEditorManifests } from './property-editors/manifests'; import { manifests as modalManifests } from './modals/manifests'; -import { UmbBackofficeNotificationContainerElement } from './components/backoffice-frame/backoffice-notification-container.element'; -import { UmbBackofficeModalContainerElement } from './components/backoffice-frame/backoffice-modal-container.element'; +import { UmbBackofficeNotificationContainerElement } from './components/backoffice-notification-container/backoffice-notification-container.element'; +import { UmbBackofficeModalContainerElement } from './components/backoffice-modal-container/backoffice-modal-container.element'; import { UmbNotificationContext, UMB_NOTIFICATION_CONTEXT_TOKEN } from '@umbraco-cms/backoffice/notification'; import { UmbModalContext, UMB_MODAL_CONTEXT_TOKEN } from '@umbraco-cms/backoffice/modal';