From b0579ebafcad27e5bdf42ea68268e27771db404e Mon Sep 17 00:00:00 2001 From: Christoph Reiter <reiter.christoph@gmail.com> Date: Tue, 23 Jun 2020 16:17:04 +0200 Subject: [PATCH] Port to vpu-auth-button --- packages/app-shell/src/app-shell.js | 6 ++++-- packages/app-shell/vendor/auth | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/packages/app-shell/src/app-shell.js b/packages/app-shell/src/app-shell.js index e35a47d8..87aa06b7 100644 --- a/packages/app-shell/src/app-shell.js +++ b/packages/app-shell/src/app-shell.js @@ -3,7 +3,7 @@ import {html, css, LitElement} from 'lit-element'; import {ScopedElementsMixin} from '@open-wc/scoped-elements'; import {LanguageSelect} from 'vpu-language-select'; import {Icon, EventBus} from 'vpu-common'; -import {Auth} from 'vpu-auth'; +import {Auth, AuthButton} from 'vpu-auth'; import {Notification} from 'vpu-notification'; import * as commonStyles from 'vpu-common/styles'; import * as commonUtils from 'vpu-common/utils'; @@ -66,6 +66,7 @@ export class AppShell extends ScopedElementsMixin(LitElement) { 'vpu-tugraz-logo': TUGrazLogo, 'vpu-build-info': BuildInfo, 'vpu-auth': Auth, + 'vpu-auth-button': AuthButton, 'vpu-notification': Notification, 'vpu-icon': Icon, }; @@ -708,6 +709,7 @@ export class AppShell extends ScopedElementsMixin(LitElement) { return html` <slot class="${slotClassMap}"></slot> + <vpu-auth lang="${this.lang}" keycloak-config="${JSON.stringify(this.keycloakConfig)}" load-person try-login></vpu-auth> <div class="${mainClassMap}"> <div id="main"> <vpu-notification lang="${this.lang}"></vpu-notification> @@ -718,7 +720,7 @@ export class AppShell extends ScopedElementsMixin(LitElement) { <div class="hd1-middle"> </div> <div class="hd1-right"> - <vpu-auth class="auth-button" lang="${this.lang}" keycloak-config="${JSON.stringify(this.keycloakConfig)}" load-person try-login></vpu-auth> + <vpu-auth-button class="auth-button" lang="${this.lang}"></vpu-auth-button> </div> <div class="hd2-left"> <div class="header"> diff --git a/packages/app-shell/vendor/auth b/packages/app-shell/vendor/auth index 4594a220..46cecbc4 160000 --- a/packages/app-shell/vendor/auth +++ b/packages/app-shell/vendor/auth @@ -1 +1 @@ -Subproject commit 4594a22095b2a7a06c0f91ec0a51a0a55125b356 +Subproject commit 46cecbc422e0c25ff9b0336c2c1bd7083117306f -- GitLab