From dca92b18f6bd7043963ff769ebb7ace962fcb24b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jesper=20M=C3=B8ller=20Jensen?= <26099018+JesmoDev@users.noreply.github.com> Date: Fri, 27 Jan 2023 03:22:11 +0100 Subject: [PATCH] cleanup --- .../src/backoffice/backoffice.element.ts | 13 ++++++++----- .../theme => backoffice/themes}/theme.service.ts | 2 +- .../themes}/themes/dark.theme.ts | 0 .../themes}/themes/high-contrast.theme.ts | 0 .../theme => backoffice/themes}/themes/index.ts | 0 .../current-user/user-dashboard-themes.element.ts | 2 +- 6 files changed, 10 insertions(+), 7 deletions(-) rename src/Umbraco.Web.UI.Client/src/{core/theme => backoffice/themes}/theme.service.ts (95%) rename src/Umbraco.Web.UI.Client/src/{core/theme => backoffice/themes}/themes/dark.theme.ts (100%) rename src/Umbraco.Web.UI.Client/src/{core/theme => backoffice/themes}/themes/high-contrast.theme.ts (100%) rename src/Umbraco.Web.UI.Client/src/{core/theme => backoffice/themes}/themes/index.ts (100%) 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 1d684f6192..e521c4d613 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/backoffice.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/backoffice.element.ts @@ -2,7 +2,6 @@ import { defineElement } from '@umbraco-ui/uui-base/lib/registration'; import { UUITextStyles } from '@umbraco-ui/uui-css/lib'; import { css, html } from 'lit'; - import { UmbModalService, UMB_MODAL_SERVICE_CONTEXT_TOKEN } from '../core/modal'; import { UmbUserStore } from './users/users/user.store'; import { UmbUserGroupStore } from './users/user-groups/user-group.store'; @@ -12,9 +11,12 @@ import { UMB_CURRENT_USER_HISTORY_STORE_CONTEXT_TOKEN, } from './users/current-user/current-user-history.store'; -import { UmbBackofficeContext, UMB_BACKOFFICE_CONTEXT_TOKEN } from './shared/components/backoffice-frame/backoffice.context'; -import {UmbDocumentTypeDetailStore} from './documents/document-types/document-type.detail.store'; -import {UmbDocumentTypeTreeStore} from './documents/document-types/document-type.tree.store'; +import { + UmbBackofficeContext, + UMB_BACKOFFICE_CONTEXT_TOKEN, +} from './shared/components/backoffice-frame/backoffice.context'; +import { UmbDocumentTypeDetailStore } from './documents/document-types/document-type.detail.store'; +import { UmbDocumentTypeTreeStore } from './documents/document-types/document-type.tree.store'; import { UmbMediaTypeDetailStore } from './media/media-types/media-type.detail.store'; import { UmbMediaTypeTreeStore } from './media/media-types/media-type.tree.store'; import { UmbDocumentDetailStore } from './documents/documents/document.detail.store'; @@ -31,9 +33,9 @@ import { UmbDocumentBlueprintTreeStore } from './documents/document-blueprints/d import { UmbDataTypeDetailStore } from './settings/data-types/data-type.detail.store'; import { UmbDataTypeTreeStore } from './settings/data-types/data-type.tree.store'; +import { UmbThemeService } from './themes/theme.service'; import { UmbNotificationService, UMB_NOTIFICATION_SERVICE_CONTEXT_TOKEN } from '@umbraco-cms/notification'; - // Domains import './settings'; import './documents'; @@ -91,6 +93,7 @@ export class UmbBackofficeElement extends UmbLitElement { new UmbDictionaryTreeStore(this); new UmbDocumentBlueprintDetailStore(this); new UmbDocumentBlueprintTreeStore(this); + new UmbThemeService(); this.provideContext(UMB_BACKOFFICE_CONTEXT_TOKEN, new UmbBackofficeContext()); this.provideContext(UMB_CURRENT_USER_HISTORY_STORE_CONTEXT_TOKEN, new UmbCurrentUserHistoryStore()); diff --git a/src/Umbraco.Web.UI.Client/src/core/theme/theme.service.ts b/src/Umbraco.Web.UI.Client/src/backoffice/themes/theme.service.ts similarity index 95% rename from src/Umbraco.Web.UI.Client/src/core/theme/theme.service.ts rename to src/Umbraco.Web.UI.Client/src/backoffice/themes/theme.service.ts index f58a16a624..851fe1ee6d 100644 --- a/src/Umbraco.Web.UI.Client/src/core/theme/theme.service.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/themes/theme.service.ts @@ -22,7 +22,7 @@ export class UmbThemeService { #styleElement: HTMLStyleElement; constructor() { - //TODO: Figure out how to handle community themes. + //TODO: Figure out how to extend this with themes from packages this.addTheme(dark); this.addTheme(highContrast); diff --git a/src/Umbraco.Web.UI.Client/src/core/theme/themes/dark.theme.ts b/src/Umbraco.Web.UI.Client/src/backoffice/themes/themes/dark.theme.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/core/theme/themes/dark.theme.ts rename to src/Umbraco.Web.UI.Client/src/backoffice/themes/themes/dark.theme.ts diff --git a/src/Umbraco.Web.UI.Client/src/core/theme/themes/high-contrast.theme.ts b/src/Umbraco.Web.UI.Client/src/backoffice/themes/themes/high-contrast.theme.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/core/theme/themes/high-contrast.theme.ts rename to src/Umbraco.Web.UI.Client/src/backoffice/themes/themes/high-contrast.theme.ts diff --git a/src/Umbraco.Web.UI.Client/src/core/theme/themes/index.ts b/src/Umbraco.Web.UI.Client/src/backoffice/themes/themes/index.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/core/theme/themes/index.ts rename to src/Umbraco.Web.UI.Client/src/backoffice/themes/themes/index.ts diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/users/current-user/user-dashboard-themes.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/users/current-user/user-dashboard-themes.element.ts index 03cd6a9c1f..f036ce0456 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/users/current-user/user-dashboard-themes.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/users/current-user/user-dashboard-themes.element.ts @@ -2,8 +2,8 @@ import { css, html } from 'lit'; import { UUITextStyles } from '@umbraco-ui/uui-css/lib'; import { customElement, state } from 'lit/decorators.js'; import { UUISelectEvent } from '@umbraco-ui/uui'; +import { UmbThemeService, UMB_THEME_SERVICE_CONTEXT_TOKEN } from '../../themes/theme.service'; import { UmbLitElement } from '@umbraco-cms/element'; -import { UmbThemeService, UMB_THEME_SERVICE_CONTEXT_TOKEN } from 'src/core/theme/theme.service'; @customElement('umb-user-dashboard-test') export class UmbUserDashboardTestElement extends UmbLitElement {