refactor: Removing some extra javascript again

Signed-off-by: Vincent Boutour <[email protected]>
ViBiOh · Nov 5, 2022 · 3faf981 · 3faf981
1 parent 853ec63
commit 3faf981
Show file tree

Hide file tree

Showing 9 changed files with 96 additions and 62 deletions.
diff --git a/cmd/fibr/static/scripts/confirm.js b/cmd/fibr/static/scripts/confirm.js
@@ -0,0 +1,15 @@
+document.addEventListener('readystatechange', (event) => {
+  if (event.target.readyState !== 'complete') {
+    return;
+  }
+
+  document.querySelectorAll('[data-confirm]').forEach((element) => {
+    element.addEventListener('click', (e) => {
+      if (
+        !confirm(`Are you sure you want to delete ${element.dataset.confirm}?`)
+      ) {
+        e.preventDefault();
+      }
+    });
+  });
+});
diff --git a/cmd/fibr/static/scripts/error.js b/cmd/fibr/static/scripts/error.js
@@ -0,0 +1,19 @@
+document.addEventListener('readystatechange', (event) => {
+  if (event.target.readyState !== 'complete') {
+    return;
+  }
+
+  const link = document.getElementById('go-back');
+
+  if (link) {
+    link.setAttribute('href', document.referrer);
+    link.addEventListener('click', (e) => {
+      e.preventDefault();
+      window.addEventListener('popstate', () => {
+        window.location.reload(true);
+      });
+      history.back();
+      return false;
+    });
+  }
+});
diff --git a/cmd/fibr/static/scripts/index.min.js b/cmd/fibr/static/scripts/index.min.js
diff --git a/cmd/fibr/static/scripts/webhook.js b/cmd/fibr/static/scripts/webhook.js
@@ -0,0 +1,53 @@
+document.addEventListener('readystatechange', (event) => {
+  if (event.target.readyState !== 'complete') {
+    return;
+  }
+
+  const urlLabel = document.getElementById('webhook-url-label');
+  if (!urlLabel) {
+    return;
+  }
+
+  const urlWebhook = document.getElementById('webhook-url');
+  const telegramChatID = document.getElementById('telegram-chat-id');
+
+  document
+    .getElementById('webhook-kind-raw')
+    .addEventListener('change', (e) => {
+      if (e.target.value === 'raw') {
+        urlWebhook.placeholder = 'http://website.com/fibr';
+        urlLabel.innerHTML = 'URL';
+        telegramChatID.classList.add('hidden');
+      }
+    });
+
+  document
+    .getElementById('webhook-kind-discord')
+    .addEventListener('change', (e) => {
+      if (e.target.value === 'discord') {
+        urlWebhook.placeholder = 'https://discord.com/api/webhooks/...';
+        urlLabel.innerHTML = 'URL';
+        telegramChatID.classList.add('hidden');
+      }
+    });
+
+  document
+    .getElementById('webhook-kind-slack')
+    .addEventListener('change', (e) => {
+      if (e.target.value === 'slack') {
+        urlWebhook.placeholder = 'https://hooks.slack.com/services/...';
+        urlLabel.innerHTML = 'URL';
+        telegramChatID.classList.add('hidden');
+      }
+    });
+
+  document
+    .getElementById('webhook-kind-telegram')
+    .addEventListener('change', (e) => {
+      if (e.target.value === 'telegram') {
+        urlLabel.innerHTML = 'Token';
+        urlWebhook.placeholder = 'Bot token';
+        telegramChatID.classList.remove('hidden');
+      }
+    });
+});
diff --git a/cmd/fibr/templates/error.html b/cmd/fibr/templates/error.html
@@ -1,26 +1,6 @@
 {{ define "error" }}
   {{ template "header" . }}
 
-  <script type="text/javascript" nonce="{{ .nonce }}">
-    document.addEventListener('readystatechange', async (event) => {
-      if (event.target.readyState === 'complete') {
-        const link = document.getElementById('go-back');
-
-        if (link) {
-          link.setAttribute('href', document.referrer);
-          link.addEventListener('click', (e) => {
-            e.preventDefault();
-            window.addEventListener('popstate', () => {
-              window.location.reload(true);
-            });
-            history.back();
-            return false;
-          });
-        }
-      }
-    });
-  </script>
-
   <header class="header center">
     <h1 class="no-margin no-padding">
       {{ template "root-link" . }}

diff --git a/cmd/fibr/templates/share-list.html b/cmd/fibr/templates/share-list.html
@@ -1,21 +1,4 @@
 {{ define "share-list" }}
