yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main' into feature/login-app

Browse Source
This commit is contained in:
Jesper Møller Jensen
2023-05-30 19:04:01 +12:00
parent 268cb6ac23 1fbe5b75a0
commit b1531f2de6
2305 changed files with 8188 additions and 7163 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Umbraco.Web.UI.Client/apps/auth/src/external-login-providers/external-login-provider-test.element.ts
View File

@@ -1,11 +1,9 @@
import { css, html, LitElement } from 'lit';
import { UUITextStyles } from '@umbraco-ui/uui-css/lib';
import { UUITextStyles } from '@umbraco-cms/backoffice/external/uui';
import { customElement } from 'lit/decorators.js';
@customElement('umb-external-login-provider-test')
export class UmbExternalLoginProviderTestElement extends LitElement {
render() {
return html`
<b>Custom External Login Provider</b>
@@ -13,7 +11,7 @@ export class UmbExternalLoginProviderTestElement extends LitElement {
<uui-button label="My custom login provider" look="primary"></uui-button>
`;
}
static styles = [
UUITextStyles,
css`

6
src/Umbraco.Web.UI.Client/apps/auth/src/external-login-providers/external-login-provider-test2.element.ts
View File

@@ -1,11 +1,9 @@
import { css, html, LitElement } from 'lit';
import { UUITextStyles } from '@umbraco-ui/uui-css/lib';
import { UUITextStyles } from '@umbraco-ui/uui-css';
import { customElement } from 'lit/decorators.js';
@customElement('umb-external-login-provider-test2')
export class UmbExternalLoginProviderTest2Element extends LitElement {
render() {
return html`
<b>Another Custom External Login Provider</b>
@@ -23,7 +21,7 @@ export class UmbExternalLoginProviderTest2Element extends LitElement {
<uui-button label="Custom login" look="primary"></uui-button>
`;
}
static styles = [
UUITextStyles,
css`

4
src/Umbraco.Web.UI.Client/apps/auth/src/external-login-providers/manifests.ts
View File

@@ -7,7 +7,7 @@ export const manifests: Array<ManifestExternalLoginProvider> = [
alias: 'Umb.ExternalLoginProvider.Test',
name: 'Test External Login Provider',
elementName: 'umb-external-login-provider-test',
loader: () => import('./external-login-provider-test.element'),
loader: () => import('./external-login-provider-test.element.js'),
weight: 2,
meta: {
label: 'Test External Login Provider',
@@ -19,7 +19,7 @@ export const manifests: Array<ManifestExternalLoginProvider> = [
alias: 'Umb.ExternalLoginProvider.Test2',
name: 'Test External Login Provider 2',
elementName: 'umb-external-login-provider-test2',
loader: () => import('./external-login-provider-test2.element'),
loader: () => import('./external-login-provider-test2.element.js'),
weight: 1,
meta: {
label: 'Test External Login Provider 2',

2
src/Umbraco.Web.UI.Client/apps/auth/src/index.ts
View File

@@ -4,4 +4,4 @@ import '@umbraco-ui/uui-css/dist/uui-css.css';
import '../../../src/shared/css/custom-properties.css';
import '@umbraco-ui/uui';
import './login.element';
import './login.element.js';

2
src/Umbraco.Web.UI.Client/apps/auth/src/login.test.ts
View File

@@ -1,6 +1,6 @@
import { expect, fixture, html } from '@open-wc/testing';
import { defaultA11yConfig } from '@umbraco-cms/internal/test-utils';
import UmbLoginElement from './login.element';
import UmbLoginElement from './login.element.js';
describe('UmbLogin', () => {
let element: UmbLoginElement;