diff --git a/src/Umbraco.Web.UI.Client/.editorconfig b/src/Umbraco.Web.UI.Client/.editorconfig new file mode 100644 index 0000000000..c8c2d2aaf6 --- /dev/null +++ b/src/Umbraco.Web.UI.Client/.editorconfig @@ -0,0 +1,29 @@ +# EditorConfig helps developers define and maintain consistent +# coding styles between different editors and IDEs +# editorconfig.org + +root = true + + +[*] + +# Change these settings to your own preference +indent_style = space +indent_size = 2 + +# We recommend you to keep these unchanged +end_of_line = lf +charset = utf-8 +trim_trailing_whitespace = true +insert_final_newline = true + +[*.md] +trim_trailing_whitespace = false + +[*.json] +indent_size = 2 + +[*.{html,js,md}] +block_comment_start = /** +block_comment = * +block_comment_end = */ diff --git a/src/Umbraco.Web.UI.Client/src/auth/login/login.element.ts b/src/Umbraco.Web.UI.Client/src/auth/login/login.element.ts index f81f4f4210..b19aedd51d 100644 --- a/src/Umbraco.Web.UI.Client/src/auth/login/login.element.ts +++ b/src/Umbraco.Web.UI.Client/src/auth/login/login.element.ts @@ -62,7 +62,7 @@ export class UmbLogin extends UmbContextConsumerMixin(LitElement) { await postUserLogin({ username, password, persist }); this._loggingIn = false; // TODO: how do we know where to go? - this._router?.push('/section/Content'); + this._router?.push('/section/content'); } catch (error) { console.log(error); this._loggingIn = false; diff --git a/src/Umbraco.Web.UI.Client/src/core/extension/extension.registry.ts b/src/Umbraco.Web.UI.Client/src/core/extension/extension.registry.ts index ee8a78929c..c07c10598e 100644 --- a/src/Umbraco.Web.UI.Client/src/core/extension/extension.registry.ts +++ b/src/Umbraco.Web.UI.Client/src/core/extension/extension.registry.ts @@ -1,7 +1,7 @@ import { BehaviorSubject, Observable } from 'rxjs'; // TODO: how do we want to type extensions? -export type UmbExtensionType = 'startUp' | 'section' | 'propertyEditor' | 'dashboard'; +export type UmbExtensionType = 'startUp' | 'section' | 'propertyEditorUI' | 'dashboard'; export interface UmbExtensionManifestBase { @@ -19,7 +19,7 @@ export type UmbExtensionManifestSection = { } & UmbExtensionManifestBase; export type UmbExtensionManifestPropertyEditor = { - type: 'propertyEditor'; + type: 'propertyEditorUI'; meta: UmbManifestPropertyEditorMeta; } & UmbExtensionManifestBase; diff --git a/src/Umbraco.Web.UI.Client/src/index.ts b/src/Umbraco.Web.UI.Client/src/index.ts index 8900c9de0f..3576371ac4 100644 --- a/src/Umbraco.Web.UI.Client/src/index.ts +++ b/src/Umbraco.Web.UI.Client/src/index.ts @@ -83,18 +83,30 @@ const registerInternalManifests = async () => { weight: 10 } }, + { + type: 'propertyEditorUI', + alias: 'Umb.PropertyEditorUI.Text', + name: 'Text', + elementName: 'umb-property-editor-text', + js: () => import('./property-editors/property-editor-text.element'), + meta: { + icon: 'document', + group: 'common', + } + }, + { + type: 'propertyEditorUI', + alias: 'Umb.PropertyEditorUI.Textarea', + name: 'Textarea', + elementName: 'umb-property-editor-textarea', + js: () => import('./property-editors/property-editor-textarea.element'), + meta: { + icon: 'document', + group: 'common', + } + }, ]; manifests.forEach((manifest: UmbExtensionManifest) => extensionRegistry.register(manifest)); - - extensionRegistry.register({ - type: 'propertyEditor', - alias: 'Umb.PropertyEditor.MyPropertyEditor', - name: 'Settings', - elementName: 'umb-settings-section', - meta: { - test: 20 - } - }); } const setup = async () => {