-  <script type="text/javascript" nonce="{{ .nonce }}">
-    document.addEventListener('readystatechange', async (event) => {
-      if (event.target.readyState === 'complete') {
-        {{ range .Shares }}
-          const shareDelete{{ js .ID }} = document.getElementById('share-delete-{{ .ID }}');
-          if (shareDelete{{ js .ID }}) {
-            shareDelete{{ js .ID }}.addEventListener('click', (e) => {
-              if (!confirm('Are you sure you want to delete share for {{ .Path }}?')) {
-                e.preventDefault()
-              }
-            });
-          }
-        {{ end }}
-      }
-    });
-  </script>
-
   <div id="share-list" class="modal">
     <div class="modal-content">
       <h2 class="flex flex-center header no-margin">
@@ -70,7 +53,7 @@ <h2 class="flex flex-center header no-margin">
                     <input type="hidden" name="type" value="share" />
                     <input type="hidden" name="method" value="DELETE" />
                     <input type="hidden" name="id" value="{{ .ID }}" />
-                    <button id="share-delete-{{ .ID }}" type="submit" class="button button-icon" alt="Delete">
+                    <button id="share-delete-{{ .ID }}" type="submit" class="button button-icon" title="Delete" data-confirm="share for {{ .Path }}">
                       <img class="icon" src="{{ url "/svg/times?fill=crimson" }}" alt="Delete">
                     </button>
                   </form>

diff --git a/cmd/fibr/templates/webhook-list.html b/cmd/fibr/templates/webhook-list.html
@@ -1,21 +1,4 @@
 {{ define "webhook-list" }}
-  <script type="text/javascript" nonce="{{ .nonce }}">
-    document.addEventListener('readystatechange', async (event) => {
-      if (event.target.readyState === 'complete') {
-        {{ range .Webhooks }}
-          const webhookDelete{{ js .ID }} = document.getElementById('webhook-delete-{{ .ID }}');
-          if (webhookDelete{{ js .ID }}) {
-            webhookDelete{{ js .ID }}.addEventListener('click', (e) => {
-              if (!confirm('Are you sure you want to delete webhook for {{ .Pathname }}?')) {
-                e.preventDefault()
-              }
-            });
-          }
-        {{ end }}
-      }
-    });
-  </script>
-
   <div id="webhook-list" class="modal">
     <div class="modal-content">
       <h2 class="flex flex-center header no-margin">
@@ -83,7 +66,7 @@ <h2 class="flex flex-center header no-margin">
                     <input type="hidden" name="type" value="webhook" />
                     <input type="hidden" name="method" value="DELETE" />
                     <input type="hidden" name="id" value="{{ .ID }}" />
-                    <button id="webhook-delete-{{ .ID }}" type="submit" class="button button-icon" title="Delete">
+                    <button id="webhook-delete-{{ .ID }}" type="submit" class="button button-icon" title="Delete" data-confirm="webhook for {{ .Pathname }}">
                       <img class="icon" src="{{ url "/svg/times?fill=crimson" }}" alt="Delete">
                     </button>
                   </form>

diff --git a/pkg/share/share.go b/pkg/share/share.go
@@ -150,8 +150,7 @@ func (a *App) loadShares(ctx context.Context) error {
 }
 
 func (a *App) refresh(ctx context.Context) error {
-	var err error
-	if a.shares, err = provider.LoadJSON[map[string]provider.Share](ctx, a.storageApp, shareFilename); err != nil {
+	if shares, err := provider.LoadJSON[map[string]provider.Share](ctx, a.storageApp, shareFilename); err != nil {
 		if !absto.IsNotExist(err) {
 			return err
 		}
@@ -161,6 +160,8 @@ func (a *App) refresh(ctx context.Context) error {
 		}
 
 		return provider.SaveJSON(ctx, a.storageApp, shareFilename, &a.shares)
+	} else {
+		a.shares = shares
 	}
 
 	return nil

diff --git a/pkg/webhook/webhook.go b/pkg/webhook/webhook.go
@@ -135,9 +135,7 @@ func (a *App) Start(ctx context.Context) {
 }
 
 func (a *App) loadWebhooks(ctx context.Context) error {
-	var err error
-
-	if a.webhooks, err = provider.LoadJSON[map[string]provider.Webhook](ctx, a.storageApp, webhookFilename); err != nil {
+	if webhooks, err := provider.LoadJSON[map[string]provider.Webhook](ctx, a.storageApp, webhookFilename); err != nil {
 		if !absto.IsNotExist(err) {
 			return err
 		}
@@ -147,6 +145,8 @@ func (a *App) loadWebhooks(ctx context.Context) error {
 		}
 
 		return provider.SaveJSON(ctx, a.storageApp, webhookFilename, &a.webhooks)
+	} else {
+		a.webhooks = webhooks
 	}
 
 	return nil