Skip to content
Snippets Groups Projects
Commit 4684a77c authored by Reiter, Christoph's avatar Reiter, Christoph :snake:
Browse files

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.
parent d81e1396
No related branches found
No related tags found
No related merge requests found
Pipeline #56635 passed
Stage: test
Stage: deploy
Stage: e2e
Show whitespace changes
Inline Side-by-side
Showing
with 19 additions and 34 deletions
packages/app-shell/src/auth-menu-button.js
+ 2
− 17
View file @ 4684a77c
...@@ -13,7 +13,6 @@ export class AuthMenuButton extends ScopedElementsMixin(AdapterLitElement) { ...@@ -13,7 +13,6 @@ export class AuthMenuButton extends ScopedElementsMixin(AdapterLitElement) {
super(); super();
this._i18n = createInstance(); this._i18n = createInstance();
this.lang = this._i18n.language; this.lang = this._i18n.language;
this.showImage = false;
this.auth = {}; this.auth = {};
this.closeDropdown = this.closeDropdown.bind(this); this.closeDropdown = this.closeDropdown.bind(this);
...@@ -30,7 +29,6 @@ export class AuthMenuButton extends ScopedElementsMixin(AdapterLitElement) { ...@@ -30,7 +29,6 @@ export class AuthMenuButton extends ScopedElementsMixin(AdapterLitElement) {
return { return {
...super.properties, ...super.properties,
lang: { type: String }, lang: { type: String },
showImage: { type: Boolean, attribute: 'show-image' },
auth: { type: Object }, auth: { type: Object },
}; };
} }
...@@ -102,12 +100,6 @@ export class AuthMenuButton extends ScopedElementsMixin(AdapterLitElement) { ...@@ -102,12 +100,6 @@ export class AuthMenuButton extends ScopedElementsMixin(AdapterLitElement) {
text-decoration: none; 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 { .dropdown.is-active .dropdown-menu, .dropdown.is-hoverable:hover .dropdown-menu {
display: block; display: block;
} }
...@@ -130,10 +122,6 @@ export class AuthMenuButton extends ScopedElementsMixin(AdapterLitElement) { ...@@ -130,10 +122,6 @@ export class AuthMenuButton extends ScopedElementsMixin(AdapterLitElement) {
padding-top: 0.5rem; padding-top: 0.5rem;
} }
.dropdown-content img {
max-width: 120px;
}
.menu a { .menu a {
/*padding: 0.3em;*/ /*padding: 0.3em;*/
font-weight: 400; font-weight: 400;
...@@ -157,7 +145,7 @@ export class AuthMenuButton extends ScopedElementsMixin(AdapterLitElement) { ...@@ -157,7 +145,7 @@ export class AuthMenuButton extends ScopedElementsMixin(AdapterLitElement) {
position: relative; position: relative;
} }
.dropdown, img.login { .dropdown {
cursor: pointer; cursor: pointer;
} }
...@@ -245,8 +233,6 @@ export class AuthMenuButton extends ScopedElementsMixin(AdapterLitElement) { ...@@ -245,8 +233,6 @@ export class AuthMenuButton extends ScopedElementsMixin(AdapterLitElement) {
renderLoggedIn() { renderLoggedIn() {
const i18n = this._i18n; const i18n = this._i18n;
const person = this.auth.person;
const imageURL = (this.showImage && person && person.image) ? person.image : null;
return html` return html`
<div class="dropdown" @click="${this.onDropdownClick}"> <div class="dropdown" @click="${this.onDropdownClick}">
...@@ -258,7 +244,6 @@ export class AuthMenuButton extends ScopedElementsMixin(AdapterLitElement) { ...@@ -258,7 +244,6 @@ export class AuthMenuButton extends ScopedElementsMixin(AdapterLitElement) {
</a> </a>
<div class="dropdown-menu" id="dropdown-menu2" role="menu"> <div class="dropdown-menu" id="dropdown-menu2" role="menu">
<div class="dropdown-content" @blur="${this.closeDropdown}"> <div class="dropdown-content" @blur="${this.closeDropdown}">
${imageURL ? html`<div class="dropdown-item"><img alt="" src="${imageURL}"></div>` : ''}
<div class="menu"> <div class="menu">
<a href="#" @click="${this.onLogoutClicked}" class="dropdown-item">${i18n.t('logout')}</a> <a href="#" @click="${this.onLogoutClicked}" class="dropdown-item">${i18n.t('logout')}</a>
</div> </div>
......
packages/auth/src/dbp-auth-demo.js
+ 2
− 2
View file @ 4684a77c
...@@ -80,12 +80,12 @@ export class DbpAuthDemo extends ScopedElementsMixin(DBPLitElement) { ...@@ -80,12 +80,12 @@ export class DbpAuthDemo extends ScopedElementsMixin(DBPLitElement) {
} }
getAuthComponentHtml() { 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"> <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" <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" url="https://auth-dev.tugraz.at/auth" realm="tugraz-vpu"
client-id="auth-dev-mw-frontend-local" load-person try-login></dbp-auth-keycloak> 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> </div>
`; `;
} }
......
packages/check-in-place-select/src/dbp-check-in-place-select-demo.js
+ 2
− 2
View file @ 4684a77c
...@@ -51,12 +51,12 @@ export class CheckInPlaceSelectDemo extends ScopedElementsMixin(DBPLitElement) { ...@@ -51,12 +51,12 @@ export class CheckInPlaceSelectDemo extends ScopedElementsMixin(DBPLitElement) {
} }
getAuthComponentHtml() { 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"> <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" <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" url="https://auth-dev.tugraz.at/auth" realm="tugraz-vpu"
client-id="auth-dev-mw-frontend-local" load-person try-login></dbp-auth-keycloak> 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> </div>
`; `;
} }
......
packages/data-table-view/src/dbp-data-table-view-demo.js
+ 2
− 2
View file @ 4684a77c
...@@ -140,12 +140,12 @@ export class DataTableViewDemo extends ScopedElementsMixin(DBPLitElement) { ...@@ -140,12 +140,12 @@ export class DataTableViewDemo extends ScopedElementsMixin(DBPLitElement) {
} }
getAuthComponentHtml() { 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"> <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" <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" url="https://auth-dev.tugraz.at/auth" realm="tugraz-vpu"
client-id="auth-dev-mw-frontend-local" load-person try-login></dbp-auth-keycloak> 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> </div>
`; `;
} }
......
packages/knowledge-base-web-page-element-view/src/dbp-knowledge-base-web-page-element-view-demo.js
+ 2
− 2
View file @ 4684a77c
...@@ -68,12 +68,12 @@ export class KnowledgeBaseWebPageElementViewDemo extends ScopedElementsMixin(DBP ...@@ -68,12 +68,12 @@ export class KnowledgeBaseWebPageElementViewDemo extends ScopedElementsMixin(DBP
} }
getAuthComponentHtml() { 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"> <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" <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" url="https://auth-dev.tugraz.at/auth" realm="tugraz-vpu"
client-id="auth-dev-mw-frontend-local" load-person try-login></dbp-auth-keycloak> 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> </div>
`; `;
} }
......
packages/matomo/src/dbp-matomo-demo.js
+ 2
− 2
View file @ 4684a77c
...@@ -72,12 +72,12 @@ export class MatomoDemo extends ScopedElementsMixin(DBPLitElement) { ...@@ -72,12 +72,12 @@ export class MatomoDemo extends ScopedElementsMixin(DBPLitElement) {
} }
getAuthComponentHtml() { 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"> <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" <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" url="https://auth-dev.tugraz.at/auth" realm="tugraz-vpu"
client-id="auth-dev-mw-frontend-local" load-person try-login></dbp-auth-keycloak> 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> </div>
`; `;
} }
......
packages/organization-select/src/dbp-organization-select-demo.js
+ 2
− 2
View file @ 4684a77c
...@@ -53,12 +53,12 @@ export class OrganizationSelectDemo extends ScopedElementsMixin(DBPLitElement) { ...@@ -53,12 +53,12 @@ export class OrganizationSelectDemo extends ScopedElementsMixin(DBPLitElement) {
} }
getAuthComponentHtml() { 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"> <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" <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" url="https://auth-dev.tugraz.at/auth" realm="tugraz-vpu"
client-id="auth-dev-mw-frontend-local" load-person try-login></dbp-auth-keycloak> 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> </div>
`; `;
} }
......
packages/person-profile/src/dbp-person-profile-demo.js
+ 2
− 2
View file @ 4684a77c
...@@ -89,12 +89,12 @@ export class PersonProfileDemo extends ScopedElementsMixin(DBPLitElement) { ...@@ -89,12 +89,12 @@ export class PersonProfileDemo extends ScopedElementsMixin(DBPLitElement) {
} }
getAuthComponentHtml() { 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"> <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" <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" url="https://auth-dev.tugraz.at/auth" realm="tugraz-vpu"
client-id="auth-dev-mw-frontend-local" load-person try-login></dbp-auth-keycloak> 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> </div>
`; `;
} }
......
packages/person-select/src/dbp-person-select-demo.js
+ 2
− 2
View file @ 4684a77c
...@@ -53,12 +53,12 @@ export class PersonSelectDemo extends ScopedElementsMixin(DBPLitElement) { ...@@ -53,12 +53,12 @@ export class PersonSelectDemo extends ScopedElementsMixin(DBPLitElement) {
} }
getAuthComponentHtml() { 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"> <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" <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" url="https://auth-dev.tugraz.at/auth" realm="tugraz-vpu"
client-id="auth-dev-mw-frontend-local" load-person try-login></dbp-auth-keycloak> 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> </div>
`; `;
} }
......
packages/provider/src/dbp-provider-demo.js
+ 1
− 1
View file @ 4684a77c
...@@ -76,7 +76,7 @@ class ProviderDemo extends ScopedElementsMixin(DBPLitElement) { ...@@ -76,7 +76,7 @@ class ProviderDemo extends ScopedElementsMixin(DBPLitElement) {
</div> </div>
<div class="container"> <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-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> <dbp-language-select></dbp-language-select>
</div> </div>
<dbp-provider id="demo" <dbp-provider id="demo"
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment