From f6c4c3e5086a64fc5b4478b5509220a86df372b6 Mon Sep 17 00:00:00 2001
From: ajdj100 <ajairplane@gmail.com>
Date: Thu, 4 Dec 2025 22:24:12 -0500
Subject: [PATCH 01/37] Added documentation page

---
 ui/src/components/Navigation/Navbar.vue           |  2 +-
 ui/src/components/application/ApplicationForm.vue |  2 +-
 ui/src/pages/Documentation.vue                    | 11 +++++++++++
 ui/src/router/index.js                            |  2 ++
 4 files changed, 15 insertions(+), 2 deletions(-)
 create mode 100644 ui/src/pages/Documentation.vue

diff --git a/ui/src/components/Navigation/Navbar.vue b/ui/src/components/Navigation/Navbar.vue
index 72c5bd4..de62765 100644
--- a/ui/src/components/Navigation/Navbar.vue
+++ b/ui/src/components/Navigation/Navbar.vue
@@ -61,7 +61,7 @@ function blurAfter() {
                             <!-- Members -->
                             <NavigationMenuItem>
                                 <NavigationMenuLink as-child :class="navigationMenuTriggerStyle()">
-                                    <RouterLink to="/" @click="blurAfter">Documents</RouterLink>
+                                    <RouterLink to="/documents" @click="blurAfter">Documents</RouterLink>
                                 </NavigationMenuLink>
                             </NavigationMenuItem>
 
diff --git a/ui/src/components/application/ApplicationForm.vue b/ui/src/components/application/ApplicationForm.vue
index 6ab7da9..02b84b4 100644
--- a/ui/src/components/application/ApplicationForm.vue
+++ b/ui/src/components/application/ApplicationForm.vue
@@ -82,7 +82,7 @@ onMounted(() => {
         <FormControl>
           <DateInput :model-value="(value as string) ?? ''" :disabled="readOnly" @update:model-value="handleChange" />
         </FormControl>
-        <FormMessage />
+        <FormMessage class="text-destructive"/>
       </FormItem>
     </FormField>
 
diff --git a/ui/src/pages/Documentation.vue b/ui/src/pages/Documentation.vue
new file mode 100644
index 0000000..51832d6
--- /dev/null
+++ b/ui/src/pages/Documentation.vue
@@ -0,0 +1,11 @@
+<script setup lang="ts">
+
+
+</script>
+
+<template>
+    <div>
+        Alo
+        <iframe src="https://docs.iceberg-gaming.com/" ></iframe>
+    </div>
+</template>
\ No newline at end of file
diff --git a/ui/src/router/index.js b/ui/src/router/index.js
index 29cc862..4e0a7db 100644
--- a/ui/src/router/index.js
+++ b/ui/src/router/index.js
@@ -18,6 +18,8 @@ const router = createRouter({
     
     { path: '/calendar', component: () => import('@/pages/Calendar.vue'), meta: { requiresAuth: true, memberOnly: true }, },
     { path: '/calendar/event/:id', component: () => import('@/pages/Calendar.vue'), meta: { requiresAuth: true, memberOnly: true }, },
+
+    { path: '/documents', component: () => import('@/pages/Documentation.vue'), meta: { requiresAuth: true, memberOnly: true }, },
     
     { path: '/trainingReport', component: () => import('@/pages/TrainingReport.vue'), meta: { requiresAuth: true, memberOnly: true } },
     { path: '/trainingReport/new', component: () => import('@/pages/TrainingReport.vue'), meta: { requiresAuth: true, memberOnly: true } },

From 6a55846f19bc4097f1fcb2e90408bb157aea2aef Mon Sep 17 00:00:00 2001
From: ajdj100 <ajairplane@gmail.com>
Date: Mon, 8 Dec 2025 15:21:14 -0500
Subject: [PATCH 02/37] improved error message readability

---
 .../application/ApplicationForm.vue           | 76 +++++++++++++------
 ui/src/pages/Application.vue                  |  2 +-
 2 files changed, 53 insertions(+), 25 deletions(-)

diff --git a/ui/src/components/application/ApplicationForm.vue b/ui/src/components/application/ApplicationForm.vue
index 6ab7da9..68fb35d 100644
--- a/ui/src/components/application/ApplicationForm.vue
+++ b/ui/src/components/application/ApplicationForm.vue
@@ -20,18 +20,18 @@ import { ApplicationData } from '@/api/application';
 
 const formSchema = toTypedSchema(z.object({
   dob: z.string().refine(v => v, { message: "A date of birth is required." }),
-  name: z.string(),
+  name: z.string().nonempty(),
   playtime: z.coerce.number({ invalid_type_error: "Must be a number", }).min(0, "Cannot be less than 0"),
-  hobbies: z.string(),
+  hobbies: z.string().nonempty(),
   military: z.boolean(),
-  communities: z.string(),
-  joinReason: z.string(),
-  milsimAttraction: z.string(),
-  referral: z.string(),
-  steamProfile: z.string(),
-  timezone: z.string(),
+  communities: z.string().nonempty(),
+  joinReason: z.string().nonempty(),
+  milsimAttraction: z.string().nonempty(),
+  referral: z.string().nonempty(),
+  steamProfile: z.string().nonempty(),
+  timezone: z.string().nonempty(),
   canAttendSaturday: z.boolean(),
-  interests: z.string(),
+  interests: z.string().nonempty(),
   aknowledgeRules: z.literal(true, {
     errorMap: () => ({ message: "Required" })
   }),
@@ -82,7 +82,9 @@ onMounted(() => {
         <FormControl>
           <DateInput :model-value="(value as string) ?? ''" :disabled="readOnly" @update:model-value="handleChange" />
         </FormControl>
-        <FormMessage />
+        <div class="h-4">
+          <FormMessage class="text-destructive" />
+        </div>
       </FormItem>
     </FormField>
 
@@ -94,7 +96,9 @@ onMounted(() => {
         <FormControl>
           <Input :model-value="value" @update:model-value="handleChange" :disabled="readOnly" />
         </FormControl>
-        <FormMessage />
+        <div class="h-4">
+          <FormMessage class="text-destructive" />
+        </div>
       </FormItem>
     </FormField>
 
@@ -105,7 +109,9 @@ onMounted(() => {
         <FormControl>
           <Input type="number" :model-value="value" @update:model-value="handleChange" :disabled="readOnly" />
         </FormControl>
-        <FormMessage />
+        <div class="h-4">
+          <FormMessage class="text-destructive" />
+        </div>
       </FormItem>
     </FormField>
 
@@ -117,7 +123,9 @@ onMounted(() => {
           <Textarea rows="4" class="resize-none" :model-value="value" @update:model-value="handleChange"
             :disabled="readOnly" />
         </FormControl>
-        <FormMessage />
+        <div class="h-4">
+          <FormMessage class="text-destructive" />
+        </div>
       </FormItem>
     </FormField>
 
@@ -131,7 +139,9 @@ onMounted(() => {
             <span>Yes (checked) / No (unchecked)</span>
           </div>
         </FormControl>
-        <FormMessage />
+        <div class="h-4">
+          <FormMessage class="text-destructive" />
+        </div>
       </FormItem>
     </FormField>
 
@@ -142,7 +152,9 @@ onMounted(() => {
         <FormControl>
           <Input :model-value="value" @update:model-value="handleChange" :disabled="readOnly" />
         </FormControl>
-        <FormMessage />
+        <div class="h-4">
+          <FormMessage class="text-destructive" />
+        </div>
       </FormItem>
     </FormField>
 
@@ -154,7 +166,9 @@ onMounted(() => {
           <Textarea rows="4" class="resize-none" :model-value="value" @update:model-value="handleChange"
             :disabled="readOnly" />
         </FormControl>
-        <FormMessage />
+        <div class="h-4">
+          <FormMessage class="text-destructive" />
+        </div>
       </FormItem>
     </FormField>
 
@@ -166,7 +180,9 @@ onMounted(() => {
           <Textarea rows="4" class="resize-none" :model-value="value" @update:model-value="handleChange"
             :disabled="readOnly" />
         </FormControl>
-        <FormMessage />
+        <div class="h-4">
+          <FormMessage class="text-destructive" />
+        </div>
       </FormItem>
     </FormField>
 
@@ -178,7 +194,9 @@ onMounted(() => {
           <Input placeholder="e.g., Reddit / Member: Alice" :model-value="value" @update:model-value="handleChange"
             :disabled="readOnly" />
         </FormControl>
-        <FormMessage />
+        <div class="h-4">
+          <FormMessage class="text-destructive" />
+        </div>
       </FormItem>
     </FormField>
 
@@ -194,7 +212,9 @@ onMounted(() => {
           <Input type="url" placeholder="https://steamcommunity.com/profiles/7656119..." :model-value="value"
             @update:model-value="handleChange" :disabled="readOnly" />
         </FormControl>
-        <FormMessage />
+        <div class="h-4">
+          <FormMessage class="text-destructive" />
+        </div>
       </FormItem>
     </FormField>
 
@@ -206,7 +226,9 @@ onMounted(() => {
           <Input placeholder="e.g., AEST, EST, UTC+10" :model-value="value" @update:model-value="handleChange"
             :disabled="readOnly" />
         </FormControl>
-        <FormMessage />
+        <div class="h-4">
+          <FormMessage class="text-destructive" />
+        </div>
       </FormItem>
     </FormField>
 
@@ -220,7 +242,9 @@ onMounted(() => {
             <span>Yes (checked) / No (unchecked)</span>
           </div>
         </FormControl>
-        <FormMessage />
+        <div class="h-4">
+          <FormMessage class="text-destructive" />
+        </div>
       </FormItem>
     </FormField>
 
@@ -232,7 +256,9 @@ onMounted(() => {
           <Input placeholder="e.g., Rifleman; Medic; Pilot" :model-value="value" @update:model-value="handleChange"
             :disabled="readOnly" />
         </FormControl>
-        <FormMessage />
+        <div class="h-4">
+          <FormMessage class="text-destructive" />
+        </div>
       </FormItem>
     </FormField>
 
@@ -243,11 +269,13 @@ onMounted(() => {
         <FormControl>
           <div class="flex items-center gap-2">
             <Checkbox :model-value="value" @update:model-value="handleChange" :disabled="readOnly" />
-            <span>By checking this box, you accept the <Button variant="link" class="p-0">Code of
+            <span>By checking this box, you accept the <Button variant="link" class="p-0 h-min">Code of
                 Conduct</Button>.</span>
           </div>
         </FormControl>
-        <FormMessage />
+        <div class="h-4">
+          <FormMessage class="text-destructive" />
+        </div>
       </FormItem>
     </FormField>
 
diff --git a/ui/src/pages/Application.vue b/ui/src/pages/Application.vue
index 04a9b84..370bfb3 100644
--- a/ui/src/pages/Application.vue
+++ b/ui/src/pages/Application.vue
@@ -162,7 +162,7 @@ async function handleDeny(id) {
         <div v-else class="flex flex-row justify-between items-center py-2 mb-8">
             <h3 class="scroll-m-20 text-2xl font-semibold tracking-tight">Apply to join the 17th Rangers</h3>
         </div>
-        <ApplicationForm :read-only="readOnly" :data="appData" @submit="(e) => { postApp(e) }" class="mb-7">
+        <ApplicationForm :read-only="readOnly" :data="appData" @submit="(e) => { postApp(e) }" class="mb-7 pb-15">
         </ApplicationForm>
         <div v-if="!newApp">
             <h3 class="scroll-m-20 text-2xl font-semibold tracking-tight mb-4">Discussion</h3>

From 4ab803ec72e6611bd8edbbb03da4b70b6168f01b Mon Sep 17 00:00:00 2001
From: ajdj100 <ajairplane@gmail.com>
Date: Mon, 8 Dec 2025 16:15:34 -0500
Subject: [PATCH 03/37] Fixed hardcoded value in application comment poster

---
 api/src/routes/applications.ts         | 38 ++++++++------------------
 api/src/services/applicationService.ts | 21 +++++++++++++-
 ui/src/api/application.ts              |  1 +
 ui/src/pages/Application.vue           |  2 +-
 4 files changed, 33 insertions(+), 29 deletions(-)

diff --git a/api/src/routes/applications.ts b/api/src/routes/applications.ts
index 76c0eca..daf1267 100644
--- a/api/src/routes/applications.ts
+++ b/api/src/routes/applications.ts
@@ -2,11 +2,12 @@ const express = require('express');
 const router = express.Router();
 
 import pool from '../db';
-import { approveApplication, createApplication, getApplicationByID, getApplicationComments, getApplicationList, getMemberApplication } from '../services/applicationService';
+import { approveApplication, createApplication, denyApplication, getApplicationByID, getApplicationComments, getApplicationList, getMemberApplication } from '../services/applicationService';
 import { MemberState, setUserState } from '../services/memberService';
 import { getRankByName, insertMemberRank } from '../services/rankService';
 import { ApplicationFull, CommentRow } from "@app/shared/types/application"
 import { assignUserToStatus } from '../services/statusService';
+import { Request, Response } from 'express';
 
 // POST /application
 router.post('/', async (req, res) => {
@@ -64,7 +65,6 @@ router.get('/me', async (req, res) => {
 // GET /application/:id
 router.get('/:id', async (req, res) => {
   let appID = req.params.id;
-  console.log("HELLO")
   try {
     const application = await getApplicationByID(appID);
     if (application === undefined)
@@ -92,9 +92,6 @@ router.post('/approve/:id', async (req, res) => {
     const app = await getApplicationByID(appID);
     const result = await approveApplication(appID);
 
-    console.log("START");
-    console.log(app, result);
-
     //guard against failures
     if (result.affectedRows != 1) {
       throw new Error("Something went wrong approving the application");
@@ -119,26 +116,11 @@ router.post('/approve/:id', async (req, res) => {
 router.post('/deny/:id', async (req, res) => {
   const appID = req.params.id;
 
-  const sql = `
-      UPDATE applications
-         SET denied_at = NOW()
-       WHERE id = ?
-        AND approved_at IS NULL
-        AND denied_at IS NULL
-      `;
   try {
-    const result = await pool.execute(sql, appID);
-
-    console.log(result);
-
-    if (result.affectedRows === 0) {
-      res.status(400).json('Something went wrong denying the application');
-    }
-
-    if (result.affectedRows == 1) {
-      res.sendStatus(200);
-    }
-
+    const app = await getApplicationByID(appID);
+    await denyApplication(appID);
+    await setUserState(app.member_id, MemberState.Denied);
+    res.sendStatus(200);
   } catch (err) {
     console.error('Approve failed:', err);
     res.status(500).json({ error: 'Failed to deny application' });
@@ -146,10 +128,12 @@ router.post('/deny/:id', async (req, res) => {
 });
 
 // POST /application/:id/comment
-router.post('/:id/comment', async (req, res) => {
+router.post('/:id/comment', async (req: Request, res: Response) => {
   const appID = req.params.id;
   const data = req.body.message;
-  const user = 1;
+  const user = req.user;
+
+  console.log(user)
 
   const sql = `INSERT INTO application_comments(
     application_id,
@@ -161,7 +145,7 @@ VALUES(?, ?, ?);`
   try {
     const conn = await pool.getConnection();
 
-    const result = await conn.query(sql, [appID, user, data])
+    const result = await conn.query(sql, [appID, user.id, data])
     console.log(result)
     if (result.affectedRows !== 1) {
       conn.release();
diff --git a/api/src/services/applicationService.ts b/api/src/services/applicationService.ts
index 8e94a08..1938189 100644
--- a/api/src/services/applicationService.ts
+++ b/api/src/services/applicationService.ts
@@ -1,5 +1,6 @@
 import { ApplicationListRow, ApplicationRow, CommentRow } from "@app/shared/types/application";
 import pool from "../db";
+import { error } from "console";
 
 export async function createApplication(memberID: number, appVersion: number, app: string) {
   const sql = `INSERT INTO applications (member_id, app_version, app_data) VALUES (?, ?, ?);`;
@@ -44,7 +45,7 @@ export async function getApplicationList(): Promise<ApplicationListRow[]> {
   return rows;
 }
 
-export async function approveApplication(id) {
+export async function approveApplication(id: number) {
   const sql = `
       UPDATE applications
          SET approved_at = NOW()
@@ -57,6 +58,24 @@ export async function approveApplication(id) {
   return result;
 }
 
+export async function denyApplication(id: number) {
+  const sql = `
+      UPDATE applications
+         SET denied_at = NOW()
+       WHERE id = ?
+        AND approved_at IS NULL
+        AND denied_at IS NULL
+      `;
+
+  const result = await pool.execute(sql, id);
+
+  if (result.affectedRows == 1) {
+    return
+  } else {
+    throw new Error(`"Something went wrong denying application with ID ${id}`);
+  }
+}
+
 export async function getApplicationComments(appID: number): Promise<CommentRow[]> {
   return await pool.query(`SELECT app.id AS comment_id,
           app.post_content,
diff --git a/ui/src/api/application.ts b/ui/src/api/application.ts
index 85a3dc5..4193635 100644
--- a/ui/src/api/application.ts
+++ b/ui/src/api/application.ts
@@ -104,6 +104,7 @@ export async function postChatMessage(message: any, post_id: number) {
 
   const response = await fetch(`${addr}/application/${post_id}/comment`, {
     method: 'POST',
+    credentials: 'include',
     headers: { 'Content-Type': 'application/json' },
     body: JSON.stringify(out),
   })
diff --git a/ui/src/pages/Application.vue b/ui/src/pages/Application.vue
index 370bfb3..433f6ca 100644
--- a/ui/src/pages/Application.vue
+++ b/ui/src/pages/Application.vue
@@ -164,7 +164,7 @@ async function handleDeny(id) {
         </div>
         <ApplicationForm :read-only="readOnly" :data="appData" @submit="(e) => { postApp(e) }" class="mb-7 pb-15">
         </ApplicationForm>
-        <div v-if="!newApp">
+        <div v-if="!newApp" class="pb-15">
             <h3 class="scroll-m-20 text-2xl font-semibold tracking-tight mb-4">Discussion</h3>
             <ApplicationChat :messages="chatData" @post="postComment"></ApplicationChat>
         </div>

From df89d9bf677b5c62273a951edcc2857b45a70dca Mon Sep 17 00:00:00 2001
From: ajdj100 <ajairplane@gmail.com>
Date: Mon, 8 Dec 2025 16:24:00 -0500
Subject: [PATCH 04/37] fixed some missing awaits

---
 api/src/routes/applications.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/api/src/routes/applications.ts b/api/src/routes/applications.ts
index daf1267..78cfd79 100644
--- a/api/src/routes/applications.ts
+++ b/api/src/routes/applications.ts
@@ -17,8 +17,8 @@ router.post('/', async (req, res) => {
 
     const appVersion = 1;
 
-    createApplication(memberID, appVersion, JSON.stringify(App))
-    setUserState(memberID, MemberState.Applicant);
+    await createApplication(memberID, appVersion, JSON.stringify(App))
+    await setUserState(memberID, MemberState.Applicant);
 
     res.sendStatus(201);
   } catch (err) {

From e61bd1c5a1365dd9f8d5bff8d46003392c6f1012 Mon Sep 17 00:00:00 2001
From: ajdj100 <ajairplane@gmail.com>
Date: Mon, 8 Dec 2025 17:10:53 -0500
Subject: [PATCH 05/37] Enabled restarting your application from denied state

---
 api/src/routes/applications.ts | 15 +++++++++++++--
 ui/src/api/application.ts      | 11 +++++++++++
 ui/src/pages/Join.vue          | 16 +++++++++++++---
 3 files changed, 37 insertions(+), 5 deletions(-)

diff --git a/api/src/routes/applications.ts b/api/src/routes/applications.ts
index 78cfd79..a5970d5 100644
--- a/api/src/routes/applications.ts
+++ b/api/src/routes/applications.ts
@@ -22,8 +22,8 @@ router.post('/', async (req, res) => {
 
     res.sendStatus(201);
   } catch (err) {
-    console.error('Insert failed:', err);
-    res.status(500).json({ error: 'Failed to save application' });
+    console.error('Failed to create application: \n', err);
+    res.status(500).json({ error: 'Failed to create application' });
   }
 });
 
@@ -170,4 +170,15 @@ VALUES(?, ?, ?);`
   }
 });
 
+router.post('/restart', async (req: Request, res: Response) => {
+  const user = req.user.id;
+  try {
+    await setUserState(user, MemberState.Guest);
+    res.sendStatus(200);
+  } catch (error) {
+    console.error('Comment failed:', error);
+    res.status(500).json({ error: 'Could not rester application' });
+  }
+})
+
 module.exports = router;
diff --git a/ui/src/api/application.ts b/ui/src/api/application.ts
index 4193635..6e8fd4a 100644
--- a/ui/src/api/application.ts
+++ b/ui/src/api/application.ts
@@ -136,4 +136,15 @@ export async function denyApplication(id: Number) {
   if (!res.ok) {
     console.error("Something went wrong denying the application")
   }
+}
+
+export async function restartApplication() {
+  const res = await fetch(`${addr}/application/restart`, {
+    method: 'POST',
+    credentials: 'include'
+  })
+
+  if (!res.ok) {
+    console.error("Something went wrong restarting your application")
+  }
 }
\ No newline at end of file
diff --git a/ui/src/pages/Join.vue b/ui/src/pages/Join.vue
index 062011e..484f65f 100644
--- a/ui/src/pages/Join.vue
+++ b/ui/src/pages/Join.vue
@@ -14,6 +14,7 @@ import { useUserStore } from '@/stores/user';
 import { Check, Circle, Dot, Users, X } from 'lucide-vue-next'
 import { computed, ref } from 'vue';
 import Application from './Application.vue';
+import { restartApplication } from '@/api/application';
 
 function goToLogin() {
     const redirectUrl = encodeURIComponent(window.location.origin + '/join')
@@ -71,10 +72,18 @@ const currentStep = computed<number>(() => {
 })
 
 const finalPanel = ref<'app' | 'message'>('message');
+
+const reloadKey = ref(0);
+
+async function restartApp() {
+    await restartApplication();
+    await userStore.loadUser();
+    reloadKey.value++;
+}
 </script>
 
 <template>
-    <div class="flex flex-col items-center mt-10 w-full">
+    <div class="flex flex-col items-center mt-10 w-full" :key="reloadKey">
 
         <!-- Stepper Container -->
         <div class="w-full flex justify-center">
@@ -219,8 +228,8 @@ const finalPanel = ref<'app' | 'message'>('message');
                     </div>
                     <!-- Denied message -->
                     <div v-else-if="userStore.state === 'denied'">
-                        <div class="w-full max-w-2xl p-8">
-                            <h1 class="text-3xl sm:text-4xl font-bold mb-4 text-left text-destructive">
+                        <div class="w-full max-w-2xl flex flex-col gap-8">
+                            <h1 class="text-3xl sm:text-4xl font-bold text-left">
                                 Application Not Approved
                             </h1>
                             <div class="space-y-4 text-muted-foreground text-left leading-relaxed">
@@ -246,6 +255,7 @@ const finalPanel = ref<'app' | 'message'>('message');
                                         Team</span>
                                 </p>
                             </div>
+                            <Button class="w-min" @click="restartApp">Restart Application</Button>
                         </div>
                     </div>
                 </div>

From 4a655962839936c863524cd996d53c4e01419cdc Mon Sep 17 00:00:00 2001
From: ajdj100 <ajairplane@gmail.com>
Date: Mon, 8 Dec 2025 19:29:59 -0500
Subject: [PATCH 06/37] tweaked get app query to support multiple applications

---
 api/src/services/applicationService.ts | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/api/src/services/applicationService.ts b/api/src/services/applicationService.ts
index 1938189..5a8bf1b 100644
--- a/api/src/services/applicationService.ts
+++ b/api/src/services/applicationService.ts
@@ -13,12 +13,16 @@ export async function getMemberApplication(memberID: number): Promise<Applicatio
           member.name AS member_name
       FROM applications AS app
           INNER JOIN members AS member ON member.id = app.member_id
-      WHERE app.member_id = ?;`;
+      WHERE app.member_id = ? ORDER BY submitted_at DESC LIMIT 1;`;
 
   let app: ApplicationRow[] = await pool.query(sql, [memberID]);
   return app[0];
 }
 
+// export async function getAllMemberApplications(memberID: number): Promise<ApplicationListRow[]> {
+
+// }
+
 export async function getApplicationByID(appID: number): Promise<ApplicationRow> {
   const sql =
     `SELECT app.*,

From 63267ac6796972173dfe08e48b8462b16d5d9e14 Mon Sep 17 00:00:00 2001
From: ajdj100 <ajairplane@gmail.com>
Date: Mon, 8 Dec 2025 21:28:02 -0500
Subject: [PATCH 07/37] set up viewing of users application history

---
 api/src/routes/applications.ts          |  43 ++++++-
 api/src/services/applicationService.ts  |  16 ++-
 ui/src/api/application.ts               |  20 ++++
 ui/src/components/Navigation/Navbar.vue |   1 +
 ui/src/pages/Application.vue            | 143 +++++++++++------------
 ui/src/pages/MyApplications.vue         | 147 ++++++++++++++++++++++++
 ui/src/router/index.js                  |   7 +-
 7 files changed, 296 insertions(+), 81 deletions(-)
 create mode 100644 ui/src/pages/MyApplications.vue

diff --git a/api/src/routes/applications.ts b/api/src/routes/applications.ts
index a5970d5..bf877e0 100644
--- a/api/src/routes/applications.ts
+++ b/api/src/routes/applications.ts
@@ -2,7 +2,7 @@ const express = require('express');
 const router = express.Router();
 
 import pool from '../db';
-import { approveApplication, createApplication, denyApplication, getApplicationByID, getApplicationComments, getApplicationList, getMemberApplication } from '../services/applicationService';
+import { approveApplication, createApplication, denyApplication, getAllMemberApplications, getApplicationByID, getApplicationComments, getApplicationList, getMemberApplication } from '../services/applicationService';
 import { MemberState, setUserState } from '../services/memberService';
 import { getRankByName, insertMemberRank } from '../services/rankService';
 import { ApplicationFull, CommentRow } from "@app/shared/types/application"
@@ -38,6 +38,20 @@ router.get('/all', async (req, res) => {
   }
 });
 
+router.get('/meList', async (req, res) => {
+
+  let userID = req.user.id;
+
+  try {
+    let application = await getAllMemberApplications(userID);
+
+    return res.status(200).json(application);
+  } catch (error) {
+    console.error('Failed to load applications: \n', error);
+    return res.status(500).json(error);
+  }
+})
+
 router.get('/me', async (req, res) => {
 
   let userID = req.user.id;
@@ -62,6 +76,33 @@ router.get('/me', async (req, res) => {
   }
 })
 
+// GET /application/:id
+router.get('/me/:id', async (req: Request, res: Response) => {
+  let appID = Number(req.params.id);
+  let member = req.user.id;
+  try {
+    const application = await getApplicationByID(appID);
+    if (application === undefined)
+      return res.sendStatus(204);
+    console.log(application.member_id, member)
+    if (application.member_id != member) {
+      return res.sendStatus(403);
+    }
+
+    const comments: CommentRow[] = await getApplicationComments(appID);
+
+    const output: ApplicationFull = {
+      application,
+      comments,
+    }
+    return res.status(200).json(output);
+  }
+  catch (err) {
+    console.error('Query failed:', err);
+    return res.status(500).json({ error: 'Failed to load application' });
+  }
+});
+
 // GET /application/:id
 router.get('/:id', async (req, res) => {
   let appID = req.params.id;
diff --git a/api/src/services/applicationService.ts b/api/src/services/applicationService.ts
index 5a8bf1b..3224479 100644
--- a/api/src/services/applicationService.ts
+++ b/api/src/services/applicationService.ts
@@ -19,9 +19,6 @@ export async function getMemberApplication(memberID: number): Promise<Applicatio
   return app[0];
 }
 
-// export async function getAllMemberApplications(memberID: number): Promise<ApplicationListRow[]> {
-
-// }
 
 export async function getApplicationByID(appID: number): Promise<ApplicationRow> {
   const sql =
@@ -49,6 +46,19 @@ export async function getApplicationList(): Promise<ApplicationListRow[]> {
   return rows;
 }
 
+export async function getAllMemberApplications(memberID: number): Promise<ApplicationListRow[]> {
+  const sql = `SELECT
+      app.id,
+      app.member_id,
+      app.submitted_at,
+      app.app_status
+      FROM applications AS app WHERE app.member_id = ? ORDER BY submitted_at DESC;`;
+
+  const rows: ApplicationListRow[] = await pool.query(sql, [memberID])
+  return rows;
+}
+
+
 export async function approveApplication(id: number) {
   const sql = `
       UPDATE applications
diff --git a/ui/src/api/application.ts b/ui/src/api/application.ts
index 6e8fd4a..ef5c543 100644
--- a/ui/src/api/application.ts
+++ b/ui/src/api/application.ts
@@ -122,6 +122,26 @@ export async function getAllApplications(): Promise<ApplicationFull> {
   }
 }
 
+export async function loadMyApplications(): Promise<ApplicationFull> {
+  const res = await fetch(`${addr}/application/meList`, { credentials: 'include' })
+
+  if (res.ok) {
+    return res.json()
+  } else {
+    console.error("Something went wrong approving the application")
+  }
+}
+
+export async function getMyApplication(id: number): Promise<ApplicationFull> {
+  const res = await fetch(`${addr}/application/me/${id}`, { credentials: 'include' })
+  if (res.status === 204) return null
+  if (res.status === 403) throw new Error("Unauthorized");
+  if (!res.ok) throw new Error('Failed to load application')
+  const json = await res.json()
+  // Accept either the object at root or under `application`
+  return json;
+}
+
 export async function approveApplication(id: Number) {
   const res = await fetch(`${addr}/application/approve/${id}`, { method: 'POST' })
 
diff --git a/ui/src/components/Navigation/Navbar.vue b/ui/src/components/Navigation/Navbar.vue
index 72c5bd4..66b690d 100644
--- a/ui/src/components/Navigation/Navbar.vue
+++ b/ui/src/components/Navigation/Navbar.vue
@@ -170,6 +170,7 @@ function blurAfter() {
                         <!-- <DropdownMenuItem>My Profile</DropdownMenuItem> -->
                         <!-- <DropdownMenuItem>Settings</DropdownMenuItem> -->
                         <DropdownMenuItem @click="$router.push('/join')">My Application</DropdownMenuItem>
+                        <DropdownMenuItem @click="$router.push('/applications')">Application History</DropdownMenuItem>
                         <DropdownMenuItem :variant="'destructive'" @click="logout()">Logout</DropdownMenuItem>
                     </DropdownMenuContent>
                 </DropdownMenu>
diff --git a/ui/src/pages/Application.vue b/ui/src/pages/Application.vue
index 433f6ca..091c926 100644
--- a/ui/src/pages/Application.vue
+++ b/ui/src/pages/Application.vue
@@ -2,10 +2,11 @@
 import ApplicationChat from '@/components/application/ApplicationChat.vue';
 import ApplicationForm from '@/components/application/ApplicationForm.vue';
 import { onMounted, ref } from 'vue';
-import { ApplicationData, approveApplication, denyApplication, loadApplication, postApplication, postChatMessage, ApplicationStatus } from '@/api/application';
+import { ApplicationData, approveApplication, denyApplication, loadApplication, postApplication, postChatMessage, ApplicationStatus, getMyApplication, ApplicationFull } from '@/api/application';
 import { useRoute } from 'vue-router';
 import Button from '@/components/ui/button/Button.vue';
 import { CheckIcon, XIcon } from 'lucide-vue-next';
+import Unauthorized from './Unauthorized.vue';
 
 const appData = ref<ApplicationData>(null);
 const appID = ref<number | null>(null);
@@ -19,13 +20,12 @@ const loading = ref<boolean>(true);
 const member_name = ref<string>();
 
 const props = defineProps<{
-    mode?: "create" | "view-self" | "view-recruiter"
+    mode?: "create" | "view-self" | "view-recruiter" | "view-self-id"
 }>()
 
-const finalMode = ref<"create" | "view-self" | "view-recruiter">("create");
+const finalMode = ref<"create" | "view-self" | "view-recruiter" | "view-self-id">("create");
 
-async function loadByID(id: number | string) {
-    const raw = await loadApplication(id);
+function loadData(raw: ApplicationFull) {
 
     const data = raw.application;
 
@@ -40,20 +40,20 @@ async function loadByID(id: number | string) {
     readOnly.value = true;
 }
 
-const router = useRoute();
+const route = useRoute();
+const unauthorized = ref(false);
 
 onMounted(async () => {
-
     //recruiter mode
     if (props.mode === 'view-recruiter') {
         finalMode.value = 'view-recruiter';
-        await loadByID(Number(router.params.id));
+        loadData(await loadApplication(Number(route.params.id)))
     }
 
     //viewer mode
     if (props.mode === 'view-self') {
         finalMode.value = 'view-self';
-        await loadByID('me');
+        loadData(await loadApplication("me"))
     }
 
     //creator mode
@@ -64,34 +64,23 @@ onMounted(async () => {
         newApp.value = true;
     }
 
+    if (props.mode === 'view-self-id') {
+        finalMode.value = 'view-self-id';
+        try {
+            let raw = await getMyApplication(Number(route.params.id))
+            loadData(raw);
+            unauthorized.value = false;
+
+        } catch (error) {
+            if (error.message === "Unauthorized") {
+                unauthorized.value = true;
+            } else {
+                console.error(error);
+            }
+        }
+    }
+
     loading.value = false;
-
-    // try {
-    //     //get app ID from URL param
-    //     if (appIDRaw === undefined) {
-    //         //new app
-    //         appData.value = null
-    //         readOnly.value = false;
-    //         newApp.value = true;
-    //     } else {
-    //         //load app
-    //         const raw = await loadApplication(appIDRaw.toString());
-
-    //         const data = raw.application;
-
-    //         appID.value = data.id;
-    //         appData.value = data.app_data;
-    //         chatData.value = raw.comments;
-    //         status.value = data.app_status;
-    //         decisionDate.value = new Date(data.decision_at);
-    //         submitDate.value = data.submitted_at ? new Date(data.submitted_at) : null;
-    //         member_name.value = data.member_name;
-    //         newApp.value = false;
-    //         readOnly.value = true;
-    //     }
-    // } catch (e) {
-    //     console.error(e);
-    // }
 })
 
 async function postComment(comment) {
@@ -107,7 +96,7 @@ async function postApp(appData) {
         newApp.value = false;
         emit('submit');
     }
-    // TODO: Handle fail to post
+    // TODO: Handle fail to post    
 }
 
 async function handleApprove(id) {
@@ -122,52 +111,58 @@ async function handleDeny(id) {
 
 <template>
     <div v-if="!loading" class="w-full h-20">
-        <div v-if="!newApp" class="flex flex-row justify-between items-center py-2 mb-8">
-            <!-- Application header -->
-            <div>
-                <h3 class="scroll-m-20 text-2xl font-semibold tracking-tight">{{ member_name }}</h3>
-                <p class="text-muted-foreground">Submitted: {{ submitDate.toLocaleString("en-US", {
-                    year: "numeric",
-                    month: "long",
-                    day: "numeric",
-                    hour: "2-digit",
-                    minute: "2-digit"
-                }) }}</p>
-            </div>
-            <div>
-                <h3 class="text-right" :class="[
-                    'font-semibold',
-                    status === ApplicationStatus.Pending && 'text-yellow-500',
-                    status === ApplicationStatus.Accepted && 'text-green-500',
-                    status === ApplicationStatus.Denied && 'text-red-500'
-                ]">{{ status }}</h3>
-                <p v-if="status != ApplicationStatus.Pending" class="text-muted-foreground">{{ status }}: {{
-                    decisionDate.toLocaleString("en-US", {
+        <div v-if="unauthorized" class="flex justify-center w-full my-10">
+            You do not have permission to view this application.
+        </div>
+        <div v-else>
+            <div v-if="!newApp" class="flex flex-row justify-between items-center py-2 mb-8">
+                <!-- Application header -->
+                <div>
+                    <h3 class="scroll-m-20 text-2xl font-semibold tracking-tight">{{ member_name }}</h3>
+                    <p class="text-muted-foreground">Submitted: {{ submitDate.toLocaleString("en-US", {
                         year: "numeric",
                         month: "long",
                         day: "numeric",
                         hour: "2-digit",
                         minute: "2-digit"
                     }) }}</p>
-                <div class="mt-2" v-else-if="finalMode === 'view-recruiter'">
-                    <Button variant="success" class="mr-2" :onclick="() => { handleApprove(appID) }">
-                        <CheckIcon></CheckIcon>
-                    </Button>
-                    <Button variant="destructive" :onClick="() => { handleDeny(appID) }">
-                        <XIcon></XIcon>
-                    </Button>
+                </div>
+                <div>
+                    <h3 class="text-right" :class="[
+                        'font-semibold',
+                        status === ApplicationStatus.Pending && 'text-yellow-500',
+                        status === ApplicationStatus.Accepted && 'text-green-500',
+                        status === ApplicationStatus.Denied && 'text-red-500'
+                    ]">{{ status }}</h3>
+                    <p v-if="status != ApplicationStatus.Pending" class="text-muted-foreground">{{ status }}: {{
+                        decisionDate.toLocaleString("en-US", {
+                            year: "numeric",
+                            month: "long",
+                            day: "numeric",
+                            hour: "2-digit",
+                            minute: "2-digit"
+                        }) }}</p>
+                    <div class="mt-2" v-else-if="finalMode === 'view-recruiter'">
+                        <Button variant="success" class="mr-2" :onclick="() => { handleApprove(appID) }">
+                            <CheckIcon></CheckIcon>
+                        </Button>
+                        <Button variant="destructive" :onClick="() => { handleDeny(appID) }">
+                            <XIcon></XIcon>
+                        </Button>
+                    </div>
                 </div>
             </div>
+            <div v-else class="flex flex-row justify-between items-center py-2 mb-8">
+                <h3 class="scroll-m-20 text-2xl font-semibold tracking-tight">Apply to join the 17th Rangers</h3>
+            </div>
+            <ApplicationForm :read-only="readOnly" :data="appData" @submit="(e) => { postApp(e) }" class="mb-7">
+            </ApplicationForm>
+            <div v-if="!newApp" class="pb-15">
+                <h3 class="scroll-m-20 text-2xl font-semibold tracking-tight mb-4">Discussion</h3>
+                <ApplicationChat :messages="chatData" @post="postComment"></ApplicationChat>
+            </div>
         </div>
-        <div v-else class="flex flex-row justify-between items-center py-2 mb-8">
-            <h3 class="scroll-m-20 text-2xl font-semibold tracking-tight">Apply to join the 17th Rangers</h3>
-        </div>
-        <ApplicationForm :read-only="readOnly" :data="appData" @submit="(e) => { postApp(e) }" class="mb-7 pb-15">
-        </ApplicationForm>
-        <div v-if="!newApp" class="pb-15">
-            <h3 class="scroll-m-20 text-2xl font-semibold tracking-tight mb-4">Discussion</h3>
-            <ApplicationChat :messages="chatData" @post="postComment"></ApplicationChat>
-        </div>
+
     </div>
     <!-- TODO: Implement some kinda loading screen -->
     <div v-else class="flex items-center justify-center h-full">Loading</div>
diff --git a/ui/src/pages/MyApplications.vue b/ui/src/pages/MyApplications.vue
new file mode 100644
index 0000000..5c21ae6
--- /dev/null
+++ b/ui/src/pages/MyApplications.vue
@@ -0,0 +1,147 @@
+<script setup>
+import { getAllApplications, approveApplication, denyApplication, ApplicationStatus, loadMyApplications } from '@/api/application';
+import {
+    Table,
+    TableBody,
+    TableCaption,
+    TableCell,
+    TableHead,
+    TableHeader,
+    TableRow,
+} from '@/components/ui/table'
+import Button from '@/components/ui/button/Button.vue';
+import { onMounted, ref, watch } from 'vue';
+import { useRoute, useRouter } from 'vue-router';
+import { CheckIcon, XIcon } from 'lucide-vue-next';
+import Application from './Application.vue';
+
+const appList = ref([]);
+const now = Date.now();
+// relative time formatter (uses user locale)
+const rtf = new Intl.RelativeTimeFormat(undefined, { numeric: 'auto' })
+// exact date/time for tooltip
+const exactFmt = new Intl.DateTimeFormat(undefined, {
+    dateStyle: 'medium', timeStyle: 'short', timeZone: 'America/Toronto'
+})
+
+function formatAgo(iso) {
+    const d = new Date(iso)
+    if (isNaN(d)) return ''
+    let diff = (d.getTime() - now) / 1000 // seconds relative to page load
+    const divisions = [
+        { amount: 60, name: 'second' },
+        { amount: 60, name: 'minute' },
+        { amount: 24, name: 'hour' },
+        { amount: 7, name: 'day' },
+        { amount: 4.34524, name: 'week' }, // avg weeks per month
+        { amount: 12, name: 'month' },
+        { amount: Infinity, name: 'year' },
+    ]
+    for (const div of divisions) {
+        if (Math.abs(diff) < div.amount) {
+            return rtf.format(Math.round(diff), div.name)
+        }
+        diff /= div.amount
+    }
+}
+
+function formatExact(iso) {
+    const d = new Date(iso)
+    return isNaN(d) ? '' : exactFmt.format(d)
+}
+
+const router = useRouter();
+function openApplication(id) {
+    router.push(`/applications/${id}`)
+    openPanel.value = true;
+}
+
+const route = useRoute();
+
+watch(() => route.params.id, (newId) => {
+    if (newId === undefined) {
+        openPanel.value = false;
+    }
+})
+
+const openPanel = ref(false);
+
+onMounted(async () => {
+    appList.value = await loadMyApplications();
+
+    //preload application
+    if (route.params.id != undefined) {
+        openApplication(route.params.id)
+    } else {
+
+    }
+})
+</script>
+<template>
+    <div class="px-20 mx-auto max-w-[100rem] w-full flex mt-5 h-52 min-h-0 overflow-hidden">
+        <!-- application list -->
+        <div :class="openPanel == false ? 'w-full' : 'w-2/5'" class="pr-9">
+            <h1 class="scroll-m-20 text-2xl font-semibold tracking-tight mb-5">My Applications</h1>
+            <Table>
+                <TableHeader>
+                    <TableRow>
+                        <TableHead>Date Submitted</TableHead>
+                        <TableHead class="text-right">Status</TableHead>
+                    </TableRow>
+                </TableHeader>
+                <TableBody class="overflow-y-auto scrollbar-themed">
+                    <TableRow v-for="app in appList" :key="app.id" class="cursor-pointer"
+                        :onClick="() => { openApplication(app.id) }">
+                        <TableCell :title="formatExact(app.submitted_at)">
+                            {{ formatAgo(app.submitted_at) }}
+                        </TableCell>
+                        <TableCell class="text-right font-semibold" :class="[
+                            ,
+                            app.app_status === ApplicationStatus.Pending && 'text-yellow-500',
+                            app.app_status === ApplicationStatus.Accepted && 'text-green-500',
+                            app.app_status === ApplicationStatus.Denied && 'text-destructive'
+                        ]">{{ app.app_status }}</TableCell>
+                    </TableRow>
+                </TableBody>
+            </Table>
+        </div>
+        <div v-if="openPanel" class="pl-9 border-l w-3/5" :key="$route.params.id">
+            <div class="mb-5 flex justify-between">
+                <p class="scroll-m-20 text-2xl font-semibold tracking-tight"> Application</p>
+            </div>
+            <div class="overflow-y-auto max-h-[80vh] h-full mt-5 scrollbar-themed">
+                <Application :mode="'view-self-id'"></Application>
+            </div>
+        </div>
+    </div>
+</template>
+
+<style scoped>
+/* Firefox */
+.scrollbar-themed {
+    scrollbar-width: thin;
+    scrollbar-color: #555 #1f1f1f;
+    padding-right: 6px;
+}
+
+/* Chrome, Edge, Safari */
+.scrollbar-themed::-webkit-scrollbar {
+    width: 10px;
+    /* slightly wider to allow padding look */
+}
+
+.scrollbar-themed::-webkit-scrollbar-track {
+    background: #1f1f1f;
+    margin-left: 6px;
+    /* ❗ adds space between content + scrollbar */
+}
+
+.scrollbar-themed::-webkit-scrollbar-thumb {
+    background: #555;
+    border-radius: 9999px;
+}
+
+.scrollbar-themed::-webkit-scrollbar-thumb:hover {
+    background: #777;
+}
+</style>
\ No newline at end of file
diff --git a/ui/src/router/index.js b/ui/src/router/index.js
index 29cc862..cd807ac 100644
--- a/ui/src/router/index.js
+++ b/ui/src/router/index.js
@@ -6,19 +6,20 @@ const router = createRouter({
   routes: [
     // PUBLIC
     { path: '/join', component: () => import('@/pages/Join.vue') },
+    { path: '/applications', component: () => import('@/pages/MyApplications.vue'), meta: { requiresAuth: true } },
+    { path: '/applications/:id', component: () => import('@/pages/MyApplications.vue'), meta: { requiresAuth: true } },
 
     // AUTH REQUIRED
-    { path: '/apply', component: () => import('@/pages/Application.vue'), meta: { requiresAuth: true } },
     { path: '/', component: () => import('@/pages/Homepage.vue') },
 
     // MEMBER ROUTES
     { path: '/members', component: () => import('@/pages/memberList.vue'), meta: { requiresAuth: true, memberOnly: true } },
     { path: '/loa', component: () => import('@/pages/SubmitLOA.vue'), meta: { requiresAuth: true, memberOnly: true } },
     { 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: '/calendar/event/:id', component: () => import('@/pages/Calendar.vue'), meta: { requiresAuth: true, memberOnly: true }, },
-    
+
     { path: '/trainingReport', component: () => import('@/pages/TrainingReport.vue'), meta: { requiresAuth: true, memberOnly: true } },
     { path: '/trainingReport/new', component: () => import('@/pages/TrainingReport.vue'), meta: { requiresAuth: true, memberOnly: true } },
     { path: '/trainingReport/:id', component: () => import('@/pages/TrainingReport.vue'), meta: { requiresAuth: true, memberOnly: true } },

From dab0a7543cf00b1dd8115150ac2c79070b021f29 Mon Sep 17 00:00:00 2001
From: ajdj100 <ajairplane@gmail.com>
Date: Mon, 8 Dec 2025 22:03:11 -0500
Subject: [PATCH 08/37] added steam regex support

---
 ui/src/components/application/ApplicationForm.vue | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/ui/src/components/application/ApplicationForm.vue b/ui/src/components/application/ApplicationForm.vue
index 68fb35d..e9cd4f0 100644
--- a/ui/src/components/application/ApplicationForm.vue
+++ b/ui/src/components/application/ApplicationForm.vue
@@ -18,6 +18,10 @@ import * as z from 'zod';
 import DateInput from '../form/DateInput.vue';
 import { ApplicationData } from '@/api/application';
 
+const regexA = /^https?:\/\/steamcommunity\.com\/id\/[A-Za-z0-9_]+\/?$/;
+const regexB = /^https?:\/\/steamcommunity\.com\/profiles\/\d+\/?$/;
+
+
 const formSchema = toTypedSchema(z.object({
   dob: z.string().refine(v => v, { message: "A date of birth is required." }),
   name: z.string().nonempty(),
@@ -28,7 +32,7 @@ const formSchema = toTypedSchema(z.object({
   joinReason: z.string().nonempty(),
   milsimAttraction: z.string().nonempty(),
   referral: z.string().nonempty(),
-  steamProfile: z.string().nonempty(),
+  steamProfile: z.string().nonempty().refine((val) => regexA.test(val) || regexB.test(val), { message: "Invalid Steam profile URL." }),
   timezone: z.string().nonempty(),
   canAttendSaturday: z.boolean(),
   interests: z.string().nonempty(),

From ae9c7c89b1844ec7e9f4c4ed9bb3613d7e8ab0a2 Mon Sep 17 00:00:00 2001
From: ajdj100 <ajairplane@gmail.com>
Date: Mon, 8 Dec 2025 22:06:04 -0500
Subject: [PATCH 09/37] fix acknowledge spelling

---
 ui/src/components/application/ApplicationForm.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ui/src/components/application/ApplicationForm.vue b/ui/src/components/application/ApplicationForm.vue
index e9cd4f0..9bcc058 100644
--- a/ui/src/components/application/ApplicationForm.vue
+++ b/ui/src/components/application/ApplicationForm.vue
@@ -36,7 +36,7 @@ const formSchema = toTypedSchema(z.object({
   timezone: z.string().nonempty(),
   canAttendSaturday: z.boolean(),
   interests: z.string().nonempty(),
-  aknowledgeRules: z.literal(true, {
+  acknowledgeRules: z.literal(true, {
     errorMap: () => ({ message: "Required" })
   }),
 }))
@@ -45,7 +45,7 @@ const formSchema = toTypedSchema(z.object({
 const fallbackInitials = {
   military: false,
   canAttendSaturday: false,
-  aknowledgeRules: false,
+  acknowledgeRules: false,
 }
 
 const props = defineProps<{
@@ -267,7 +267,7 @@ onMounted(() => {
     </FormField>
 
     <!-- Code of Conduct (boolean, field name kept as-is) -->
-    <FormField name="aknowledgeRules" v-slot="{ value, handleChange }">
+    <FormField name="acknowledgeRules" v-slot="{ value, handleChange }">
       <FormItem>
         <FormLabel>Community Code of Conduct</FormLabel>
         <FormControl>

From e22f164097fd57c08f4fb0f86895b98877c05989 Mon Sep 17 00:00:00 2001
From: ajdj100 <ajairplane@gmail.com>
Date: Mon, 8 Dec 2025 22:32:07 -0500
Subject: [PATCH 10/37] Handled retired behaviour on join page

---
 ui/src/pages/Join.vue | 37 ++++++++++++++++++++++++++++++++++++-
 1 file changed, 36 insertions(+), 1 deletion(-)

diff --git a/ui/src/pages/Join.vue b/ui/src/pages/Join.vue
index 484f65f..e93a9c7 100644
--- a/ui/src/pages/Join.vue
+++ b/ui/src/pages/Join.vue
@@ -68,6 +68,9 @@ const currentStep = computed<number>(() => {
         case "denied":
             return 5;
             break;
+        case "retired":
+            return 5;
+            break;
     }
 })
 
@@ -255,7 +258,39 @@ async function restartApp() {
                                         Team</span>
                                 </p>
                             </div>
-                            <Button class="w-min" @click="restartApp">Restart Application</Button>
+                            <Button class="w-min" @click="restartApp">New Application</Button>
+                        </div>
+                    </div>
+                    <div v-else-if="userStore.state === 'retired'">
+                        <div class="w-full max-w-2xl flex flex-col gap-8">
+                            <h1 class="text-3xl sm:text-4xl font-bold text-left">
+                                You have retired from the 17th Ranger Battalion
+                            </h1>
+                            <div class="space-y-4 text-muted-foreground text-left leading-relaxed">
+                                <p>
+                                    Thank you for your service and participation in the <strong>17th Ranger
+                                        Battalion</strong>.
+                                    Your time with us has been sincerely appreciated.
+                                </p>
+                                <p>
+                                    Should you ever wish to return, you are welcome to <strong>reach out to our
+                                        leadership
+                                        team</strong>
+                                    for guidance on the reinstatement process or to stay connected with the community.
+                                </p>
+                                <p>
+                                    We recognize that circumstances change, and you will always have a place to
+                                    reconnect with
+                                    us
+                                    should the opportunity arise in the future.
+                                </p>
+                                <p>
+                                    All the best,<br />
+                                    <span class="text-foreground font-medium">The 17th Ranger Battalion Leadership
+                                        Team</span>
+                                </p>
+                            </div>
+                            <Button class="w-min" @click="restartApp">New Application</Button>
                         </div>
                     </div>
                 </div>

From f5a0df779522a905a6b2f7e88722e83b0a9229dc Mon Sep 17 00:00:00 2001
From: ajdj100 <ajairplane@gmail.com>
Date: Tue, 9 Dec 2025 17:02:39 -0500
Subject: [PATCH 11/37] Supported public vs internal application comments, and
 moved some type dependencies to the shared lib

---
 api/src/routes/applications.ts                | 66 +++++++++++++-
 api/src/services/applicationService.ts        |  9 +-
 shared/types/application.ts                   |  1 +
 ui/src/api/application.ts                     | 90 ++++---------------
 .../application/ApplicationChat.vue           | 32 +++++--
 .../application/ApplicationForm.vue           |  2 +-
 ui/src/pages/Application.vue                  | 14 ++-
 ui/src/pages/ManageApplications.vue           |  3 +-
 ui/src/pages/MyApplications.vue               |  3 +-
 9 files changed, 128 insertions(+), 92 deletions(-)

diff --git a/api/src/routes/applications.ts b/api/src/routes/applications.ts
index bf877e0..c79514e 100644
--- a/api/src/routes/applications.ts
+++ b/api/src/routes/applications.ts
@@ -8,6 +8,7 @@ import { getRankByName, insertMemberRank } from '../services/rankService';
 import { ApplicationFull, CommentRow } from "@app/shared/types/application"
 import { assignUserToStatus } from '../services/statusService';
 import { Request, Response } from 'express';
+import { getUserRoles } from '../services/rolesService';
 
 // POST /application
 router.post('/', async (req, res) => {
@@ -104,14 +105,28 @@ router.get('/me/:id', async (req: Request, res: Response) => {
 });
 
 // GET /application/:id
-router.get('/:id', async (req, res) => {
-  let appID = req.params.id;
+router.get('/:id', async (req: Request, res: Response) => {
+  let appID = Number(req.params.id);
+  let asAdmin = !!req.query.admin || false;
+  let user = req.user.id;
+
+  //TODO: Replace this with bigger authorization system eventually
+  if (asAdmin) {
+    let allowed = (await getUserRoles(user)).some((role) =>
+      role.name.toLowerCase() === 'dev' ||
+      role.name.toLowerCase() === 'recruiter' ||
+      role.name.toLowerCase() === 'administrator')
+    console.log(allowed)
+    if (!allowed) {
+      return res.sendStatus(403)
+    }
+  }
   try {
     const application = await getApplicationByID(appID);
     if (application === undefined)
       return res.sendStatus(204);
 
-    const comments: CommentRow[] = await getApplicationComments(appID);
+    const comments: CommentRow[] = await getApplicationComments(appID, asAdmin);
 
     const output: ApplicationFull = {
       application,
@@ -211,6 +226,51 @@ VALUES(?, ?, ?);`
   }
 });
 
+// POST /application/:id/comment
+router.post('/:id/adminComment', async (req: Request, res: Response) => {
+  const appID = req.params.id;
+  const data = req.body.message;
+  const user = req.user;
+
+  console.log(user)
+
+  const sql = `INSERT INTO application_comments(
+    application_id,
+    poster_id,
+    post_content,
+    admin_only
+  )
+VALUES(?, ?, ?, 1);`
+
+  try {
+    const conn = await pool.getConnection();
+
+    const result = await conn.query(sql, [appID, user.id, data])
+    console.log(result)
+    if (result.affectedRows !== 1) {
+      conn.release();
+      throw new Error("Insert Failure")
+    }
+
+    const getSQL = `SELECT app.id AS comment_id,
+      app.post_content,
+      app.poster_id,
+      app.post_time,
+      app.last_modified,
+      app.admin_only,
+      member.name AS poster_name
+        FROM application_comments AS app
+          INNER JOIN members AS member ON member.id = app.poster_id
+        WHERE app.id = ?; `;
+    const comment = await conn.query(getSQL, [result.insertId])
+    res.status(201).json(comment[0]);
+
+  } catch (err) {
+    console.error('Comment failed:', err);
+    res.status(500).json({ error: 'Could not post comment' });
+  }
+});
+
 router.post('/restart', async (req: Request, res: Response) => {
   const user = req.user.id;
   try {
diff --git a/api/src/services/applicationService.ts b/api/src/services/applicationService.ts
index 3224479..dceaad3 100644
--- a/api/src/services/applicationService.ts
+++ b/api/src/services/applicationService.ts
@@ -90,15 +90,20 @@ export async function denyApplication(id: number) {
   }
 }
 
-export async function getApplicationComments(appID: number): Promise<CommentRow[]> {
+export async function getApplicationComments(appID: number, admin: boolean = false): Promise<CommentRow[]> {
+  const excludeAdmin = ' AND app.admin_only = false';
+
+  const whereClause = `WHERE app.application_id = ?${!admin ? excludeAdmin : ''}`;
+
   return await pool.query(`SELECT app.id AS comment_id,
           app.post_content,
           app.poster_id,
           app.post_time,
           app.last_modified,
+          app.admin_only,
           member.name AS poster_name
         FROM application_comments AS app
           INNER JOIN members AS member ON member.id = app.poster_id
-        WHERE app.application_id = ?;`,
+        ${whereClause}`,
     [appID]);
 }
\ No newline at end of file
diff --git a/shared/types/application.ts b/shared/types/application.ts
index f8b648d..12b0db5 100644
--- a/shared/types/application.ts
+++ b/shared/types/application.ts
@@ -40,6 +40,7 @@ export interface CommentRow {
     post_time: string;
     last_modified: string | null;
     poster_name: string;
+    admin_only: boolean;
 }
 
 export interface ApplicationFull {
diff --git a/ui/src/api/application.ts b/ui/src/api/application.ts
index ef5c543..8f60f1e 100644
--- a/ui/src/api/application.ts
+++ b/ui/src/api/application.ts
@@ -1,80 +1,11 @@
-export type ApplicationDto = Partial<{
-  age: number | string
-  name: string
-  playtime: number | string
-  hobbies: string
-  military: boolean
-  communities: string
-  joinReason: string
-  milsimAttraction: string
-  referral: string
-  steamProfile: string
-  timezone: string
-  canAttendSaturday: boolean
-  interests: string
-  aknowledgeRules: boolean
-}>
-
-export interface ApplicationData {
-  dob: string;
-  name: string;
-  playtime: number;
-  hobbies: string;
-  military: boolean;
-  communities: string;
-  joinReason: string;
-  milsimAttraction: string;
-  referral: string;
-  steamProfile: string;
-  timezone: string;
-  canAttendSaturday: boolean;
-  interests: string;
-  aknowledgeRules: boolean;
-}
-
-//reflects how applications are stored in the database
-export interface ApplicationRow {
-  id: number;
-  member_id: number;
-  app_version: number;
-  app_data: ApplicationData;
-
-  submitted_at: string;        // ISO datetime from DB (e.g., "2025-08-25T18:04:29.000Z")
-  updated_at: string | null;
-  approved_at: string | null;
-  denied_at: string | null;
-
-  app_status: ApplicationStatus;       // generated column
-  decision_at: string | null;  // generated column
-
-  // present when you join members (e.g., SELECT a.*, m.name AS member_name)
-  member_name: string;
-}
-export interface CommentRow {
-  comment_id: number;
-  post_content: string;
-  poster_id: number;
-  post_time: string;
-  last_modified: string | null;
-  poster_name: string;
-}
-
-export interface ApplicationFull {
-  application: ApplicationRow;
-  comments: CommentRow[];
-}
+import { ApplicationFull } from "@shared/types/application";
 
 
-export enum ApplicationStatus {
-  Pending = "Pending",
-  Accepted = "Accepted",
-  Denied = "Denied",
-}
 //  @ts-ignore
 const addr = import.meta.env.VITE_APIHOST;
 
-export async function loadApplication(id: number | string): Promise<ApplicationFull | null> {
-  const res = await fetch(`${addr}/application/${id}`, { credentials: 'include' })
+export async function loadApplication(id: number | string, asAdmin: boolean = false): Promise<ApplicationFull | null> {
+  const res = await fetch(`${addr}/application/${id}?admin=${asAdmin}`, { credentials: 'include' })
   if (res.status === 204) return null
   if (!res.ok) throw new Error('Failed to load application')
   const json = await res.json()
@@ -112,6 +43,21 @@ export async function postChatMessage(message: any, post_id: number) {
   return await response.json();
 }
 
+export async function postAdminChatMessage(message: any, post_id: number) {
+  const out = {
+    message: message
+  }
+
+  const response = await fetch(`${addr}/application/${post_id}/adminComment`, {
+    method: 'POST',
+    credentials: 'include',
+    headers: { 'Content-Type': 'application/json' },
+    body: JSON.stringify(out),
+  })
+
+  return await response.json();
+}
+
 export async function getAllApplications(): Promise<ApplicationFull> {
   const res = await fetch(`${addr}/application/all`)
 
diff --git a/ui/src/components/application/ApplicationChat.vue b/ui/src/components/application/ApplicationChat.vue
index cc1d653..896ad0d 100644
--- a/ui/src/components/application/ApplicationChat.vue
+++ b/ui/src/components/application/ApplicationChat.vue
@@ -11,13 +11,18 @@ import {
 import Textarea from '@/components/ui/textarea/Textarea.vue'
 import { toTypedSchema } from '@vee-validate/zod'
 import * as z from 'zod'
+import { useAuth } from '@/composables/useAuth'
+import { CommentRow } from '@shared/types/application'
+import { Dot } from 'lucide-vue-next'
+import { ref } from 'vue'
 
 const props = defineProps<{
-  messages: Array<Record<string, any>>
+  messages: CommentRow[]
 }>()
 
 const emit = defineEmits<{
   (e: 'post', text: string): void
+  (e: 'postInternal', text: string): void
 }>()
 
 const commentSchema = toTypedSchema(
@@ -26,9 +31,14 @@ const commentSchema = toTypedSchema(
   })
 )
 
+const submitMode = ref("public");
+
 // vee-validate passes (values, actions) to @submit
 function onSubmit(values: { text: string }, { resetForm }: { resetForm: () => void }) {
-  emit('post', values.text.trim())
+  if (submitMode.value === "internal")
+    emit('postInternal', values.text.trim())
+  else
+    emit('post', values.text.trim())
   resetForm()
 }
 </script>
@@ -48,25 +58,31 @@ function onSubmit(values: { text: string }, { resetForm }: { resetForm: () => vo
       </FormField>
 
       <!-- Button below, right-aligned -->
-      <div class="mt-2 flex justify-end">
-        <Button type="submit">Post</Button>
+      <div class="mt-2 flex justify-end gap-2">
+        <Button type="submit" @click="submitMode = 'internal'" variant="outline">Post (Internal)</Button>
+        <Button type="submit" @click="submitMode = 'public'">Post</Button>
       </div>
     </Form>
 
     <!-- Existing posts -->
     <div class="space-y-3">
-      <div v-for="(message, i) in props.messages" :key="message.id ?? i"
-        class="rounded-md border border-neutral-800 p-3 space-y-5">
+      <div v-for="(message, i) in props.messages" :key="message.comment_id ?? i" class="rounded-md border p-3 space-y-5"
+        :class="message.admin_only ? 'border-amber-300/70' : 'border-neutral-800'">
         <!-- Comment header -->
         <div class="flex justify-between">
-          <p>{{ message.poster_name }}</p>
+          <div class="flex">
+            <p>{{ message.poster_name }}</p>
+            <p v-if="message.admin_only" class="flex">
+              <Dot /><span class="text-amber-300">Internal</span>
+            </p>
+          </div>
           <p class="text-muted-foreground">{{ new Date(message.post_time).toLocaleString("EN-us", {
             year: "numeric",
             month: "long",
             day: "numeric",
             hour: "2-digit",
             minute: "2-digit"
-            }) }}</p>
+          }) }}</p>
         </div>
         <p>{{ message.post_content }}</p>
       </div>
diff --git a/ui/src/components/application/ApplicationForm.vue b/ui/src/components/application/ApplicationForm.vue
index 9bcc058..eb1a85f 100644
--- a/ui/src/components/application/ApplicationForm.vue
+++ b/ui/src/components/application/ApplicationForm.vue
@@ -16,7 +16,7 @@ import { Form } from 'vee-validate';
 import { onMounted, ref } from 'vue';
 import * as z from 'zod';
 import DateInput from '../form/DateInput.vue';
-import { ApplicationData } from '@/api/application';
+import { ApplicationData } from '@shared/types/application';
 
 const regexA = /^https?:\/\/steamcommunity\.com\/id\/[A-Za-z0-9_]+\/?$/;
 const regexB = /^https?:\/\/steamcommunity\.com\/profiles\/\d+\/?$/;
diff --git a/ui/src/pages/Application.vue b/ui/src/pages/Application.vue
index 091c926..0c30c0e 100644
--- a/ui/src/pages/Application.vue
+++ b/ui/src/pages/Application.vue
@@ -2,15 +2,16 @@
 import ApplicationChat from '@/components/application/ApplicationChat.vue';
 import ApplicationForm from '@/components/application/ApplicationForm.vue';
 import { onMounted, ref } from 'vue';
-import { ApplicationData, approveApplication, denyApplication, loadApplication, postApplication, postChatMessage, ApplicationStatus, getMyApplication, ApplicationFull } from '@/api/application';
+import { approveApplication, denyApplication, loadApplication, postApplication, postChatMessage, getMyApplication, postAdminChatMessage } from '@/api/application';
 import { useRoute } from 'vue-router';
 import Button from '@/components/ui/button/Button.vue';
 import { CheckIcon, XIcon } from 'lucide-vue-next';
 import Unauthorized from './Unauthorized.vue';
+import { ApplicationData, ApplicationFull, ApplicationStatus, CommentRow } from '@shared/types/application';
 
 const appData = ref<ApplicationData>(null);
 const appID = ref<number | null>(null);
-const chatData = ref<object[]>([])
+const chatData = ref<CommentRow[]>([])
 const readOnly = ref<boolean>(false);
 const newApp = ref<boolean>(null);
 const status = ref<ApplicationStatus>(null);
@@ -47,7 +48,7 @@ onMounted(async () => {
     //recruiter mode
     if (props.mode === 'view-recruiter') {
         finalMode.value = 'view-recruiter';
-        loadData(await loadApplication(Number(route.params.id)))
+        loadData(await loadApplication(Number(route.params.id), true))
     }
 
     //viewer mode
@@ -87,6 +88,10 @@ async function postComment(comment) {
     chatData.value.push(await postChatMessage(comment, appID.value));
 }
 
+async function postCommentInternal(comment) {
+    chatData.value.push(await postAdminChatMessage(comment, appID.value));
+}
+
 const emit = defineEmits(['submit']);
 
 async function postApp(appData) {
@@ -159,7 +164,8 @@ async function handleDeny(id) {
             </ApplicationForm>
             <div v-if="!newApp" class="pb-15">
                 <h3 class="scroll-m-20 text-2xl font-semibold tracking-tight mb-4">Discussion</h3>
-                <ApplicationChat :messages="chatData" @post="postComment"></ApplicationChat>
+                <ApplicationChat :messages="chatData" @post="postComment" @post-internal="postCommentInternal">
+                </ApplicationChat>
             </div>
         </div>
 
diff --git a/ui/src/pages/ManageApplications.vue b/ui/src/pages/ManageApplications.vue
index cc3e689..a19316b 100644
--- a/ui/src/pages/ManageApplications.vue
+++ b/ui/src/pages/ManageApplications.vue
@@ -1,5 +1,6 @@
 <script setup>
-import { getAllApplications, approveApplication, denyApplication, ApplicationStatus } from '@/api/application';
+import { getAllApplications, approveApplication, denyApplication     } from '@/api/application';
+import { ApplicationStatus } from '@shared/types/application'
 import {
     Table,
     TableBody,
diff --git a/ui/src/pages/MyApplications.vue b/ui/src/pages/MyApplications.vue
index 5c21ae6..b73916f 100644
--- a/ui/src/pages/MyApplications.vue
+++ b/ui/src/pages/MyApplications.vue
@@ -1,5 +1,6 @@
 <script setup>
-import { getAllApplications, approveApplication, denyApplication, ApplicationStatus, loadMyApplications } from '@/api/application';
+import { loadMyApplications } from '@/api/application';
+import { ApplicationStatus } from '@shared/types/application';
 import {
     Table,
     TableBody,

From 5354fa85f10d6241c7f645eab36e3f7008114d48 Mon Sep 17 00:00:00 2001
From: ajdj100 <ajairplane@gmail.com>
Date: Tue, 9 Dec 2025 17:02:55 -0500
Subject: [PATCH 12/37] minor wording change to submit buttons

---
 ui/src/components/application/ApplicationChat.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui/src/components/application/ApplicationChat.vue b/ui/src/components/application/ApplicationChat.vue
index 896ad0d..2501d50 100644
--- a/ui/src/components/application/ApplicationChat.vue
+++ b/ui/src/components/application/ApplicationChat.vue
@@ -60,7 +60,7 @@ function onSubmit(values: { text: string }, { resetForm }: { resetForm: () => vo
       <!-- Button below, right-aligned -->
       <div class="mt-2 flex justify-end gap-2">
         <Button type="submit" @click="submitMode = 'internal'" variant="outline">Post (Internal)</Button>
-        <Button type="submit" @click="submitMode = 'public'">Post</Button>
+        <Button type="submit" @click="submitMode = 'public'">Post (Public)</Button>
       </div>
     </Form>
 

From 62defe5b6d701eb7fe34d87ee2927244aed5538a Mon Sep 17 00:00:00 2001
From: ajdj100 <ajairplane@gmail.com>
Date: Wed, 10 Dec 2025 21:30:41 -0500
Subject: [PATCH 13/37] LOA backend refactor

---
 api/src/routes/loa.js             | 56 ----------------------
 api/src/routes/loa.ts             | 80 +++++++++++++++++++++++++++++++
 api/src/services/loaService.ts    | 29 +++++++++++
 shared/types/loa.ts               | 24 ++++++++++
 ui/src/api/loa.ts                 | 46 ++++++++++++++----
 ui/src/components/loa/loaForm.vue |  3 +-
 6 files changed, 172 insertions(+), 66 deletions(-)
 delete mode 100644 api/src/routes/loa.js
 create mode 100644 api/src/routes/loa.ts
 create mode 100644 api/src/services/loaService.ts
 create mode 100644 shared/types/loa.ts

diff --git a/api/src/routes/loa.js b/api/src/routes/loa.js
deleted file mode 100644
index c14bf24..0000000
--- a/api/src/routes/loa.js
+++ /dev/null
@@ -1,56 +0,0 @@
-const express = require('express');
-const router = express.Router();
-
-import pool from '../db';
-
-//post a new LOA
-router.post("/", async (req, res) => {
-    const { member_id, filed_date, start_date, end_date, reason } = req.body;
-
-    if (!member_id || !filed_date || !start_date || !end_date) {
-        return res.status(400).json({ error: "Missing required fields" });
-    }
-
-    try {
-        const result = await pool.query(
-            `INSERT INTO leave_of_absences 
-                (member_id, filed_date, start_date, end_date, reason) 
-             VALUES (?, ?, ?, ?, ?)`,
-            [member_id, filed_date, start_date, end_date, reason]
-        );
-        res.sendStatus(201);
-    } catch (error) {
-        console.error(error);
-        res.status(500).send('Something went wrong', error);
-    }
-});
-
-//get my current LOA
-router.get("/me", async (req, res) => {
-    //TODO: implement current user getter
-    const user = 89;
-
-    try {
-        const result = await pool.query("SELECT * FROM leave_of_absences WHERE member_id = ?", [user])
-        res.status(200).json(result)
-    } catch (error) {
-        console.error(error);
-        res.status(500).send(error);
-    }
-})
-
-router.get('/all', async (req, res) => {
-    try {
-        const result = await pool.query(
-            `SELECT loa.*, members.name
-            FROM leave_of_absences AS loa
-            INNER JOIN members ON loa.member_id = members.id;
-            `);
-        res.status(200).json(result)
-    } catch (error) {
-        console.error(error);
-        res.status(500).send(error);
-    }
-})
-
-module.exports = router;
diff --git a/api/src/routes/loa.ts b/api/src/routes/loa.ts
new file mode 100644
index 0000000..054977e
--- /dev/null
+++ b/api/src/routes/loa.ts
@@ -0,0 +1,80 @@
+const express = require('express');
+const router = express.Router();
+
+import { Request, Response } from 'express';
+import pool from '../db';
+import { createNewLOA, getAllLOA, getLoaTypes, getUserLOA } from '../services/loaService';
+import { LOARequest } from '@app/shared/types/loa';
+
+//member posts LOA
+router.post("/", async (req: Request, res: Response) => {
+    let LOARequest = req.body as LOARequest;
+    LOARequest.member_id = req.user.id;
+    LOARequest.created_by = req.user.id;
+
+    console.log(LOARequest);
+
+    try {
+        // const result = await pool.query(
+        //     `INSERT INTO leave_of_absences 
+        //         (member_id, filed_date, start_date, end_date, reason) 
+        //      VALUES (?, ?, ?, ?, ?)`,
+        //     [member_id, filed_date, start_date, end_date, reason]
+        // );
+        await createNewLOA(LOARequest);
+        res.sendStatus(201);
+    } catch (error) {
+        console.error(error);
+        res.status(500).send(error);
+    }
+});
+
+//admin posts LOA
+router.post("/admin", async (req: Request, res: Response) => {
+    let LOARequest = req.body as LOARequest;
+    LOARequest.created_by = req.user.id;
+
+    console.log(LOARequest);
+
+    try {
+        await createNewLOA(LOARequest);
+        res.sendStatus(201);
+    } catch (error) {
+        console.error(error);
+        res.status(500).send(error);
+    }
+});
+
+//get my current LOA
+router.get("/me", async (req: Request, res: Response) => {
+    const user = req.user.id;
+    try {
+        const result = await getUserLOA(user);
+        res.status(200).json(result)
+    } catch (error) {
+        console.error(error);
+        res.status(500).send(error);
+    }
+})
+
+router.get('/all', async (req, res) => {
+    try {
+        const result = await getAllLOA();
+        res.status(200).json(result)
+    } catch (error) {
+        console.error(error);
+        res.status(500).send(error);
+    }
+})
+
+router.get('/types', async (req: Request, res: Response) => {
+    try {
+        let out = await getLoaTypes();
+        res.status(200).json(out);
+    } catch (error) {
+        res.status(500).json(error);
+        console.error(error);
+    }
+})
+
+module.exports = router;
diff --git a/api/src/services/loaService.ts b/api/src/services/loaService.ts
new file mode 100644
index 0000000..ae65128
--- /dev/null
+++ b/api/src/services/loaService.ts
@@ -0,0 +1,29 @@
+import pool from "../db";
+import { LOARequest, LOAType } from '@app/shared/types/loa'
+
+export async function getLoaTypes(): Promise<LOAType[]> {
+    return await pool.query('SELECT * FROM leave_of_absences_types;');
+}
+
+export async function getAllLOA(): Promise<LOARequest[]> {
+    let res: LOARequest[] = await pool.query(
+        `SELECT loa.*, members.name, t.name AS type_name
+            FROM leave_of_absences AS loa
+            LEFT JOIN members ON loa.member_id = members.id
+            LEFT JOIN leave_of_absences_types AS t ON loa.type_id = t.id;
+            `) as LOARequest[];
+    return res;
+}
+
+export async function getUserLOA(userId: number): Promise<LOARequest[]> {
+    const result: LOARequest[] = await pool.query("SELECT * FROM leave_of_absences WHERE member_id = ?", [userId])
+    return result;
+}
+
+export async function createNewLOA(data: LOARequest) {
+    const sql = `INSERT INTO leave_of_absences 
+                (member_id, filed_date, start_date, end_date, type_id, reason) 
+             VALUES (?, ?, ?, ?, ?, ?)`;
+    await pool.query(sql, [data.member_id, data.filed_date, data.start_date, data.end_date, data.type_id, data.reason])
+    return;
+}
\ No newline at end of file
diff --git a/shared/types/loa.ts b/shared/types/loa.ts
new file mode 100644
index 0000000..c87bf87
--- /dev/null
+++ b/shared/types/loa.ts
@@ -0,0 +1,24 @@
+export interface LOARequest {
+    id?: number;
+    member_id?: number;
+    filed_date?: string;   // ISO 8601 string
+    start_date: string;   // ISO 8601 string
+    end_date: string;     // ISO 8601 string
+    extended_till?: string;
+    type_id?: number;
+    reason?: string;
+    expired?: boolean;
+    closed?: boolean;
+    closed_by?: number;
+    created_by?: number;
+
+    name?: string;  //member name
+    type_name?: string;
+};
+
+export interface LOAType {
+    id: number;
+    name: string;
+    max_length_days: number;
+    extendable: boolean;
+}
\ No newline at end of file
diff --git a/ui/src/api/loa.ts b/ui/src/api/loa.ts
index 6f9314b..93168cb 100644
--- a/ui/src/api/loa.ts
+++ b/ui/src/api/loa.ts
@@ -1,12 +1,4 @@
-export type LOARequest = {
-    id?: number;
-    name?: string;
-    member_id: number;
-    filed_date: string;   // ISO 8601 string
-    start_date: string;   // ISO 8601 string
-    end_date: string;     // ISO 8601 string
-    reason?: string;
-};
+import { LOARequest, LOAType } from '@shared/types/loa'
 // @ts-ignore
 const addr = import.meta.env.VITE_APIHOST;
 
@@ -17,6 +9,7 @@ export async function submitLOA(request: LOARequest): Promise<{ id?: number; err
             "Content-Type": "application/json",
         },
         body: JSON.stringify(request),
+        credentials: 'include',
     });
 
     if (res.ok) {
@@ -26,6 +19,24 @@ export async function submitLOA(request: LOARequest): Promise<{ id?: number; err
     }
 }
 
+export async function adminSubmitLOA(request: LOARequest): Promise<{ id?: number; error?: string }> {
+    const res = await fetch(`${addr}/loa/admin`, {
+        method: "POST",
+        headers: {
+            "Content-Type": "application/json",
+        },
+        body: JSON.stringify(request),
+        credentials: 'include',
+    });
+
+    if (res.ok) {
+        return res.json();
+    } else {
+        return { error: "Failed to submit LOA" };
+    }
+}
+
+
 export async function getMyLOA(): Promise<LOARequest | null> {
     const res = await fetch(`${addr}/loa/me`, {
         method: "GET",
@@ -60,3 +71,20 @@ export function getAllLOAs(): Promise<LOARequest[]> {
         }
     });
 }
+
+export async function getLoaTypes(): Promise<LOAType[]> {
+    const res = await fetch(`${addr}/loa/types`, {
+        method: "GET",
+        credentials: 'include',
+    });
+
+    if (res.ok) {
+        const out = res.json();
+        if (!out) {
+            return null;
+        }
+        return out;
+    } else {
+        return null;
+    }
+}
\ No newline at end of file
diff --git a/ui/src/components/loa/loaForm.vue b/ui/src/components/loa/loaForm.vue
index e970f0e..f234fb7 100644
--- a/ui/src/components/loa/loaForm.vue
+++ b/ui/src/components/loa/loaForm.vue
@@ -18,7 +18,8 @@ import { RangeCalendar } from "@/components/ui/range-calendar"
 import { cn } from "@/lib/utils";
 import { CalendarIcon } from "lucide-vue-next"
 import Textarea from "@/components/ui/textarea/Textarea.vue";
-import { LOARequest, submitLOA } from "@/api/loa"; // <-- import the submit function
+import { submitLOA } from "@/api/loa"; // <-- import the submit function
+import { LOARequest } from "@shared/types/loa";
 
 const members = ref<Member[]>([])
 const currentMember = ref<Member | null>(null);

From 92c0d657ea25115614df7db12ea4de1be0bcac69 Mon Sep 17 00:00:00 2001
From: ajdj100 <ajairplane@gmail.com>
Date: Thu, 11 Dec 2025 10:25:29 -0500
Subject: [PATCH 14/37] overhauled form system to new modern form

---
 api/src/routes/loa.ts             |   6 -
 shared/schemas/loaSchema.ts       |  51 ++++++
 ui/src/components/loa/loaForm.vue | 290 ++++++++++++++++++------------
 3 files changed, 228 insertions(+), 119 deletions(-)
 create mode 100644 shared/schemas/loaSchema.ts

diff --git a/api/src/routes/loa.ts b/api/src/routes/loa.ts
index 054977e..7bd9492 100644
--- a/api/src/routes/loa.ts
+++ b/api/src/routes/loa.ts
@@ -15,12 +15,6 @@ router.post("/", async (req: Request, res: Response) => {
     console.log(LOARequest);
 
     try {
-        // const result = await pool.query(
-        //     `INSERT INTO leave_of_absences 
-        //         (member_id, filed_date, start_date, end_date, reason) 
-        //      VALUES (?, ?, ?, ?, ?)`,
-        //     [member_id, filed_date, start_date, end_date, reason]
-        // );
         await createNewLOA(LOARequest);
         res.sendStatus(201);
     } catch (error) {
diff --git a/shared/schemas/loaSchema.ts b/shared/schemas/loaSchema.ts
new file mode 100644
index 0000000..30c94c2
--- /dev/null
+++ b/shared/schemas/loaSchema.ts
@@ -0,0 +1,51 @@
+import * as z from "zod";
+import { LOAType } from "../types/loa";
+
+export const loaTypeSchema = z.object({
+    id: z.number(),
+    name: z.string(),
+    max_length_days: z.number(),
+});
+
+export const loaSchema = z.object({
+    member_id: z.number(),
+    start_date: z.date(),
+    end_date: z.date(),
+    type: loaTypeSchema,
+    reason: z.string(),
+})
+    .superRefine((data, ctx) => {
+        const { start_date, end_date, type } = data;
+
+        const today = new Date();
+        today.setHours(0, 0, 0, 0);
+
+        if (start_date < today) {
+            ctx.addIssue({
+            code: z.ZodIssueCode.custom,
+            path: ["start_date"],
+            message: "Start date cannot be in the past.",
+            });
+        }
+
+        // 1. end > start
+        if (end_date <= start_date) {
+            ctx.addIssue({
+                code: z.ZodIssueCode.custom,
+                path: ["end_date"],
+                message: "End date must be after start date.",
+            });
+        }
+
+        // 2. calculate max
+        const maxEnd = new Date(start_date);
+        maxEnd.setDate(maxEnd.getDate() + type.max_length_days);
+
+        if (end_date > maxEnd) {
+            ctx.addIssue({
+                code: z.ZodIssueCode.custom,
+                path: ["end_date"],
+                message: `This LOA type allows a maximum of ${type.max_length_days} days.`,
+            });
+        }
+    });
diff --git a/ui/src/components/loa/loaForm.vue b/ui/src/components/loa/loaForm.vue
index f234fb7..ec8cfd7 100644
--- a/ui/src/components/loa/loaForm.vue
+++ b/ui/src/components/loa/loaForm.vue
@@ -1,13 +1,15 @@
 <script setup lang="ts">
 import { Check, Search } from "lucide-vue-next"
-import { Combobox, ComboboxAnchor, ComboboxEmpty, ComboboxGroup, ComboboxInput, ComboboxItem, ComboboxItemIndicator, ComboboxList } from "@/components/ui/combobox"
-import { onMounted, ref } from "vue";
+import { ComboboxAnchor, ComboboxEmpty, ComboboxGroup, ComboboxInput, ComboboxItem, ComboboxItemIndicator, ComboboxList } from "@/components/ui/combobox"
+import { onMounted, ref, watch } from "vue";
 import { Member, getMembers } from "@/api/member";
 import Button from "@/components/ui/button/Button.vue";
 import {
     CalendarDate,
     DateFormatter,
+    fromDate,
     getLocalTimeZone,
+    parseDate,
 } from "@internationalized/date"
 import type { DateRange } from "reka-ui"
 import type { Ref } from "vue"
@@ -18,10 +20,27 @@ import { RangeCalendar } from "@/components/ui/range-calendar"
 import { cn } from "@/lib/utils";
 import { CalendarIcon } from "lucide-vue-next"
 import Textarea from "@/components/ui/textarea/Textarea.vue";
-import { submitLOA } from "@/api/loa"; // <-- import the submit function
-import { LOARequest } from "@shared/types/loa";
+import { getLoaTypes, submitLOA } from "@/api/loa"; // <-- import the submit function
+import { LOARequest, LOAType } from "@shared/types/loa";
+import { useForm, Field as VeeField } from "vee-validate";
+import {
+    Field,
+    FieldContent,
+    FieldDescription,
+    FieldGroup,
+    FieldLabel,
+} from '@/components/ui/field'
+import Combobox from "../ui/combobox/Combobox.vue";
+import Select from "../ui/select/Select.vue";
+import SelectTrigger from "../ui/select/SelectTrigger.vue";
+import SelectValue from "../ui/select/SelectValue.vue";
+import SelectContent from "../ui/select/SelectContent.vue";
+import SelectItem from "../ui/select/SelectItem.vue";
+import FieldError from "../ui/field/FieldError.vue";
 
 const members = ref<Member[]>([])
+const loaTypes = ref<LOAType[]>();
+
 const currentMember = ref<Member | null>(null);
 
 const props = withDefaults(defineProps<{
@@ -32,73 +51,40 @@ const props = withDefaults(defineProps<{
     member: null,
 });
 
+const df = new Intl.DateTimeFormat('en-US', {
+    year: 'numeric',
+    month: 'long',
+    day: 'numeric'
+});
 
-const df = new DateFormatter("en-US", {
-    dateStyle: "medium",
+
+//form stuff
+import { loaSchema } from '@shared/schemas/loaSchema'
+import { toTypedSchema } from "@vee-validate/zod";
+import Calendar from "../ui/calendar/Calendar.vue";
+
+const { handleSubmit, values, resetForm } = useForm({
+    validationSchema: toTypedSchema(loaSchema),
 })
 
-const value = ref({
-    // start: new CalendarDate(2022, 1, 20),
-    // end: new CalendarDate(2022, 1, 20).add({ days: 20 }),
-}) as Ref<DateRange>
+watch(values, (v) => {
+    console.log("Form values:", v)
+})
 
-const reason = ref(""); // <-- reason for LOA
-const submitting = ref(false);
-const submitError = ref<string | null>(null);
-const submitSuccess = ref(false);
+const onSubmit = handleSubmit((values) => {
+    console.log(values);
+})
 
 onMounted(async () => {
     if (props.member) {
         currentMember.value = props.member;
     }
-    if (props.adminMode) {
-        members.value = await getMembers();
-    }
     members.value = await getMembers();
+    loaTypes.value = await getLoaTypes();
+    console.log(currentMember.value);
+    resetForm({ values: { member_id: currentMember.value?.member_id } });
 });
 
-// Submit handler
-async function handleSubmit() {
-    submitError.value = null;
-    submitSuccess.value = false;
-    submitting.value = true;
-
-    // Use currentMember if adminMode, otherwise use your own member id (stubbed as 89 here)
-    const member_id = currentMember.value?.member_id ?? 89;
-
-    // Format dates as ISO strings
-    const filed_date = toMariaDBDatetime(new Date());
-    const start_date = toMariaDBDatetime(value.value.start?.toDate(getLocalTimeZone()));
-    const end_date = toMariaDBDatetime(value.value.end?.toDate(getLocalTimeZone()));
-
-    if (!member_id || !filed_date || !start_date || !end_date) {
-        submitError.value = "Missing required fields";
-        submitting.value = false;
-        return;
-    }
-
-    const req: LOARequest = {
-        filed_date,
-        start_date,
-        end_date,
-        reason: reason.value,
-        member_id
-    };
-
-    const result = await submitLOA(req);
-    submitting.value = false;
-
-    if (result.id) {
-        submitSuccess.value = true;
-        reason.value = "";
-    } else {
-        submitError.value = result.error || "Failed to submit LOA";
-    }
-}
-
-function toMariaDBDatetime(date: Date): string {
-    return date.toISOString().slice(0, 19).replace('T', ' ');
-}
 </script>
 
 <template>
@@ -114,60 +100,138 @@ function toMariaDBDatetime(date: Date): string {
             </div>
         </div>
         <div class="flex-1 flex flex-col gap-5">
-            <div class="flex w-full gap-5 ">
-                <Combobox class="w-1/2" v-model="currentMember" :disabled="!adminMode">
-                    <ComboboxAnchor class="w-full">
-                        <ComboboxInput placeholder="Search members..." class="w-full pl-9"
-                            :display-value="(v) => v ? v.member_name : ''" />
-                    </ComboboxAnchor>
-                    <ComboboxList class="w-full">
-                        <ComboboxEmpty class="text-muted-foreground">No results</ComboboxEmpty>
-                        <ComboboxGroup>
-                            <template v-for="member in members" :key="member.member_id">
-                                <ComboboxItem :value="member"
-                                    class="data-[highlighted]:bg-accent data-[highlighted]:text-accent-foreground relative cursor-pointer select-none px-2 py-1.5">
-                                    {{ member.member_name }}
-                                    <ComboboxItemIndicator class="absolute left-2 inline-flex items-center">
-                                        <Check class="h-4 w-4" />
-                                    </ComboboxItemIndicator>
-                                </ComboboxItem>
-                            </template>
-                        </ComboboxGroup>
-                    </ComboboxList>
-                </Combobox>
-                <Popover>
-                    <PopoverTrigger as-child>
-                        <Button variant="outline" :class="cn(
-                            'w-1/2 justify-start text-left font-normal',
-                            !value && 'text-muted-foreground',
-                        )">
-                            <CalendarIcon class="mr-2 h-4 w-4" />
-                            <template v-if="value.start">
-                                <template v-if="value.end">
-                                    {{ df.format(value.start.toDate(getLocalTimeZone())) }} - {{
-                                        df.format(value.end.toDate(getLocalTimeZone())) }}
-                                </template>
-                                <template v-else>
-                                    {{ df.format(value.start.toDate(getLocalTimeZone())) }}
-                                </template>
-                            </template>
-                            <template v-else>
-                                Pick a date
-                            </template>
-                        </Button>
-                    </PopoverTrigger>
-                    <PopoverContent class="w-auto p-0">
-                        <RangeCalendar v-model="value" initial-focus :number-of-months="2"
-                            @update:start-value="(startDate) => value.start = startDate" />
-                    </PopoverContent>
-                </Popover>
-            </div>
-            <Textarea v-model="reason" placeholder="Reason for LOA" class="w-full resize-none" />
-            <div class="flex justify-end">
-                <Button :onClick="handleSubmit" :disabled="submitting" class="w-min">Submit</Button>
-            </div>
-            <div v-if="submitError" class="text-red-500 text-sm mt-2">{{ submitError }}</div>
-            <div v-if="submitSuccess" class="text-green-500 text-sm mt-2">LOA submitted successfully!</div>
+            <form @submit="onSubmit" class="flex flex-col gap-2">
+                <div class="flex w-full gap-5">
+                    <VeeField v-slot="{ field, errors }" name="member_id">
+                        <Field>
+                            <FieldContent>
+                                <FieldLabel>Member</FieldLabel>
+                                <Combobox :model-value="field.value" @update:model-value="field.onChange"
+                                    :disabled="!adminMode">
+                                    <ComboboxAnchor class="w-full">
+                                        <ComboboxInput placeholder="Search members..." class="w-full pl-3"
+                                            :display-value="(id) => {
+                                                const m = members.find(mem => mem.member_id === id)
+                                                return m ? m.member_name : ''
+                                            }" />
+                                    </ComboboxAnchor>
+                                    <ComboboxList class="*:w-64">
+                                        <ComboboxEmpty class="text-muted-foreground w-full">No results</ComboboxEmpty>
+                                        <ComboboxGroup>
+                                            <template v-for="member in members" :key="member.member_id">
+                                                <ComboboxItem :value="member.member_id"
+                                                    class="data-[highlighted]:bg-accent data-[highlighted]:text-accent-foreground relative cursor-pointer select-none px-2 py-1.5 w-full">
+                                                    {{ member.member_name }}
+                                                    <ComboboxItemIndicator
+                                                        class="absolute left-2 inline-flex items-center">
+                                                        <Check class="h-4 w-4" />
+                                                    </ComboboxItemIndicator>
+                                                </ComboboxItem>
+                                            </template>
+                                        </ComboboxGroup>
+                                    </ComboboxList>
+                                </Combobox>
+                                <div class="h-4">
+                                    <FieldError v-if="errors.length" :errors="errors"></FieldError>
+                                </div>
+                            </FieldContent>
+                        </Field>
+                    </VeeField>
+                    <VeeField v-slot="{ field, errors }" name="type">
+                        <Field class="w-full">
+                            <FieldContent>
+                                <FieldLabel>Type</FieldLabel>
+                                <Select :model-value="field.value" @update:model-value="field.onChange">
+                                    <SelectTrigger class="w-full">
+                                        <SelectValue></SelectValue>
+                                    </SelectTrigger>
+                                    <SelectContent>
+                                        <SelectItem v-for="type in loaTypes" :value="type">
+                                            {{ type.name }}
+                                        </SelectItem>
+                                    </SelectContent>
+                                </Select>
+                                <div class="h-4">
+                                    <FieldError v-if="errors.length" :errors="errors"></FieldError>
+                                </div>
+                            </FieldContent>
+                        </Field>
+                    </VeeField>
+                </div>
+                <div class="flex gap-5">
+                    <VeeField v-slot="{ field, errors }" name="start_date">
+                        <Field>
+                            <FieldContent>
+                                <FieldLabel>Start Date</FieldLabel>
+                                <Popover>
+                                    <PopoverTrigger as-child>
+                                        <Button variant="outline" :class="cn(
+                                            'w-[280px] justify-start text-left font-normal',
+                                            !field.value && 'text-muted-foreground',
+                                        )">
+                                            <CalendarIcon class="mr-2 h-4 w-4" />
+                                            {{ field.value ? df.format(field.value) : "Pick a date" }}
+                                        </Button>
+                                    </PopoverTrigger>
+                                    <PopoverContent class="w-auto p-0">
+                                        <Calendar
+                                              :model-value="field.value ? fromDate(field.value, getLocalTimeZone()) : null"
+                                            @update:model-value="(val: CalendarDate) => field.onChange(val.toDate(getLocalTimeZone()))"
+                                            layout="month-and-year" />
+                                    </PopoverContent>
+                                </Popover>
+                                <div class="h-4">
+                                    <FieldError v-if="errors.length" :errors="errors"></FieldError>
+                                </div>
+                            </FieldContent>
+                        </Field>
+                    </VeeField>
+                    <VeeField v-slot="{ field, errors }" name="end_date">
+                        <Field>
+                            <FieldContent>
+                                <FieldLabel>End Date</FieldLabel>
+                                <Popover>
+                                    <PopoverTrigger as-child>
+                                        <Button variant="outline" :class="cn(
+                                            'w-[280px] justify-start text-left font-normal',
+                                            !field.value && 'text-muted-foreground',
+                                        )">
+                                            <CalendarIcon class="mr-2 h-4 w-4" />
+                                            {{ field.value ? df.format(field.value) : "Pick a date" }}
+                                        </Button>
+                                    </PopoverTrigger>
+                                    <PopoverContent class="w-auto p-0">
+                                        <Calendar
+                                            :model-value="field.value ? new CalendarDate(field.value.getFullYear(), field.value.getMonth() + 1, field.value.getDate()) : null"
+                                            @update:model-value="(val: CalendarDate) => field.onChange(val.toDate(getLocalTimeZone()))"
+                                            layout="month-and-year" />
+                                    </PopoverContent>
+                                </Popover>
+                                <div class="h-4">
+                                    <FieldError v-if="errors.length" :errors="errors"></FieldError>
+                                </div>
+                            </FieldContent>
+                        </Field>
+                    </VeeField>
+                </div>
+                <div>
+                    <VeeField v-slot="{ field, errors }" name="reason">
+                        <Field>
+                            <FieldContent>
+                                <FieldLabel>Reason</FieldLabel>
+                                <Textarea :model-value="field.value" @update:model-value="field.onChange"
+                                    placeholder="Reason for LOA" class="resize-none h-28"></Textarea>
+                                <div class="h-4">
+                                    <FieldError v-if="errors.length" :errors="errors"></FieldError>
+                                </div>
+                            </FieldContent>
+                        </Field>
+                    </VeeField>
+                </div>
+                <div class="flex justify-end">
+                    <Button type="submit">Submit</Button>
+                </div>
+            </form>
         </div>
     </div>
 </template>
\ No newline at end of file

From dd472a5283a3739a7263597d077a192041e912d5 Mon Sep 17 00:00:00 2001
From: ajdj100 <ajairplane@gmail.com>
Date: Thu, 11 Dec 2025 11:00:02 -0500
Subject: [PATCH 15/37] updated datepicker dependency

---
 ui/src/components/loa/loaForm.vue             |  19 +-
 ui/src/components/ui/calendar/Calendar.vue    | 164 ++++++++++++++++--
 .../components/ui/calendar/CalendarCell.vue   |   2 +-
 .../ui/calendar/CalendarCellTrigger.vue       |   2 +-
 .../components/ui/calendar/CalendarGrid.vue   |   2 +-
 .../ui/calendar/CalendarGridBody.vue          |   2 +-
 .../ui/calendar/CalendarGridHead.vue          |   2 +-
 .../ui/calendar/CalendarGridRow.vue           |   2 +-
 .../ui/calendar/CalendarHeadCell.vue          |   4 +-
 .../components/ui/calendar/CalendarHeader.vue |   7 +-
 .../ui/calendar/CalendarHeading.vue           |   2 +-
 .../ui/calendar/CalendarNextButton.vue        |   3 +-
 .../ui/calendar/CalendarPrevButton.vue        |   3 +-
 .../ui/native-select/NativeSelect.vue         |  51 ++++++
 .../ui/native-select/NativeSelectOptGroup.vue |  19 ++
 .../ui/native-select/NativeSelectOption.vue   |  19 ++
 ui/src/components/ui/native-select/index.js   |   3 +
 17 files changed, 275 insertions(+), 31 deletions(-)
 create mode 100644 ui/src/components/ui/native-select/NativeSelect.vue
 create mode 100644 ui/src/components/ui/native-select/NativeSelectOptGroup.vue
 create mode 100644 ui/src/components/ui/native-select/NativeSelectOption.vue
 create mode 100644 ui/src/components/ui/native-select/index.js

diff --git a/ui/src/components/loa/loaForm.vue b/ui/src/components/loa/loaForm.vue
index ec8cfd7..f49407d 100644
--- a/ui/src/components/loa/loaForm.vue
+++ b/ui/src/components/loa/loaForm.vue
@@ -10,8 +10,9 @@ import {
     fromDate,
     getLocalTimeZone,
     parseDate,
+    today,
 } from "@internationalized/date"
-import type { DateRange } from "reka-ui"
+import type { DateRange, DateValue } from "reka-ui"
 import type { Ref } from "vue"
 import Popover from "@/components/ui/popover/Popover.vue";
 import PopoverTrigger from "@/components/ui/popover/PopoverTrigger.vue";
@@ -84,6 +85,11 @@ onMounted(async () => {
     console.log(currentMember.value);
     resetForm({ values: { member_id: currentMember.value?.member_id } });
 });
+import type { LayoutTypes } from '@/components/ui/calendar'
+
+const defaultPlaceholder = today(getLocalTimeZone())
+const date = ref(today(getLocalTimeZone())) as Ref<DateValue>
+const layout = ref<LayoutTypes>('month-and-year')
 
 </script>
 
@@ -175,7 +181,7 @@ onMounted(async () => {
                                     </PopoverTrigger>
                                     <PopoverContent class="w-auto p-0">
                                         <Calendar
-                                              :model-value="field.value ? fromDate(field.value, getLocalTimeZone()) : null"
+                                            :model-value="field.value ? fromDate(field.value, getLocalTimeZone()) : null"
                                             @update:model-value="(val: CalendarDate) => field.onChange(val.toDate(getLocalTimeZone()))"
                                             layout="month-and-year" />
                                     </PopoverContent>
@@ -204,7 +210,8 @@ onMounted(async () => {
                                         <Calendar
                                             :model-value="field.value ? new CalendarDate(field.value.getFullYear(), field.value.getMonth() + 1, field.value.getDate()) : null"
                                             @update:model-value="(val: CalendarDate) => field.onChange(val.toDate(getLocalTimeZone()))"
-                                            layout="month-and-year" />
+                                            :default-placeholder="defaultPlaceholder" layout="month-and-year">
+                                        </Calendar>
                                     </PopoverContent>
                                 </Popover>
                                 <div class="h-4">
@@ -233,5 +240,11 @@ onMounted(async () => {
                 </div>
             </form>
         </div>
+
+        <div class="flex flex-col gap-4 w-min">
+            <Calendar v-model="date" :default-placeholder="defaultPlaceholder" class="rounded-md border shadow-sm"
+                layout="month-and-year" disable-days-outside-current-view />
+        </div>
+
     </div>
 </template>
\ No newline at end of file
diff --git a/ui/src/components/ui/calendar/Calendar.vue b/ui/src/components/ui/calendar/Calendar.vue
index e3f69e2..3d421ec 100644
--- a/ui/src/components/ui/calendar/Calendar.vue
+++ b/ui/src/components/ui/calendar/Calendar.vue
@@ -1,7 +1,14 @@
 <script setup>
-import { reactiveOmit } from "@vueuse/core";
-import { CalendarRoot, useForwardPropsEmits } from "reka-ui";
+import { getLocalTimeZone, today } from "@internationalized/date";
+import { createReusableTemplate, reactiveOmit, useVModel } from "@vueuse/core";
+import { CalendarRoot, useDateFormatter, useForwardPropsEmits } from "reka-ui";
+import { createYear, createYearRange, toDate } from "reka-ui/date";
+import { computed, toRaw } from "vue";
 import { cn } from "@/lib/utils";
+import {
+  NativeSelect,
+  NativeSelectOption,
+} from '@/components/ui/native-select';
 import {
   CalendarCell,
   CalendarCellTrigger,
@@ -38,34 +45,165 @@ const props = defineProps({
   dir: { type: String, required: false },
   nextPage: { type: Function, required: false },
   prevPage: { type: Function, required: false },
-  modelValue: { type: null, required: false },
+  modelValue: { type: null, required: false, default: undefined },
   multiple: { type: Boolean, required: false },
   disableDaysOutsideCurrentView: { type: Boolean, required: false },
   asChild: { type: Boolean, required: false },
-  as: { type: [String, Object, Function], required: false },
+  as: { type: null, required: false },
   class: { type: null, required: false },
+  layout: { type: null, required: false, default: undefined },
+  yearRange: { type: Array, required: false },
 });
 const emits = defineEmits(["update:modelValue", "update:placeholder"]);
 
-const delegatedProps = reactiveOmit(props, "class");
+const delegatedProps = reactiveOmit(props, "class", "layout", "placeholder");
+
+const placeholder = useVModel(props, "placeholder", emits, {
+  passive: true,
+  defaultValue: props.defaultPlaceholder ?? today(getLocalTimeZone()),
+});
+
+const formatter = useDateFormatter(props.locale ?? "en");
+
+const yearRange = computed(() => {
+  return (
+    props.yearRange ??
+    createYearRange({
+      start:
+        props?.minValue ??
+        (
+          toRaw(props.placeholder) ??
+          props.defaultPlaceholder ??
+          today(getLocalTimeZone())
+        ).cycle("year", -100),
+
+      end:
+        props?.maxValue ??
+        (
+          toRaw(props.placeholder) ??
+          props.defaultPlaceholder ??
+          today(getLocalTimeZone())
+        ).cycle("year", 10),
+    })
+  );
+});
+
+const [DefineMonthTemplate, ReuseMonthTemplate] = createReusableTemplate();
+const [DefineYearTemplate, ReuseYearTemplate] = createReusableTemplate();
 
 const forwarded = useForwardPropsEmits(delegatedProps, emits);
 </script>
 
 <template>
+  <DefineMonthTemplate v-slot="{ date }">
+    <div class="**:data-[slot=native-select-icon]:right-1">
+      <div class="relative">
+        <div
+          class="absolute inset-0 flex h-full items-center text-sm pl-2 pointer-events-none"
+        >
+          {{ formatter.custom(toDate(date), { month: "short" }) }}
+        </div>
+        <NativeSelect
+          class="text-xs h-8 pr-6 pl-2 text-transparent relative"
+          @change="
+            (e) => {
+              placeholder = placeholder.set({
+                month: Number(e?.target?.value),
+              });
+            }
+          "
+        >
+          <NativeSelectOption
+            v-for="month in createYear({ dateObj: date })"
+            :key="month.toString()"
+            :value="month.month"
+            :selected="date.month === month.month"
+          >
+            {{ formatter.custom(toDate(month), { month: "short" }) }}
+          </NativeSelectOption>
+        </NativeSelect>
+      </div>
+    </div>
+  </DefineMonthTemplate>
+
+  <DefineYearTemplate v-slot="{ date }">
+    <div class="**:data-[slot=native-select-icon]:right-1">
+      <div class="relative">
+        <div
+          class="absolute inset-0 flex h-full items-center text-sm pl-2 pointer-events-none"
+        >
+          {{ formatter.custom(toDate(date), { year: "numeric" }) }}
+        </div>
+        <NativeSelect
+          class="text-xs h-8 pr-6 pl-2 text-transparent relative"
+          @change="
+            (e) => {
+              placeholder = placeholder.set({
+                year: Number(e?.target?.value),
+              });
+            }
+          "
+        >
+          <NativeSelectOption
+            v-for="year in yearRange"
+            :key="year.toString()"
+            :value="year.year"
+            :selected="date.year === year.year"
+          >
+            {{ formatter.custom(toDate(year), { year: "numeric" }) }}
+          </NativeSelectOption>
+        </NativeSelect>
+      </div>
+    </div>
+  </DefineYearTemplate>
+
   <CalendarRoot
-    v-slot="{ grid, weekDays }"
+    v-slot="{ grid, weekDays, date }"
+    v-bind="forwarded"
+    v-model:placeholder="placeholder"
     data-slot="calendar"
     :class="cn('p-3', props.class)"
-    v-bind="forwarded"
   >
-    <CalendarHeader>
-      <CalendarHeading />
+    <CalendarHeader class="pt-0">
+      <nav
+        class="flex items-center gap-1 absolute top-0 inset-x-0 justify-between"
+      >
+        <CalendarPrevButton>
+          <slot name="calendar-prev-icon" />
+        </CalendarPrevButton>
+        <CalendarNextButton>
+          <slot name="calendar-next-icon" />
+        </CalendarNextButton>
+      </nav>
 
-      <div class="flex items-center gap-1">
-        <CalendarPrevButton />
-        <CalendarNextButton />
-      </div>
+      <slot
+        name="calendar-heading"
+        :date="date"
+        :month="ReuseMonthTemplate"
+        :year="ReuseYearTemplate"
+      >
+        <template v-if="layout === 'month-and-year'">
+          <div class="flex items-center justify-center gap-1">
+            <ReuseMonthTemplate :date="date" />
+            <ReuseYearTemplate :date="date" />
+          </div>
+        </template>
+        <template v-else-if="layout === 'month-only'">
+          <div class="flex items-center justify-center gap-1">
+            <ReuseMonthTemplate :date="date" />
+            {{ formatter.custom(toDate(date), { year: "numeric" }) }}
+          </div>
+        </template>
+        <template v-else-if="layout === 'year-only'">
+          <div class="flex items-center justify-center gap-1">
+            {{ formatter.custom(toDate(date), { month: "short" }) }}
+            <ReuseYearTemplate :date="date" />
+          </div>
+        </template>
+        <template v-else>
+          <CalendarHeading />
+        </template>
+      </slot>
     </CalendarHeader>
 
     <div class="flex flex-col gap-y-4 mt-4 sm:flex-row sm:gap-x-4 sm:gap-y-0">
diff --git a/ui/src/components/ui/calendar/CalendarCell.vue b/ui/src/components/ui/calendar/CalendarCell.vue
index 43f68f5..7a720dd 100644
--- a/ui/src/components/ui/calendar/CalendarCell.vue
+++ b/ui/src/components/ui/calendar/CalendarCell.vue
@@ -6,7 +6,7 @@ import { cn } from "@/lib/utils";
 const props = defineProps({
   date: { type: null, required: true },
   asChild: { type: Boolean, required: false },
-  as: { type: [String, Object, Function], required: false },
+  as: { type: null, required: false },
   class: { type: null, required: false },
 });
 
diff --git a/ui/src/components/ui/calendar/CalendarCellTrigger.vue b/ui/src/components/ui/calendar/CalendarCellTrigger.vue
index cbb0b7f..b8f2462 100644
--- a/ui/src/components/ui/calendar/CalendarCellTrigger.vue
+++ b/ui/src/components/ui/calendar/CalendarCellTrigger.vue
@@ -8,7 +8,7 @@ const props = defineProps({
   day: { type: null, required: true },
   month: { type: null, required: true },
   asChild: { type: Boolean, required: false },
-  as: { type: [String, Object, Function], required: false, default: "button" },
+  as: { type: null, required: false, default: "button" },
   class: { type: null, required: false },
 });
 
diff --git a/ui/src/components/ui/calendar/CalendarGrid.vue b/ui/src/components/ui/calendar/CalendarGrid.vue
index 0d55ae2..52bef72 100644
--- a/ui/src/components/ui/calendar/CalendarGrid.vue
+++ b/ui/src/components/ui/calendar/CalendarGrid.vue
@@ -5,7 +5,7 @@ import { cn } from "@/lib/utils";
 
 const props = defineProps({
   asChild: { type: Boolean, required: false },
-  as: { type: [String, Object, Function], required: false },
+  as: { type: null, required: false },
   class: { type: null, required: false },
 });
 
diff --git a/ui/src/components/ui/calendar/CalendarGridBody.vue b/ui/src/components/ui/calendar/CalendarGridBody.vue
index 2cd699c..131bc5a 100644
--- a/ui/src/components/ui/calendar/CalendarGridBody.vue
+++ b/ui/src/components/ui/calendar/CalendarGridBody.vue
@@ -3,7 +3,7 @@ import { CalendarGridBody } from "reka-ui";
 
 const props = defineProps({
   asChild: { type: Boolean, required: false },
-  as: { type: [String, Object, Function], required: false },
+  as: { type: null, required: false },
 });
 </script>
 
diff --git a/ui/src/components/ui/calendar/CalendarGridHead.vue b/ui/src/components/ui/calendar/CalendarGridHead.vue
index 637c4fc..1d8e684 100644
--- a/ui/src/components/ui/calendar/CalendarGridHead.vue
+++ b/ui/src/components/ui/calendar/CalendarGridHead.vue
@@ -3,7 +3,7 @@ import { CalendarGridHead } from "reka-ui";
 
 const props = defineProps({
   asChild: { type: Boolean, required: false },
-  as: { type: [String, Object, Function], required: false },
+  as: { type: null, required: false },
   class: { type: null, required: false },
 });
 </script>
diff --git a/ui/src/components/ui/calendar/CalendarGridRow.vue b/ui/src/components/ui/calendar/CalendarGridRow.vue
index 7a4b966..9ad8c5b 100644
--- a/ui/src/components/ui/calendar/CalendarGridRow.vue
+++ b/ui/src/components/ui/calendar/CalendarGridRow.vue
@@ -5,7 +5,7 @@ import { cn } from "@/lib/utils";
 
 const props = defineProps({
   asChild: { type: Boolean, required: false },
-  as: { type: [String, Object, Function], required: false },
+  as: { type: null, required: false },
   class: { type: null, required: false },
 });
 
diff --git a/ui/src/components/ui/calendar/CalendarHeadCell.vue b/ui/src/components/ui/calendar/CalendarHeadCell.vue
index dd31fc6..c2d29cc 100644
--- a/ui/src/components/ui/calendar/CalendarHeadCell.vue
+++ b/ui/src/components/ui/calendar/CalendarHeadCell.vue
@@ -5,7 +5,7 @@ import { cn } from "@/lib/utils";
 
 const props = defineProps({
   asChild: { type: Boolean, required: false },
-  as: { type: [String, Object, Function], required: false },
+  as: { type: null, required: false },
   class: { type: null, required: false },
 });
 
@@ -19,7 +19,7 @@ const forwardedProps = useForwardProps(delegatedProps);
     data-slot="calendar-head-cell"
     :class="
       cn(
-        'text-muted-foreground rounded-md w-8 font-normal text-[0.8rem]',
+        'text-muted-foreground rounded-md flex-1 font-normal text-[0.8rem]',
         props.class,
       )
     "
diff --git a/ui/src/components/ui/calendar/CalendarHeader.vue b/ui/src/components/ui/calendar/CalendarHeader.vue
index ccc366f..a5373fe 100644
--- a/ui/src/components/ui/calendar/CalendarHeader.vue
+++ b/ui/src/components/ui/calendar/CalendarHeader.vue
@@ -5,7 +5,7 @@ import { cn } from "@/lib/utils";
 
 const props = defineProps({
   asChild: { type: Boolean, required: false },
-  as: { type: [String, Object, Function], required: false },
+  as: { type: null, required: false },
   class: { type: null, required: false },
 });
 
@@ -18,7 +18,10 @@ const forwardedProps = useForwardProps(delegatedProps);
   <CalendarHeader
     data-slot="calendar-header"
     :class="
-      cn('flex justify-center pt-1 relative items-center w-full', props.class)
+      cn(
+        'flex justify-center pt-1 relative items-center w-full px-8',
+        props.class,
+      )
     "
     v-bind="forwardedProps"
   >
diff --git a/ui/src/components/ui/calendar/CalendarHeading.vue b/ui/src/components/ui/calendar/CalendarHeading.vue
index dd001b8..7e6ef9a 100644
--- a/ui/src/components/ui/calendar/CalendarHeading.vue
+++ b/ui/src/components/ui/calendar/CalendarHeading.vue
@@ -5,7 +5,7 @@ import { cn } from "@/lib/utils";
 
 const props = defineProps({
   asChild: { type: Boolean, required: false },
-  as: { type: [String, Object, Function], required: false },
+  as: { type: null, required: false },
   class: { type: null, required: false },
 });
 
diff --git a/ui/src/components/ui/calendar/CalendarNextButton.vue b/ui/src/components/ui/calendar/CalendarNextButton.vue
index 541d275..6912f78 100644
--- a/ui/src/components/ui/calendar/CalendarNextButton.vue
+++ b/ui/src/components/ui/calendar/CalendarNextButton.vue
@@ -8,7 +8,7 @@ import { buttonVariants } from '@/components/ui/button';
 const props = defineProps({
   nextPage: { type: Function, required: false },
   asChild: { type: Boolean, required: false },
-  as: { type: [String, Object, Function], required: false },
+  as: { type: null, required: false },
   class: { type: null, required: false },
 });
 
@@ -23,7 +23,6 @@ const forwardedProps = useForwardProps(delegatedProps);
     :class="
       cn(
         buttonVariants({ variant: 'outline' }),
-        'absolute right-1',
         'size-7 bg-transparent p-0 opacity-50 hover:opacity-100',
         props.class,
       )
diff --git a/ui/src/components/ui/calendar/CalendarPrevButton.vue b/ui/src/components/ui/calendar/CalendarPrevButton.vue
index acabe33..3cb9ba6 100644
--- a/ui/src/components/ui/calendar/CalendarPrevButton.vue
+++ b/ui/src/components/ui/calendar/CalendarPrevButton.vue
@@ -8,7 +8,7 @@ import { buttonVariants } from '@/components/ui/button';
 const props = defineProps({
   prevPage: { type: Function, required: false },
   asChild: { type: Boolean, required: false },
-  as: { type: [String, Object, Function], required: false },
+  as: { type: null, required: false },
   class: { type: null, required: false },
 });
 
@@ -23,7 +23,6 @@ const forwardedProps = useForwardProps(delegatedProps);
     :class="
       cn(
         buttonVariants({ variant: 'outline' }),
-        'absolute left-1',
         'size-7 bg-transparent p-0 opacity-50 hover:opacity-100',
         props.class,
       )
diff --git a/ui/src/components/ui/native-select/NativeSelect.vue b/ui/src/components/ui/native-select/NativeSelect.vue
new file mode 100644
index 0000000..9a40416
--- /dev/null
+++ b/ui/src/components/ui/native-select/NativeSelect.vue
@@ -0,0 +1,51 @@
+<script setup>
+import { reactiveOmit, useVModel } from "@vueuse/core";
+import { ChevronDownIcon } from "lucide-vue-next";
+import { cn } from "@/lib/utils";
+
+defineOptions({
+  inheritAttrs: false,
+});
+
+const props = defineProps({
+  modelValue: { type: null, required: false },
+  class: { type: null, required: false },
+});
+
+const emit = defineEmits(["update:modelValue"]);
+
+const modelValue = useVModel(props, "modelValue", emit, {
+  passive: true,
+  defaultValue: "",
+});
+
+const delegatedProps = reactiveOmit(props, "class");
+</script>
+
+<template>
+  <div
+    class="group/native-select relative w-fit has-[select:disabled]:opacity-50"
+    data-slot="native-select-wrapper"
+  >
+    <select
+      v-bind="{ ...$attrs, ...delegatedProps }"
+      v-model="modelValue"
+      data-slot="native-select"
+      :class="
+        cn(
+          'border-input placeholder:text-muted-foreground selection:bg-primary selection:text-primary-foreground dark:bg-input/30 dark:hover:bg-input/50 h-9 w-full min-w-0 appearance-none rounded-md border bg-transparent px-3 py-2 pr-9 text-sm shadow-xs transition-[color,box-shadow] outline-none disabled:pointer-events-none disabled:cursor-not-allowed',
+          'focus-visible:border-ring focus-visible:ring-ring/50 focus-visible:ring-[3px]',
+          'aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive',
+          props.class,
+        )
+      "
+    >
+      <slot />
+    </select>
+    <ChevronDownIcon
+      class="text-muted-foreground pointer-events-none absolute top-1/2 right-3.5 size-4 -translate-y-1/2 opacity-50 select-none"
+      aria-hidden="true"
+      data-slot="native-select-icon"
+    />
+  </div>
+</template>
diff --git a/ui/src/components/ui/native-select/NativeSelectOptGroup.vue b/ui/src/components/ui/native-select/NativeSelectOptGroup.vue
new file mode 100644
index 0000000..b4bba1e
--- /dev/null
+++ b/ui/src/components/ui/native-select/NativeSelectOptGroup.vue
@@ -0,0 +1,19 @@
+<!-- @fallthroughAttributes true -->
+<!-- @strictTemplates true -->
+
+<script setup>
+import { cn } from "@/lib/utils";
+
+const props = defineProps({
+  class: { type: null, required: false },
+});
+</script>
+
+<template>
+  <optgroup
+    data-slot="native-select-optgroup"
+    :class="cn('bg-popover text-popover-foreground', props.class)"
+  >
+    <slot />
+  </optgroup>
+</template>
diff --git a/ui/src/components/ui/native-select/NativeSelectOption.vue b/ui/src/components/ui/native-select/NativeSelectOption.vue
new file mode 100644
index 0000000..f206f5d
--- /dev/null
+++ b/ui/src/components/ui/native-select/NativeSelectOption.vue
@@ -0,0 +1,19 @@
+<!-- @fallthroughAttributes true -->
+<!-- @strictTemplates true -->
+
+<script setup>
+import { cn } from "@/lib/utils";
+
+const props = defineProps({
+  class: { type: null, required: false },
+});
+</script>
+
+<template>
+  <option
+    data-slot="native-select-option"
+    :class="cn('bg-popover text-popover-foreground', props.class)"
+  >
+    <slot />
+  </option>
+</template>
diff --git a/ui/src/components/ui/native-select/index.js b/ui/src/components/ui/native-select/index.js
new file mode 100644
index 0000000..7ebf604
--- /dev/null
+++ b/ui/src/components/ui/native-select/index.js
@@ -0,0 +1,3 @@
+export { default as NativeSelect } from "./NativeSelect.vue";
+export { default as NativeSelectOptGroup } from "./NativeSelectOptGroup.vue";
+export { default as NativeSelectOption } from "./NativeSelectOption.vue";

From 2821bc62c49925ac163e9914fb16697270f3518e Mon Sep 17 00:00:00 2001
From: ajdj100 <ajairplane@gmail.com>
Date: Thu, 11 Dec 2025 11:00:11 -0500
Subject: [PATCH 16/37] removed test datepicker

---
 ui/src/components/loa/loaForm.vue | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/ui/src/components/loa/loaForm.vue b/ui/src/components/loa/loaForm.vue
index f49407d..8186f0d 100644
--- a/ui/src/components/loa/loaForm.vue
+++ b/ui/src/components/loa/loaForm.vue
@@ -240,11 +240,5 @@ const layout = ref<LayoutTypes>('month-and-year')
                 </div>
             </form>
         </div>
-
-        <div class="flex flex-col gap-4 w-min">
-            <Calendar v-model="date" :default-placeholder="defaultPlaceholder" class="rounded-md border shadow-sm"
-                layout="month-and-year" disable-days-outside-current-view />
-        </div>
-
     </div>
 </template>
\ No newline at end of file

From 8cdbb99d6f81287486fdaeb4b2559954e186746e Mon Sep 17 00:00:00 2001
From: ajdj100 <ajairplane@gmail.com>
Date: Thu, 11 Dec 2025 11:25:09 -0500
Subject: [PATCH 17/37] implemented constraints on datepickers

---
 ui/src/components/loa/loaForm.vue | 31 +++++++++++++++++++++++--------
 1 file changed, 23 insertions(+), 8 deletions(-)

diff --git a/ui/src/components/loa/loaForm.vue b/ui/src/components/loa/loaForm.vue
index 8186f0d..cc7f050 100644
--- a/ui/src/components/loa/loaForm.vue
+++ b/ui/src/components/loa/loaForm.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import { Check, Search } from "lucide-vue-next"
 import { ComboboxAnchor, ComboboxEmpty, ComboboxGroup, ComboboxInput, ComboboxItem, ComboboxItemIndicator, ComboboxList } from "@/components/ui/combobox"
-import { onMounted, ref, watch } from "vue";
+import { computed, onMounted, ref, watch } from "vue";
 import { Member, getMembers } from "@/api/member";
 import Button from "@/components/ui/button/Button.vue";
 import {
@@ -63,6 +63,7 @@ const df = new Intl.DateTimeFormat('en-US', {
 import { loaSchema } from '@shared/schemas/loaSchema'
 import { toTypedSchema } from "@vee-validate/zod";
 import Calendar from "../ui/calendar/Calendar.vue";
+import { el } from "@fullcalendar/core/internal-common";
 
 const { handleSubmit, values, resetForm } = useForm({
     validationSchema: toTypedSchema(loaSchema),
@@ -85,12 +86,24 @@ onMounted(async () => {
     console.log(currentMember.value);
     resetForm({ values: { member_id: currentMember.value?.member_id } });
 });
-import type { LayoutTypes } from '@/components/ui/calendar'
-
 const defaultPlaceholder = today(getLocalTimeZone())
-const date = ref(today(getLocalTimeZone())) as Ref<DateValue>
-const layout = ref<LayoutTypes>('month-and-year')
 
+const minEndDate = computed(() => {
+    if (values.start_date) {
+        return new CalendarDate(values.start_date.getFullYear(), values.start_date.getMonth() + 1, values.start_date.getDate())
+    } else {
+        return null;
+    }
+})
+
+const maxEndDate = computed(() => {
+    if (values.type && values.start_date) {
+        let endDateObj = new Date(values.start_date.getTime() + values.type.max_length_days * 24 * 60 * 60 * 1000);
+        return new CalendarDate(endDateObj.getFullYear(), endDateObj.getMonth() + 1, endDateObj.getDate())
+    } else {
+        return null;
+    }
+})
 </script>
 
 <template>
@@ -181,9 +194,10 @@ const layout = ref<LayoutTypes>('month-and-year')
                                     </PopoverTrigger>
                                     <PopoverContent class="w-auto p-0">
                                         <Calendar
-                                            :model-value="field.value ? fromDate(field.value, getLocalTimeZone()) : null"
+                                            :model-value="field.value
+                                                ? new CalendarDate(field.value.getFullYear(), field.value.getMonth() + 1, field.value.getDate()) : null"
                                             @update:model-value="(val: CalendarDate) => field.onChange(val.toDate(getLocalTimeZone()))"
-                                            layout="month-and-year" />
+                                            layout="month-and-year" :min-value="today(getLocalTimeZone())" />
                                     </PopoverContent>
                                 </Popover>
                                 <div class="h-4">
@@ -210,7 +224,8 @@ const layout = ref<LayoutTypes>('month-and-year')
                                         <Calendar
                                             :model-value="field.value ? new CalendarDate(field.value.getFullYear(), field.value.getMonth() + 1, field.value.getDate()) : null"
                                             @update:model-value="(val: CalendarDate) => field.onChange(val.toDate(getLocalTimeZone()))"
-                                            :default-placeholder="defaultPlaceholder" layout="month-and-year">
+                                            :default-placeholder="defaultPlaceholder" :min-value="minEndDate"
+                                            :max-value="maxEndDate" layout="month-and-year">
                                         </Calendar>
                                     </PopoverContent>
                                 </Popover>

From dcb4720129f7ac1830dc0edfe30bea6c01caddde Mon Sep 17 00:00:00 2001
From: ajdj100 <ajairplane@gmail.com>
Date: Thu, 11 Dec 2025 11:38:11 -0500
Subject: [PATCH 18/37] placeholdered bookstack integration

---
 ui/.env.example                   |  1 +
 ui/src/api/loa.ts                 | 18 ++++++++++++++++++
 ui/src/components/loa/loaForm.vue |  9 ++++++---
 3 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/ui/.env.example b/ui/.env.example
index becdf99..57810b0 100644
--- a/ui/.env.example
+++ b/ui/.env.example
@@ -1,5 +1,6 @@
 # SITE SETTINGS
 VITE_APIHOST=
+VITE_DOCHOST= # https://bookstack.whatever.com/api
 VITE_ENVIRONMENT= # dev / prod
 
 # Glitchtip
diff --git a/ui/src/api/loa.ts b/ui/src/api/loa.ts
index 93168cb..f21f7d7 100644
--- a/ui/src/api/loa.ts
+++ b/ui/src/api/loa.ts
@@ -87,4 +87,22 @@ export async function getLoaTypes(): Promise<LOAType[]> {
     } else {
         return null;
     }
+};
+
+export async function getLoaPolicy(): Promise<string> {
+    //@ts-ignore
+    const res = await fetch(`${import.meta.env.VITE_DOCHOST}/api/pages/42`, {
+        method: "GET",
+        credentials: 'include',
+    });
+    if (res.ok) {
+        const out = res.json();
+        console.log(out);
+        if (!out) {
+            return null;
+        }
+        return out;
+    } else {
+        return null;
+    }
 }
\ No newline at end of file
diff --git a/ui/src/components/loa/loaForm.vue b/ui/src/components/loa/loaForm.vue
index cc7f050..09f7a49 100644
--- a/ui/src/components/loa/loaForm.vue
+++ b/ui/src/components/loa/loaForm.vue
@@ -17,11 +17,10 @@ import type { Ref } from "vue"
 import Popover from "@/components/ui/popover/Popover.vue";
 import PopoverTrigger from "@/components/ui/popover/PopoverTrigger.vue";
 import PopoverContent from "@/components/ui/popover/PopoverContent.vue";
-import { RangeCalendar } from "@/components/ui/range-calendar"
 import { cn } from "@/lib/utils";
 import { CalendarIcon } from "lucide-vue-next"
 import Textarea from "@/components/ui/textarea/Textarea.vue";
-import { getLoaTypes, submitLOA } from "@/api/loa"; // <-- import the submit function
+import { getLoaPolicy, getLoaTypes, submitLOA } from "@/api/loa"; // <-- import the submit function
 import { LOARequest, LOAType } from "@shared/types/loa";
 import { useForm, Field as VeeField } from "vee-validate";
 import {
@@ -41,6 +40,7 @@ import FieldError from "../ui/field/FieldError.vue";
 
 const members = ref<Member[]>([])
 const loaTypes = ref<LOAType[]>();
+const policyString = ref<string | null>(null);
 
 const currentMember = ref<Member | null>(null);
 
@@ -63,7 +63,6 @@ const df = new Intl.DateTimeFormat('en-US', {
 import { loaSchema } from '@shared/schemas/loaSchema'
 import { toTypedSchema } from "@vee-validate/zod";
 import Calendar from "../ui/calendar/Calendar.vue";
-import { el } from "@fullcalendar/core/internal-common";
 
 const { handleSubmit, values, resetForm } = useForm({
     validationSchema: toTypedSchema(loaSchema),
@@ -81,11 +80,15 @@ onMounted(async () => {
     if (props.member) {
         currentMember.value = props.member;
     }
+    if (!props.adminMode) {
+        policyString.value = await getLoaPolicy();
+    }
     members.value = await getMembers();
     loaTypes.value = await getLoaTypes();
     console.log(currentMember.value);
     resetForm({ values: { member_id: currentMember.value?.member_id } });
 });
+
 const defaultPlaceholder = today(getLocalTimeZone())
 
 const minEndDate = computed(() => {

From 87c472e98ee86616862c2e9eacdbb6382b692518 Mon Sep 17 00:00:00 2001
From: ajdj100 <ajairplane@gmail.com>
Date: Thu, 11 Dec 2025 11:52:11 -0500
Subject: [PATCH 19/37] fixed dialog scaling issue

---
 ui/src/components/loa/loaForm.vue | 14 +++++++-------
 ui/src/pages/ManageLOA.vue        | 21 ++++++++++++++-------
 2 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/ui/src/components/loa/loaForm.vue b/ui/src/components/loa/loaForm.vue
index 09f7a49..f66b2f7 100644
--- a/ui/src/components/loa/loaForm.vue
+++ b/ui/src/components/loa/loaForm.vue
@@ -68,10 +68,6 @@ const { handleSubmit, values, resetForm } = useForm({
     validationSchema: toTypedSchema(loaSchema),
 })
 
-watch(values, (v) => {
-    console.log("Form values:", v)
-})
-
 const onSubmit = handleSubmit((values) => {
     console.log(values);
 })
@@ -80,12 +76,16 @@ onMounted(async () => {
     if (props.member) {
         currentMember.value = props.member;
     }
-    if (!props.adminMode) {
-        policyString.value = await getLoaPolicy();
+    try {
+        if (!props.adminMode) {
+            policyString.value = await getLoaPolicy();
+        }
+    } catch (error) {
+        console.error(error);
     }
+
     members.value = await getMembers();
     loaTypes.value = await getLoaTypes();
-    console.log(currentMember.value);
     resetForm({ values: { member_id: currentMember.value?.member_id } });
 });
 
diff --git a/ui/src/pages/ManageLOA.vue b/ui/src/pages/ManageLOA.vue
index 5fd3d35..be94973 100644
--- a/ui/src/pages/ManageLOA.vue
+++ b/ui/src/pages/ManageLOA.vue
@@ -18,20 +18,27 @@ const showLOADialog = ref(false);
 
 <template>
     <Dialog v-model:open="showLOADialog" v-on:update:open="showLOADialog = false">
-        <DialogContent>
+        <DialogContent class="sm:max-w-fit">
             <DialogHeader>
                 <DialogTitle>Post LOA</DialogTitle>
                 <DialogDescription>
                     Post an LOA on behalf of a member.
                 </DialogDescription>
             </DialogHeader>
-            <LoaForm :admin-mode="true" class="my-5 w-full"></LoaForm>
-            <!-- <DialogFooter>
-                <Button variant="secondary" @click="showLOADialog = false">Cancel</Button>
-                <Button>Apply</Button>
-            </DialogFooter> -->
+            <LoaForm :admin-mode="true" class="my-3"></LoaForm>
         </DialogContent>
-    </Dialog>
+    </Dialog> 
+    <!-- <Dialog v-model:open="showLOADialog" v-on:update:open="showLOADialog = false">
+        <DialogContent class="max-w-full">
+            <DialogHeader>
+                <DialogTitle>Are you absolutely sure?</DialogTitle>
+                <DialogDescription>
+                    This action cannot be undone. This will permanently delete your account
+                    and remove your data from our servers.
+                </DialogDescription>
+            </DialogHeader>
+        </DialogContent>
+    </Dialog> -->
 
     <div class="max-w-5xl mx-auto pt-10">
         <div class="flex justify-end mb-4">

From 9d217aafaf136b009bb35b46287af1d964bba15d Mon Sep 17 00:00:00 2001
From: ajdj100 <ajairplane@gmail.com>
Date: Thu, 11 Dec 2025 12:05:41 -0500
Subject: [PATCH 20/37] improved robustness of time serialization system

---
 shared/utils/time.ts | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/shared/utils/time.ts b/shared/utils/time.ts
index 416fba5..322b015 100644
--- a/shared/utils/time.ts
+++ b/shared/utils/time.ts
@@ -1,5 +1,8 @@
 export function toDateTime(date: Date): string {
     console.log(date);
+    if (typeof date === 'string') {
+        date = new Date(date);
+    }
     // This produces a CST-local time because server runs in CST
     const year   = date.getFullYear();
     const month  = (date.getMonth() + 1).toString().padStart(2, "0");

From 7ab06b6a4c8ac67652b32e763bbc9a690c50b10f Mon Sep 17 00:00:00 2001
From: ajdj100 <ajairplane@gmail.com>
Date: Thu, 11 Dec 2025 12:06:00 -0500
Subject: [PATCH 21/37] hooked up new LOA creation system

---
 api/src/routes/loa.ts             |  2 ++
 api/src/services/loaService.ts    |  3 ++-
 shared/types/loa.ts               |  8 ++++----
 ui/src/components/loa/loaForm.vue | 16 ++++++++++++++--
 ui/src/pages/ManageLOA.vue        | 12 ------------
 5 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/api/src/routes/loa.ts b/api/src/routes/loa.ts
index 7bd9492..8602b38 100644
--- a/api/src/routes/loa.ts
+++ b/api/src/routes/loa.ts
@@ -11,6 +11,7 @@ router.post("/", async (req: Request, res: Response) => {
     let LOARequest = req.body as LOARequest;
     LOARequest.member_id = req.user.id;
     LOARequest.created_by = req.user.id;
+    LOARequest.filed_date = new Date();
 
     console.log(LOARequest);
 
@@ -27,6 +28,7 @@ router.post("/", async (req: Request, res: Response) => {
 router.post("/admin", async (req: Request, res: Response) => {
     let LOARequest = req.body as LOARequest;
     LOARequest.created_by = req.user.id;
+    LOARequest.filed_date = new Date();
 
     console.log(LOARequest);
 
diff --git a/api/src/services/loaService.ts b/api/src/services/loaService.ts
index ae65128..1261a1e 100644
--- a/api/src/services/loaService.ts
+++ b/api/src/services/loaService.ts
@@ -1,3 +1,4 @@
+import { toDateTime } from "@app/shared/utils/time";
 import pool from "../db";
 import { LOARequest, LOAType } from '@app/shared/types/loa'
 
@@ -24,6 +25,6 @@ export async function createNewLOA(data: LOARequest) {
     const sql = `INSERT INTO leave_of_absences 
                 (member_id, filed_date, start_date, end_date, type_id, reason) 
              VALUES (?, ?, ?, ?, ?, ?)`;
-    await pool.query(sql, [data.member_id, data.filed_date, data.start_date, data.end_date, data.type_id, data.reason])
+    await pool.query(sql, [data.member_id, toDateTime(data.filed_date), toDateTime(data.start_date), toDateTime(data.end_date), data.type_id, data.reason])
     return;
 }
\ No newline at end of file
diff --git a/shared/types/loa.ts b/shared/types/loa.ts
index c87bf87..4eae0dc 100644
--- a/shared/types/loa.ts
+++ b/shared/types/loa.ts
@@ -1,10 +1,10 @@
 export interface LOARequest {
     id?: number;
     member_id?: number;
-    filed_date?: string;   // ISO 8601 string
-    start_date: string;   // ISO 8601 string
-    end_date: string;     // ISO 8601 string
-    extended_till?: string;
+    filed_date?: Date;   // ISO 8601 string
+    start_date: Date;   // ISO 8601 string
+    end_date: Date;     // ISO 8601 string
+    extended_till?: Date;
     type_id?: number;
     reason?: string;
     expired?: boolean;
diff --git a/ui/src/components/loa/loaForm.vue b/ui/src/components/loa/loaForm.vue
index f66b2f7..1ae6063 100644
--- a/ui/src/components/loa/loaForm.vue
+++ b/ui/src/components/loa/loaForm.vue
@@ -20,7 +20,7 @@ import PopoverContent from "@/components/ui/popover/PopoverContent.vue";
 import { cn } from "@/lib/utils";
 import { CalendarIcon } from "lucide-vue-next"
 import Textarea from "@/components/ui/textarea/Textarea.vue";
-import { getLoaPolicy, getLoaTypes, submitLOA } from "@/api/loa"; // <-- import the submit function
+import { adminSubmitLOA, getLoaPolicy, getLoaTypes, submitLOA } from "@/api/loa"; // <-- import the submit function
 import { LOARequest, LOAType } from "@shared/types/loa";
 import { useForm, Field as VeeField } from "vee-validate";
 import {
@@ -68,8 +68,20 @@ const { handleSubmit, values, resetForm } = useForm({
     validationSchema: toTypedSchema(loaSchema),
 })
 
-const onSubmit = handleSubmit((values) => {
+const onSubmit = handleSubmit(async (values) => {
     console.log(values);
+    const out: LOARequest = {
+        member_id: values.member_id,
+        start_date: values.start_date,
+        end_date: values.end_date,
+        type_id: values.type.id,
+        reason: values.reason
+    };
+    if (props.adminMode) {
+        await adminSubmitLOA(out);
+    } else {
+        await submitLOA(out);
+    }
 })
 
 onMounted(async () => {
diff --git a/ui/src/pages/ManageLOA.vue b/ui/src/pages/ManageLOA.vue
index be94973..1b073e1 100644
--- a/ui/src/pages/ManageLOA.vue
+++ b/ui/src/pages/ManageLOA.vue
@@ -28,18 +28,6 @@ const showLOADialog = ref(false);
             <LoaForm :admin-mode="true" class="my-3"></LoaForm>
         </DialogContent>
     </Dialog> 
-    <!-- <Dialog v-model:open="showLOADialog" v-on:update:open="showLOADialog = false">
-        <DialogContent class="max-w-full">
-            <DialogHeader>
-                <DialogTitle>Are you absolutely sure?</DialogTitle>
-                <DialogDescription>
-                    This action cannot be undone. This will permanently delete your account
-                    and remove your data from our servers.
-                </DialogDescription>
-            </DialogHeader>
-        </DialogContent>
-    </Dialog> -->
-
     <div class="max-w-5xl mx-auto pt-10">
         <div class="flex justify-end mb-4">
             <Button @click="showLOADialog = true">Post LOA</Button>

From a3216ba5ab345f54557cba60c887e7c9b9b1181a Mon Sep 17 00:00:00 2001
From: ajdj100 <ajairplane@gmail.com>
Date: Thu, 11 Dec 2025 15:49:08 -0500
Subject: [PATCH 22/37] More bookstack integration stuff

---
 api/.env.example               |  7 +++-
 api/src/routes/loa.ts          | 60 +++++++++++++++++++++++++++++++++-
 api/src/services/loaService.ts | 22 +++++++++++++
 ui/src/api/loa.ts              |  4 +--
 4 files changed, 89 insertions(+), 4 deletions(-)

diff --git a/api/.env.example b/api/.env.example
index a740a31..21bf82e 100644
--- a/api/.env.example
+++ b/api/.env.example
@@ -22,4 +22,9 @@ CLIENT_DOMAIN= #whatever.com
 
 # Glitchtip
 GLITCHTIP_DSN=
-DISABLE_GLITCHTIP= # true/false
\ No newline at end of file
+DISABLE_GLITCHTIP= # true/false
+
+# Bookstack
+DOC_HOST=  # https://bookstack.whatever.com/
+DOC_TOKEN_SECRET=
+DOC_TOKEN_ID=
\ No newline at end of file
diff --git a/api/src/routes/loa.ts b/api/src/routes/loa.ts
index 8602b38..65cbf4a 100644
--- a/api/src/routes/loa.ts
+++ b/api/src/routes/loa.ts
@@ -3,7 +3,7 @@ const router = express.Router();
 
 import { Request, Response } from 'express';
 import pool from '../db';
-import { createNewLOA, getAllLOA, getLoaTypes, getUserLOA } from '../services/loaService';
+import { closeLOA, createNewLOA, getAllLOA, getLOAbyID, getLoaTypes, getUserLOA } from '../services/loaService';
 import { LOARequest } from '@app/shared/types/loa';
 
 //member posts LOA
@@ -73,4 +73,62 @@ router.get('/types', async (req: Request, res: Response) => {
     }
 })
 
+router.post('/cancel/:id', async (req: Request, res: Response) => {
+    let closer = req.user.id;
+    let id = Number(req.params.id);
+    try {
+        let loa = await getLOAbyID(id);
+        if (loa.member_id != closer) {
+            return res.sendStatus(403);
+        }
+
+        await closeLOA(Number(req.params.id), closer);
+        res.sendStatus(200);
+    } catch (error) {
+        console.error(error);
+        res.status(500).json(error);
+    }
+})
+
+//TODO: enforce admin only
+router.post('/adminCancel/:id', async (req: Request, res: Response) => {
+    let closer = req.user.id;
+    try {
+        await closeLOA(Number(req.params.id), closer);
+        res.sendStatus(200);
+    } catch (error) {
+        console.error(error);
+        res.status(500).json(error);
+    }
+})
+
+// TODO: Enforce admin only
+router.post('/extend/:id', async (req: Request, res: Response) => {
+    const extendTo = req.body;
+    console.log(extendTo);
+    try {
+
+    } catch (error) {
+        console.error(error)
+        res.status(500).json(error);
+    }
+})
+
+router.get('/policy', async (req: Request, res: Response) => {
+    const output = await fetch(`${process.env.DOC_HOST}/api/pages/42`, {
+        headers: {
+            Authorization: `Token ${process.env.DOC_TOKEN_ID}:${process.env.DOC_TOKEN_SECRET}`,
+        }
+    })
+
+    if (output.ok) {
+        const out = await output.json();
+        console.log(out);
+        res.status(200).json(out);
+    } else {
+        console.log("BAD");
+        res.sendStatus(500);
+    }
+})
+
 module.exports = router;
diff --git a/api/src/services/loaService.ts b/api/src/services/loaService.ts
index 1261a1e..129f5e2 100644
--- a/api/src/services/loaService.ts
+++ b/api/src/services/loaService.ts
@@ -27,4 +27,26 @@ export async function createNewLOA(data: LOARequest) {
              VALUES (?, ?, ?, ?, ?, ?)`;
     await pool.query(sql, [data.member_id, toDateTime(data.filed_date), toDateTime(data.start_date), toDateTime(data.end_date), data.type_id, data.reason])
     return;
+}
+
+export async function closeLOA(id: number, closer: number) {
+    const sql = `UPDATE leave_of_absences
+                SET closed = 1,
+                closed_by = ?
+                WHERE leave_of_absences.id = ?`;
+    let out = await pool.query(sql, [closer, id]);
+    console.log(out);
+    return out;
+}
+
+export async function getLOAbyID(id: number): Promise<LOARequest> {
+    let res = await pool.query(`SELECT * FROM leave_of_absences WHERE id = ?`, [id]);
+    if (res.length != 1)
+        throw new Error(`LOA with id ${id} not found`);
+    return res[0];
+}
+
+export async function setLOAExtension(id: number, extendTo: Date) {
+    
+
 }
\ No newline at end of file
diff --git a/ui/src/api/loa.ts b/ui/src/api/loa.ts
index f21f7d7..80417d9 100644
--- a/ui/src/api/loa.ts
+++ b/ui/src/api/loa.ts
@@ -91,7 +91,7 @@ export async function getLoaTypes(): Promise<LOAType[]> {
 
 export async function getLoaPolicy(): Promise<string> {
     //@ts-ignore
-    const res = await fetch(`${import.meta.env.VITE_DOCHOST}/api/pages/42`, {
+    const res = await fetch(`${addr}/loa/policy`, {
         method: "GET",
         credentials: 'include',
     });
@@ -105,4 +105,4 @@ export async function getLoaPolicy(): Promise<string> {
     } else {
         return null;
     }
-}
\ No newline at end of file
+}

From bcde81093d43d710d7e6860c50195331850b0184 Mon Sep 17 00:00:00 2001
From: ajdj100 <ajairplane@gmail.com>
Date: Thu, 11 Dec 2025 19:08:24 -0500
Subject: [PATCH 23/37] implemented LOA cancelling and extensioning

---
 api/src/routes/loa.ts             |  16 ++-
 api/src/routes/members.js         |  14 ++-
 api/src/services/loaService.ts    |  50 +++++++--
 ui/src/App.vue                    |   8 +-
 ui/src/api/loa.ts                 |  32 +++++-
 ui/src/components/loa/loaForm.vue |   2 +-
 ui/src/components/loa/loaList.vue | 179 +++++++++++++++++++++---------
 7 files changed, 219 insertions(+), 82 deletions(-)

diff --git a/api/src/routes/loa.ts b/api/src/routes/loa.ts
index 65cbf4a..45d48cc 100644
--- a/api/src/routes/loa.ts
+++ b/api/src/routes/loa.ts
@@ -3,7 +3,7 @@ const router = express.Router();
 
 import { Request, Response } from 'express';
 import pool from '../db';
-import { closeLOA, createNewLOA, getAllLOA, getLOAbyID, getLoaTypes, getUserLOA } from '../services/loaService';
+import { closeLOA, createNewLOA, getAllLOA, getLOAbyID, getLoaTypes, getUserLOA, setLOAExtension } from '../services/loaService';
 import { LOARequest } from '@app/shared/types/loa';
 
 //member posts LOA
@@ -104,10 +104,15 @@ router.post('/adminCancel/:id', async (req: Request, res: Response) => {
 
 // TODO: Enforce admin only
 router.post('/extend/:id', async (req: Request, res: Response) => {
-    const extendTo = req.body;
-    console.log(extendTo);
-    try {
+    const to: Date = req.body.to;
 
+    if (!to) {
+        res.status(400).send("Extension length is required");
+    }
+
+    try {
+        await setLOAExtension(Number(req.params.id), to);
+        res.sendStatus(200);
     } catch (error) {
         console.error(error)
         res.status(500).json(error);
@@ -123,8 +128,7 @@ router.get('/policy', async (req: Request, res: Response) => {
 
     if (output.ok) {
         const out = await output.json();
-        console.log(out);
-        res.status(200).json(out);
+        res.status(200).json(out.markdown);
     } else {
         console.log("BAD");
         res.sendStatus(500);
diff --git a/api/src/routes/members.js b/api/src/routes/members.js
index c93f249..3196569 100644
--- a/api/src/routes/members.js
+++ b/api/src/routes/members.js
@@ -2,6 +2,7 @@ const express = require('express');
 const router = express.Router();
 
 import pool from '../db';
+import { getUserActiveLOA } from '../services/loaService';
 import { getUserData } from '../services/memberService';
 import { getUserRoles } from '../services/rolesService';
 
@@ -40,12 +41,13 @@ router.get('/me', async (req, res) => {
 
     try {
         const { id, name, state } = await getUserData(req.user.id);
-        const LOAData = await pool.query(
-            `SELECT *
-            FROM leave_of_absences
-            WHERE member_id = ?
-            AND deleted = 0 
-            AND UTC_TIMESTAMP() BETWEEN start_date AND end_date;`, req.user.id);
+        // const LOAData = await pool.query(
+        //     `SELECT *
+        //     FROM leave_of_absences
+        //     WHERE member_id = ?
+        //     AND deleted = 0 
+        //     AND UTC_TIMESTAMP() BETWEEN start_date AND end_date;`, req.user.id);
+        const LOAData = await getUserActiveLOA(req.user.id);
 
         const roleData = await getUserRoles(req.user.id);
 
diff --git a/api/src/services/loaService.ts b/api/src/services/loaService.ts
index 129f5e2..1446724 100644
--- a/api/src/services/loaService.ts
+++ b/api/src/services/loaService.ts
@@ -6,13 +6,28 @@ export async function getLoaTypes(): Promise<LOAType[]> {
     return await pool.query('SELECT * FROM leave_of_absences_types;');
 }
 
-export async function getAllLOA(): Promise<LOARequest[]> {
-    let res: LOARequest[] = await pool.query(
-        `SELECT loa.*, members.name, t.name AS type_name
-            FROM leave_of_absences AS loa
-            LEFT JOIN members ON loa.member_id = members.id
-            LEFT JOIN leave_of_absences_types AS t ON loa.type_id = t.id;
-            `) as LOARequest[];
+export async function getAllLOA(page = 1, pageSize = 20): Promise<LOARequest[]> {
+    const offset = (page - 1) * pageSize;
+
+    const sql = `
+        SELECT loa.*, members.name, t.name AS type_name
+        FROM leave_of_absences AS loa
+        LEFT JOIN members ON loa.member_id = members.id
+        LEFT JOIN leave_of_absences_types AS t ON loa.type_id = t.id
+        ORDER BY
+            CASE
+                WHEN loa.closed IS NULL 
+                     AND NOW() > COALESCE(loa.extended_till, loa.end_date) THEN 1
+                WHEN loa.closed IS NULL
+                     AND NOW() BETWEEN loa.start_date AND COALESCE(loa.extended_till, loa.end_date) THEN 2
+                WHEN loa.closed IS NULL AND NOW() < loa.start_date THEN 3
+                WHEN loa.closed IS NOT NULL THEN 4
+            END,
+            loa.start_date DESC
+        LIMIT ? OFFSET ?;
+    `;
+
+    let res: LOARequest[] = await pool.query(sql, [pageSize, offset]) as LOARequest[];
     return res;
 }
 
@@ -21,6 +36,16 @@ export async function getUserLOA(userId: number): Promise<LOARequest[]> {
     return result;
 }
 
+export async function getUserActiveLOA(userId: number): Promise<LOARequest[]> {
+    const sql = `SELECT *
+            FROM leave_of_absences
+            WHERE member_id = ?
+            AND closed IS NULL
+            AND UTC_TIMESTAMP() BETWEEN start_date AND end_date;`
+    const LOAData = await pool.query(sql, [userId]);
+    return LOAData;
+}
+
 export async function createNewLOA(data: LOARequest) {
     const sql = `INSERT INTO leave_of_absences 
                 (member_id, filed_date, start_date, end_date, type_id, reason) 
@@ -41,12 +66,17 @@ export async function closeLOA(id: number, closer: number) {
 
 export async function getLOAbyID(id: number): Promise<LOARequest> {
     let res = await pool.query(`SELECT * FROM leave_of_absences WHERE id = ?`, [id]);
-    if (res.length != 1)
+    console.log(res);
+    if (res.length == 1)
         throw new Error(`LOA with id ${id} not found`);
     return res[0];
 }
 
 export async function setLOAExtension(id: number, extendTo: Date) {
-    
-
+    let res = await pool.query(`UPDATE leave_of_absences
+                                    SET extended_till = ?
+                                    WHERE leave_of_absences.id = ? `, [toDateTime(extendTo), id]);
+    if (res.affectedRows != 1)
+        throw new Error(`Could not extend LOA`);
+    return res[0];
 }
\ No newline at end of file
diff --git a/ui/src/App.vue b/ui/src/App.vue
index a656c08..8289a75 100644
--- a/ui/src/App.vue
+++ b/ui/src/App.vue
@@ -5,6 +5,7 @@ import { useUserStore } from './stores/user';
 import Alert from './components/ui/alert/Alert.vue';
 import AlertDescription from './components/ui/alert/AlertDescription.vue';
 import Navbar from './components/Navigation/Navbar.vue';
+import { cancelLOA } from './api/loa';
 
 const userStore = useUserStore();
 
@@ -29,10 +30,11 @@ const environment = import.meta.env.VITE_ENVIRONMENT;
           <p>This is a development build of the application. Some features will be unavailable or unstable.</p>
         </AlertDescription>
       </Alert>
-      <Alert v-if="userStore.user?.loa?.[0]" class="m-2 mx-auto w-5xl" variant="info">
+      <Alert v-if="userStore.user?.LOAData?.[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>
+          <p>You are on LOA until <strong>{{ formatDate(userStore.user?.LOAData?.[0].end_date) }}</strong></p>
+          <Button variant="secondary" @click="async () => { await cancelLOA(userStore.user?.LOAData?.[0].id); userStore.loadUser(); }">End
+            LOA</Button>
         </AlertDescription>
       </Alert>
     </div>
diff --git a/ui/src/api/loa.ts b/ui/src/api/loa.ts
index 80417d9..fc85bb3 100644
--- a/ui/src/api/loa.ts
+++ b/ui/src/api/loa.ts
@@ -90,7 +90,6 @@ export async function getLoaTypes(): Promise<LOAType[]> {
 };
 
 export async function getLoaPolicy(): Promise<string> {
-    //@ts-ignore
     const res = await fetch(`${addr}/loa/policy`, {
         method: "GET",
         credentials: 'include',
@@ -106,3 +105,34 @@ export async function getLoaPolicy(): Promise<string> {
         return null;
     }
 }
+
+export async function cancelLOA(id: number, admin: boolean = false) {
+    let route = admin ? 'adminCancel' : 'cancel';
+    const res = await fetch(`${addr}/loa/${route}/${id}`, {
+        method: "POST",
+        credentials: 'include',
+    });
+
+    if (res.ok) {
+        return
+    } else {
+        throw new Error("Could not cancel LOA");
+    }
+}
+
+export async function extendLOA(id: number, to: Date) {
+    const res = await fetch(`${addr}/loa/extend/${id}`, {
+        method: "POST",
+        credentials: 'include',
+        body: JSON.stringify({ to }),
+        headers: {
+            "Content-Type": "application/json",
+        }
+    });
+
+    if (res.ok) {
+        return
+    } else {
+        throw new Error("Could not extend LOA");
+    }
+}
\ No newline at end of file
diff --git a/ui/src/components/loa/loaForm.vue b/ui/src/components/loa/loaForm.vue
index 1ae6063..4e157bb 100644
--- a/ui/src/components/loa/loaForm.vue
+++ b/ui/src/components/loa/loaForm.vue
@@ -177,7 +177,7 @@ const maxEndDate = computed(() => {
                                 <FieldLabel>Type</FieldLabel>
                                 <Select :model-value="field.value" @update:model-value="field.onChange">
                                     <SelectTrigger class="w-full">
-                                        <SelectValue></SelectValue>
+                                        <SelectValue placeholder="Select type"></SelectValue>
                                     </SelectTrigger>
                                     <SelectContent>
                                         <SelectItem v-for="type in loaTypes" :value="type">
diff --git a/ui/src/components/loa/loaList.vue b/ui/src/components/loa/loaList.vue
index 6494067..1154641 100644
--- a/ui/src/components/loa/loaList.vue
+++ b/ui/src/components/loa/loaList.vue
@@ -16,30 +16,47 @@ import {
     DropdownMenuTrigger,
 } from "@/components/ui/dropdown-menu"
 import { Ellipsis } from "lucide-vue-next";
-import { getAllLOAs, LOARequest } from "@/api/loa";
+import { cancelLOA, extendLOA, getAllLOAs } from "@/api/loa";
 import { onMounted, ref, computed } from "vue";
+import { LOARequest } from "@shared/types/loa";
+import Dialog from "../ui/dialog/Dialog.vue";
+import DialogTrigger from "../ui/dialog/DialogTrigger.vue";
+import DialogContent from "../ui/dialog/DialogContent.vue";
+import DialogHeader from "../ui/dialog/DialogHeader.vue";
+import DialogTitle from "../ui/dialog/DialogTitle.vue";
+import DialogDescription from "../ui/dialog/DialogDescription.vue";
+import Button from "../ui/button/Button.vue";
+import Calendar from "../ui/calendar/Calendar.vue";
+import {
+    CalendarDate,
+    getLocalTimeZone,
+} from "@internationalized/date"
+
 
 const LOAList = ref<LOARequest[]>([]);
 
 onMounted(async () => {
-    LOAList.value = await getAllLOAs();
+    await loadLOAs();
 });
 
-function formatDate(dateStr: string): string {
-    if (!dateStr) return "";
-    return new Date(dateStr).toLocaleDateString("en-US", {
+async function loadLOAs() {
+    // const unsort = await getAllLOAs();
+    // LOAList.value = sortByStartDate(unsort);
+    LOAList.value = await getAllLOAs();
+}
+
+function formatDate(date: Date): string {
+    if (!date) return "";
+    date = typeof date === 'string' ? new Date(date) : date;
+    return date.toLocaleDateString("en-US", {
         year: "numeric",
         month: "short",
         day: "numeric",
     });
 }
 
-function loaStatus(loa: {
-    start_date: string;
-    end_date: string;
-    deleted?: number;
-}): "Upcoming" | "Active" | "Expired" | "Cancelled" {
-    if (loa.deleted) return "Cancelled";
+function loaStatus(loa: LOARequest): "Upcoming" | "Active" | "Overdue" | "Closed" {
+    if (loa.closed) return "Closed";
 
     const now = new Date();
     const start = new Date(loa.start_date);
@@ -47,9 +64,9 @@ function loaStatus(loa: {
 
     if (now < start) return "Upcoming";
     if (now >= start && now <= end) return "Active";
-    if (now > end) return "Expired";
+    if (now > end) return "Overdue";
 
-    return "Expired"; // fallback
+    return "Overdue"; // fallback
 }
 
 function sortByStartDate(loas: LOARequest[]): LOARequest[] {
@@ -58,50 +75,102 @@ function sortByStartDate(loas: LOARequest[]): LOARequest[] {
     );
 }
 
-const sortedLoas = computed(() => sortByStartDate(LOAList.value));
+async function cancelAndReload(id: number) {
+    await cancelLOA(id, true);
+    await loadLOAs();
+}
+
+const isExtending = ref(false);
+const targetLOA = ref<LOARequest | null>(null);
+const extendTo = ref<CalendarDate | null>(null);
+
+const targetEnd = computed(() => { return targetLOA.value.extended_till ? targetLOA.value.extended_till : targetLOA.value.end_date })
+
+function toCalendarDate(date: Date): CalendarDate {
+    if (typeof date === 'string')
+        date = new Date(date);
+    return new CalendarDate(date.getFullYear(), date.getMonth() + 1, date.getDate())
+}
+
+async function commitExtend() {
+    await extendLOA(targetLOA.value.id, extendTo.value.toDate(getLocalTimeZone()));
+    isExtending.value = false;
+    await loadLOAs();
+}
 </script>
 
 <template>
-    <div class="w-5xl mx-auto">
-        <Table>
-            <TableHeader>
-                <TableRow>
-                    <TableHead class="w-[100px]">Member</TableHead>
-                    <TableHead>Start</TableHead>
-                    <TableHead>End</TableHead>
-                    <TableHead>Reason</TableHead>
-                    <TableHead>Posted on</TableHead>
-                    <TableHead>Status</TableHead>
-                </TableRow>
-            </TableHeader>
-            <TableBody>
-                <TableRow v-for="post in sortedLoas" :key="post.id" class="hover:bg-muted/50">
-                    <TableCell class="font-medium">
-                        {{ post.name }}
-                    </TableCell>
-                    <TableCell>{{ formatDate(post.start_date) }}</TableCell>
-                    <TableCell>{{ formatDate(post.end_date) }}</TableCell>
-                    <TableCell>{{ post.reason }}</TableCell>
-                    <TableCell>{{ formatDate(post.filed_date) }}</TableCell>
-                    <TableCell>
-                        <Badge v-if="loaStatus(post) === 'Upcoming'" class="bg-blue-500">Upcoming</Badge>
-                        <Badge v-else-if="loaStatus(post) === 'Active'" class="bg-green-500">Active</Badge>
-                        <Badge v-else-if="loaStatus(post) === 'Expired'" class="bg-gray-400">Expired</Badge>
-                        <Badge v-else class="bg-red-500">Cancelled</Badge>
-                    </TableCell>
-                    <TableCell @click.stop="console.log('hi')" class="text-right">
-                        <DropdownMenu>
-                            <DropdownMenuTrigger class="cursor-pointer">
-                                <Ellipsis></Ellipsis>
-                            </DropdownMenuTrigger>
-                            <DropdownMenuContent>
-                                <DropdownMenuItem :variant="'destructive'">Cancel</DropdownMenuItem>
-                            </DropdownMenuContent>
-                        </DropdownMenu>
-                    </TableCell>
-
-                </TableRow>
-            </TableBody>
-        </Table>
+    <div>
+        <Dialog :open="isExtending" @update:open="(val) => isExtending = val">
+            <DialogContent>
+                <DialogHeader>
+                    <DialogTitle>Extend {{ targetLOA.name }}'s Leave of Absence </DialogTitle>
+                </DialogHeader>
+                <div class="flex gap-5">
+                    <Calendar v-model="extendTo" class="rounded-md border shadow-sm w-min" layout="month-and-year"
+                        :min-value="toCalendarDate(targetEnd)"
+                        :max-value="toCalendarDate(targetEnd).add({ years: 1 })" />
+                    <div class="flex flex-col w-full gap-3 px-2">
+                        <p>Quick Options</p>
+                        <Button variant="outline" @click="extendTo = toCalendarDate(targetEnd).add({ days: 7 })">1
+                            Week</Button>
+                        <Button variant="outline" @click="extendTo = toCalendarDate(targetEnd).add({ months: 1 })">1
+                            Month</Button>
+                    </div>
+                </div>
+                <div class="flex justify-end gap-4">
+                    <Button variant="outline" @click="isExtending = false">Cancel</Button>
+                    <Button @click="commitExtend">Extend</Button>
+                </div>
+            </DialogContent>
+        </Dialog>
+        <div class="max-w-7xl w-full mx-auto">
+            <Table>
+                <TableHeader>
+                    <TableRow>
+                        <TableHead>Member</TableHead>
+                        <TableHead>Type</TableHead>
+                        <TableHead>Start</TableHead>
+                        <TableHead>End</TableHead>
+                        <TableHead class="w-[500px]">Reason</TableHead>
+                        <TableHead>Posted on</TableHead>
+                        <TableHead>Status</TableHead>
+                    </TableRow>
+                </TableHeader>
+                <TableBody>
+                    <TableRow v-for="post in LOAList" :key="post.id" class="hover:bg-muted/50">
+                        <TableCell class="font-medium">
+                            {{ post.name }}
+                        </TableCell>
+                        <TableCell>{{ post.type_name }}</TableCell>
+                        <TableCell>{{ formatDate(post.start_date) }}</TableCell>
+                        <TableCell>{{ post.extended_till ? formatDate(post.extended_till) : formatDate(post.end_date) }}
+                        </TableCell>
+                        <TableCell>{{ post.reason }}</TableCell>
+                        <TableCell>{{ formatDate(post.filed_date) }}</TableCell>
+                        <TableCell>
+                            <Badge v-if="loaStatus(post) === 'Upcoming'" class="bg-blue-400">Upcoming</Badge>
+                            <Badge v-else-if="loaStatus(post) === 'Active'" class="bg-green-500">Active</Badge>
+                            <Badge v-else-if="loaStatus(post) === 'Overdue'" class="bg-yellow-400">Overdue</Badge>
+                            <Badge v-else class="bg-gray-400">Ended</Badge>
+                        </TableCell>
+                        <TableCell @click.stop="" class="text-right">
+                            <DropdownMenu>
+                                <DropdownMenuTrigger class="cursor-pointer">
+                                    <Ellipsis></Ellipsis>
+                                </DropdownMenuTrigger>
+                                <DropdownMenuContent>
+                                    <DropdownMenuItem v-if="!post.closed" @click="isExtending = true; targetLOA = post">
+                                        Extend
+                                    </DropdownMenuItem>
+                                    <DropdownMenuItem :variant="'destructive'" @click="cancelAndReload(post.id)">End
+                                    </DropdownMenuItem>
+                                </DropdownMenuContent>
+                            </DropdownMenu>
+                        </TableCell>
+                    </TableRow>
+                </TableBody>
+            </Table>
+        </div>
     </div>
 </template>

From 710b24e5a796fd940db1c220cfdb2f40185a8d32 Mon Sep 17 00:00:00 2001
From: ajdj100 <ajairplane@gmail.com>
Date: Thu, 11 Dec 2025 20:28:49 -0500
Subject: [PATCH 24/37] added policy system and self LOA management

---
 api/src/routes/loa.ts             | 14 +++++-
 api/src/services/loaService.ts    | 20 ++++++++-
 ui/src/api/loa.ts                 | 17 ++++++++
 ui/src/assets/base.css            | 72 +++++++++++++++++++++++++++++++
 ui/src/components/loa/loaForm.vue | 22 +++++-----
 ui/src/components/loa/loaList.vue | 26 ++++++++---
 ui/src/pages/ManageLOA.vue        |  2 +-
 ui/src/pages/SubmitLOA.vue        | 20 ++++++++-
 8 files changed, 170 insertions(+), 23 deletions(-)

diff --git a/api/src/routes/loa.ts b/api/src/routes/loa.ts
index 45d48cc..4c9bc82 100644
--- a/api/src/routes/loa.ts
+++ b/api/src/routes/loa.ts
@@ -53,6 +53,18 @@ router.get("/me", async (req: Request, res: Response) => {
     }
 })
 
+//get my LOA history
+router.get("/history", async (req: Request, res: Response) => {
+    const user = req.user.id;
+    try {
+        const result = await getUserLOA(user);
+        res.status(200).json(result)
+    } catch (error) {
+        console.error(error);
+        res.status(500).send(error);
+    }
+})
+
 router.get('/all', async (req, res) => {
     try {
         const result = await getAllLOA();
@@ -128,7 +140,7 @@ router.get('/policy', async (req: Request, res: Response) => {
 
     if (output.ok) {
         const out = await output.json();
-        res.status(200).json(out.markdown);
+        res.status(200).json(out.html);
     } else {
         console.log("BAD");
         res.sendStatus(500);
diff --git a/api/src/services/loaService.ts b/api/src/services/loaService.ts
index 1446724..19e789e 100644
--- a/api/src/services/loaService.ts
+++ b/api/src/services/loaService.ts
@@ -32,7 +32,23 @@ export async function getAllLOA(page = 1, pageSize = 20): Promise<LOARequest[]>
 }
 
 export async function getUserLOA(userId: number): Promise<LOARequest[]> {
-    const result: LOARequest[] = await pool.query("SELECT * FROM leave_of_absences WHERE member_id = ?", [userId])
+    const result: LOARequest[] = await pool.query(`
+        SELECT loa.*, members.name, t.name AS type_name
+            FROM leave_of_absences AS loa
+            LEFT JOIN members ON loa.member_id = members.id
+            LEFT JOIN leave_of_absences_types AS t ON loa.type_id = t.id
+            WHERE member_id = ?         
+            ORDER BY
+                CASE
+                    WHEN loa.closed IS NULL 
+                        AND NOW() > COALESCE(loa.extended_till, loa.end_date) THEN 1
+                    WHEN loa.closed IS NULL
+                        AND NOW() BETWEEN loa.start_date AND COALESCE(loa.extended_till, loa.end_date) THEN 2
+                    WHEN loa.closed IS NULL AND NOW() < loa.start_date THEN 3
+                    WHEN loa.closed IS NOT NULL THEN 4
+                END,
+                loa.start_date DESC
+            `, [userId])
     return result;
 }
 
@@ -67,7 +83,7 @@ export async function closeLOA(id: number, closer: number) {
 export async function getLOAbyID(id: number): Promise<LOARequest> {
     let res = await pool.query(`SELECT * FROM leave_of_absences WHERE id = ?`, [id]);
     console.log(res);
-    if (res.length == 1)
+    if (res.length != 1)
         throw new Error(`LOA with id ${id} not found`);
     return res[0];
 }
diff --git a/ui/src/api/loa.ts b/ui/src/api/loa.ts
index fc85bb3..f8ba82b 100644
--- a/ui/src/api/loa.ts
+++ b/ui/src/api/loa.ts
@@ -72,6 +72,23 @@ export function getAllLOAs(): Promise<LOARequest[]> {
     });
 }
 
+export function getMyLOAs(): Promise<LOARequest[]> {
+    return fetch(`${addr}/loa/history`, {
+        method: "GET",
+        credentials: 'include',
+        headers: {
+            "Content-Type": "application/json",
+        },
+    }).then((res) => {
+        if (res.ok) {
+            return res.json();
+        } else {
+            return [];
+        }
+    });
+
+}
+
 export async function getLoaTypes(): Promise<LOAType[]> {
     const res = await fetch(`${addr}/loa/types`, {
         method: "GET",
diff --git a/ui/src/assets/base.css b/ui/src/assets/base.css
index 0814dcd..b29a3bb 100644
--- a/ui/src/assets/base.css
+++ b/ui/src/assets/base.css
@@ -165,4 +165,76 @@
   body {
     @apply bg-background text-foreground;
   }
+}
+
+/* Root container */
+.ListRendererV2-container {
+  font-family: var(--font-sans, system-ui), sans-serif;
+  color: var(--foreground);
+  line-height: 1.45;
+  max-width: 760px;
+  margin: 0 auto;
+  font-size: 0.9rem;
+}
+
+/* Headers */
+.ListRendererV2-container h4 {
+  margin: 0.9rem 0 0.4rem 0;
+  font-weight: 600;
+  line-height: 1.35;
+  font-size: 1.05rem;
+  color: var(--foreground);
+  /* PURE WHITE */
+}
+
+.ListRendererV2-container h5 {
+  margin: 0.9rem 0 0.4rem 0;
+  font-weight: 600;
+  line-height: 1.35;
+  font-size: 0.95rem;
+  color: var(--foreground);
+  /* Still white (change to muted if desired) */
+}
+
+/* Lists */
+.ListRendererV2-container ul {
+  list-style-type: disc;
+  margin-left: 1.1rem;
+  margin-bottom: 0.6rem;
+  padding-left: 0.6rem;
+  color: var(--muted-foreground);
+  /* dim text */
+}
+
+/* Nested lists */
+.ListRendererV2-container ul ul {
+  list-style-type: circle;
+  margin-left: 0.9rem;
+}
+
+/* List items */
+.ListRendererV2-container li {
+  margin: 0.15rem 0;
+  padding-left: 0.1rem;
+  color: var(--muted-foreground);
+}
+
+/* Bullet color */
+.ListRendererV2-container li::marker {
+  color: var(--muted-foreground);
+}
+
+/* Inline elements */
+.ListRendererV2-container li p,
+.ListRendererV2-container li span,
+.ListRendererV2-container p {
+  display: inline;
+  margin: 0;
+  padding: 0;
+  color: var(--muted-foreground);
+}
+
+/* Top-level spacing */
+.ListRendererV2-container>ul>li {
+  margin-top: 0.3rem;
 }
\ No newline at end of file
diff --git a/ui/src/components/loa/loaForm.vue b/ui/src/components/loa/loaForm.vue
index 4e157bb..df4ddb0 100644
--- a/ui/src/components/loa/loaForm.vue
+++ b/ui/src/components/loa/loaForm.vue
@@ -90,7 +90,9 @@ onMounted(async () => {
     }
     try {
         if (!props.adminMode) {
-            policyString.value = await getLoaPolicy();
+            let policy = await getLoaPolicy() as any;
+            policyString.value = policy;
+            policyRef.value.innerHTML = policyString.value;
         }
     } catch (error) {
         console.error(error);
@@ -101,6 +103,8 @@ onMounted(async () => {
     resetForm({ values: { member_id: currentMember.value?.member_id } });
 });
 
+const policyRef = ref<HTMLElement>(null);
+
 const defaultPlaceholder = today(getLocalTimeZone())
 
 const minEndDate = computed(() => {
@@ -123,14 +127,10 @@ const maxEndDate = computed(() => {
 
 <template>
     <div class="flex flex-row-reverse gap-6 mx-auto w-full" :class="!adminMode ? 'max-w-5xl' : 'max-w-5xl'">
-        <div v-if="!adminMode" class="flex-1 flex space-x-4 rounded-md border p-4">
-            <div class="flex-2 space-y-1">
-                <p class="text-sm font-medium leading-none">
-                    LOA Policy
-                </p>
-                <p class="text-sm text-muted-foreground">
-                    Policy goes here.
-                </p>
+        <div v-if="!adminMode" class="flex-1 flex flex-col space-x-4 rounded-md border p-4">
+            <p class="scroll-m-20 text-2xl font-semibold tracking-tight">LOA Policy</p>
+            <div ref="policyRef">
+                <!-- LOA policy gets loaded here -->
             </div>
         </div>
         <div class="flex-1 flex flex-col gap-5">
@@ -200,7 +200,7 @@ const maxEndDate = computed(() => {
                                 <Popover>
                                     <PopoverTrigger as-child>
                                         <Button variant="outline" :class="cn(
-                                            'w-[280px] justify-start text-left font-normal',
+                                            'w-full justify-start text-left font-normal',
                                             !field.value && 'text-muted-foreground',
                                         )">
                                             <CalendarIcon class="mr-2 h-4 w-4" />
@@ -228,7 +228,7 @@ const maxEndDate = computed(() => {
                                 <Popover>
                                     <PopoverTrigger as-child>
                                         <Button variant="outline" :class="cn(
-                                            'w-[280px] justify-start text-left font-normal',
+                                            'w-full justify-start text-left font-normal',
                                             !field.value && 'text-muted-foreground',
                                         )">
                                             <CalendarIcon class="mr-2 h-4 w-4" />
diff --git a/ui/src/components/loa/loaList.vue b/ui/src/components/loa/loaList.vue
index 1154641..2151d1c 100644
--- a/ui/src/components/loa/loaList.vue
+++ b/ui/src/components/loa/loaList.vue
@@ -16,7 +16,7 @@ import {
     DropdownMenuTrigger,
 } from "@/components/ui/dropdown-menu"
 import { Ellipsis } from "lucide-vue-next";
-import { cancelLOA, extendLOA, getAllLOAs } from "@/api/loa";
+import { cancelLOA, extendLOA, getAllLOAs, getMyLOAs } from "@/api/loa";
 import { onMounted, ref, computed } from "vue";
 import { LOARequest } from "@shared/types/loa";
 import Dialog from "../ui/dialog/Dialog.vue";
@@ -31,7 +31,11 @@ import {
     CalendarDate,
     getLocalTimeZone,
 } from "@internationalized/date"
+import { el } from "@fullcalendar/core/internal-common";
 
+const props = defineProps<{
+    adminMode?: boolean
+}>()
 
 const LOAList = ref<LOARequest[]>([]);
 
@@ -40,9 +44,11 @@ onMounted(async () => {
 });
 
 async function loadLOAs() {
-    // const unsort = await getAllLOAs();
-    // LOAList.value = sortByStartDate(unsort);
-    LOAList.value = await getAllLOAs();
+    if (props.adminMode) {
+        LOAList.value = await getAllLOAs();
+    } else {
+        LOAList.value = await getMyLOAs();
+    }
 }
 
 function formatDate(date: Date): string {
@@ -76,7 +82,7 @@ function sortByStartDate(loas: LOARequest[]): LOARequest[] {
 }
 
 async function cancelAndReload(id: number) {
-    await cancelLOA(id, true);
+    await cancelLOA(id, props.adminMode);
     await loadLOAs();
 }
 
@@ -160,11 +166,17 @@ async function commitExtend() {
                                     <Ellipsis></Ellipsis>
                                 </DropdownMenuTrigger>
                                 <DropdownMenuContent>
-                                    <DropdownMenuItem v-if="!post.closed" @click="isExtending = true; targetLOA = post">
+                                    <DropdownMenuItem v-if="!post.closed && props.adminMode"
+                                        @click="isExtending = true; targetLOA = post">
                                         Extend
                                     </DropdownMenuItem>
-                                    <DropdownMenuItem :variant="'destructive'" @click="cancelAndReload(post.id)">End
+                                    <DropdownMenuItem v-if="!post.closed" :variant="'destructive'"
+                                        @click="cancelAndReload(post.id)">End
                                     </DropdownMenuItem>
+                                    <!-- Fallback: no actions available -->
+                                    <p v-if="post.closed || (!props.adminMode && post.closed)" class="p-2 text-center text-sm">
+                                        No actions
+                                    </p>
                                 </DropdownMenuContent>
                             </DropdownMenu>
                         </TableCell>
diff --git a/ui/src/pages/ManageLOA.vue b/ui/src/pages/ManageLOA.vue
index 1b073e1..3d706b8 100644
--- a/ui/src/pages/ManageLOA.vue
+++ b/ui/src/pages/ManageLOA.vue
@@ -33,6 +33,6 @@ const showLOADialog = ref(false);
             <Button @click="showLOADialog = true">Post LOA</Button>
         </div>
         <h1>LOA Log</h1>
-        <LoaList></LoaList>
+        <LoaList :admin-mode="true"></LoaList>
     </div>
 </template>
\ No newline at end of file
diff --git a/ui/src/pages/SubmitLOA.vue b/ui/src/pages/SubmitLOA.vue
index 1bed54a..e34dc4c 100644
--- a/ui/src/pages/SubmitLOA.vue
+++ b/ui/src/pages/SubmitLOA.vue
@@ -2,6 +2,8 @@
 import LoaForm from '@/components/loa/loaForm.vue';
 import { useUserStore } from '@/stores/user';
 import { Member } from '@/api/member';
+import LoaList from '@/components/loa/loaList.vue';
+import { ref } from 'vue';
 
 const userStore = useUserStore();
 const user = userStore.user;
@@ -13,8 +15,24 @@ const memberFull: Member = {
     status: null,
     status_date: null,
 };
+
+const mode = ref<'submit' | 'view'>('submit')
 </script>
 
 <template>
-    <LoaForm class="m-10" :member="memberFull"></LoaForm>
+    <div class="max-w-5xl mx-auto flex w-full flex-col mt-4 mb-10">
+        <div class="mb-8">
+            <p class="scroll-m-20 text-2xl font-semibold tracking-tight">Leave of Absence</p>
+            <div class="pt-3">
+                <div class="flex w-min *:px-10 pt-2 border-b *:w-full *:text-center *:pb-1 *:cursor-pointer">
+                    <label :class="mode === 'submit' ? 'border-b-3 border-foreground' : 'mb-[2px]'"
+                        @click="mode = 'submit'">Submit</label>
+                    <label :class="mode === 'view' ? 'border-b-3 border-foreground' : 'mb-[2px]'"
+                        @click="mode = 'view'">History</label>
+                </div>
+            </div>
+        </div>
+        <LoaForm v-if="mode === 'submit'" :member="memberFull"></LoaForm>
+        <LoaList v-if="mode === 'view'" :admin-mode="false"></LoaList>
+    </div>
 </template>
\ No newline at end of file

From f0ac2dca027d2016d7ec60da30bb62a20566419b Mon Sep 17 00:00:00 2001
From: ajdj100 <ajairplane@gmail.com>
Date: Thu, 11 Dec 2025 20:37:00 -0500
Subject: [PATCH 25/37] fixed an issue with a bad response on submitting LOA

---
 ui/src/api/loa.ts                 |  5 ++---
 ui/src/components/loa/loaForm.vue |  3 +++
 ui/src/pages/ManageLOA.vue        | 34 ++++++++++++++++---------------
 3 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/ui/src/api/loa.ts b/ui/src/api/loa.ts
index f8ba82b..dd7350a 100644
--- a/ui/src/api/loa.ts
+++ b/ui/src/api/loa.ts
@@ -13,9 +13,9 @@ export async function submitLOA(request: LOARequest): Promise<{ id?: number; err
     });
 
     if (res.ok) {
-        return res.json();
+        return;
     } else {
-        return { error: "Failed to submit LOA" };
+        throw new Error("Failed to submit LOA");
     }
 }
 
@@ -113,7 +113,6 @@ export async function getLoaPolicy(): Promise<string> {
     });
     if (res.ok) {
         const out = res.json();
-        console.log(out);
         if (!out) {
             return null;
         }
diff --git a/ui/src/components/loa/loaForm.vue b/ui/src/components/loa/loaForm.vue
index df4ddb0..3ca59a1 100644
--- a/ui/src/components/loa/loaForm.vue
+++ b/ui/src/components/loa/loaForm.vue
@@ -58,11 +58,13 @@ const df = new Intl.DateTimeFormat('en-US', {
     day: 'numeric'
 });
 
+const userStore = useUserStore()
 
 //form stuff
 import { loaSchema } from '@shared/schemas/loaSchema'
 import { toTypedSchema } from "@vee-validate/zod";
 import Calendar from "../ui/calendar/Calendar.vue";
+import { useUserStore } from "@/stores/user";
 
 const { handleSubmit, values, resetForm } = useForm({
     validationSchema: toTypedSchema(loaSchema),
@@ -81,6 +83,7 @@ const onSubmit = handleSubmit(async (values) => {
         await adminSubmitLOA(out);
     } else {
         await submitLOA(out);
+        userStore.loadUser();
     }
 })
 
diff --git a/ui/src/pages/ManageLOA.vue b/ui/src/pages/ManageLOA.vue
index 3d706b8..1d9298f 100644
--- a/ui/src/pages/ManageLOA.vue
+++ b/ui/src/pages/ManageLOA.vue
@@ -17,22 +17,24 @@ const showLOADialog = ref(false);
 </script>
 
 <template>
-    <Dialog v-model:open="showLOADialog" v-on:update:open="showLOADialog = false">
-        <DialogContent class="sm:max-w-fit">
-            <DialogHeader>
-                <DialogTitle>Post LOA</DialogTitle>
-                <DialogDescription>
-                    Post an LOA on behalf of a member.
-                </DialogDescription>
-            </DialogHeader>
-            <LoaForm :admin-mode="true" class="my-3"></LoaForm>
-        </DialogContent>
-    </Dialog> 
-    <div class="max-w-5xl mx-auto pt-10">
-        <div class="flex justify-end mb-4">
-            <Button @click="showLOADialog = true">Post LOA</Button>
+    <div>
+        <Dialog v-model:open="showLOADialog" v-on:update:open="showLOADialog = false">
+            <DialogContent class="sm:max-w-fit">
+                <DialogHeader>
+                    <DialogTitle>Post LOA</DialogTitle>
+                    <DialogDescription>
+                        Post an LOA on behalf of a member.
+                    </DialogDescription>
+                </DialogHeader>
+                <LoaForm :admin-mode="true" class="my-3"></LoaForm>
+            </DialogContent>
+        </Dialog>
+        <div class="max-w-5xl mx-auto pt-10">
+            <div class="flex justify-end mb-4">
+                <Button @click="showLOADialog = true">Post LOA</Button>
+            </div>
+            <h1>LOA Log</h1>
+            <LoaList :admin-mode="true"></LoaList>
         </div>
-        <h1>LOA Log</h1>
-        <LoaList :admin-mode="true"></LoaList>
     </div>
 </template>
\ No newline at end of file

From 3835f229408508ca626a955711613cba1e9a2380 Mon Sep 17 00:00:00 2001
From: ajdj100 <ajairplane@gmail.com>
Date: Thu, 11 Dec 2025 20:41:29 -0500
Subject: [PATCH 26/37] removed nuisance logging

---
 api/src/routes/loa.ts | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/api/src/routes/loa.ts b/api/src/routes/loa.ts
index 4c9bc82..cbcc30b 100644
--- a/api/src/routes/loa.ts
+++ b/api/src/routes/loa.ts
@@ -13,8 +13,6 @@ router.post("/", async (req: Request, res: Response) => {
     LOARequest.created_by = req.user.id;
     LOARequest.filed_date = new Date();
 
-    console.log(LOARequest);
-
     try {
         await createNewLOA(LOARequest);
         res.sendStatus(201);
@@ -142,7 +140,7 @@ router.get('/policy', async (req: Request, res: Response) => {
         const out = await output.json();
         res.status(200).json(out.html);
     } else {
-        console.log("BAD");
+        console.error("Failed to fetch LOA policy from bookstack");
         res.sendStatus(500);
     }
 })

From 97119dec97e27c541fcbcea6fc4e0b8563f86a6c Mon Sep 17 00:00:00 2001
From: ajdj100 <ajairplane@gmail.com>
Date: Thu, 11 Dec 2025 21:22:23 -0500
Subject: [PATCH 27/37] added config_id reference to .env

---
 api/.env.example | 1 +
 1 file changed, 1 insertion(+)

diff --git a/api/.env.example b/api/.env.example
index 8bfe497..9a1e8da 100644
--- a/api/.env.example
+++ b/api/.env.example
@@ -21,6 +21,7 @@ CLIENT_URL= # This is whatever URL the client web app is served on
 CLIENT_DOMAIN= #whatever.com
 APPLICATION_VERSION= # Should match release tag
 APPLICATION_ENVIRONMENT= # dev / prod
+CONFIG_ID= # configures 
 
 # Glitchtip
 GLITCHTIP_DSN=

From 0a1704b60bdf2f09b4912241c93a40854d1bf36a Mon Sep 17 00:00:00 2001
From: ajdj100 <ajairplane@gmail.com>
Date: Thu, 11 Dec 2025 21:43:49 -0500
Subject: [PATCH 28/37] Updated application acceptance system

---
 api/src/routes/applications.ts | 15 ++++++++-------
 ui/src/api/application.ts      |  4 ++--
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/api/src/routes/applications.ts b/api/src/routes/applications.ts
index c79514e..718a92b 100644
--- a/api/src/routes/applications.ts
+++ b/api/src/routes/applications.ts
@@ -141,8 +141,9 @@ router.get('/:id', async (req: Request, res: Response) => {
 });
 
 // POST /application/approve/:id
-router.post('/approve/:id', async (req, res) => {
-  const appID = req.params.id;
+router.post('/approve/:id', async (req: Request, res: Response) => {
+  const appID = Number(req.params.id);
+  const approved_by = req.user.id;
 
   try {
     const app = await getApplicationByID(appID);
@@ -153,14 +154,14 @@ router.post('/approve/:id', async (req, res) => {
       throw new Error("Something went wrong approving the application");
     }
 
-    console.log(app.member_id);
     //update user profile
     await setUserState(app.member_id, MemberState.Member);
 
-    let nextRank = await getRankByName('Recruit')
-    await insertMemberRank(app.member_id, nextRank.id);
-    //assign user to "pending basic"
-    await assignUserToStatus(app.member_id, 1);
+    await pool.query('CALL sp_accept_new_recruit(?, ?, ?, ?)', [Number(process.env.CONFIG_ID), app.member_id, approved_by, approved_by])
+    // let nextRank = await getRankByName('Recruit')
+    // await insertMemberRank(app.member_id, nextRank.id);
+    // //assign user to "pending basic"
+    // await assignUserToStatus(app.member_id, 1);
     res.sendStatus(200);
   } catch (err) {
     console.error('Approve failed:', err);
diff --git a/ui/src/api/application.ts b/ui/src/api/application.ts
index 8f60f1e..ca1b52b 100644
--- a/ui/src/api/application.ts
+++ b/ui/src/api/application.ts
@@ -89,7 +89,7 @@ export async function getMyApplication(id: number): Promise<ApplicationFull> {
 }
 
 export async function approveApplication(id: Number) {
-  const res = await fetch(`${addr}/application/approve/${id}`, { method: 'POST' })
+  const res = await fetch(`${addr}/application/approve/${id}`, { method: 'POST', credentials: 'include' })
 
   if (!res.ok) {
     console.error("Something went wrong approving the application")
@@ -97,7 +97,7 @@ export async function approveApplication(id: Number) {
 }
 
 export async function denyApplication(id: Number) {
-  const res = await fetch(`${addr}/application/deny/${id}`, { method: 'POST' })
+  const res = await fetch(`${addr}/application/deny/${id}`, { method: 'POST', credentials: 'include' })
 
   if (!res.ok) {
     console.error("Something went wrong denying the application")

From c74b5b280b5c8893ac48a806fe9ff474b3c31a27 Mon Sep 17 00:00:00 2001
From: ajdj100 <ajairplane@gmail.com>
Date: Thu, 11 Dec 2025 22:05:46 -0500
Subject: [PATCH 29/37] placeholdered CoC getter until CoC page exists on
 bookstack

---
 api/src/routes/applications.ts | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/api/src/routes/applications.ts b/api/src/routes/applications.ts
index 718a92b..e6327d9 100644
--- a/api/src/routes/applications.ts
+++ b/api/src/routes/applications.ts
@@ -7,7 +7,7 @@ import { MemberState, setUserState } from '../services/memberService';
 import { getRankByName, insertMemberRank } from '../services/rankService';
 import { ApplicationFull, CommentRow } from "@app/shared/types/application"
 import { assignUserToStatus } from '../services/statusService';
-import { Request, Response } from 'express';
+import { Request, response, Response } from 'express';
 import { getUserRoles } from '../services/rolesService';
 
 // POST /application
@@ -157,7 +157,7 @@ router.post('/approve/:id', async (req: Request, res: Response) => {
     //update user profile
     await setUserState(app.member_id, MemberState.Member);
 
-    await pool.query('CALL sp_accept_new_recruit(?, ?, ?, ?)', [Number(process.env.CONFIG_ID), app.member_id, approved_by, approved_by])
+    await pool.query('CALL sp_accept_new_recruit_validation(?, ?, ?, ?)', [Number(process.env.CONFIG_ID), app.member_id, approved_by, approved_by])
     // let nextRank = await getRankByName('Recruit')
     // await insertMemberRank(app.member_id, nextRank.id);
     // //assign user to "pending basic"
@@ -283,4 +283,20 @@ router.post('/restart', async (req: Request, res: Response) => {
   }
 })
 
+// router.get('/coc', async (req: Request, res: Response) => {
+//   const output = await fetch(`${process.env.DOC_HOST}/api/pages/`, {
+//     headers: {
+//       Authorization: `Token ${process.env.DOC_TOKEN_ID}:${process.env.DOC_TOKEN_SECRET}`,
+//     }
+//   })
+
+//   if (output.ok) {
+//     const out = await output.json();
+//     res.status(200).json(out.html);
+//   } else {
+//     console.error("Failed to fetch LOA policy from bookstack");
+//     res.sendStatus(500);
+//   }
+// })
+
 module.exports = router;

From dc88126b6c679d23c250f4c55bd0d6af9994e23a Mon Sep 17 00:00:00 2001
From: ajdj100 <ajairplane@gmail.com>
Date: Thu, 11 Dec 2025 22:26:33 -0500
Subject: [PATCH 30/37] Added documents site link

---
 ui/src/components/Navigation/Navbar.vue | 4 +++-
 ui/src/router/index.js                  | 7 ++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/ui/src/components/Navigation/Navbar.vue b/ui/src/components/Navigation/Navbar.vue
index de62765..917a285 100644
--- a/ui/src/components/Navigation/Navbar.vue
+++ b/ui/src/components/Navigation/Navbar.vue
@@ -25,6 +25,8 @@ const auth = useAuth();
 
 //@ts-ignore
 const APIHOST = import.meta.env.VITE_APIHOST;
+//@ts-ignore
+const DOCHOST = import.meta.env.VITE_DOCHOST;
 
 async function logout() {
     userStore.user = null;
@@ -61,7 +63,7 @@ function blurAfter() {
                             <!-- Members -->
                             <NavigationMenuItem>
                                 <NavigationMenuLink as-child :class="navigationMenuTriggerStyle()">
-                                    <RouterLink to="/documents" @click="blurAfter">Documents</RouterLink>
+                                    <a href="https://docs.iceberg-gaming.com">Documents</a>
                                 </NavigationMenuLink>
                             </NavigationMenuItem>
 
diff --git a/ui/src/router/index.js b/ui/src/router/index.js
index 4e0a7db..6fb05fb 100644
--- a/ui/src/router/index.js
+++ b/ui/src/router/index.js
@@ -15,12 +15,13 @@ const router = createRouter({
     { path: '/members', component: () => import('@/pages/memberList.vue'), meta: { requiresAuth: true, memberOnly: true } },
     { path: '/loa', component: () => import('@/pages/SubmitLOA.vue'), meta: { requiresAuth: true, memberOnly: true } },
     { 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: '/calendar/event/:id', component: () => import('@/pages/Calendar.vue'), meta: { requiresAuth: true, memberOnly: true }, },
 
-    { path: '/documents', component: () => import('@/pages/Documentation.vue'), meta: { requiresAuth: true, memberOnly: true }, },
-    
+    // disabled in favor of linking 
+    // { path: '/documents', component: () => import('@/pages/Documentation.vue'), meta: { requiresAuth: true, memberOnly: true }, },
+
     { path: '/trainingReport', component: () => import('@/pages/TrainingReport.vue'), meta: { requiresAuth: true, memberOnly: true } },
     { path: '/trainingReport/new', component: () => import('@/pages/TrainingReport.vue'), meta: { requiresAuth: true, memberOnly: true } },
     { path: '/trainingReport/:id', component: () => import('@/pages/TrainingReport.vue'), meta: { requiresAuth: true, memberOnly: true } },

From 26ccae90789cbadff3da1b8432eb56ea956bd909 Mon Sep 17 00:00:00 2001
From: ajdj100 <ajairplane@gmail.com>
Date: Thu, 11 Dec 2025 22:36:20 -0500
Subject: [PATCH 31/37] added arrow to indicate redirect

---
 ui/src/components/Navigation/Navbar.vue | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/ui/src/components/Navigation/Navbar.vue b/ui/src/components/Navigation/Navbar.vue
index 917a285..bb73289 100644
--- a/ui/src/components/Navigation/Navbar.vue
+++ b/ui/src/components/Navigation/Navbar.vue
@@ -18,7 +18,7 @@ import NavigationMenuTrigger from '../ui/navigation-menu/NavigationMenuTrigger.v
 import NavigationMenuContent from '../ui/navigation-menu/NavigationMenuContent.vue';
 import { navigationMenuTriggerStyle } from '../ui/navigation-menu/'
 import { useAuth } from '@/composables/useAuth';
-import { CircleArrowOutUpRight } from 'lucide-vue-next';
+import { ArrowUpRight, CircleArrowOutUpRight } from 'lucide-vue-next';
 
 const userStore = useUserStore();
 const auth = useAuth();
@@ -60,10 +60,15 @@ function blurAfter() {
                                 </NavigationMenuLink>
                             </NavigationMenuItem>
 
-                            <!-- Members -->
+                            <!-- Docs -->
                             <NavigationMenuItem>
                                 <NavigationMenuLink as-child :class="navigationMenuTriggerStyle()">
-                                    <a href="https://docs.iceberg-gaming.com">Documents</a>
+                                    <a href="https://docs.iceberg-gaming.com" target="_blank">
+                                        <span class="flex items-center gap-1">
+                                            Documents
+                                            <ArrowUpRight class="h-4 w-4" />
+                                        </span>
+                                    </a>
                                 </NavigationMenuLink>
                             </NavigationMenuItem>
 

From 333bf20d867e5b85dba34a9031ee6cc194ba8d58 Mon Sep 17 00:00:00 2001
From: ajdj100 <ajairplane@gmail.com>
Date: Fri, 12 Dec 2025 00:39:19 -0500
Subject: [PATCH 32/37] integrated CoC pull from bookstack

---
 api/src/routes/applications.ts                | 33 +++++++------
 ui/src/api/application.ts                     | 16 +++++++
 .../application/ApplicationForm.vue           | 46 +++++++++++++++++--
 3 files changed, 77 insertions(+), 18 deletions(-)

diff --git a/api/src/routes/applications.ts b/api/src/routes/applications.ts
index e6327d9..e1c9394 100644
--- a/api/src/routes/applications.ts
+++ b/api/src/routes/applications.ts
@@ -10,6 +10,24 @@ import { assignUserToStatus } from '../services/statusService';
 import { Request, response, Response } from 'express';
 import { getUserRoles } from '../services/rolesService';
 
+//get CoC
+router.get('/coc', async (req: Request, res: Response) => {
+  const output = await fetch(`${process.env.DOC_HOST}/api/pages/714`, {
+    headers: {
+      Authorization: `Token ${process.env.DOC_TOKEN_ID}:${process.env.DOC_TOKEN_SECRET}`,
+    }
+  })
+
+  if (output.ok) {
+    const out = await output.json();
+    res.status(200).json(out.html);
+  } else {
+    console.error("Failed to fetch LOA policy from bookstack");
+    res.sendStatus(500);
+  }
+})
+
+
 // POST /application
 router.post('/', async (req, res) => {
   try {
@@ -283,20 +301,5 @@ router.post('/restart', async (req: Request, res: Response) => {
   }
 })
 
-// router.get('/coc', async (req: Request, res: Response) => {
-//   const output = await fetch(`${process.env.DOC_HOST}/api/pages/`, {
-//     headers: {
-//       Authorization: `Token ${process.env.DOC_TOKEN_ID}:${process.env.DOC_TOKEN_SECRET}`,
-//     }
-//   })
-
-//   if (output.ok) {
-//     const out = await output.json();
-//     res.status(200).json(out.html);
-//   } else {
-//     console.error("Failed to fetch LOA policy from bookstack");
-//     res.sendStatus(500);
-//   }
-// })
 
 module.exports = router;
diff --git a/ui/src/api/application.ts b/ui/src/api/application.ts
index ca1b52b..ec05982 100644
--- a/ui/src/api/application.ts
+++ b/ui/src/api/application.ts
@@ -113,4 +113,20 @@ export async function restartApplication() {
   if (!res.ok) {
     console.error("Something went wrong restarting your application")
   }
+}
+
+export async function getCoC(): Promise<string> {
+  const res = await fetch(`${addr}/application/coc`, {
+    method: "GET",
+    credentials: 'include',
+  });
+  if (res.ok) {
+    const out = res.json();
+    if (!out) {
+      return null;
+    }
+    return out;
+  } else {
+    return null;
+  }
 }
\ No newline at end of file
diff --git a/ui/src/components/application/ApplicationForm.vue b/ui/src/components/application/ApplicationForm.vue
index eb1a85f..28ee1ad 100644
--- a/ui/src/components/application/ApplicationForm.vue
+++ b/ui/src/components/application/ApplicationForm.vue
@@ -13,10 +13,18 @@ import Input from '@/components/ui/input/Input.vue';
 import Textarea from '@/components/ui/textarea/Textarea.vue';
 import { toTypedSchema } from '@vee-validate/zod';
 import { Form } from 'vee-validate';
-import { onMounted, ref } from 'vue';
+import { nextTick, onMounted, ref } from 'vue';
 import * as z from 'zod';
 import DateInput from '../form/DateInput.vue';
 import { ApplicationData } from '@shared/types/application';
+import Dialog from '../ui/dialog/Dialog.vue';
+import DialogTrigger from '../ui/dialog/DialogTrigger.vue';
+import DialogContent from '../ui/dialog/DialogContent.vue';
+import DialogHeader from '../ui/dialog/DialogHeader.vue';
+import DialogTitle from '../ui/dialog/DialogTitle.vue';
+import DialogDescription from '../ui/dialog/DialogDescription.vue';
+import { getCoC } from '@/api/application';
+import { startBrowserTracingPageLoadSpan } from '@sentry/vue';
 
 const regexA = /^https?:\/\/steamcommunity\.com\/id\/[A-Za-z0-9_]+\/?$/;
 const regexB = /^https?:\/\/steamcommunity\.com\/profiles\/\d+\/?$/;
@@ -61,7 +69,7 @@ async function onSubmit(val: any) {
   emit('submit', val);
 }
 
-onMounted(() => {
+onMounted(async () => {
   if (props.data !== null) {
     const parsed = typeof props.data === "string"
       ? JSON.parse(props.data)
@@ -71,8 +79,25 @@ onMounted(() => {
   } else {
     initialValues.value = { ...fallbackInitials };
   }
+
+  // CoCbox.value.innerHTML = await getCoC()
+  CoCString.value = await getCoC();
 })
 
+const showCoC = ref(false);
+const CoCbox = ref<HTMLElement>();
+const CoCString = ref<string>();
+
+async function onDialogToggle(state: boolean) {
+  showCoC.value = state;
+
+  if (state) {
+    await nextTick();
+    if (CoCbox.value && CoCString.value) {
+      CoCbox.value.innerHTML = CoCString.value;
+    }
+  }
+}
 
 </script>
 
@@ -273,7 +298,8 @@ onMounted(() => {
         <FormControl>
           <div class="flex items-center gap-2">
             <Checkbox :model-value="value" @update:model-value="handleChange" :disabled="readOnly" />
-            <span>By checking this box, you accept the <Button variant="link" class="p-0 h-min">Code of
+            <span>By checking this box, you accept the <Button variant="link" class="p-0 h-min"
+                @click="showCoC = true">Code of
                 Conduct</Button>.</span>
           </div>
         </FormControl>
@@ -286,5 +312,19 @@ onMounted(() => {
     <div class="pt-2" v-if="!readOnly">
       <Button type="submit" :onClick="() => console.log('hi')" :disabled="readOnly">Submit Application</Button>
     </div>
+
+    <Dialog :open="showCoC" @update:open="onDialogToggle">
+      <DialogContent>
+        <DialogHeader>
+          <DialogTitle>Community Code of Conduct</DialogTitle>
+          <DialogDescription>
+            <div v-html="CoCString">
+
+            </div>
+          </DialogDescription>
+        </DialogHeader>
+      </DialogContent>
+    </Dialog>
+
   </Form>
 </template>
\ No newline at end of file

From 629fd59a7c0d21b1d8a298fbaa206ed2a884ba59 Mon Sep 17 00:00:00 2001
From: ajdj100 <ajairplane@gmail.com>
Date: Fri, 12 Dec 2025 10:53:33 -0500
Subject: [PATCH 33/37] fixed scrolling behaviour on application management
 page

---
 ui/src/assets/base.css              |  64 ++++++++++++----
 ui/src/pages/ManageApplications.vue | 109 ++++++++++++----------------
 2 files changed, 96 insertions(+), 77 deletions(-)

diff --git a/ui/src/assets/base.css b/ui/src/assets/base.css
index b29a3bb..f06ddf1 100644
--- a/ui/src/assets/base.css
+++ b/ui/src/assets/base.css
@@ -168,7 +168,7 @@
 }
 
 /* Root container */
-.ListRendererV2-container {
+.bookstack-container {
   font-family: var(--font-sans, system-ui), sans-serif;
   color: var(--foreground);
   line-height: 1.45;
@@ -178,56 +178,53 @@
 }
 
 /* Headers */
-.ListRendererV2-container h4 {
+.bookstack-container h4 {
   margin: 0.9rem 0 0.4rem 0;
   font-weight: 600;
   line-height: 1.35;
   font-size: 1.05rem;
   color: var(--foreground);
-  /* PURE WHITE */
 }
 
-.ListRendererV2-container h5 {
+.bookstack-container h5 {
   margin: 0.9rem 0 0.4rem 0;
   font-weight: 600;
   line-height: 1.35;
   font-size: 0.95rem;
   color: var(--foreground);
-  /* Still white (change to muted if desired) */
 }
 
 /* Lists */
-.ListRendererV2-container ul {
+.bookstack-container ul {
   list-style-type: disc;
   margin-left: 1.1rem;
   margin-bottom: 0.6rem;
   padding-left: 0.6rem;
   color: var(--muted-foreground);
-  /* dim text */
 }
 
 /* Nested lists */
-.ListRendererV2-container ul ul {
+.bookstack-container ul ul {
   list-style-type: circle;
   margin-left: 0.9rem;
 }
 
 /* List items */
-.ListRendererV2-container li {
+.bookstack-container li {
   margin: 0.15rem 0;
   padding-left: 0.1rem;
   color: var(--muted-foreground);
 }
 
 /* Bullet color */
-.ListRendererV2-container li::marker {
+.bookstack-container li::marker {
   color: var(--muted-foreground);
 }
 
 /* Inline elements */
-.ListRendererV2-container li p,
-.ListRendererV2-container li span,
-.ListRendererV2-container p {
+.bookstack-container li p,
+.bookstack-container li span,
+.bookstack-container p {
   display: inline;
   margin: 0;
   padding: 0;
@@ -235,6 +232,45 @@
 }
 
 /* Top-level spacing */
-.ListRendererV2-container>ul>li {
+.bookstack-container>ul>li {
   margin-top: 0.3rem;
+}
+
+/* links */
+.bookstack-container a {
+  color: var(--color-primary);
+  margin-top: 0.3rem;
+}
+
+.bookstack-container a:hover {
+  text-decoration: underline;
+}
+
+/* Scrollbar stuff */
+/* Firefox */
+.scrollbar-themed {
+  scrollbar-width: thin;
+  scrollbar-color: #555 #1f1f1f;
+  padding-right: 6px;
+}
+
+/* Chrome, Edge, Safari */
+.scrollbar-themed::-webkit-scrollbar {
+  width: 10px;
+  /* slightly wider to allow padding look */
+}
+
+.scrollbar-themed::-webkit-scrollbar-track {
+  background: #1f1f1f;
+  margin-left: 6px;
+  /* ❗ adds space between content + scrollbar */
+}
+
+.scrollbar-themed::-webkit-scrollbar-thumb {
+  background: #555;
+  border-radius: 9999px;
+}
+
+.scrollbar-themed::-webkit-scrollbar-thumb:hover {
+  background: #777;
 }
\ No newline at end of file
diff --git a/ui/src/pages/ManageApplications.vue b/ui/src/pages/ManageApplications.vue
index a19316b..76b4737 100644
--- a/ui/src/pages/ManageApplications.vue
+++ b/ui/src/pages/ManageApplications.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { getAllApplications, approveApplication, denyApplication     } from '@/api/application';
+import { getAllApplications, approveApplication, denyApplication } from '@/api/application';
 import { ApplicationStatus } from '@shared/types/application'
 import {
     Table,
@@ -96,39 +96,50 @@ onMounted(async () => {
         <!-- application list -->
         <div :class="openPanel == false ? 'w-full' : 'w-2/5'" class="pr-9">
             <h1 class="scroll-m-20 text-2xl font-semibold tracking-tight">Manage Applications</h1>
-            <Table>
-                <TableHeader>
-                    <TableRow>
-                        <TableHead>User</TableHead>
-                        <TableHead>Date Submitted</TableHead>
-                        <TableHead class="text-right">Status</TableHead>
-                    </TableRow>
-                </TableHeader>
-                <TableBody class="overflow-y-auto scrollbar-themed">
-                    <TableRow v-for="app in appList" :key="app.id" class="cursor-pointer"
-                        :onClick="() => { openApplication(app.id) }">
-                        <TableCell class="font-medium">{{ app.member_name }}</TableCell>
-                        <TableCell :title="formatExact(app.submitted_at)">
-                            {{ formatAgo(app.submitted_at) }}
-                        </TableCell>
-                        <TableCell v-if="app.app_status === ApplicationStatus.Pending"
-                            class="inline-flex items-end gap-2">
-                            <Button variant="success" @click.stop="() => { handleApprove(app.id) }">
-                                <CheckIcon></CheckIcon>
-                            </Button>
-                            <Button variant="destructive" @click.stop="() => { handleDeny(app.id) }">
-                                <XIcon></XIcon>
-                            </Button>
-                        </TableCell>
-                        <TableCell class="text-right font-semibold" :class="[
-                            ,
-                            app.app_status === ApplicationStatus.Pending && 'text-yellow-500',
-                            app.app_status === ApplicationStatus.Accepted && 'text-green-500',
-                            app.app_status === ApplicationStatus.Denied && 'text-destructive'
-                        ]">{{ app.app_status }}</TableCell>
-                    </TableRow>
-                </TableBody>
-            </Table>
+            <div class="max-h-[80vh] overflow-hidden">
+                <Table class="w-full">
+                    <TableHeader>
+                        <TableRow>
+                            <TableHead>User</TableHead>
+                            <TableHead>Date Submitted</TableHead>
+                            <TableHead class="text-right">Status</TableHead>
+                        </TableRow>
+                    </TableHeader>
+                </Table>
+
+                <!-- Scrollable body container -->
+                <div class="overflow-y-auto max-h-[70vh] scrollbar-themed">
+                    <Table class="w-full">
+                        <TableBody>
+                            <TableRow v-for="app in appList" :key="app.id" class="cursor-pointer"
+                                @click="openApplication(app.id)">
+                                <TableCell class="font-medium">{{ app.member_name }}</TableCell>
+                                <TableCell :title="formatExact(app.submitted_at)">
+                                    {{ formatAgo(app.submitted_at) }}
+                                </TableCell>
+
+                                <TableCell v-if="app.app_status === ApplicationStatus.Pending"
+                                    class="inline-flex items-end gap-2">
+                                    <Button variant="success" @click.stop="handleApprove(app.id)">
+                                        <CheckIcon />
+                                    </Button>
+                                    <Button variant="destructive" @click.stop="handleDeny(app.id)">
+                                        <XIcon />
+                                    </Button>
+                                </TableCell>
+
+                                <TableCell class="text-right font-semibold" :class="[
+                                    app.app_status === ApplicationStatus.Pending && 'text-yellow-500',
+                                    app.app_status === ApplicationStatus.Accepted && 'text-green-500',
+                                    app.app_status === ApplicationStatus.Denied && 'text-destructive'
+                                ]">
+                                    {{ app.app_status }}
+                                </TableCell>
+                            </TableRow>
+                        </TableBody>
+                    </Table>
+                </div>
+            </div>
         </div>
         <div v-if="openPanel" class="pl-9 border-l w-3/5" :key="$route.params.id">
             <div class="mb-5 flex justify-between">
@@ -144,32 +155,4 @@ onMounted(async () => {
     </div>
 </template>
 
-<style scoped>
-/* Firefox */
-.scrollbar-themed {
-    scrollbar-width: thin;
-    scrollbar-color: #555 #1f1f1f;
-    padding-right: 6px;
-}
-
-/* Chrome, Edge, Safari */
-.scrollbar-themed::-webkit-scrollbar {
-    width: 10px;
-    /* slightly wider to allow padding look */
-}
-
-.scrollbar-themed::-webkit-scrollbar-track {
-    background: #1f1f1f;
-    margin-left: 6px;
-    /* ❗ adds space between content + scrollbar */
-}
-
-.scrollbar-themed::-webkit-scrollbar-thumb {
-    background: #555;
-    border-radius: 9999px;
-}
-
-.scrollbar-themed::-webkit-scrollbar-thumb:hover {
-    background: #777;
-}
-</style>
\ No newline at end of file
+<style scoped></style>
\ No newline at end of file

From d7908570b2075d8d5d078e2c57439a1d5127dff0 Mon Sep 17 00:00:00 2001
From: ajdj100 <ajairplane@gmail.com>
Date: Fri, 12 Dec 2025 10:53:45 -0500
Subject: [PATCH 34/37] improved bookstack rendering

---
 ui/src/components/application/ApplicationForm.vue | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/ui/src/components/application/ApplicationForm.vue b/ui/src/components/application/ApplicationForm.vue
index 28ee1ad..994e0d2 100644
--- a/ui/src/components/application/ApplicationForm.vue
+++ b/ui/src/components/application/ApplicationForm.vue
@@ -314,13 +314,11 @@ async function onDialogToggle(state: boolean) {
     </div>
 
     <Dialog :open="showCoC" @update:open="onDialogToggle">
-      <DialogContent>
+      <DialogContent class="sm:max-w-fit">
         <DialogHeader>
           <DialogTitle>Community Code of Conduct</DialogTitle>
-          <DialogDescription>
-            <div v-html="CoCString">
-
-            </div>
+          <DialogDescription class="w-full max-h-[75vh]">
+            <div v-html="CoCString" class="bookstack-container w-full"></div>
           </DialogDescription>
         </DialogHeader>
       </DialogContent>

From 2a841ebf27d1dd5c8cfa9e56c3d959ac4985adbc Mon Sep 17 00:00:00 2001
From: ajdj100 <ajairplane@gmail.com>
Date: Fri, 12 Dec 2025 10:56:07 -0500
Subject: [PATCH 35/37] fixed "view coc" button causing application submit

---
 ui/src/components/application/ApplicationForm.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ui/src/components/application/ApplicationForm.vue b/ui/src/components/application/ApplicationForm.vue
index 994e0d2..927d870 100644
--- a/ui/src/components/application/ApplicationForm.vue
+++ b/ui/src/components/application/ApplicationForm.vue
@@ -299,7 +299,7 @@ async function onDialogToggle(state: boolean) {
           <div class="flex items-center gap-2">
             <Checkbox :model-value="value" @update:model-value="handleChange" :disabled="readOnly" />
             <span>By checking this box, you accept the <Button variant="link" class="p-0 h-min"
-                @click="showCoC = true">Code of
+                @click.prevent.stop="showCoC = true">Code of
                 Conduct</Button>.</span>
           </div>
         </FormControl>
@@ -310,7 +310,7 @@ async function onDialogToggle(state: boolean) {
     </FormField>
 
     <div class="pt-2" v-if="!readOnly">
-      <Button type="submit" :onClick="() => console.log('hi')" :disabled="readOnly">Submit Application</Button>
+      <Button type="submit" :disabled="readOnly">Submit Application</Button>
     </div>
 
     <Dialog :open="showCoC" @update:open="onDialogToggle">

From 8dc11ee34dedd32bbfd97fdfa6219618c3f8961c Mon Sep 17 00:00:00 2001
From: ajdj100 <ajairplane@gmail.com>
Date: Fri, 12 Dec 2025 11:06:00 -0500
Subject: [PATCH 36/37] made nested bookstack links open in new tab

---
 .../application/ApplicationForm.vue           | 30 ++++++++++++-------
 1 file changed, 20 insertions(+), 10 deletions(-)

diff --git a/ui/src/components/application/ApplicationForm.vue b/ui/src/components/application/ApplicationForm.vue
index 927d870..5ad43b9 100644
--- a/ui/src/components/application/ApplicationForm.vue
+++ b/ui/src/components/application/ApplicationForm.vue
@@ -13,7 +13,7 @@ import Input from '@/components/ui/input/Input.vue';
 import Textarea from '@/components/ui/textarea/Textarea.vue';
 import { toTypedSchema } from '@vee-validate/zod';
 import { Form } from 'vee-validate';
-import { nextTick, onMounted, ref } from 'vue';
+import { nextTick, onMounted, ref, watch } from 'vue';
 import * as z from 'zod';
 import DateInput from '../form/DateInput.vue';
 import { ApplicationData } from '@shared/types/application';
@@ -90,15 +90,25 @@ const CoCString = ref<string>();
 
 async function onDialogToggle(state: boolean) {
   showCoC.value = state;
-
-  if (state) {
-    await nextTick();
-    if (CoCbox.value && CoCString.value) {
-      CoCbox.value.innerHTML = CoCString.value;
-    }
-  }
 }
 
+function enforceExternalLinks() {
+  if (!CoCbox.value) return;
+
+  const links = CoCbox.value.querySelectorAll("a");
+  links.forEach(a => {
+    a.setAttribute("target", "_blank");
+    a.setAttribute("rel", "noopener noreferrer");
+  });
+}
+
+watch(() => showCoC.value, async () => {
+  if (showCoC) {
+    await nextTick(); // wait for v-html to update
+    enforceExternalLinks();
+  }
+});
+
 </script>
 
 <template>
@@ -317,8 +327,8 @@ async function onDialogToggle(state: boolean) {
       <DialogContent class="sm:max-w-fit">
         <DialogHeader>
           <DialogTitle>Community Code of Conduct</DialogTitle>
-          <DialogDescription class="w-full max-h-[75vh]">
-            <div v-html="CoCString" class="bookstack-container w-full"></div>
+          <DialogDescription class="w-full max-h-[75vh] overflow-y-auto scrollbar-themed">
+            <div v-html="CoCString" ref="CoCbox" class="bookstack-container w-full"></div>
           </DialogDescription>
         </DialogHeader>
       </DialogContent>

From 17307147370a695db1b33899f6ce7a1858d1317a Mon Sep 17 00:00:00 2001
From: ajdj100 <ajairplane@gmail.com>
Date: Fri, 12 Dec 2025 11:10:32 -0500
Subject: [PATCH 37/37] updated loa bookstack to new render system

---
 ui/src/components/loa/loaForm.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui/src/components/loa/loaForm.vue b/ui/src/components/loa/loaForm.vue
index 3ca59a1..a7362b8 100644
--- a/ui/src/components/loa/loaForm.vue
+++ b/ui/src/components/loa/loaForm.vue
@@ -132,7 +132,7 @@ const maxEndDate = computed(() => {
     <div class="flex flex-row-reverse gap-6 mx-auto w-full" :class="!adminMode ? 'max-w-5xl' : 'max-w-5xl'">
         <div v-if="!adminMode" class="flex-1 flex flex-col space-x-4 rounded-md border p-4">
             <p class="scroll-m-20 text-2xl font-semibold tracking-tight">LOA Policy</p>
-            <div ref="policyRef">
+            <div ref="policyRef" class="bookstack-container">
                 <!-- LOA policy gets loaded here -->
             </div>
         </div>