From d361e01eef32ed62cf94d65969ec58f6f9a6c976 Mon Sep 17 00:00:00 2001
From: Huskydog9988 <39809509+Huskydog9988@users.noreply.github.com>
Date: Tue, 15 Apr 2025 21:43:27 -0400
Subject: [PATCH] fix: last eslint errors

---
 components/NewsArticleCreateButton.vue |  1 +
 components/NewsDirectory.vue           |  1 +
 composables/task.ts                    | 35 ++++++++++++++------------
 composables/ws.ts                      |  3 ++-
 error.vue                              |  7 ++++--
 layouts/admin.vue                      | 15 +++--------
 middleware/require-user.global.ts      |  2 +-
 nuxt.config.ts                         |  1 -
 pages/account.vue                      | 11 +-------
 pages/account/devices.vue              |  3 ++-
 pages/account/index.vue                |  2 +-
 pages/account/notifications.vue        |  4 +--
 pages/account/security.vue             |  4 +--
 pages/account/settings.vue             |  2 +-
 14 files changed, 42 insertions(+), 49 deletions(-)

diff --git a/components/NewsArticleCreateButton.vue b/components/NewsArticleCreateButton.vue
index 89ef839..f83e575 100644
--- a/components/NewsArticleCreateButton.vue
+++ b/components/NewsArticleCreateButton.vue
@@ -1,3 +1,4 @@
+<!-- eslint-disable vue/no-v-html -->
 <template>
   <div class="w-full">
     <!-- Create article button - only show for admin users -->
diff --git a/components/NewsDirectory.vue b/components/NewsDirectory.vue
index d84e548..73b3092 100644
--- a/components/NewsDirectory.vue
+++ b/components/NewsDirectory.vue
@@ -1,3 +1,4 @@
+<!-- eslint-disable vue/no-v-html -->
 <template>
   <div
     class="flex grow flex-col gap-y-5 overflow-y-auto bg-zinc-900 px-6 py-6 ring-1 ring-white/10"
diff --git a/composables/task.ts b/composables/task.ts
index 77515ef..e4405be 100644
--- a/composables/task.ts
+++ b/composables/task.ts
@@ -2,11 +2,12 @@ import type { TaskMessage } from "~/server/internal/tasks";
 import { WebSocketHandler } from "./ws";
 
 const websocketHandler = new WebSocketHandler("/api/v1/task");
