From 74151dbf2d1a81ae421baed220f7834112330791 Mon Sep 17 00:00:00 2001
From: ajdj100 <ajairplane@gmail.com>
Date: Mon, 17 Nov 2025 16:00:20 -0500
Subject: [PATCH] more typescript changes/conversion nonsense (this broke a lot
 of stuff)

---
 ui/src/App.vue                        |  8 ++++----
 ui/src/{main.js => main.ts}           |  2 +-
 ui/src/router/{index.js => index.ts}  | 14 +++++++-------
 ui/tsconfig.json                      |  3 +++
 ui/{vite.config.js => vite.config.ts} |  4 +++-
 5 files changed, 18 insertions(+), 13 deletions(-)
 rename ui/src/{main.js => main.ts} (91%)
 rename ui/src/router/{index.js => index.ts} (86%)
 rename ui/{vite.config.js => vite.config.ts} (75%)

diff --git a/ui/src/App.vue b/ui/src/App.vue
index af9f817..51b9f6f 100644
--- a/ui/src/App.vue
+++ b/ui/src/App.vue
@@ -1,4 +1,4 @@
-<script setup>
+<script setup lang="ts">
 import { RouterLink, RouterView } from 'vue-router';
 import Separator from './components/ui/separator/Separator.vue';
 import Button from './components/ui/button/Button.vue';
@@ -14,7 +14,7 @@ import { useUserStore } from './stores/user';
 import Alert from './components/ui/alert/Alert.vue';
 import AlertDescription from './components/ui/alert/AlertDescription.vue';
 
-const userStore = useUserStore();
+let userStore = useUserStore();
 
 // onMounted(async () => {
 //   const res = await fetch(`${import.meta.env.VITE_APIHOST}/members/me`, {
@@ -96,7 +96,7 @@ function formatDate(dateStr) {
 
       </div>
       <div>
-        <DropdownMenu v-if="userStore.isLoggedIn">
+        <DropdownMenu v-if="userStore?.isLoggedIn">
           <DropdownMenuTrigger class="cursor-pointer">
             <p>{{ userStore.user.name }}</p>
           </DropdownMenuTrigger>
@@ -116,7 +116,7 @@ function formatDate(dateStr) {
       </div>
     </div>
     <Separator></Separator>
-    <Alert v-if="userStore.user?.loa?.[0]" class="m-2 mx-auto w-5xl" variant="info">
+    <Alert v-if="userStore?.user?.loa?.[0]" class="m-2 mx-auto w-5xl" variant="info">
       <AlertDescription class="flex flex-row items-center text-nowrap gap-5 mx-auto">
         <p>You are on LOA until <strong>{{ formatDate(userStore.user?.loa?.[0].end_date) }}</strong></p>
         <Button variant="secondary">End LOA</Button>
diff --git a/ui/src/main.js b/ui/src/main.ts
similarity index 91%
rename from ui/src/main.js
rename to ui/src/main.ts
index 8ccbddc..ecfe8f4 100644
--- a/ui/src/main.js
+++ b/ui/src/main.ts
@@ -4,7 +4,7 @@ import { createApp } from 'vue'
 import { createPinia } from 'pinia'
 
 import App from './App.vue'
-import router from './router'
+import router from './router/index'
 import FormCheckbox from './components/form/FormCheckbox.vue'
 import FormInput from './components/form/FormInput.vue'
 
diff --git a/ui/src/router/index.js b/ui/src/router/index.ts
similarity index 86%
rename from ui/src/router/index.js
rename to ui/src/router/index.ts
index acfce65..8989294 100644
--- a/ui/src/router/index.js
+++ b/ui/src/router/index.ts
@@ -17,7 +17,7 @@ const router = createRouter({
     { path: '/transfer', component: () => import('@/pages/Transfer.vue'), meta: { requiresAuth: true, memberOnly: true } },
     { path: '/calendar', component: () => import('@/pages/Calendar.vue'), meta: { requiresAuth: true, memberOnly: true } },
     { path: '/trainingReport', component: () => import('@/pages/TrainingReport.vue'), meta: { requiresAuth: true, memberOnly: true } },
-
+    
     // ADMIN / STAFF ROUTES
     {
       path: '/administration',
@@ -47,12 +47,12 @@ router.beforeEach(async (to) => {
   }
 
   // Not logged in
-  if (to.meta.requiresAuth && !user.isLoggedIn) {
-    // Redirect back to original page after login
-    const redirectUrl = encodeURIComponent(window.location.origin + to.fullPath)
-    window.location.href = `https://aj17thdevapi.nexuszone.net/login?redirect=${redirectUrl}`
-    return false // Prevent Vue Router from continuing
-  }
+  // if (to.meta.requiresAuth && !user.isLoggedIn) {
+  //   // Redirect back to original page after login
+  //   const redirectUrl = encodeURIComponent(window.location.origin + to.fullPath)
+  //   window.location.href = `https://aj17thdevapi.nexuszone.net/login?redirect=${redirectUrl}`
+  //   return false // Prevent Vue Router from continuing
+  // }
 
 
   // // Must be a member
diff --git a/ui/tsconfig.json b/ui/tsconfig.json
index eac02cb..dcc5982 100644
--- a/ui/tsconfig.json
+++ b/ui/tsconfig.json
@@ -1,5 +1,8 @@
 {
   "compilerOptions": {
+    "module": "esnext",
+    "moduleResolution": "bundler",
+    "types": ["vite/client"],
     "paths": {
       "@/*": ["./src/*"],
       "@shared/*": ["../shared/*"]
diff --git a/ui/vite.config.js b/ui/vite.config.ts
similarity index 75%
rename from ui/vite.config.js
rename to ui/vite.config.ts
index e04dc43..a5ba0bf 100644
--- a/ui/vite.config.js
+++ b/ui/vite.config.ts
@@ -1,4 +1,5 @@
 import { fileURLToPath, URL } from 'node:url'
+import path from 'node:path'
 
 import { defineConfig } from 'vite'
 import vue from '@vitejs/plugin-vue'
@@ -15,7 +16,8 @@ export default defineConfig({
   ],
   resolve: {
     alias: {
-      '@': fileURLToPath(new URL('./src', import.meta.url))
+      '@': fileURLToPath(new URL('./src', import.meta.url)),
+      '@shared': path.resolve(__dirname, '../shared/*')
     },
   },
   server: {