From 4684a77ca918785ba64d5f23ae6b2139c9ad1973 Mon Sep 17 00:00:00 2001
From: Christoph Reiter <reiter.christoph@gmail.com>
Date: Tue, 5 Oct 2021 11:18:48 +0200
Subject: [PATCH] AuthMenuButton: remove functionality to show a user image
This removes the 'show-image' (false by default) and removes the functionality
to show a user profile image in the logout dropdown.
We've never used this actively and want to clean things up, so remove it.
---
packages/app-shell/src/auth-menu-button.js | 19 ++-----------------
packages/auth/src/dbp-auth-demo.js | 4 ++--
.../src/dbp-check-in-place-select-demo.js | 4 ++--
.../src/dbp-data-table-view-demo.js | 4 ++--
...owledge-base-web-page-element-view-demo.js | 4 ++--
packages/matomo/src/dbp-matomo-demo.js | 4 ++--
.../src/dbp-organization-select-demo.js | 4 ++--
.../src/dbp-person-profile-demo.js | 4 ++--
.../src/dbp-person-select-demo.js | 4 ++--
packages/provider/src/dbp-provider-demo.js | 2 +-
10 files changed, 19 insertions(+), 34 deletions(-)
diff --git a/packages/app-shell/src/auth-menu-button.js b/packages/app-shell/src/auth-menu-button.js
index a122cb82..3bce2204 100644
--- a/packages/app-shell/src/auth-menu-button.js
+++ b/packages/app-shell/src/auth-menu-button.js
@@ -13,7 +13,6 @@ export class AuthMenuButton extends ScopedElementsMixin(AdapterLitElement) {
super();
this._i18n = createInstance();
this.lang = this._i18n.language;
- this.showImage = false;
this.auth = {};
this.closeDropdown = this.closeDropdown.bind(this);
@@ -30,7 +29,6 @@ export class AuthMenuButton extends ScopedElementsMixin(AdapterLitElement) {
return {
...super.properties,
lang: { type: String },
- showImage: { type: Boolean, attribute: 'show-image' },
auth: { type: Object },
};
}
@@ -102,12 +100,6 @@ export class AuthMenuButton extends ScopedElementsMixin(AdapterLitElement) {
text-decoration: none;
}
- img {
- border-width: var(--dbp-border-width);
- border-color: var(--dbp-dark);
- border-style: solid;
- }
-
.dropdown.is-active .dropdown-menu, .dropdown.is-hoverable:hover .dropdown-menu {
display: block;
}
@@ -130,10 +122,6 @@ export class AuthMenuButton extends ScopedElementsMixin(AdapterLitElement) {
padding-top: 0.5rem;
}
- .dropdown-content img {
- max-width: 120px;
- }
-
.menu a {
/*padding: 0.3em;*/
font-weight: 400;
@@ -157,7 +145,7 @@ export class AuthMenuButton extends ScopedElementsMixin(AdapterLitElement) {
position: relative;
}
- .dropdown, img.login {
+ .dropdown {
cursor: pointer;
}
@@ -245,9 +233,7 @@ export class AuthMenuButton extends ScopedElementsMixin(AdapterLitElement) {
renderLoggedIn() {
const i18n = this._i18n;
- const person = this.auth.person;
- const imageURL = (this.showImage && person && person.image) ? person.image : null;
-
+
return html`
<div class="dropdown" @click="${this.onDropdownClick}">
<a href="#">
@@ -258,7 +244,6 @@ export class AuthMenuButton extends ScopedElementsMixin(AdapterLitElement) {
</a>
<div class="dropdown-menu" id="dropdown-menu2" role="menu">
<div class="dropdown-content" @blur="${this.closeDropdown}">
- ${imageURL ? html`<div class="dropdown-item"><img alt="" src="${imageURL}"></div>` : ''}
<div class="menu">
<a href="#" @click="${this.onLogoutClicked}" class="dropdown-item">${i18n.t('logout')}</a>
</div>
diff --git a/packages/auth/src/dbp-auth-demo.js b/packages/auth/src/dbp-auth-demo.js
index c4f9a872..cbe64328 100644
--- a/packages/auth/src/dbp-auth-demo.js
+++ b/packages/auth/src/dbp-auth-demo.js
@@ -80,12 +80,12 @@ export class DbpAuthDemo extends ScopedElementsMixin(DBPLitElement) {
}
getAuthComponentHtml() {
- return this.noAuth ? html`<dbp-login-button subscribe="auth" lang="${this.lang}" show-image></dbp-login-button>` : html`
+ return this.noAuth ? html`<dbp-login-button subscribe="auth" lang="${this.lang}"></dbp-login-button>` : html`
<div class="container">
<dbp-auth-keycloak subscribe="requested-login-status" lang="${this.lang}" entry-point-url="${this.entryPointUrl}" silent-check-sso-redirect-uri="/silent-check-sso.html"
url="https://auth-dev.tugraz.at/auth" realm="tugraz-vpu"
client-id="auth-dev-mw-frontend-local" load-person try-login></dbp-auth-keycloak>
- <dbp-login-button subscribe="auth" lang="${this.lang}" show-image></dbp-login-button>
+ <dbp-login-button subscribe="auth" lang="${this.lang}"></dbp-login-button>
</div>
`;
}
diff --git a/packages/check-in-place-select/src/dbp-check-in-place-select-demo.js b/packages/check-in-place-select/src/dbp-check-in-place-select-demo.js
index f029893f..8e2a889b 100644
--- a/packages/check-in-place-select/src/dbp-check-in-place-select-demo.js
+++ b/packages/check-in-place-select/src/dbp-check-in-place-select-demo.js
@@ -51,12 +51,12 @@ export class CheckInPlaceSelectDemo extends ScopedElementsMixin(DBPLitElement) {
}
getAuthComponentHtml() {
- return this.noAuth ? html`<dbp-login-button subscribe="auth" lang="${this.lang}" show-image></dbp-login-button>` : html`
+ return this.noAuth ? html`<dbp-login-button subscribe="auth" lang="${this.lang}"></dbp-login-button>` : html`
<div class="container">
<dbp-auth-keycloak subscribe="requested-login-status" lang="${this.lang}" entry-point-url="${this.entryPointUrl}" silent-check-sso-redirect-uri="/dist/silent-check-sso.html"
url="https://auth-dev.tugraz.at/auth" realm="tugraz-vpu"
client-id="auth-dev-mw-frontend-local" load-person try-login></dbp-auth-keycloak>
- <dbp-login-button subscribe="auth" lang="${this.lang}" show-image></dbp-login-button>
+ <dbp-login-button subscribe="auth" lang="${this.lang}"></dbp-login-button>
</div>
`;
}
diff --git a/packages/data-table-view/src/dbp-data-table-view-demo.js b/packages/data-table-view/src/dbp-data-table-view-demo.js
index 829afe65..5c2056b0 100644
--- a/packages/data-table-view/src/dbp-data-table-view-demo.js
+++ b/packages/data-table-view/src/dbp-data-table-view-demo.js
@@ -140,12 +140,12 @@ export class DataTableViewDemo extends ScopedElementsMixin(DBPLitElement) {
}
getAuthComponentHtml() {
- return this.noAuth ? html`<dbp-login-button subscribe="auth" lang="${this.lang}" show-image></dbp-login-button>` : html`
+ return this.noAuth ? html`<dbp-login-button subscribe="auth" lang="${this.lang}"></dbp-login-button>` : html`
<div class="container">
<dbp-auth-keycloak subscribe="requested-login-status" lang="${this.lang}" entry-point-url="${this.entryPointUrl}" silent-check-sso-redirect-uri="/dist/silent-check-sso.html"
url="https://auth-dev.tugraz.at/auth" realm="tugraz-vpu"
client-id="auth-dev-mw-frontend-local" load-person try-login></dbp-auth-keycloak>
- <dbp-login-button subscribe="auth" lang="${this.lang}" show-image></dbp-login-button>
+ <dbp-login-button subscribe="auth" lang="${this.lang}"></dbp-login-button>
</div>
`;
}
diff --git a/packages/knowledge-base-web-page-element-view/src/dbp-knowledge-base-web-page-element-view-demo.js b/packages/knowledge-base-web-page-element-view/src/dbp-knowledge-base-web-page-element-view-demo.js
index d66957f7..109bd9a7 100644
--- a/packages/knowledge-base-web-page-element-view/src/dbp-knowledge-base-web-page-element-view-demo.js
+++ b/packages/knowledge-base-web-page-element-view/src/dbp-knowledge-base-web-page-element-view-demo.js
@@ -68,12 +68,12 @@ export class KnowledgeBaseWebPageElementViewDemo extends ScopedElementsMixin(DBP
}
getAuthComponentHtml() {
- return this.noAuth ? html`<dbp-login-button subscribe="auth" lang="${this.lang}" show-image></dbp-login-button>` : html`
+ return this.noAuth ? html`<dbp-login-button subscribe="auth" lang="${this.lang}"></dbp-login-button>` : html`
<div class="container">
<dbp-auth-keycloak subscribe="requested-login-status" lang="${this.lang}" entry-point-url="${this.entryPointUrl}" silent-check-sso-redirect-uri="/dist/silent-check-sso.html"
url="https://auth-dev.tugraz.at/auth" realm="tugraz-vpu"
client-id="auth-dev-mw-frontend-local" load-person try-login></dbp-auth-keycloak>
- <dbp-login-button subscribe="auth" lang="${this.lang}" show-image></dbp-login-button>
+ <dbp-login-button subscribe="auth" lang="${this.lang}"></dbp-login-button>
</div>
`;
}
diff --git a/packages/matomo/src/dbp-matomo-demo.js b/packages/matomo/src/dbp-matomo-demo.js
index 4184912f..bfb9c08d 100644
--- a/packages/matomo/src/dbp-matomo-demo.js
+++ b/packages/matomo/src/dbp-matomo-demo.js
@@ -72,12 +72,12 @@ export class MatomoDemo extends ScopedElementsMixin(DBPLitElement) {
}
getAuthComponentHtml() {
- return this.noAuth ? html`<dbp-login-button subscribe="auth" lang="${this.lang}" show-image></dbp-login-button>` : html`
+ return this.noAuth ? html`<dbp-login-button subscribe="auth" lang="${this.lang}"></dbp-login-button>` : html`
<div class="container">
<dbp-auth-keycloak subscribe="requested-login-status" lang="${this.lang}" entry-point-url="${this.entryPointUrl}" silent-check-sso-redirect-uri="/dist/silent-check-sso.html"
url="https://auth-dev.tugraz.at/auth" realm="tugraz-vpu"
client-id="auth-dev-mw-frontend-local" load-person try-login></dbp-auth-keycloak>
- <dbp-login-button subscribe="auth" lang="${this.lang}" show-image></dbp-login-button>
+ <dbp-login-button subscribe="auth" lang="${this.lang}"></dbp-login-button>
</div>
`;
}
diff --git a/packages/organization-select/src/dbp-organization-select-demo.js b/packages/organization-select/src/dbp-organization-select-demo.js
index 4d3a047c..45b8b547 100644
--- a/packages/organization-select/src/dbp-organization-select-demo.js
+++ b/packages/organization-select/src/dbp-organization-select-demo.js
@@ -53,12 +53,12 @@ export class OrganizationSelectDemo extends ScopedElementsMixin(DBPLitElement) {
}
getAuthComponentHtml() {
- return this.noAuth ? html`<dbp-login-button subscribe="auth" lang="${this.lang}" show-image></dbp-login-button>` : html`
+ return this.noAuth ? html`<dbp-login-button subscribe="auth" lang="${this.lang}"></dbp-login-button>` : html`
<div class="container">
<dbp-auth-keycloak subscribe="requested-login-status" lang="${this.lang}" entry-point-url="${this.entryPointUrl}" silent-check-sso-redirect-uri="/dist/silent-check-sso.html"
url="https://auth-dev.tugraz.at/auth" realm="tugraz-vpu"
client-id="auth-dev-mw-frontend-local" load-person try-login></dbp-auth-keycloak>
- <dbp-login-button subscribe="auth" lang="${this.lang}" show-image></dbp-login-button>
+ <dbp-login-button subscribe="auth" lang="${this.lang}"></dbp-login-button>
</div>
`;
}
diff --git a/packages/person-profile/src/dbp-person-profile-demo.js b/packages/person-profile/src/dbp-person-profile-demo.js
index 4507fab0..64aaa9f6 100644
--- a/packages/person-profile/src/dbp-person-profile-demo.js
+++ b/packages/person-profile/src/dbp-person-profile-demo.js
@@ -89,12 +89,12 @@ export class PersonProfileDemo extends ScopedElementsMixin(DBPLitElement) {
}
getAuthComponentHtml() {
- return this.noAuth ? html`<dbp-login-button subscribe="auth" lang="${this.lang}" show-image></dbp-login-button>` : html`
+ return this.noAuth ? html`<dbp-login-button subscribe="auth" lang="${this.lang}"></dbp-login-button>` : html`
<div class="container">
<dbp-auth-keycloak subscribe="requested-login-status" lang="${this.lang}" entry-point-url="${this.entryPointUrl}" silent-check-sso-redirect-uri="/dist/silent-check-sso.html"
url="https://auth-dev.tugraz.at/auth" realm="tugraz-vpu"
client-id="auth-dev-mw-frontend-local" load-person try-login></dbp-auth-keycloak>
- <dbp-login-button subscribe="auth" lang="${this.lang}" show-image></dbp-login-button>
+ <dbp-login-button subscribe="auth" lang="${this.lang}"></dbp-login-button>
</div>
`;
}
diff --git a/packages/person-select/src/dbp-person-select-demo.js b/packages/person-select/src/dbp-person-select-demo.js
index e792e7b2..ae4f00ab 100644
--- a/packages/person-select/src/dbp-person-select-demo.js
+++ b/packages/person-select/src/dbp-person-select-demo.js
@@ -53,12 +53,12 @@ export class PersonSelectDemo extends ScopedElementsMixin(DBPLitElement) {
}
getAuthComponentHtml() {
- return this.noAuth ? html`<dbp-login-button subscribe="auth" lang="${this.lang}" show-image></dbp-login-button>` : html`
+ return this.noAuth ? html`<dbp-login-button subscribe="auth" lang="${this.lang}"></dbp-login-button>` : html`
<div class="container">
<dbp-auth-keycloak subscribe="requested-login-status" lang="${this.lang}" entry-point-url="${this.entryPointUrl}" silent-check-sso-redirect-uri="/dist/silent-check-sso.html"
url="https://auth-dev.tugraz.at/auth" realm="tugraz-vpu"
client-id="auth-dev-mw-frontend-local" load-person try-login></dbp-auth-keycloak>
- <dbp-login-button subscribe="auth" lang="${this.lang}" show-image></dbp-login-button>
+ <dbp-login-button subscribe="auth" lang="${this.lang}"></dbp-login-button>
</div>
`;
}
diff --git a/packages/provider/src/dbp-provider-demo.js b/packages/provider/src/dbp-provider-demo.js
index 0def833c..7c1b9306 100644
--- a/packages/provider/src/dbp-provider-demo.js
+++ b/packages/provider/src/dbp-provider-demo.js
@@ -76,7 +76,7 @@ class ProviderDemo extends ScopedElementsMixin(DBPLitElement) {
</div>
<div class="container">
<dbp-auth-keycloak subscribe="requested-login-status" lang="${this.lang}" entry-point-url="${this.entryPointUrl}" url="https://auth-dev.tugraz.at/auth" realm="tugraz-vpu" client-id="auth-dev-mw-frontend-local" load-person try-login></dbp-auth-keycloak>
- <dbp-login-button subscribe="auth" lang="${this.lang}" show-image></dbp-login-button>
+ <dbp-login-button subscribe="auth" lang="${this.lang}"></dbp-login-button>
<dbp-language-select></dbp-language-select>
</div>
<dbp-provider id="demo"
--
GitLab