From b14c22cbff99f8141abbd4ed0e072e3eee16b708 Mon Sep 17 00:00:00 2001
From: Jens Langhammer <jens.langhammer@beryju.org>
Date: Mon, 6 Dec 2021 21:13:04 +0100
Subject: [PATCH] web: fix duplicate classes, make generic icon clickable

Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>
---
 Makefile                                              |  3 +++
 web/src/elements/notifications/NotificationDrawer.ts  |  2 +-
 .../stages/identification/IdentificationStage.ts      |  2 +-
 web/src/pages/applications/ApplicationListPage.ts     |  2 +-
 web/src/pages/events/EventListPage.ts                 |  2 +-
 web/src/user/LibraryApplication.ts                    | 11 ++++++-----
 6 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/Makefile b/Makefile
index b2792c949..60f9ef558 100644
--- a/Makefile
+++ b/Makefile
@@ -84,6 +84,9 @@ migrate:
 run:
 	go run -v cmd/server/main.go
 
+web-watch:
+	cd web && npm run watch
+
 web: web-lint-fix web-lint web-extract
 
 web-lint-fix:
diff --git a/web/src/elements/notifications/NotificationDrawer.ts b/web/src/elements/notifications/NotificationDrawer.ts
index 1955a4eaf..175a5ae44 100644
--- a/web/src/elements/notifications/NotificationDrawer.ts
+++ b/web/src/elements/notifications/NotificationDrawer.ts
@@ -95,7 +95,7 @@ export class NotificationDrawer extends LitElement {
                         class="pf-c-dropdown__toggle pf-m-plain"
                         href="#/events/log/${item.event?.pk}"
                     >
-                        <i class="fas fas fa-share-square"></i>
+                        <i class="fas fa-share-square"></i>
                     </a>
                 `}
                 <button
diff --git a/web/src/flows/stages/identification/IdentificationStage.ts b/web/src/flows/stages/identification/IdentificationStage.ts
index c25b54d29..9d8ad2c8a 100644
--- a/web/src/flows/stages/identification/IdentificationStage.ts
+++ b/web/src/flows/stages/identification/IdentificationStage.ts
@@ -143,7 +143,7 @@ export class IdentificationStage extends BaseStage<
     }
 
     renderSource(source: LoginSource): TemplateResult {
-        let icon = html`<i class="fas fas fa-share-square" title="${source.name}"></i>`;
+        let icon = html`<i class="fas fa-share-square" title="${source.name}"></i>`;
         if (source.iconUrl) {
             icon = html`<img src="${source.iconUrl}" alt="${source.name}" />`;
         }
diff --git a/web/src/pages/applications/ApplicationListPage.ts b/web/src/pages/applications/ApplicationListPage.ts
index 8b75b1fd6..450ff28a6 100644
--- a/web/src/pages/applications/ApplicationListPage.ts
+++ b/web/src/pages/applications/ApplicationListPage.ts
@@ -125,7 +125,7 @@ export class ApplicationListPage extends TablePage<Application> {
                 </ak-forms-modal>
                 ${item.launchUrl
                     ? html`<a href=${item.launchUrl} target="_blank" class="pf-c-button pf-m-plain">
-                          <i class="fas fas fa-share-square"></i>
+                          <i class="fas fa-share-square"></i>
                       </a>`
                     : html``}`,
         ];
diff --git a/web/src/pages/events/EventListPage.ts b/web/src/pages/events/EventListPage.ts
index 9aaa92e57..4bfc8a76e 100644
--- a/web/src/pages/events/EventListPage.ts
+++ b/web/src/pages/events/EventListPage.ts
@@ -70,7 +70,7 @@ export class EventListPage extends TablePage<Event> {
             html`<span>${item.clientIp || t`-`}</span>`,
             html`<span>${item.tenant?.name || t`-`}</span>`,
             html`<a href="#/events/log/${item.pk}">
-                <i class="fas fas fa-share-square"></i>
+                <i class="fas fa-share-square"></i>
             </a>`,
         ];
     }
diff --git a/web/src/user/LibraryApplication.ts b/web/src/user/LibraryApplication.ts
index 989c10761..7ed6d989d 100644
--- a/web/src/user/LibraryApplication.ts
+++ b/web/src/user/LibraryApplication.ts
@@ -73,14 +73,15 @@ export class LibraryApplication extends LitElement {
             style="background: ${this.background} !important"
         >
             <div class="pf-c-card__header">
-                ${this.application.metaIcon
-                    ? html`<a href="${ifDefined(this.application.launchUrl ?? "")}"
-                          ><img
+                <a href="${ifDefined(this.application.launchUrl ?? "")}">
+                    ${this.application.metaIcon
+                        ? html`<img
                               class="app-icon pf-c-avatar"
                               src="${ifDefined(this.application.metaIcon)}"
                               alt="${t`Application Icon`}"
-                      /></a>`
-                    : html`<i class="fas fas fa-share-square"></i>`}
+                          />`
+                        : html`<i class="fas fa-share-square"></i>`}
+                </a>
                 ${until(
                     uiConfig().then((config) => {
                         if (!config.enabledFeatures.applicationEdit) {