-const taskStates: { [key: string]: Ref<TaskMessage | undefined> } = {};
+// const taskStates: { [key: string]:  } = {};
+const taskStates = new Map<string, Ref<TaskMessage | undefined>>();
 
 function handleUpdateMessage(msg: TaskMessage) {
   const taskStates = useTaskStates();
-  const state = taskStates[msg.id];
+  const state = taskStates.get(msg.id);
   if (!state) return;
   if (!state.value || msg.reset) {
     state.value = msg;
@@ -29,18 +30,22 @@ websocketHandler.listen((message) => {
     const [action, ...data] = message.split("/");
 
     switch (action) {
-      case "connect":
+      case "connect": {
         const taskReady = useTaskReady();
         taskReady.value = true;
         break;
-      case "disconnect":
+      }
+      case "disconnect": {
         const disconnectTaskId = data[0];
-        delete taskStates[disconnectTaskId];
+        taskStates.delete(disconnectTaskId);
         console.log(`disconnected from ${disconnectTaskId}`);
         break;
-      case "error":
+      }
+      case "error": {
         const [taskId, title, description] = data;
-        taskStates[taskId].value ??= {
+        const state = taskStates.get(taskId);
+        if (!state) break;
+        state.value ??= {
           id: taskId,
           name: "Unknown task",
           success: false,
@@ -48,8 +53,9 @@ websocketHandler.listen((message) => {
           error: undefined,
           log: [],
         };
-        taskStates[taskId].value.error = { title, description };
+        state.value.error = { title, description };
         break;
+      }
     }
   }
 });
@@ -61,15 +67,12 @@ export const useTaskReady = () => useState("taskready", () => false);
 export const useTask = (taskId: string): Ref<TaskMessage | undefined> => {
   if (import.meta.server) return ref(undefined);
   const taskStates = useTaskStates();
-  if (
-    taskStates[taskId] &&
-    taskStates[taskId].value &&
-    !taskStates[taskId].value.error
-  )
-    return taskStates[taskId];
+  const task = taskStates.get(taskId);
+  if (task && task.value && !task.value.error) return task;
 
-  taskStates[taskId] = ref(undefined);
+  taskStates.set(taskId, ref(undefined));
   console.log("connecting to " + taskId);
   websocketHandler.send(`connect/${taskId}`);
-  return taskStates[taskId];
+  // TODO: this may have changed behavior
+  return taskStates.get(taskId) ?? ref(undefined);
 };
diff --git a/composables/ws.ts b/composables/ws.ts
index 01db40f..282cc30 100644
--- a/composables/ws.ts
+++ b/composables/ws.ts
@@ -30,7 +30,7 @@ export class WebSocketHandler {
     this.ws.onmessage = (e) => {
       const message = e.data;
       switch (message) {
-        case "unauthenticated":
+        case "unauthenticated": {
           const error = createError({
             statusCode: 403,
             statusMessage: "Unable to connect to websocket - unauthenticated",
@@ -40,6 +40,7 @@ export class WebSocketHandler {
           } else {
             throw error;
           }
+        }
       }
       if (this.listeners.length == 0) {
         this.inQueue.push(message);
diff --git a/error.vue b/error.vue
index f8314bf..c6b0489 100644
--- a/error.vue
+++ b/error.vue
@@ -2,7 +2,10 @@
 import type { NuxtError } from "#app";
 
 const props = defineProps({
-  error: Object as () => NuxtError,
+  error: {
+    type: Object as () => NuxtError,
+    default: () => ({}),
+  },
 });
 
 const route = useRoute();
@@ -105,7 +108,7 @@ if (import.meta.client) {
         src="/wallpapers/error-wallpaper.jpg"
         class="absolute inset-0 h-full w-full object-cover"
         alt=""
-      >
+      />
     </div>
   </div>
 </template>
diff --git a/layouts/admin.vue b/layouts/admin.vue
index 0abe49d..663d950 100644
--- a/layouts/admin.vue
+++ b/layouts/admin.vue
@@ -152,10 +152,6 @@ import { ref, type Component } from "vue";
 import {
   Dialog,
   DialogPanel,
-  Menu,
-  MenuButton,
-  MenuItem,
-  MenuItems,
   TransitionChild,
   TransitionRoot,
 } from "@headlessui/vue";
@@ -163,10 +159,7 @@ import {
   Bars3Icon,
   ServerStackIcon,
   HomeIcon,
-  LockClosedIcon,
   Cog6ToothIcon,
-  FlagIcon,
-  BellIcon,
   DocumentIcon,
   UserGroupIcon,
 } from "@heroicons/vue/24/outline";
@@ -209,10 +202,10 @@ const navigation: Array<NavigationItem & { icon: Component }> = [
   },
 ];
 
-const notifications = useNotifications();
-const unreadNotifications = computed(() =>
-  notifications.value.filter((e) => !e.read)
-);
+// const notifications = useNotifications();
+// const unreadNotifications = computed(() =>
+//   notifications.value.filter((e) => !e.read)
+// );
 
 const currentNavigationIndex = useCurrentNavigationIndex(navigation);
 
diff --git a/middleware/require-user.global.ts b/middleware/require-user.global.ts
index f4f93a9..93084d3 100644
--- a/middleware/require-user.global.ts
+++ b/middleware/require-user.global.ts
@@ -1,7 +1,7 @@
 const whitelistedPrefixes = ["/auth", "/api", "/setup"];
 const requireAdmin = ["/admin"];
 
-export default defineNuxtRouteMiddleware(async (to, from) => {
+export default defineNuxtRouteMiddleware(async (to, _from) => {
   if (import.meta.server) return;
   const error = useError();
   if (error.value !== undefined) return;
diff --git a/nuxt.config.ts b/nuxt.config.ts
index a337e2d..248bc3c 100644
--- a/nuxt.config.ts
+++ b/nuxt.config.ts
@@ -1,4 +1,3 @@
-import path from "path";
 import tailwindcss from "@tailwindcss/vite";
 
 // https://nuxt.com/docs/api/configuration/nuxt-config
diff --git a/pages/account.vue b/pages/account.vue
index b9d03e1..b18e454 100644
--- a/pages/account.vue
+++ b/pages/account.vue
@@ -97,16 +97,7 @@ import {
   TransitionChild,
   TransitionRoot,
 } from "@headlessui/vue";
-import {
-  Bars3Icon,
-  CalendarIcon,
-  ChartPieIcon,
-  DocumentDuplicateIcon,
-  FolderIcon,
-  HomeIcon,
-  UsersIcon,
-  XMarkIcon,
-} from "@heroicons/vue/24/outline";
+import { Bars3Icon, XMarkIcon } from "@heroicons/vue/24/outline";
 
 const router = useRouter();
 const sidebarOpen = ref(false);
diff --git a/pages/account/devices.vue b/pages/account/devices.vue
index e8de422..db50f7e 100644
--- a/pages/account/devices.vue
+++ b/pages/account/devices.vue
@@ -94,6 +94,7 @@
 import { CheckIcon } from "@heroicons/vue/24/outline";
 import { DateTime } from "luxon";
 
+// eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore pending https://github.com/nitrojs/nitro/issues/2758
 const clients = ref(await $dropFetch("/api/v1/user/client"));
 
@@ -114,7 +115,7 @@ function revokeClientWrapper(id: string) {
           title: "Failed to revoke client",
           description: `Failed to revoke client: ${e}`,
         },
-        (_, c) => c()
+        (_, c) => c(),
       );
     });
 }
diff --git a/pages/account/index.vue b/pages/account/index.vue
index cc340bc..0ada1d8 100644
--- a/pages/account/index.vue
+++ b/pages/account/index.vue
@@ -1 +1 @@
-<template></template>
+<template><div></div></template>
diff --git a/pages/account/notifications.vue b/pages/account/notifications.vue
index 27e0f69..7b8b46c 100644
--- a/pages/account/notifications.vue
+++ b/pages/account/notifications.vue
@@ -1,3 +1,3 @@
 <template>
-    
-</template>
\ No newline at end of file
+  <div></div>
+</template>
diff --git a/pages/account/security.vue b/pages/account/security.vue
index 27e0f69..7b8b46c 100644
--- a/pages/account/security.vue
+++ b/pages/account/security.vue
@@ -1,3 +1,3 @@
 <template>
-    
-</template>
\ No newline at end of file
+  <div></div>
+</template>
diff --git a/pages/account/settings.vue b/pages/account/settings.vue
index cc340bc..0ada1d8 100644
--- a/pages/account/settings.vue
+++ b/pages/account/settings.vue
@@ -1 +1 @@
-<template></template>
+<template><div></div></template>