Merge remote-tracking branch 'Origin/main' into Mobile-Enhancements

ui/src/App.vue

@@ -1,25 +1,27 @@
-<script setup>
-import { RouterView } from 'vue-router';
-import Button from './components/ui/button/Button.vue';
-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';
+<script setup lang="ts">
+  import { RouterView } from 'vue-router';
+  import Button from './components/ui/button/Button.vue';
+  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();
+  const userStore = useUserStore();
 
-function formatDate(dateStr) {
-  if (!dateStr) return "";
-  return new Date(dateStr).toLocaleDateString("en-US", {
-    year: "numeric",
-    month: "short",
-    day: "numeric",
-  });
-}
+  function formatDate(dateStr) {
+    if (!dateStr) return "";
+    return new Date(dateStr).toLocaleDateString("en-US", {
+      year: "numeric",
+      month: "short",
+      day: "numeric",
+    });
+  }
 
-const environment = import.meta.env.VITE_ENVIRONMENT;
-const version = import.meta.env.VITE_APPLICATION_VERSION;
+  //@ts-ignore
+  const environment = import.meta.env.VITE_ENVIRONMENT;
+  //@ts-ignore
+  const version = import.meta.env.VITE_APPLICATION_VERSION;
 </script>
 
 <template>
@@ -29,15 +31,22 @@ const version = import.meta.env.VITE_APPLICATION_VERSION;
       background-position: center;">
     <div class="sticky top-0 bg-background z-50">
       <Navbar class="flex"></Navbar>
-      <Alert v-if="environment == 'dev'" class="m-2 mx-auto w-5xl" variant="info">
-        <AlertDescription class="flex flex-row items-center text-nowrap gap-5 mx-auto">
+      <Alert v-if="environment == 'dev'" class="m-2 mx-auto max-w-5xl" variant="info">
+        <AlertDescription class="flex flex-row items-center text-wrap gap-5 mx-auto">
           <p>Development environment (v{{ version }}). Features may be incomplete or unavailable.</p>
         </AlertDescription>
       </Alert>
-      <Alert v-if="userStore.user?.LOAs?.[0]" class="m-2 mx-auto w-5xl" variant="info">
+      <Alert v-if="userStore.user?.LOAs?.[0]" class="m-2 mx-auto max-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?.LOAs?.[0].extended_till ||
-            userStore.user?.LOAs?.[0].end_date) }}</strong></p>
+          <p
+            v-if="new Date(userStore.user?.LOAs?.[0].extended_till || userStore.user?.LOAs?.[0].end_date) > new Date()">
+            LOA until <strong>{{ formatDate(userStore.user?.LOAs?.[0].extended_till ||
+              userStore.user?.LOAs?.[0].end_date) }}</strong>
+          </p>
+          <p v-else>
+            LOA expired on <strong>{{ formatDate(userStore.user?.LOAs?.[0].extended_till ||
+              userStore.user?.LOAs?.[0].end_date) }}</strong>
+          </p>
           <Button variant="secondary"
             @click="async () => { await cancelLOA(userStore.user.LOAs?.[0].id); userStore.loadUser(); }">End
             LOA</Button>
@@ -48,5 +57,3 @@ const version = import.meta.env.VITE_APPLICATION_VERSION;
     <RouterView class="flex-1 min-h-0"></RouterView>
   </div>
 </template>
-
-<style scoped></style>

ui/src/api/loa.ts

@@ -169,6 +169,23 @@ export async function extendLOA(id: number, to: Date) {
         }
     });
 
+    if (res.ok) {
+        return
+    } else {
+        throw new Error("Could not extend LOA");
+    }
+}
+
+export async function adminExtendLOA(id: number, to: Date) {
+    const res = await fetch(`${addr}/loa/extendAdmin/${id}`, {
+        method: "POST",
+        credentials: 'include',
+        body: JSON.stringify({ to }),
+        headers: {
+            "Content-Type": "application/json",
+        }
+    });
+
     if (res.ok) {
         return
     } else {

ui/src/api/member.ts

@@ -1,4 +1,5 @@
-import { memberSettings, Member, MemberLight, MemberCardDetails } from "@shared/types/member";
+import { Discharge } from "@shared/schemas/dischargeSchema";
+import { memberSettings, Member, MemberLight, MemberCardDetails, PaginatedMembers, MemberState, UserCacheBustResult } from "@shared/types/member";
 
 //  @ts-ignore
 const addr = import.meta.env.VITE_APIHOST;
@@ -13,6 +14,33 @@ export async function getMembers(): Promise<Member[]> {
     return response.json();
 }
 
+export async function getMembersFiltered(params: {
+    page?: number;
+    pageSize?: number;
+    search?: string;
+    status?: string | MemberState;
+    unitId?: string;
+} = {}): Promise<PaginatedMembers> {
+
+    // Construct the query string dynamically
+    const query = new URLSearchParams();
+    if (params.page) query.append('page', params.page.toString());
+    if (params.pageSize) query.append('pageSize', params.pageSize.toString());
+    if (params.search) query.append('search', params.search);
+    if (params.status && params.status !== 'all') query.append('status', String(params.status));
+    if (params.unitId && params.unitId !== 'all') query.append('unitId', params.unitId);
+
+    const response = await fetch(`${addr}/members/filtered?${query.toString()}`, {
+        credentials: 'include'
+    });
+
+    if (!response.ok) {
+        throw new Error("Failed to fetch members");
+    }
+
+    return response.json();
+}
+
 export async function getMemberSettings(): Promise<memberSettings> {
     const response = await fetch(`${addr}/members/settings`, {
         credentials: 'include'
@@ -38,8 +66,8 @@ export async function setMemberSettings(settings: memberSettings) {
     return;
 }
 
-export async function getAllLightMembers(): Promise<MemberLight[]> {
-    const response = await fetch(`${addr}/members/lite`, {
+export async function getAllLightMembers(activeOnly: boolean = true): Promise<MemberLight[]> {
+    const response = await fetch(`${addr}/members/lite${activeOnly ? '?active=true' : '?active=false'}`, {
         credentials: 'include',
         headers: {
             "Content-Type": "application/json",
@@ -86,5 +114,60 @@ export async function getFullMembers(ids: number[]): Promise<MemberCardDetails[]
     if (!response.ok) {
         throw new Error("Failed to fetch settings");
     }
+    return response.json();
+}
+
+/**
+ * Requests for the given member to be discharged
+ * @param data discharge packet
+ * @returns true on success
+ */
+export async function dischargeMember(data: Discharge): Promise<boolean> {
+    const response = await fetch(`${addr}/members/discharge`, {
+        credentials: 'include',
+        method: 'POST',
+        headers: {
+            "Content-Type": "application/json",
+        },
+        body: JSON.stringify(data)
+    });
+    if (!response.ok) {
+        throw new Error("Failed to discharge member");
+    }
+    return true;
+}
+
+export async function suspendMember(memberID: number): Promise<boolean> {
+    const response = await fetch(`${addr}/members/suspend?target=${memberID}`, {
+        credentials: 'include',
+        method: 'POST',
+    });
+    if (!response.ok) {
+        throw new Error("Failed to discharge member");
+    }
+    return true;
+}
+
+export async function unsuspendMember(memberID: number): Promise<boolean> {
+    const response = await fetch(`${addr}/members/unsuspend?target=${memberID}`, {
+        credentials: 'include',
+        method: 'POST',
+    });
+    if (!response.ok) {
+        throw new Error("Failed to discharge member");
+    }
+    return true;
+}
+
+export async function bustUserCache(): Promise<UserCacheBustResult> {
+    const response = await fetch(`${addr}/members/cache/user/bust`, {
+        credentials: 'include',
+        method: 'POST',
+    });
+
+    if (!response.ok) {
+        throw new Error('Failed to bust user cache');
+    }
+
     return response.json();
 }

ui/src/api/units.ts

@@ -0,0 +1,26 @@
+import { memberSettings, Member, MemberLight, MemberCardDetails } from "@shared/types/member";
+import { Unit } from "@shared/types/units";
+
+//  @ts-ignore
+const addr = import.meta.env.VITE_APIHOST;
+
+export async function getUnits(): Promise<Unit[]> {
+    const response = await fetch(`${addr}/units`, {
+        credentials: 'include'
+    });
+    if (!response.ok) {
+        throw new Error("Failed to fetch units");
+    }
+    return response.json();
+}
+
+export async function adminAssignUnit(member: number, unit: number, rank: number, reason: string) {
+    const response = await fetch(`${addr}/memberUnits/admin?memberId=${member}&unitId=${unit}&rankId=${rank}&reason=${encodeURIComponent(reason)}`, {
+        method: 'POST',
+        credentials: 'include'
+    });
+    if (!response.ok) {
+        throw new Error("Failed to assign unit");
+    }
+    return;
+}

ui/src/components/Navigation/Navbar.vue

@@ -21,6 +21,7 @@ import { useAuth } from '@/composables/useAuth';
 import { ArrowUpRight, ChevronDown, ChevronUp, CircleArrowOutUpRight, LogIn, LogOut, Menu, Settings, X } from 'lucide-vue-next';
 import DropdownMenuGroup from '../ui/dropdown-menu/DropdownMenuGroup.vue';
 import DropdownMenuSeparator from '../ui/dropdown-menu/DropdownMenuSeparator.vue';
+import { MemberState } from '@shared/types/member';
 import { computed, nextTick, ref } from 'vue';
 
 const userStore = useUserStore();
@@ -176,7 +177,7 @@ function mobileNavigateTo(to: string) {
                     <img src="/17RBN_Logo.png" class="w-10 h-10 object-contain"></img>
                 </RouterLink>
                 <!-- Member navigation -->
-                <div v-if="auth.accountStatus.value == 'member'" class="h-15 flex items-center justify-center">
+                <div v-if="auth.accountStatus.value == MemberState.Member" class="h-15 flex items-center justify-center">
                     <NavigationMenu>
                         <NavigationMenuList class="gap-3">
 
@@ -263,6 +264,12 @@ function mobileNavigateTo(to: string) {
                                         </RouterLink>
                                     </NavigationMenuLink>
 
+                                    <NavigationMenuItem as-child :class="navigationMenuTriggerStyle()">
+                                        <RouterLink to="/administration/members" @click="blurAfter">
+                                            Member Management
+                                        </RouterLink>
+                                    </NavigationMenuItem>
+
                                     <NavigationMenuLink v-if="auth.hasRole('17th Administrator')" as-child
                                         :class="navigationMenuTriggerStyle()">
                                         <RouterLink to="/administration/roles" @click="blurAfter">
@@ -272,12 +279,11 @@ function mobileNavigateTo(to: string) {
                                 </NavigationMenuContent>
                             </NavigationMenuItem>
 
-                            <!-- <NavigationMenuItem as-child :class="navigationMenuTriggerStyle()">
-                                <RouterLink to="/members" @click="blurAfter">
-                                    Members (debug)
-                                </RouterLink>
-                            </NavigationMenuItem> -->
-
+                            <NavigationMenuItem v-if="auth.hasRole('Dev')">
+                                <NavigationMenuLink as-child :class="navigationMenuTriggerStyle()">
+                                    <RouterLink to="/developer" @click="blurAfter">Developer</RouterLink>
+                                </NavigationMenuLink>
+                            </NavigationMenuItem>
                         </NavigationMenuList>
                     </NavigationMenu>
                 </div>

ui/src/components/application/ApplicationForm.vue

@@ -1,18 +1,18 @@
 <script setup lang="ts">
 import Button from '@/components/ui/button/Button.vue';
 import Checkbox from '@/components/ui/checkbox/Checkbox.vue';
+import { useForm, Field as VeeField } from 'vee-validate';
 import {
-  FormControl,
-  FormDescription,
-  FormField,
-  FormItem,
-  FormLabel,
-  FormMessage,
-} from '@/components/ui/form'
+  Field,
+  FieldContent,
+  FieldDescription,
+  FieldGroup,
+  FieldLabel,
+} from '@/components/ui/field'
+import FieldError from '@/components/ui/field/FieldError.vue';
 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, watch } from 'vue';
 import * as z from 'zod';
 import DateInput from '../form/DateInput.vue';
@@ -58,13 +58,22 @@ const fallbackInitials = {
 
 const props = defineProps<{
   readOnly: boolean,
-  data: ApplicationData,
+  data: ApplicationData | null,
 }>()
 
 const emit = defineEmits(['submit']);
 
 const initialValues = ref<Record<string, unknown> | null>(null);
 
+const { handleSubmit, resetForm, values } = useForm({
+  validationSchema: formSchema,
+  validateOnMount: false,
+});
+
+const submitForm = handleSubmit(async (val) => {
+  await onSubmit(val);
+});
+
 async function onSubmit(val: any) {
   emit('submit', val);
 }
@@ -80,6 +89,9 @@ onMounted(async () => {
     initialValues.value = { ...fallbackInitials };
   }
 
+  // apply the initial values to the vee-validate form
+  resetForm({ values: initialValues.value });
+
   // CoCbox.value.innerHTML = await getCoC()
   CoCString.value = await getCoC();
 })
@@ -103,235 +115,237 @@ function enforceExternalLinks() {
 }
 
 watch(() => showCoC.value, async () => {
-  if (showCoC) {
+  if (showCoC.value) {
     await nextTick(); // wait for v-html to update
     enforceExternalLinks();
   }
 });
 
 function convertToAge(dob: string) {
+
+  if (dob === undefined) return "";
   const [month, day, year] = dob.split('/').map(Number);
 
   let dobDate = new Date(year, month - 1, day);
 
-  return Math.floor(
+  let out = Math.floor(
     (Date.now() - dobDate.getTime()) / (1000 * 60 * 60 * 24 * 365.2425)
   );
 
+  return Number.isNaN(out) ? "" : out;
 }
 
 </script>
 
 <template>
-  <Form v-if="initialValues" :validation-schema="formSchema" :initial-values="initialValues" @submit="onSubmit"
-    class="space-y-6">
+  <form v-if="initialValues" @submit.prevent="submitForm" class="space-y-6">
     <!-- Age -->
-    <FormField name="dob" v-slot="{ value, handleChange }">
-      <FormItem>
-        <FormLabel>What is your date of birth?</FormLabel>
-        <FormControl>
-          <template class="flex items-center gap-10">
-            <DateInput :model-value="(value as string) ?? ''" :disabled="readOnly" @update:model-value="handleChange" />
-            <p class="text-muted-foreground">Age: {{ convertToAge(value) }}</p>
-          </template>
-        </FormControl>
+    <VeeField name="dob" v-slot="{ field, errors }">
+      <Field>
+        <FieldLabel>What is your date of birth?</FieldLabel>
+        <FieldContent>
+          <div class="flex items-center gap-10">
+            <DateInput :model-value="(field.value as string) ?? ''" :disabled="readOnly" @update:model-value="field.onChange" />
+            <p v-if="props.readOnly" class="text-muted-foreground">Age: {{ convertToAge(field.value) }}</p>
+          </div>
+        </FieldContent>
         <div class="h-4">
-          <FormMessage class="text-destructive" />
+          <FieldError v-if="errors.length" :errors="errors" />
         </div>
-      </FormItem>
-    </FormField>
+      </Field>
+    </VeeField>
 
     <!-- Name -->
-    <FormField name="name" v-slot="{ value, handleChange }">
-      <FormItem>
-        <FormLabel>What name will you be going by within the community?</FormLabel>
-        <FormDescription>This name must be consistent across platforms.</FormDescription>
-        <FormControl>
-          <Input :model-value="value" @update:model-value="handleChange" :disabled="readOnly" />
-        </FormControl>
+    <VeeField name="name" v-slot="{ field, errors }">
+      <Field>
+        <FieldLabel>What name will you be going by within the community?</FieldLabel>
+        <FieldDescription>This name must be consistent across platforms.</FieldDescription>
+        <FieldContent>
+          <Input :model-value="field.value" @update:model-value="field.onChange" :disabled="readOnly" />
+        </FieldContent>
         <div class="h-4">
-          <FormMessage class="text-destructive" />
+          <FieldError v-if="errors.length" :errors="errors" />
         </div>
-      </FormItem>
-    </FormField>
+      </Field>
+    </VeeField>
 
     <!-- Playtime -->
-    <FormField name="playtime" v-slot="{ value, handleChange }">
-      <FormItem>
-        <FormLabel>How long have you played Arma 3 for (in hours)?</FormLabel>
-        <FormControl>
-          <Input type="number" :model-value="value" @update:model-value="handleChange" :disabled="readOnly" />
-        </FormControl>
+    <VeeField name="playtime" v-slot="{ field, errors }">
+      <Field>
+        <FieldLabel>How long have you played Arma 3 for (in hours)?</FieldLabel>
+        <FieldContent>
+          <Input type="number" :model-value="field.value" @update:model-value="field.onChange" :disabled="readOnly" />
+        </FieldContent>
         <div class="h-4">
-          <FormMessage class="text-destructive" />
+          <FieldError v-if="errors.length" :errors="errors" />
         </div>
-      </FormItem>
-    </FormField>
+      </Field>
+    </VeeField>
 
     <!-- Hobbies -->
-    <FormField name="hobbies" v-slot="{ value, handleChange }">
-      <FormItem>
-        <FormLabel>What hobbies do you like to participate in outside of gaming?</FormLabel>
-        <FormControl>
-          <Textarea rows="4" class="resize-none" :model-value="value" @update:model-value="handleChange"
+    <VeeField name="hobbies" v-slot="{ field, errors }">
+      <Field>
+        <FieldLabel>What hobbies do you like to participate in outside of gaming?</FieldLabel>
+        <FieldContent>
+          <Textarea rows="4" class="resize-none" :model-value="field.value" @update:model-value="field.onChange"
             :disabled="readOnly" />
-        </FormControl>
+        </FieldContent>
         <div class="h-4">
-          <FormMessage class="text-destructive" />
+          <FieldError v-if="errors.length" :errors="errors" />
         </div>
-      </FormItem>
-    </FormField>
+      </Field>
+    </VeeField>
 
     <!-- Military (boolean) -->
-    <FormField name="military" v-slot="{ value, handleChange }">
-      <FormItem>
-        <FormLabel>Have you ever served in the military?</FormLabel>
-        <FormControl>
+    <VeeField name="military" v-slot="{ field, errors }">
+      <Field>
+        <FieldLabel>Have you ever served in the military?</FieldLabel>
+        <FieldContent>
           <div class="flex items-center gap-2">
-            <Checkbox :model-value="value" @update:model-value="handleChange" :disabled="readOnly" />
+            <Checkbox :model-value="field.value" @update:model-value="field.onChange" :disabled="readOnly" />
             <span>Yes (checked) / No (unchecked)</span>
           </div>
-        </FormControl>
+        </FieldContent>
         <div class="h-4">
-          <FormMessage class="text-destructive" />
+          <FieldError v-if="errors.length" :errors="errors" />
         </div>
-      </FormItem>
-    </FormField>
+      </Field>
+    </VeeField>
 
     <!-- Other communities (freeform) -->
-    <FormField name="communities" v-slot="{ value, handleChange }">
-      <FormItem>
-        <FormLabel>Are you a part of any other communities? If so, which ones? If none, type "No"</FormLabel>
-        <FormControl>
-          <Input :model-value="value" @update:model-value="handleChange" :disabled="readOnly" />
-        </FormControl>
+    <VeeField name="communities" v-slot="{ field, errors }">
+      <Field>
+        <FieldLabel>Are you a part of any other communities? If so, which ones? If none, type "No"</FieldLabel>
+        <FieldContent>
+          <Input :model-value="field.value" @update:model-value="field.onChange" :disabled="readOnly" />
+        </FieldContent>
         <div class="h-4">
-          <FormMessage class="text-destructive" />
+          <FieldError v-if="errors.length" :errors="errors" />
         </div>
-      </FormItem>
-    </FormField>
+      </Field>
+    </VeeField>
 
     <!-- Why join -->
-    <FormField name="joinReason" v-slot="{ value, handleChange }">
-      <FormItem>
-        <FormLabel>Why do you want to join our community?</FormLabel>
-        <FormControl>
-          <Textarea rows="4" class="resize-none" :model-value="value" @update:model-value="handleChange"
+    <VeeField name="joinReason" v-slot="{ field, errors }">
+      <Field>
+        <FieldLabel>Why do you want to join our community?</FieldLabel>
+        <FieldContent>
+          <Textarea rows="4" class="resize-none" :model-value="field.value" @update:model-value="field.onChange"
             :disabled="readOnly" />
-        </FormControl>
+        </FieldContent>
         <div class="h-4">
-          <FormMessage class="text-destructive" />
+          <FieldError v-if="errors.length" :errors="errors" />
         </div>
-      </FormItem>
-    </FormField>
+      </Field>
+    </VeeField>
 
     <!-- Attraction to milsim -->
-    <FormField name="milsimAttraction" v-slot="{ value, handleChange }">
-      <FormItem>
-        <FormLabel>What attracts you to the Arma 3 milsim playstyle?</FormLabel>
-        <FormControl>
-          <Textarea rows="4" class="resize-none" :model-value="value" @update:model-value="handleChange"
+    <VeeField name="milsimAttraction" v-slot="{ field, errors }">
+      <Field>
+        <FieldLabel>What attracts you to the Arma 3 milsim playstyle?</FieldLabel>
+        <FieldContent>
+          <Textarea rows="4" class="resize-none" :model-value="field.value" @update:model-value="field.onChange"
             :disabled="readOnly" />
-        </FormControl>
+        </FieldContent>
         <div class="h-4">
-          <FormMessage class="text-destructive" />
+          <FieldError v-if="errors.length" :errors="errors" />
         </div>
-      </FormItem>
-    </FormField>
+      </Field>
+    </VeeField>
 
     <!-- Referral (freeform) -->
-    <FormField name="referral" v-slot="{ value, handleChange }">
-      <FormItem>
-        <FormLabel>Where did you hear about us? (If another member, who?)</FormLabel>
-        <FormControl>
-          <Input placeholder="e.g., Reddit / Member: Alice" :model-value="value" @update:model-value="handleChange"
+    <VeeField name="referral" v-slot="{ field, errors }">
+      <Field>
+        <FieldLabel>Where did you hear about us? (If another member, who?)</FieldLabel>
+        <FieldContent>
+          <Input placeholder="e.g., Reddit / Member: Alice" :model-value="field.value" @update:model-value="field.onChange"
             :disabled="readOnly" />
-        </FormControl>
+        </FieldContent>
         <div class="h-4">
-          <FormMessage class="text-destructive" />
+          <FieldError v-if="errors.length" :errors="errors" />
         </div>
-      </FormItem>
-    </FormField>
+      </Field>
+    </VeeField>
 
     <!-- Steam profile -->
-    <FormField name="steamProfile" v-slot="{ value, handleChange }">
-      <FormItem>
-        <FormLabel>Steam profile link</FormLabel>
-        <FormDescription>
+    <VeeField name="steamProfile" v-slot="{ field, errors }">
+      <Field>
+        <FieldLabel>Steam profile link</FieldLabel>
+        <FieldDescription>
           Format: <code>https://steamcommunity.com/id/USER/</code> or
           <code>https://steamcommunity.com/profiles/STEAMID64/</code>
-        </FormDescription>
-        <FormControl>
-          <Input type="url" placeholder="https://steamcommunity.com/profiles/7656119..." :model-value="value"
-            @update:model-value="handleChange" :disabled="readOnly" />
-        </FormControl>
+        </FieldDescription>
+        <FieldContent>
+          <Input type="url" placeholder="https://steamcommunity.com/profiles/7656119..." :model-value="field.value"
+            @update:model-value="field.onChange" :disabled="readOnly" />
+        </FieldContent>
         <div class="h-4">
-          <FormMessage class="text-destructive" />
+          <FieldError v-if="errors.length" :errors="errors" />
         </div>
-      </FormItem>
-    </FormField>
+      </Field>
+    </VeeField>
 
     <!-- Timezone -->
-    <FormField name="timezone" v-slot="{ value, handleChange }">
-      <FormItem>
-        <FormLabel>What time zone are you in?</FormLabel>
-        <FormControl>
-          <Input placeholder="e.g., AEST, EST, UTC+10" :model-value="value" @update:model-value="handleChange"
+    <VeeField name="timezone" v-slot="{ field, errors }">
+      <Field>
+        <FieldLabel>What time zone are you in?</FieldLabel>
+        <FieldContent>
+          <Input placeholder="e.g., AEST, EST, UTC+10" :model-value="field.value" @update:model-value="field.onChange"
             :disabled="readOnly" />
-        </FormControl>
+        </FieldContent>
         <div class="h-4">
-          <FormMessage class="text-destructive" />
+          <FieldError v-if="errors.length" :errors="errors" />
         </div>
-      </FormItem>
-    </FormField>
+      </Field>
+    </VeeField>
 
     <!-- Attendance (boolean) -->
-    <FormField name="canAttendSaturday" v-slot="{ value, handleChange }">
-      <FormItem>
-        <FormLabel>Are you able to attend weekly operations Saturdays @ 7pm CST?</FormLabel>
-        <FormControl>
+    <VeeField name="canAttendSaturday" v-slot="{ field, errors }">
+      <Field>
+        <FieldLabel>Are you able to attend weekly operations Saturdays @ 7pm CST?</FieldLabel>
+        <FieldContent>
           <div class="flex items-center gap-2">
-            <Checkbox :model-value="value ?? false" @update:model-value="handleChange" :disabled="readOnly" />
+            <Checkbox :model-value="field.value ?? false" @update:model-value="field.onChange" :disabled="readOnly" />
             <span>Yes (checked) / No (unchecked)</span>
           </div>
-        </FormControl>
+        </FieldContent>
         <div class="h-4">
-          <FormMessage class="text-destructive" />
+          <FieldError v-if="errors.length" :errors="errors" />
         </div>
-      </FormItem>
-    </FormField>
+      </Field>
+    </VeeField>
 
     <!-- Interests / Playstyle (freeform) -->
-    <FormField name="interests" v-slot="{ value, handleChange }">
-      <FormItem>
-        <FormLabel>Which playstyles interest you?</FormLabel>
-        <FormControl>
-          <Input placeholder="e.g., Rifleman; Medic; Pilot" :model-value="value" @update:model-value="handleChange"
+    <VeeField name="interests" v-slot="{ field, errors }">
+      <Field>
+        <FieldLabel>Which playstyles interest you?</FieldLabel>
+        <FieldContent>
+          <Input placeholder="e.g., Rifleman; Medic; Pilot" :model-value="field.value" @update:model-value="field.onChange"
             :disabled="readOnly" />
-        </FormControl>
+        </FieldContent>
         <div class="h-4">
-          <FormMessage class="text-destructive" />
+          <FieldError v-if="errors.length" :errors="errors" />
         </div>
-      </FormItem>
-    </FormField>
+      </Field>
+    </VeeField>
 
     <!-- Code of Conduct (boolean, field name kept as-is) -->
-    <FormField name="acknowledgeRules" v-slot="{ value, handleChange }">
-      <FormItem>
-        <FormLabel>Community Code of Conduct</FormLabel>
-        <FormControl>
+    <VeeField name="acknowledgeRules" v-slot="{ field, errors }">
+      <Field>
+        <FieldLabel>Community Code of Conduct</FieldLabel>
+        <FieldContent>
           <div class="flex items-center gap-2">
-            <Checkbox :model-value="value" @update:model-value="handleChange" :disabled="readOnly" />
+            <Checkbox :model-value="field.value" @update:model-value="field.onChange" :disabled="readOnly" />
             <span>By checking this box, you accept the <Button variant="link" class="p-0 h-min"
                 @click.prevent.stop="showCoC = true">Code of
                 Conduct</Button>.</span>
           </div>
-        </FormControl>
+        </FieldContent>
         <div class="h-4">
-          <FormMessage class="text-destructive" />
+          <FieldError v-if="errors.length" :errors="errors" />
         </div>
-      </FormItem>
-    </FormField>
+      </Field>
+    </VeeField>
 
     <div class="pt-2" v-if="!readOnly">
       <Button type="submit" :disabled="readOnly">Submit Application</Button>
@@ -348,5 +362,5 @@ function convertToAge(dob: string) {
       </DialogContent>
     </Dialog>
 
-  </Form>
+  </form>
 </template>

ui/src/components/calendar/ViewCalendarEvent.vue

@@ -15,6 +15,7 @@ import { Calendar } from 'lucide-vue-next';
 import MemberCard from '../members/MemberCard.vue';
 import Spinner from '../ui/spinner/Spinner.vue';
 import { CopyLink } from '@/lib/copyLink';
+import { MemberState } from '@shared/types/member';
 
 const route = useRoute();
 
@@ -31,9 +32,14 @@ watch(
     { immediate: true }
 );
 
+watch(loaded, (value) => {
+    if (value) emit('load');
+});
+
 const emit = defineEmits<{
     (e: 'close'): void
     (e: 'reload'): void
+    (e: 'load'): void
     (e: 'edit', event: CalendarEvent): void
 }>()
 
@@ -81,7 +87,7 @@ async function setAttendance(state: CalendarAttendance) {
 
 const canEditEvent = computed(() => {
     if (!userStore.isLoggedIn) return false;
-    if (userStore.state !== 'member') return false;
+    if (userStore.state !== MemberState.Member) return false;
     if (userStore.user.member.member_id == activeEvent.value.creator_id)
         return true;
 });
@@ -179,7 +185,7 @@ defineExpose({ forceReload })
 <template>
     <div v-if="loaded">
         <!-- Header -->
-        <div class="flex items-center justify-between gap-3 border-b px-4 py-3 ">
+        <div class="flex items-center justify-between gap-3 border-b border-border px-4 py-3 ">
             <h2 class="text-lg font-semibold break-after-all">
                 {{ activeEvent?.name || 'Event' }}
             </h2>
@@ -226,15 +232,15 @@ defineExpose({ forceReload })
                     <CircleAlert></CircleAlert> This event has been cancelled
                 </div>
             </section>
-            <section v-if="isPast && userStore.state === 'member'" class="w-full">
-                <ButtonGroup class="flex w-full">
-                    <Button variant="outline"
+            <section v-if="isPast && userStore.state === MemberState.Member" class="w-full">
+                <ButtonGroup class="flex w-full justify-center">
+                    <Button variant="outline" class="flex-1"
                         :class="myAttendance?.status === CalendarAttendance.Attending ? 'border-2 border-primary text-primary' : ''"
                         @click="setAttendance(CalendarAttendance.Attending)">Going</Button>
-                    <Button variant="outline"
+                    <Button variant="outline" class="flex-1"
                         :class="myAttendance?.status === CalendarAttendance.Maybe ? 'border-2 !border-l-2 border-primary text-primary' : ''"
                         @click="setAttendance(CalendarAttendance.Maybe)">Maybe</Button>
-                    <Button variant="outline"
+                    <Button variant="outline" class="flex-1"
                         :class="myAttendance?.status === CalendarAttendance.NotAttending ? 'border-2 !border-l-2 border-primary text-primary' : ''"
                         @click="setAttendance(CalendarAttendance.NotAttending)">Declined</Button>
                 </ButtonGroup>
@@ -259,7 +265,7 @@ defineExpose({ forceReload })
             <!-- Description -->
             <section class="space-y-2 w-full">
                 <p class="text-lg font-semibold">Description</p>
-                <p class="border bg-muted/50 px-3 py-2 rounded-lg min-h-24 my-2 whitespace-pre-line">
+                <p class="border border-border bg-muted/50 px-3 py-2 rounded-lg min-h-24 my-2 whitespace-pre-line">
                     {{ activeEvent.description }}
                 </p>
             </section>
@@ -273,8 +279,8 @@ defineExpose({ forceReload })
                         <p>Declined <span class="ml-1">{{ attendanceStatusSummary.notAttending }}</span></p>
                     </div> -->
                 </div>
-                <div class="flex flex-col border bg-muted/50 rounded-lg min-h-24 my-2">
-                    <div class="flex w-full pt-2 border-b *:w-full *:text-center *:pb-1 *:cursor-pointer">
+                <div class="flex flex-col border border-border bg-muted/50 rounded-lg min-h-24 my-2">
+                    <div class="flex w-full pt-2 border-b border-border *:w-full *:text-center *:pb-1 *:cursor-pointer">
                         <label :class="attendanceTab === 'Alpha' ? 'border-b-3 border-foreground' : 'mb-[2px]'"
                             @click="attendanceTab = 'Alpha'">Alpha {{ attendanceCountsByGroup.Alpha }}</label>
                         <label :class="attendanceTab === 'Echo' ? 'border-b-3 border-foreground' : 'mb-[2px]'"
@@ -283,14 +289,14 @@ defineExpose({ forceReload })
                             @click="attendanceTab = 'Other'">Other {{ attendanceCountsByGroup.Other }}</label>
                     </div>
                     <div class="pb-1 min-h-48">
-                        <div class="grid grid-cols-2 font-semibold text-muted-foreground border-b py-1 px-3 mb-2">
+                        <div class="grid grid-cols-2 font-semibold text-muted-foreground border-b border-border py-1 px-3 mb-2">
                             <p>Name</p>
                             <p class="text-right">Status</p>
                         </div>
 
                         <div v-for="person in attendanceList" :key="person.member_id"
-                            class="grid grid-cols-2 py-1 *:px-3 hover:bg-muted">
-                            <div>
+                            class="grid grid-cols-3 py-1 *:px-3 hover:bg-muted">
+                            <div class="col-span-2">
                                 <MemberCard :member-id="person.member_id"></MemberCard>
                             </div>
                             <p :class="statusColor(person.status)" class="text-right">
@@ -302,11 +308,14 @@ defineExpose({ forceReload })
             </section>
         </div>
     </div>
-    <div v-else class="flex justify-center h-full items-center">
-        <Button variant="ghost" size="icon" @click="emit('close')">
+    <div v-else class="relative flex justify-center items-center h-full">
+        <!-- Close button (top-right) -->
+        <Button variant="ghost" size="icon" class="absolute top-2 right-2" @click="emit('close')">
             <X class="size-5" />
         </Button>
 
-        <Spinner class="size-8"></Spinner>
+        <!-- Spinner (centered) -->
+        <Spinner class="size-8" />
     </div>
+
 </template>

ui/src/components/loa/loaForm.vue

@@ -66,14 +66,19 @@ import { loaSchema } from '@shared/schemas/loaSchema'
 import { toTypedSchema } from "@vee-validate/zod";
 import Calendar from "../ui/calendar/Calendar.vue";
 import { useUserStore } from "@/stores/user";
+import Spinner from "../ui/spinner/Spinner.vue";
 
 const { handleSubmit, values, resetForm } = useForm({
     validationSchema: toTypedSchema(loaSchema),
 })
 
 const formSubmitted = ref(false);
+const submitting = ref(false);
 
 const onSubmit = handleSubmit(async (values) => {
+    //catch double submit
+    if (submitting.value) return;
+    submitting.value = true;
     const out: LOARequest = {
         member_id: values.member_id,
         start_date: values.start_date,
@@ -88,6 +93,7 @@ const onSubmit = handleSubmit(async (values) => {
         userStore.loadUser();
     }
     formSubmitted.value = true;
+    submitting.value = false;
 })
 
 onMounted(async () => {
@@ -325,7 +331,12 @@ const filteredMembers = computed(() => {
                     </VeeField>
                 </div>
                 <div class="flex justify-end">
-                    <Button type="submit">Submit</Button>
+                    <Button type="submit" :disabled="submitting" class="w-35">
+                        <span class="flex items-center gap-2" v-if="submitting">
+                            <Spinner></Spinner> Submitting…
+                        </span>
+                        <span v-else>Submit</span>
+                    </Button>
                 </div>
             </form>
             <div v-else class="flex flex-col  gap-4 py-8 text-left">

ui/src/components/loa/loaList.vue

@@ -1,136 +1,141 @@
 <script setup lang="ts">
-import {
-    Table,
-    TableBody,
-    TableCaption,
-    TableCell,
-    TableHead,
-    TableHeader,
-    TableRow,
-} from "@/components/ui/table"
-import { Badge } from '@/components/ui/badge'
-import {
-    DropdownMenu,
-    DropdownMenuContent,
-    DropdownMenuItem,
-    DropdownMenuTrigger,
-} from "@/components/ui/dropdown-menu"
-import { ChevronDown, ChevronUp, Ellipsis, X } from "lucide-vue-next";
-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";
-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"
-import { el } from "@fullcalendar/core/internal-common";
-import MemberCard from "../members/MemberCard.vue";
-import {
-    Pagination,
-    PaginationContent,
-    PaginationEllipsis,
-    PaginationItem,
-    PaginationNext,
-    PaginationPrevious,
-} from '@/components/ui/pagination'
-import { pagination } from "@shared/types/pagination";
+    import {
+        Table,
+        TableBody,
+        TableCaption,
+        TableCell,
+        TableHead,
+        TableHeader,
+        TableRow,
+    } from "@/components/ui/table"
+    import { Badge } from '@/components/ui/badge'
+    import {
+        DropdownMenu,
+        DropdownMenuContent,
+        DropdownMenuItem,
+        DropdownMenuTrigger,
+    } from "@/components/ui/dropdown-menu"
+    import { ChevronDown, ChevronUp, Ellipsis, X } from "lucide-vue-next";
+    import { adminExtendLOA, 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";
+    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"
+    import { el } from "@fullcalendar/core/internal-common";
+    import MemberCard from "../members/MemberCard.vue";
+    import {
+        Pagination,
+        PaginationContent,
+        PaginationEllipsis,
+        PaginationItem,
+        PaginationNext,
+        PaginationPrevious,
+    } from '@/components/ui/pagination'
+    import { pagination } from "@shared/types/pagination";
 
-const props = defineProps<{
-    adminMode?: boolean
-}>()
+    const props = defineProps<{
+        adminMode?: boolean
+    }>()
 
-const LOAList = ref<LOARequest[]>([]);
+    const LOAList = ref<LOARequest[]>([]);
 
-onMounted(async () => {
-    await loadLOAs();
-});
-
-async function loadLOAs() {
-    if (props.adminMode) {
-        let result = await getAllLOAs(pageNum.value, pageSize.value);
-        LOAList.value = result.data;
-        pageData.value = result.pagination;
-    } else {
-        let result = await getMyLOAs(pageNum.value, pageSize.value);
-        LOAList.value = result.data;
-        pageData.value = result.pagination;
-    }
-}
-
-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",
+    onMounted(async () => {
+        await loadLOAs();
     });
-}
 
-function loaStatus(loa: LOARequest): "Upcoming" | "Active" | "Overdue" | "Closed" {
-    if (loa.closed) return "Closed";
+    async function loadLOAs() {
+        if (props.adminMode) {
+            let result = await getAllLOAs(pageNum.value, pageSize.value);
+            LOAList.value = result.data;
+            pageData.value = result.pagination;
+        } else {
+            let result = await getMyLOAs(pageNum.value, pageSize.value);
+            LOAList.value = result.data;
+            pageData.value = result.pagination;
+        }
+    }
 
-    const now = new Date();
-    const start = new Date(loa.start_date);
-    const end = new Date(loa.end_date);
+    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",
+        });
+    }
 
-    if (now < start) return "Upcoming";
-    if (now >= start && now <= end) return "Active";
-    if (now > loa.extended_till || end) return "Overdue";
+    function loaStatus(loa: LOARequest): "Upcoming" | "Active" | "Extended" | "Overdue" | "Closed" {
+        if (loa.closed) return "Closed";
 
-    return "Overdue"; // fallback
-}
+        const now = new Date();
+        const start = new Date(loa.start_date);
+        const end = new Date(loa.end_date);
+        const extension = new Date(loa.extended_till);
 
-async function cancelAndReload(id: number) {
-    await cancelLOA(id, props.adminMode);
-    await loadLOAs();
-}
+        if (now < start) return "Upcoming";
+        if (now >= start && (now <= end)) return "Active";
+        if (now >= start && (now <= extension)) return "Extended";
+        if (now > loa.extended_till || end) return "Overdue";
 
-const isExtending = ref(false);
-const targetLOA = ref<LOARequest | null>(null);
-const extendTo = ref<CalendarDate | null>(null);
+        return "Overdue"; // fallback
+    }
 
-const targetEnd = computed(() => { return targetLOA.value.extended_till ? targetLOA.value.extended_till : targetLOA.value.end_date })
+    async function cancelAndReload(id: number) {
+        await cancelLOA(id, props.adminMode);
+        await loadLOAs();
+    }
 
-function toCalendarDate(date: Date): CalendarDate {
-    if (typeof date === 'string')
-        date = new Date(date);
-    return new CalendarDate(date.getFullYear(), date.getMonth() + 1, date.getDate())
-}
+    const isExtending = ref(false);
+    const targetLOA = ref<LOARequest | null>(null);
+    const extendTo = ref<CalendarDate | null>(null);
 
-async function commitExtend() {
-    await extendLOA(targetLOA.value.id, extendTo.value.toDate(getLocalTimeZone()));
-    isExtending.value = false;
-    await loadLOAs();
-}
+    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())
+    }
 
-const expanded = ref<number | null>(null);
-const hoverID = ref<number | null>(null);
+    async function commitExtend() {
+        if (props.adminMode) {
+            await adminExtendLOA(targetLOA.value.id, extendTo.value.toDate(getLocalTimeZone()));
+        } else {
+            await extendLOA(targetLOA.value.id, extendTo.value.toDate(getLocalTimeZone()));
+        }
+        isExtending.value = false;
+        await loadLOAs();
+    }
 
-const pageNum = ref<number>(1);
-const pageData = ref<pagination>();
+    const expanded = ref<number | null>(null);
+    const hoverID = ref<number | null>(null);
 
-const pageSize = ref<number>(15)
-const pageSizeOptions = [10, 15, 30]
+    const pageNum = ref<number>(1);
+    const pageData = ref<pagination>();
 
-function setPageSize(size: number) {
-    pageSize.value = size
-    pageNum.value = 1;
-    loadLOAs();
-}
+    const pageSize = ref<number>(15)
+    const pageSizeOptions = [10, 15, 30]
 
-function setPage(pagenum: number) {
-    pageNum.value = pagenum;
-    loadLOAs();
-}
+    function setPageSize(size: number) {
+        pageSize.value = size
+        pageNum.value = 1;
+        loadLOAs();
+    }
+
+    function setPage(pagenum: number) {
+        pageNum.value = pagenum;
+        loadLOAs();
+    }
 </script>
 
 <template>
@@ -143,7 +148,7 @@ function setPage(pagenum: number) {
                 <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 })" />
+                        :max-value="props.adminMode ? toCalendarDate(targetEnd).add({ years: 1 }) : toCalendarDate(targetEnd).add({ months: 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
@@ -191,6 +196,7 @@ function setPage(pagenum: number) {
                             <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) === 'Extended'" class="bg-green-500">Extended</Badge>
                                 <Badge v-else-if="loaStatus(post) === 'Overdue'" class="bg-yellow-400">Overdue</Badge>
                                 <Badge v-else class="bg-gray-400">Ended</Badge>
                             </TableCell>
@@ -202,9 +208,10 @@ function setPage(pagenum: number) {
                                         </Button>
                                     </DropdownMenuTrigger>
                                     <DropdownMenuContent>
-                                        <DropdownMenuItem v-if="!post.closed && props.adminMode"
+                                        <DropdownMenuItem v-if="!post.closed"
+                                            :disabled="post.extended_till !== null && !props.adminMode"
                                             @click="isExtending = true; targetLOA = post">
-                                            Extend
+                                             {{ (post.extended_till !== null && !props.adminMode) ? 'Extend (Already Extended)' : 'Extend' }}
                                         </DropdownMenuItem>
                                         <DropdownMenuItem v-if="!post.closed" :variant="'destructive'"
                                             @click="cancelAndReload(post.id)">{{ loaStatus(post) === 'Upcoming' ?
@@ -232,27 +239,47 @@ function setPage(pagenum: number) {
                         <TableRow v-if="expanded === post.id" @mouseenter="hoverID = post.id"
                             @mouseleave="hoverID = null" :class="{ 'bg-muted/50 border-t-0': hoverID === post.id }">
                             <TableCell :colspan="8" class="p-0">
-                                <div class="w-full p-3 mb-6 space-y-3">
-                                    <div class="flex justify-between items-start gap-4">
-                                        <div class="space-y-3 w-full">
-
-                                            <!-- Header -->
-                                            <div class="flex items-center gap-2">
-                                                <h4 class="text-sm font-semibold text-foreground">
-                                                    Reason
-                                                </h4>
-                                                <Separator class="flex-1" />
-                                            </div>
-
-                                            <!-- Content -->
-                                            <div
-                                                class="rounded-lg border bg-muted/40 px-4 py-3 text-sm leading-relaxed whitespace-pre-wrap text-muted-foreground w-full">
-                                                {{ post.reason || 'No reason provided.' }}
-                                            </div>
+                                <div class="w-full p-4 mb-6 space-y-4">
 
+                                    <!-- Dates -->
+                                    <div class="grid grid-cols-3 gap-4 text-sm">
+                                        <div>
+                                            <p class="text-muted-foreground">Start</p>
+                                            <p class="font-medium">
+                                                {{ formatDate(post.start_date) }}
+                                            </p>
                                         </div>
 
+                                        <div>
+                                            <p class="text-muted-foreground">Original end</p>
+                                            <p class="font-medium">
+                                                {{ formatDate(post.end_date) }}
+                                            </p>
+                                        </div>
+
+                                        <div class="">
+                                            <p class="text-muted-foreground">Extended to</p>
+                                            <p class="font-medium text-foreground">
+                                                {{ post.extended_till ? formatDate(post.extended_till) : 'N/A' }}
+                                            </p>
+                                        </div>
                                     </div>
+
+                                    <!-- Reason -->
+                                    <div class="space-y-2">
+                                        <div class="flex items-center gap-2">
+                                            <h4 class="text-sm font-semibold text-foreground">
+                                                Reason
+                                            </h4>
+                                            <Separator class="flex-1" />
+                                        </div>
+
+                                        <div
+                                            class="rounded-lg border bg-muted/40 px-4 py-3 text-sm leading-relaxed whitespace-pre-wrap text-muted-foreground">
+                                            {{ post.reason || 'No reason provided.' }}
+                                        </div>
+                                    </div>
+
                                 </div>
                             </TableCell>
                         </TableRow>

ui/src/components/members/DischargeMember.vue

@@ -0,0 +1,94 @@
+<script setup lang="ts">
+import { toTypedSchema } from '@vee-validate/zod'
+import { Form, Field as VeeField } from 'vee-validate'
+import * as z from 'zod'
+import { X, AlertTriangle } from 'lucide-vue-next'
+
+import { Button } from '@/components/ui/button'
+import {
+    Dialog,
+    DialogContent,
+    DialogDescription,
+    DialogFooter,
+    DialogHeader,
+    DialogTitle,
+} from '@/components/ui/dialog'
+import { Field, FieldLabel, FieldError } from '@/components/ui/field'
+import { Input } from '@/components/ui/input'
+import { Textarea } from '@/components/ui/textarea'
+import MemberCard from './MemberCard.vue'
+import { Member } from '@shared/types/member'
+import { Discharge, dischargeSchema } from '@shared/schemas/dischargeSchema';
+import { dischargeMember } from '@/api/member'
+
+const props = defineProps<{
+    open: boolean
+    member: Member | null
+}>()
+
+const emit = defineEmits<{
+    'update:open': [value: boolean]
+    'discharged': [value: { data: Discharge }]
+}>()
+
+const formSchema = toTypedSchema(dischargeSchema);
+
+async function onSubmit(values: z.infer<typeof dischargeSchema>) {
+    const data: Discharge = { userID: props.member.member_id, reason: values.reason }
+    console.log('Discharging member:', props.member?.member_id)
+    console.log('Discharge Data:', data)
+
+    await dischargeMember(data);
+
+    // Notify parent to refresh/close
+    emit('discharged', { data })
+    emit('update:open', false)
+}
+</script>
+
+<template>
+    <Dialog :open="open" @update:open="emit('update:open', $event)">
+        <DialogContent class="sm:max-w-[425px]">
+            <DialogHeader>
+                <div class="flex items-center gap-2 mb-1">
+                    <!-- <AlertTriangle class="size-5" /> -->
+                    <DialogTitle>Discharge Member</DialogTitle>
+                </div>
+                <DialogDescription>
+                    You are initiating the discharge process for <MemberCard :member-id="member.member_id"></MemberCard>
+                    <!-- <span class="font-semibold text-foreground">{{ member }}</span> -->
+                </DialogDescription>
+            </DialogHeader>
+
+            <Form v-slot="{ handleSubmit }" as="" :validation-schema="formSchema">
+                <form id="dischargeForm" @submit="handleSubmit($event, onSubmit)" class="space-y-4 py-2">
+                    <VeeField v-slot="{ componentField, errors }" name="reason">
+                        <Field :data-invalid="!!errors.length">
+                            <FieldLabel>Reason for Discharge</FieldLabel>
+                            <Textarea placeholder="Retirement, inactivity, etc. " v-bind="componentField"
+                                class="resize-none" />
+                            <FieldError v-if="errors.length" :errors="errors" />
+                        </Field>
+                    </VeeField>
+
+                    <!-- <VeeField v-slot="{ componentField, errors }" name="effectiveDate">
+                        <Field :data-invalid="!!errors.length">
+                            <FieldLabel>Effective Date</FieldLabel>
+                            <Input type="date" v-bind="componentField" />
+                            <FieldError v-if="errors.length" :errors="errors" />
+                        </Field>
+                    </VeeField> -->
+                </form>
+            </Form>
+
+            <DialogFooter class="gap-2">
+                <Button variant="ghost" @click="emit('update:open', false)">
+                    Cancel
+                </Button>
+                <Button type="submit" form="dischargeForm" variant="destructive">
+                    Discharge
+                </Button>
+            </DialogFooter>
+        </DialogContent>
+    </Dialog>
+</template>

ui/src/components/members/TransferMember.vue

@@ -0,0 +1,250 @@
+<script setup lang="ts">
+import { computed, ref, watch } from 'vue'
+
+import { adminAssignUnit, getUnits } from '@/api/units'
+import { getAllRanks } from '@/api/rank'
+import { Button } from '@/components/ui/button'
+import {
+    Dialog,
+    DialogContent,
+    DialogDescription,
+    DialogFooter,
+    DialogHeader,
+    DialogTitle,
+} from '@/components/ui/dialog'
+import { Field, FieldError, FieldLabel } from '@/components/ui/field'
+import { Input } from '@/components/ui/input'
+import {
+    Select,
+    SelectContent,
+    SelectItem,
+    SelectTrigger,
+    SelectValue,
+} from '@/components/ui/select'
+import MemberCard from './MemberCard.vue'
+import type { Member } from '@shared/types/member'
+import type { Rank } from '@shared/types/rank'
+import type { Unit } from '@shared/types/units'
+
+const props = defineProps<{
+    open: boolean
+    member: Member | null
+}>()
+
+const emit = defineEmits<{
+    'update:open': [value: boolean]
+    transferred: [value: { memberId: number; unitId: number; rankId: number; reason: string }]
+}>()
+
+const units = ref<Unit[]>([])
+const ranks = ref<Rank[]>([])
+const loadingUnits = ref(false)
+const loadingRanks = ref(false)
+const submitting = ref(false)
+const formError = ref('')
+
+const selectedUnitId = ref('')
+const selectedRankId = ref('')
+const selectedReason = ref('transfer_request')
+const customReason = ref('')
+
+const reasonOptions = [
+    { label: 'Transfer Request', value: 'transfer_request' },
+    { label: 'Leadership Vote', value: 'leadership_vote' },
+    { label: 'Appointment', value: 'appointment' },
+    { label: 'Step Down', value: 'step_down' },
+    { label: 'Custom', value: 'custom' },
+]
+
+const resolvedReason = computed(() => {
+    if (selectedReason.value === 'custom') {
+        return customReason.value.trim()
+    }
+    return selectedReason.value
+})
+
+const canSubmit = computed(() => {
+    return !!props.member && !!selectedUnitId.value && !!selectedRankId.value && !!resolvedReason.value
+})
+
+function resolveDefaultRankId(member: Member | null): string {
+    if (!member || !member.rank) {
+        return ''
+    }
+
+    const normalizedMemberRank = member.rank.trim().toLowerCase()
+    const matchedRank = ranks.value.find((rank) => {
+        return rank.name.trim().toLowerCase() === normalizedMemberRank
+            || rank.short_name.trim().toLowerCase() === normalizedMemberRank
+    })
+
+    return matchedRank ? String(matchedRank.id) : ''
+}
+
+function resetForm() {
+    selectedUnitId.value = ''
+    selectedRankId.value = ''
+    selectedReason.value = 'transfer_request'
+    customReason.value = ''
+    formError.value = ''
+}
+
+async function loadUnits() {
+    loadingUnits.value = true
+    formError.value = ''
+    try {
+        units.value = await getUnits()
+    } catch {
+        formError.value = 'Failed to load units. Please try again.'
+    } finally {
+        loadingUnits.value = false
+    }
+}
+
+async function loadRanks() {
+    loadingRanks.value = true
+    formError.value = ''
+    try {
+        ranks.value = await getAllRanks()
+        selectedRankId.value = resolveDefaultRankId(props.member)
+    } catch {
+        formError.value = 'Failed to load ranks. Please try again.'
+    } finally {
+        loadingRanks.value = false
+    }
+}
+
+watch(
+    () => props.open,
+    (isOpen) => {
+        if (isOpen) {
+            resetForm()
+            loadUnits()
+            loadRanks()
+        }
+    },
+)
+
+async function onSubmit() {
+    if (!props.member) {
+        return
+    }
+
+    if (!selectedUnitId.value) {
+        formError.value = 'Please select a target unit.'
+        return
+    }
+
+    if (!selectedRankId.value) {
+        formError.value = 'Please select a target rank.'
+        return
+    }
+
+    if (!resolvedReason.value) {
+        formError.value = 'Please select a reason or enter a custom reason.'
+        return
+    }
+
+    submitting.value = true
+    formError.value = ''
+    try {
+        const unitId = Number(selectedUnitId.value)
+        const rankId = Number(selectedRankId.value)
+        await adminAssignUnit(props.member.member_id, unitId, rankId, resolvedReason.value)
+
+        emit('transferred', {
+            memberId: props.member.member_id,
+            unitId,
+            rankId,
+            reason: resolvedReason.value,
+        })
+        emit('update:open', false)
+    } catch {
+        formError.value = 'Failed to transfer member. Please try again.'
+    } finally {
+        submitting.value = false
+    }
+}
+</script>
+
+<template>
+    <Dialog :open="open" @update:open="emit('update:open', $event)">
+        <DialogContent class="sm:max-w-[425px]">
+            <DialogHeader>
+                <DialogTitle>Transfer Member</DialogTitle>
+                <DialogDescription>
+                    Select a new unit assignment for
+                    <MemberCard v-if="member" :member-id="member.member_id" />
+                </DialogDescription>
+            </DialogHeader>
+
+            <form id="transferForm" @submit.prevent="onSubmit" class="space-y-4 py-2">
+                <Field>
+                    <FieldLabel>Target Unit</FieldLabel>
+                    <Select v-model="selectedUnitId" :disabled="loadingUnits || submitting">
+                        <SelectTrigger>
+                            <SelectValue placeholder="Select unit" />
+                        </SelectTrigger>
+                        <SelectContent>
+                            <SelectItem v-for="unit in units" :key="unit.id" :value="String(unit.id)">
+                                {{ unit.name }}
+                            </SelectItem>
+                        </SelectContent>
+                    </Select>
+                </Field>
+
+                <Field>
+                    <FieldLabel>Target Rank</FieldLabel>
+                    <Select v-model="selectedRankId" :disabled="loadingRanks || submitting">
+                        <SelectTrigger>
+                            <SelectValue placeholder="Select rank" />
+                        </SelectTrigger>
+                        <SelectContent>
+                            <SelectItem v-for="rank in ranks" :key="rank.id" :value="String(rank.id)">
+                                {{ rank.name }}
+                            </SelectItem>
+                        </SelectContent>
+                    </Select>
+                </Field>
+
+                <Field>
+                    <FieldLabel>Reason</FieldLabel>
+                    <Select v-model="selectedReason" :disabled="submitting">
+                        <SelectTrigger>
+                            <SelectValue placeholder="Select reason" />
+                        </SelectTrigger>
+                        <SelectContent>
+                            <SelectItem
+                                v-for="reason in reasonOptions"
+                                :key="reason.value"
+                                :value="reason.value"
+                            >
+                                {{ reason.label }}
+                            </SelectItem>
+                        </SelectContent>
+                    </Select>
+                </Field>
+
+                <Field v-if="selectedReason === 'custom'">
+                    <FieldLabel>Custom Reason</FieldLabel>
+                    <Input
+                        v-model="customReason"
+                        :disabled="submitting"
+                        placeholder="Enter custom transfer reason"
+                    />
+                </Field>
+
+                <FieldError v-if="formError" :errors="[formError]" />
+            </form>
+
+            <DialogFooter class="gap-2">
+                <Button variant="ghost" @click="emit('update:open', false)">
+                    Cancel
+                </Button>
+                <Button type="submit" form="transferForm" :disabled="!canSubmit || loadingUnits || loadingRanks || submitting">
+                    {{ submitting ? 'Transferring...' : 'Transfer Member' }}
+                </Button>
+            </DialogFooter>
+        </DialogContent>
+    </Dialog>
+</template>

ui/src/components/promotions/promotionForm.vue

@@ -31,8 +31,12 @@ const { handleSubmit, errors, values, resetForm, setFieldValue, submitCount } =
     validateOnMount: false,
 })
 
+const submitting = ref(false);
+
 const submitForm = handleSubmit(
     async (vals) => {
+        if (submitting.value) return;
+        submitting.value = true;
         try {
             let output = vals;
             output.promotions.map(p => p.start_date = new Date(p.start_date).toISOString())
@@ -42,6 +46,8 @@ const submitForm = handleSubmit(
         } catch (error) {
             submitError.value = error;
             console.error(error);
+        } finally {
+            submitting.value = false;
         }
     }
 );
@@ -277,7 +283,12 @@ function setAllToday() {
                 </VeeField>
                 <div class="flex flex-col items-end gap-2">
                     <div class="h-6" />
-                    <Button type="submit" class="w-min">Submit</Button>
+                    <Button type="submit" form="trainingForm" :disabled="submitting" class="w-35">
+                        <span class="flex items-center gap-2" v-if="submitting">
+                            <Spinner></Spinner> Submitting…
+                        </span>
+                        <span v-else>Submit</span>
+                    </Button>
                     <p v-if="submitError" class="text-destructive">{{ submitError }}</p>
                     <div v-else class="h-6 flex justify-end">
                         <p v-if="submitCount > 0 && errors.promotions && typeof errors.promotions === 'string'"

ui/src/components/roles/addMember.vue

@@ -13,6 +13,7 @@ import Button from '../ui/button/Button.vue';
 import InputGroup from '../ui/input-group/InputGroup.vue';
 import InputGroupAddon from '../ui/input-group/InputGroupAddon.vue';
 import { SearchIcon } from 'lucide-vue-next';
+import Spinner from '../ui/spinner/Spinner.vue';
 
 const props = defineProps<{
     allMembers: MemberLight[],
@@ -43,8 +44,11 @@ function openDialog() {
     showAddMemberDialog.value = true;
 }
 
-
+const submitting = ref(false);
 async function handleAddMember() {
+    //catch double submit
+    if (submitting.value) return;
+    submitting.value = true;
     //guard
     if (memberToAdd.value == null)
         return;
@@ -52,6 +56,7 @@ async function handleAddMember() {
     await addMemberToRole(memberToAdd.value.id, props.role.id);
     emit('submit');
     showAddMemberDialog.value = false;
+    submitting.value = false;
 }
 
 </script>
@@ -94,8 +99,11 @@ async function handleAddMember() {
                 <Button variant="secondary" @click="showAddMemberDialog = false">
                     Cancel
                 </Button>
-                <Button :disabled="!memberToAdd" @click="handleAddMember">
-                    Add
+                <Button :disabled="!memberToAdd || submitting" @click="handleAddMember">
+                    <span class="flex items-center gap-2" v-if="submitting">
+                        <Spinner></Spinner> Add
+                    </span>
+                    <span v-else>Add</span>
                 </Button>
             </DialogFooter>
         </DialogContent>

ui/src/components/trainingReport/trainingReportForm.vue

@@ -26,6 +26,7 @@ import PopoverTrigger from "@/components/ui/popover/PopoverTrigger.vue";
 import PopoverContent from "@/components/ui/popover/PopoverContent.vue";
 import Combobox from '../ui/combobox/Combobox.vue'
 import Tooltip from '../tooltip/Tooltip.vue'
+import Spinner from '../ui/spinner/Spinner.vue'
 
 
 const { handleSubmit, resetForm, errors, values, setFieldValue } = useForm({
@@ -67,19 +68,24 @@ function toMySQLDateTime(date: Date): string {
         .replace("T", " ") + "000";    // becomes → 2025-11-19 00:00:00.000000
 }
 
-
-function onSubmit(vals) {
+const submitting = ref(false);
+async function onSubmit(vals) {
+    //catch double submit
+    if (submitting.value) return;
+    submitting.value = true;
     try {
         const clean: CourseEventDetails = {
             ...vals,
             event_date: new Date(vals.event_date),
         }
 
-        postTrainingReport(clean).then((newID) => {
+        await postTrainingReport(clean).then((newID) => {
             emit("submit", newID);
         });
     } catch (err) {
         console.error("There was an error submitting the training report", err);
+    } finally {
+        submitting.value = false;
     }
 }
 
@@ -402,7 +408,12 @@ const filteredMembers = computed(() => {
         </FieldGroup>
         <div class="flex gap-3 justify-end">
             <Button type="button" variant="outline" @click="resetForm">Reset</Button>
-            <Button type="submit" form="trainingForm">Submit</Button>
+            <Button type="submit" form="trainingForm" :disabled="submitting" class="w-35">
+                <span class="flex items-center gap-2" v-if="submitting">
+                    <Spinner></Spinner> Submitting…
+                </span>
+                <span v-else>Submit</span>
+            </Button>
         </div>
     </form>
 </template>

ui/src/components/ui/button/index.js

@@ -16,7 +16,7 @@ export const buttonVariants = cva(
         secondary:
           "bg-secondary text-secondary-foreground shadow-xs hover:bg-secondary/80",
         ghost:
-          "hover:bg-accent hover:text-accent-foreground dark:hover:bg-accent/50",
+          "hover:bg-accent active:bg-accent hover:text-accent-foreground dark:hover:bg-accent/50",
         success:
           "bg-success text-success-foreground shadow-xs hover:bg-success/90",
         link: "text-primary underline-offset-4 hover:underline",

ui/src/main.js

@@ -10,14 +10,9 @@ import FormInput from './components/form/FormInput.vue'
 
 import * as Sentry from "@sentry/vue";
 
-
-
-
 const app = createApp(App)
-
-
-
-app.use(createPinia())
+const pinia = createPinia()
+app.use(pinia)
 app.use(router)
 
 if (import.meta.env.VITE_DISABLE_GLITCHTIP === "true") {
@@ -38,7 +33,7 @@ if (import.meta.env.VITE_DISABLE_GLITCHTIP === "true") {
     });
 }
 
-app.component("FormInput", FormInput)
-app.component("FormCheckbox", FormCheckbox)
+// app.component("FormInput", FormInput)
+// app.component("FormCheckbox", FormCheckbox)
 
 app.mount('#app')

ui/src/pages/Calendar.vue

@@ -11,6 +11,8 @@ import { useRouter, useRoute } from 'vue-router'
 import { useCalendarEvents } from '@/composables/useCalendarEvents'
 import { useCalendarNavigation } from '@/composables/useCalendarNavigation'
 import { useUserStore } from '@/stores/user'
+import { CalendarOptions } from '@fullcalendar/core'
+import { MemberState } from '@shared/types/member'
 
 const monthLabels = [
     'January', 'February', 'March', 'April', 'May', 'June',
@@ -49,14 +51,14 @@ const dialogRef = ref<any>(null)
 // NEW: handle day/time slot clicks to start creating an event
 function onDateClick(arg: { dateStr: string }) {
     if (!userStore.isLoggedIn) return;
-    if (userStore.state !== 'member') return;
+    if (userStore.state !== MemberState.Member) return;
     dialogRef.value?.openDialog(arg.dateStr);
 }
 
-const calendarOptions = ref({
+const calendarOptions = ref<CalendarOptions>({
     plugins: [dayGridPlugin, interactionPlugin],
     initialView: 'dayGridMonth',
-    height: '100%',
+    height: 'auto',
     expandRows: true,
     headerToolbar: {
         left: '',
@@ -70,6 +72,7 @@ const calendarOptions = ref({
     eventClick: onEventClick,
     editable: false,
 
+
     // force block-mode in dayGrid so we can lay it out on one line
     eventDisplay: 'block',
 
@@ -155,8 +158,8 @@ onMounted(() => {
     <div>
         <CreateCalendarEvent ref="dialogRef" @reload="loadEvents(); eventViewRef.forceReload();"></CreateCalendarEvent>
         <div class="flex">
-            <div class="flex-1 min-h-0 mt-5">
-                <div class="h-[80vh] min-h-0">
+            <div class="flex-1 min-h-0 mt-5" :class="{ 'hidden md:block': panelOpen }">
+                <div class="max-h-[80vh] overflow-y-auto min-h-0 scrollbar-themed p-2">
                     <!-- calendar header -->
                     <div class="flex items-center justify-between mx-5">
                         <!-- Left: title + pickers -->
@@ -196,7 +199,7 @@ onMounted(() => {
                                 @click="goToday">
                                 Today
                             </button>
-                            <button v-if="userStore.isLoggedIn && userStore.state === 'member'"
+                            <button v-if="userStore.isLoggedIn && userStore.state === MemberState.Member"
                                 class="cursor-pointer ml-1 inline-flex items-center gap-1.5 rounded-md bg-primary px-3 py-1.5 text-sm text-primary-foreground hover:opacity-90"
                                 @click="onCreateEvent">
                                 <Plus class="h-4 w-4" />
@@ -208,50 +211,52 @@ onMounted(() => {
                 </div>
             </div>
             <aside v-if="panelOpen"
-                class="3xl:w-lg 2xl:w-md border-l bg-card text-foreground flex flex-col overflow-auto scrollbar-themed"
+                class="w-screen 3xl:w-lg 2xl:w-md lg:border-l bg-card text-foreground flex flex-col overflow-auto scrollbar-themed"
                 :style="{ height: 'calc(100vh - 61px)', position: 'sticky', top: '64px' }">
                 <ViewCalendarEvent ref="eventViewRef" :key="currentEventID" @close="() => { router.push('/calendar'); }"
-                    @reload="loadEvents()" @edit="(val) => { dialogRef.openDialog(null, 'edit', val) }">
+                    @reload="loadEvents()" @load="calendarRef.getApi().updateSize()"
+                    @edit="(val) => { dialogRef.openDialog(null, 'edit', val) }">
                 </ViewCalendarEvent>
             </aside>
         </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>
-
 <style scoped>
 /* ---------- Optional container "card" around the calendar ---------- */
+/* Ensure the calendar fills the container properly */
 :global(.fc) {
     height: 100% !important;
+    --fc-page-bg-color: transparent;
+    --fc-neutral-bg-color: color-mix(in srgb, var(--color-foreground) 8%, transparent);
+    --fc-neutral-text-color: var(--color-muted-foreground);
+    --fc-border-color: var(--color-border);
+    --fc-button-bg-color: transparent;
+    --fc-button-border-color: var(--color-border);
+    --fc-button-hover-bg-color: var(--color-muted);
+}
+
+:global(.fc-theme-standard .fc-scrollgrid) {
+    border-radius: 8px;
+    overflow: hidden;
+    /* Rounds the corners of the grid */
+    border: 1px solid var(--color-border);
+}
+
+:global(.fc-daygrid-day-frame) {
+    display: flex;
+    flex-direction: column;
+    padding: 4px;
+}
+
+:global(.fc .fc-scroller-harness) {
+    background: transparent;
+}
+
+
+:global(.fc-daygrid-day-events) {
+    flex-grow: 1;
+    /* Pushes events to take up available space */
 }
 
 :global(.ev-pill.is-cancelled) {
@@ -297,6 +302,7 @@ onMounted(() => {
 :global(.fc .fc-scrollgrid td),
 :global(.fc .fc-scrollgrid th) {
     border-color: var(--color-border);
+    background: var(--fc-page-bg-color);
 }
 
 /* ---------- Built-in toolbar (if you keep it) ---------- */
@@ -344,6 +350,7 @@ onMounted(() => {
     text-decoration: none;
 }
 
+
 :global(.fc .fc-daygrid-day-top) {
     padding: 8px 8px 0 8px;
 }

ui/src/pages/DeveloperTools.vue

@@ -0,0 +1,52 @@
+<script setup lang="ts">
+import Button from '@/components/ui/button/Button.vue';
+import { bustUserCache } from '@/api/member';
+import type { UserCacheBustResult } from '@shared/types/member';
+import { ref } from 'vue';
+
+const loading = ref(false);
+const result = ref<UserCacheBustResult | null>(null);
+const error = ref<string | null>(null);
+
+async function onBustUserCache() {
+    loading.value = true;
+    error.value = null;
+
+    try {
+        result.value = await bustUserCache();
+    } catch (err) {
+        result.value = null;
+        error.value = err instanceof Error ? err.message : 'Failed to bust user cache';
+    } finally {
+        loading.value = false;
+    }
+}
+</script>
+
+<template>
+    <div class="max-w-3xl mx-auto pt-10 px-4">
+        <h1 class="scroll-m-20 text-2xl font-semibold tracking-tight">Developer Tools</h1>
+        <p class="mt-2 text-sm text-muted-foreground">
+            Use this page to recover from stale in-memory authentication data after manual database changes.
+        </p>
+
+        <div class="mt-6 rounded-lg border p-5 bg-card">
+            <p class="font-medium">Server User Cache</p>
+            <p class="text-sm text-muted-foreground mt-1">
+                This clears the API server's cached user session data so the next request reloads from the database.
+            </p>
+
+            <div class="mt-4 flex items-center gap-3">
+                <Button :disabled="loading" @click="onBustUserCache">
+                    {{ loading ? 'Busting Cache...' : 'Bust User Cache' }}
+                </Button>
+            </div>
+
+            <p v-if="result" class="mt-4 text-sm text-green-700">
+                Cache busted successfully. Cleared {{ result.clearedEntries }} entr{{ result.clearedEntries === 1 ? 'y' : 'ies' }} at
+                {{ new Date(result.bustedAt).toLocaleString() }}.
+            </p>
+            <p v-if="error" class="mt-4 text-sm text-red-700">{{ error }}</p>
+        </div>
+    </div>
+</template>

ui/src/pages/Homepage.vue

@@ -2,6 +2,7 @@
 import { getWelcomeMessage } from '@/api/docs';
 import { Button } from '@/components/ui/button'
 import { useUserStore } from '@/stores/user'
+import { MemberState } from '@shared/types/member';
 import { onMounted, ref } from 'vue';
 import { useRouter } from 'vue-router'
 
@@ -14,7 +15,7 @@ function goToApplication() {
 }
 
 onMounted(async () => {
-    if (user.state == 'member') {
+    if (user.state == MemberState.Member) {
         let policy = await getWelcomeMessage() as any;
         welcomeRef.value.innerHTML = policy;
     }
@@ -25,7 +26,7 @@ const welcomeRef = ref<HTMLElement>(null);
 
 <template>
     <div>
-        <div v-if="user.state == 'member'" class="mt-10">
+        <div v-if="user.state == MemberState.Member" class="mt-10">
             <div ref="welcomeRef" class="bookstack-container">
                 <!-- bookstack -->
             </div>

ui/src/pages/Join.vue

@@ -1,90 +1,93 @@
 <script setup lang="ts">
-import ApplicationForm from '@/components/application/ApplicationForm.vue';
-import Button from '@/components/ui/button/Button.vue';
-import {
-    Stepper,
-    StepperDescription,
-    StepperIndicator,
-    StepperItem,
-    StepperSeparator,
-    StepperTitle,
-    StepperTrigger,
-} from '@/components/ui/stepper'
-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';
+    import ApplicationForm from '@/components/application/ApplicationForm.vue';
+    import Button from '@/components/ui/button/Button.vue';
+    import {
+        Stepper,
+        StepperDescription,
+        StepperIndicator,
+        StepperItem,
+        StepperSeparator,
+        StepperTitle,
+        StepperTrigger,
+    } from '@/components/ui/stepper'
+    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';
+    import { MemberState } from '@shared/types/member';
 
-function goToLogin() {
-    const redirectUrl = encodeURIComponent(window.location.origin + '/join')
-    //@ts-ignore
-    const addr = import.meta.env.VITE_APIHOST;
-    window.location.href = `${addr}/login?redirect=${redirectUrl}`;
-}
-
-let userStore = useUserStore();
-
-const steps = computed(() => {
-    const isDenied = userStore.state === 'denied'
-
-    return [
-        {
-            step: 1,
-            title: 'Create account',
-            description: 'Begin by setting up your account',
-        },
-        {
-            step: 2,
-            title: 'Submit application',
-            description: 'Provide a few details about yourself',
-        },
-        {
-            step: 3,
-            title: 'Application review',
-            description: 'Our team will review your submission',
-        },
-        {
-            step: 4,
-            title: isDenied ? 'Application denied' : 'Acceptance',
-            description: isDenied
-                ? 'Your application was not approved'
-                : 'Get started with the 17th Rangers',
-        },
-    ]
-})
-
-const currentStep = computed<number>(() => {
-    if (!userStore.isLoggedIn)
-        return 1;
-    switch (userStore.state) {
-        case "guest":
-            return 2;
-            break;
-        case "applicant":
-            return 3;
-            break;
-        case "member":
-            return 5;
-            break;
-        case "denied":
-            return 5;
-            break;
-        case "retired":
-            return 5;
-            break;
+    function goToLogin() {
+        const redirectUrl = encodeURIComponent(window.location.origin + '/join')
+        //@ts-ignore
+        const addr = import.meta.env.VITE_APIHOST;
+        window.location.href = `${addr}/login?redirect=${redirectUrl}`;
     }
-})
 
-const finalPanel = ref<'app' | 'message'>('message');
+    let userStore = useUserStore();
 
-const reloadKey = ref(0);
+    const steps = computed(() => {
+        const isDenied = userStore.state === MemberState.Denied
 
-async function restartApp() {
-    await restartApplication();
-    await userStore.loadUser();
-    reloadKey.value++;
-}
+        return [
+            {
+                step: 1,
+                title: 'Create account',
+                description: 'Begin by setting up your account',
+            },
+            {
+                step: 2,
+                title: 'Submit application',
+                description: 'Provide a few details about yourself',
+            },
+            {
+                step: 3,
+                title: 'Application review',
+                description: 'Our team will review your submission',
+            },
+            {
+                step: 4,
+                title: isDenied ? 'Application denied' : 'Acceptance',
+                description: isDenied
+                    ? 'Your application was not approved'
+                    : 'Get started with the 17th Rangers',
+            },
+        ]
+    })
+
+    const currentStep = computed<number>(() => {
+        if (!userStore.isLoggedIn)
+            return 1;
+        switch (userStore.state) {
+            case MemberState.Guest:
+                return 2;
+                break;
+            case MemberState.Applicant:
+                return 3;
+                break;
+            case MemberState.Member:
+                return 5;
+                break;
+            case MemberState.Denied:
+                return 5;
+                break;
+            case MemberState.Retired:
+                return 5;
+            case MemberState.Discharged:
+                return 5;
+                break;
+        }
+    })
+
+    const finalPanel = ref<'app' | 'message'>('message');
+
+    const reloadKey = ref(0);
+
+    async function restartApp() {
+        await restartApplication();
+        await userStore.loadUser();
+        reloadKey.value++;
+    }
 </script>
 
 <template>
@@ -104,7 +107,8 @@ async function restartApp() {
                                 size="icon" class="z-10 rounded-full shrink-0"
                                 :class="[state === 'active' && 'ring-2 ring-ring ring-offset-2 ring-offset-background']">
                                 <template v-if="state === 'completed'">
-                                    <X v-if="step.step === 4 && userStore.state === 'denied'" class="size-5" />
+                                    <X v-if="step.step === 4 && userStore.state === MemberState.Denied"
+                                        class="size-5" />
                                     <Check v-else class="size-5" />
                                 </template>
                                 <Circle v-if="state === 'active'" />
@@ -160,7 +164,7 @@ async function restartApp() {
                 </div>
                 <div v-if="finalPanel === 'message'">
                     <!-- Accepted message -->
-                    <div v-if="userStore.state === 'member'">
+                    <div v-if="userStore.state === MemberState.Member">
                         <h1 class="text-3xl sm:text-4xl font-bold mb-4 text-left">
                             Welcome to the 17th Ranger Battalion
                         </h1>
@@ -232,7 +236,7 @@ async function restartApp() {
                         </div>
                     </div>
                     <!-- Denied message -->
-                    <div v-else-if="userStore.state === 'denied'">
+                    <div v-else-if="userStore.state === MemberState.Denied">
                         <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
@@ -263,7 +267,8 @@ async function restartApp() {
                             <Button class="w-min" @click="restartApp">New Application</Button>
                         </div>
                     </div>
-                    <div v-else-if="userStore.state === 'retired'">
+                    <div
+                        v-else-if="userStore.state === MemberState.Discharged || userStore.state === MemberState.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

ui/src/pages/memberList.vue

@@ -1,98 +1,363 @@
 <script setup lang="ts">
-import {
-    Table,
-    TableBody,
-    TableCaption,
-    TableCell,
-    TableHead,
-    TableHeader,
-    TableRow,
-} from "@/components/ui/table"
-import {
-    DropdownMenu,
-    DropdownMenuContent,
-    DropdownMenuItem,
-    DropdownMenuTrigger,
-} from "@/components/ui/dropdown-menu"
-import {
-    Dialog,
-    DialogContent,
-    DialogDescription,
-    DialogFooter,
-    DialogHeader,
-    DialogTitle,
-    DialogTrigger,
-} from "@/components/ui/dialog"
-import Badge from "@/components/ui/badge/Badge.vue";
-import { computed, ref } from "vue";
-import { Member, getMembers } from "@/api/member";
-import { useRouter } from 'vue-router';
-import { Ellipsis } from "lucide-vue-next";
-import Input from "@/components/ui/input/Input.vue";
-import LoaForm from "@/components/loa/loaForm.vue";
+    import { ref, computed, onMounted, watch } from "vue";
+    import { useRouter } from 'vue-router';
+    import {
+        Ellipsis, Search, Trash2, UserX,
+        X,
+    } from "lucide-vue-next";
+    import {
+        Pagination,
+        PaginationContent,
+        PaginationEllipsis,
+        PaginationItem,
+        PaginationNext,
+        PaginationPrevious,
+    } from '@/components/ui/pagination'
 
-const members = ref<Member[]>([]);
-const router = useRouter();
+    // API & Types
+    import { getMembersFiltered, suspendMember, unsuspendMember } from "@/api/member";
+    import { getUnits } from "@/api/units";
+    import type { Member } from "@shared/types/member";
+    import { MemberState } from "@shared/types/member";
+    import type { Unit } from "@shared/types/units";
+    import type { pagination as PaginationType } from "@shared/types/pagination";
 
-const fetchMembers = async () => {
-    members.value = await getMembers();
-};
+    // UI Components
+    import { Table, TableBody, TableCell, TableHead, TableHeader, TableRow } from "@/components/ui/table";
+    import { DropdownMenu, DropdownMenuContent, DropdownMenuItem, DropdownMenuTrigger } from "@/components/ui/dropdown-menu";
+    import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '@/components/ui/select';
+    import { Button } from "@/components/ui/button";
+    import Badge from "@/components/ui/badge/Badge.vue";
+    import Input from "@/components/ui/input/Input.vue";
+    import Spinner from "@/components/ui/spinner/Spinner.vue";
+    import DischargeMember from "@/components/members/DischargeMember.vue";
+    import MemberCard from "@/components/members/MemberCard.vue";
+    import { useMemberDirectory } from "@/stores/memberDirectory";
+    import { Discharge } from "@shared/schemas/dischargeSchema";
+    import TransferMember from "@/components/members/TransferMember.vue";
 
-function viewMember(id) {
-    router.push(`/member/${id}`)
-}
+    // --- State ---
+    const router = useRouter();
+    const members = ref<Member[]>([]);
+    const units = ref<Unit[]>([]);
+    const isLoaded = ref(false);
+    const pagination = ref<PaginationType>({
+        page: 1,
+        pageSize: 15,
+        total: 0,
+        totalPages: 0,
+    });
 
-fetchMembers();
+    const filters = ref<{ search: string; status: "all" | MemberState; unitId: string }>({
+        search: "",
+        status: MemberState.Member,
+        unitId: "all"
+    });
 
-const searchVal = ref<string>("");
-const searchedMembers = computed(() => {
-    return members.value.filter(member => member.member_name.toLowerCase().includes(searchVal.value.toLowerCase()));
-});
+    // Pagination State
+    const pageNum = ref(1);
+    const pageSize = ref(15);
+    const pageSizeOptions = [10, 15, 30];
 
+    const MEMBER_STATUSES = Object.entries(MemberState)
+        .filter(([key, value]) => isNaN(Number(key)))
+        .map(([label, id]) => ({
+            label,
+            id: id as number // Casting back to number for your SQL logic
+        }));
+
+    // --- Methods ---
+    const fetchMembers = async () => {
+        isLoaded.value = false;
+        try {
+            const result = await getMembersFiltered({
+                page: pageNum.value,
+                pageSize: pageSize.value,
+                search: filters.value.search || undefined,
+                status: filters.value.status,
+                unitId: filters.value.unitId,
+            });
+            members.value = result.data;
+            pagination.value = result.pagination;
+        } catch (error) {
+            console.error('Failed to fetch members:', error);
+            members.value = [];
+        } finally {
+            isLoaded.value = true;
+        }
+    };
+
+    const fetchUnits = async () => {
+        try {
+            units.value = await getUnits();
+        } catch (error) {
+            console.error('Failed to fetch units:', error);
+        }
+    };
+
+    const navigateToMember = (id: string | number) => router.push(`/member/${id}`);
+
+    const setPage = (num: number) => {
+        pageNum.value = num;
+    };
+
+    const setPageSize = (size: number) => {
+        pageSize.value = size;
+        pageNum.value = 1;
+    };
+
+    // --- Computed ---
+    const paginatedMembers = computed(() => members.value);
+    const totalItems = computed(() => pagination.value.total);
+
+    let debounceTimer: ReturnType<typeof setTimeout> | null = null;
+    // Watch pagination (Immediate)
+    watch([pageNum, pageSize], () => {
+        if (debounceTimer) clearTimeout(debounceTimer);
+        fetchMembers();
+    });
+
+    // Watch filters (Debounced)
+    watch(filters, () => {
+        if (debounceTimer) clearTimeout(debounceTimer);
+        debounceTimer = setTimeout(() => {
+            setPage(1); //reset page number when filters change to avoid that one annoying bug eagle keeps finding
+            fetchMembers();
+        }, 300);
+    }, { deep: true });
+
+    function clearFilters() {
+        filters.value = {
+            search: "",
+            status: "all",
+            unitId: "all"
+        }
+    }
+
+
+    onMounted(() => {
+        fetchUnits();
+        fetchMembers();
+    });
+
+    //discharge form logic
+    const isDischargeOpen = ref(false)
+    const isTransferOpen = ref(false)
+    const targetMember = ref<Member | null>(null)
+
+    function openDischargeModal(member: Member) {
+        targetMember.value = member
+        isDischargeOpen.value = true
+    }
+
+    function openTransferModal(member: Member) {
+        targetMember.value = member
+        isTransferOpen.value = true
+    }
+
+    async function onSuspend(member: Member) {
+        await suspendMember(member.member_id);
+        await fetchMembers();
+        memberCache.invalidateMember(member.member_id);
+    }
+
+    async function onUnsuspend(member: Member) {
+        await unsuspendMember(member.member_id);
+        await fetchMembers();
+        memberCache.invalidateMember(member.member_id);
+    }
+
+    const memberCache = useMemberDirectory();
+
+    function handleDischargeSuccess(value: { data: Discharge }) {
+        fetchMembers();
+        memberCache.invalidateMember(value.data.userID);
+    }
+
+    function handleTransferSuccess(value: { memberId: number; unitId: number; rankId: number; reason: string }) {
+        fetchMembers();
+        memberCache.invalidateMember(value.memberId);
+    }
 </script>
 
 <template>
-
-    <!-- table menu -->
-    <div class="w-4xl mx-auto">
-        <div class="flex justify-between mb-4">
-            <Input v-model="searchVal" placeholder="search..."></Input>
+    <div>
+        <DischargeMember v-model:open="isDischargeOpen" :member="targetMember" @discharged="handleDischargeSuccess">
+        </DischargeMember>
+        <TransferMember v-model:open="isTransferOpen" :member="targetMember" @transferred="handleTransferSuccess">
+        </TransferMember>
+        <div class="mx-auto max-w-7xl w-full py-10 px-4">
+            <div class="flex flex-col gap-2">
+                <div class="flex flex-col md:flex-row md:items-center justify-between gap-4">
+                    <div class="space-y-0.5">
+                        <h1 class="text-2xl font-bold tracking-tight text-foreground">Member Management</h1>
+                        <p class="text-muted-foreground text-sm">Directory of all personnel and unit assignments.</p>
+                    </div>
+                </div>
+                <div
+                    class="flex flex-col gap-4 sm:flex-row sm:items-center justify-between border-y border-border/40 py-3">
+                    <div class="flex items-center gap-2">
+                        <Select v-model="filters.status">
+                            <SelectTrigger
+                                class="h-8 w-fit min-w-[110px] border-none bg-muted/50 hover:bg-muted transition-colors text-xs capitalize">
+                                <SelectValue placeholder="Status" />
+                            </SelectTrigger>
+                            <SelectContent>
+                                <SelectItem value="all">All Statuses</SelectItem>
+                                <SelectItem v-for="s in MEMBER_STATUSES" :key="s.id" :value="s.id">
+                                    <span class="capitalize">{{ s.label }}</span>
+                                </SelectItem>
+                            </SelectContent>
+                        </Select>
+                        <Select v-model="filters.unitId">
+                            <SelectTrigger
+                                class="h-8 w-fit min-w-[110px] border-none bg-muted/50 hover:bg-muted transition-colors text-xs">
+                                <SelectValue placeholder="Unit" />
+                            </SelectTrigger>
+                            <SelectContent>
+                                <SelectItem value="all">All Units</SelectItem>
+                                <SelectItem v-for="u in units" :key="u.id" :value="u.name">
+                                    {{ u.name }}
+                                </SelectItem>
+                            </SelectContent>
+                        </Select>
+                        <div v-if="filters.status !== 'all' || filters.unitId !== 'all'"
+                            class="h-4 w-[1px] bg-border mx-1" />
+                        <Button v-if="filters.status !== MemberState.Member || filters.unitId !== 'all'" variant="ghost"
+                            size="sm" class="h-8 px-2 text-xs text-muted-foreground"
+                            @click="filters.status = MemberState.Member; filters.unitId = 'all'">
+                            Clear Filters
+                        </Button>
+                    </div>
+                    <div class="flex items-center gap-2">
+                        <div class="relative w-full sm:w-[260px]">
+                            <Search
+                                class="absolute left-3 top-1/2 -translate-y-1/2 h-3.5 w-3.5 text-muted-foreground/50" />
+                            <Input v-model="filters.search" placeholder="Search members..."
+                                class="h-8 pl-9 pr-8 bg-background text-xs focus-visible:ring-1" />
+                            <button v-if="filters.search" @click="filters.search = ''"
+                                class="absolute right-2.5 top-1/2 -translate-y-1/2 text-muted-foreground/60 hover:text-foreground transition-colors">
+                                <X class="size-3.5" />
+                            </button>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="min-h-[500px]">
+                <Table>
+                    <TableHeader>
+                        <TableRow class="hover:bg-transparent border-b">
+                            <TableHead class="w-[200px]">Member</TableHead>
+                            <TableHead>Rank</TableHead>
+                            <TableHead>Unit</TableHead>
+                            <TableHead>State</TableHead>
+                            <TableHead></TableHead>
+                            <TableHead class="text-right">Actions</TableHead>
+                        </TableRow>
+                    </TableHeader>
+                    <TableBody>
+                        <template v-if="isLoaded">
+                            <TableRow v-for="member in paginatedMembers" :key="member.member_id"
+                                class="group cursor-pointer hover:bg-muted/30 transition-colors">
+                                <TableCell class="font-medium">
+                                    <MemberCard :member-id="member.member_id"></MemberCard>
+                                </TableCell>
+                                <!-- <TableCell class="font-medium py-4">{{ member.displayName || member.member_name }}</TableCell> -->
+                                <TableCell>{{ member.rank }}</TableCell>
+                                <TableCell>{{ member.unit }}</TableCell>
+                                <TableCell>
+                                    <Badge variant="outline" class="capitalize font-normal">{{
+                                        MemberState[member.member_state] }}</Badge>
+                                </TableCell>
+                                <TableCell>
+                                    <Badge v-if="member.loa_until" variant="secondary"
+                                        class="bg-yellow-500/10 text-yellow-600 border-none">On LOA</Badge>
+                                </TableCell>
+                                <TableCell class="text-right" @click.stop>
+                                    <DropdownMenu>
+                                        <DropdownMenuTrigger as-child>
+                                            <Button variant="ghost" size="icon" class="hover:bg-muted">
+                                                <Ellipsis class="size-5" />
+                                            </Button>
+                                        </DropdownMenuTrigger>
+                                        <DropdownMenuContent align="end" class="w-48">
+                                            <!-- <DropdownMenuItem @click="navigateToMember(member.member_id)">
+                                                View Profile
+                                            </DropdownMenuItem> -->
+                                            <DropdownMenuItem v-if="member.member_state === MemberState.Member"
+                                                @click="openTransferModal(member)">
+                                                Transfer Member
+                                            </DropdownMenuItem>
+                                            <DropdownMenuItem v-if="member.member_state !== MemberState.Discharged"
+                                                @click="openDischargeModal(member)"
+                                                class="text-destructive focus:bg-destructive focus:text-destructive-foreground font-medium">
+                                                Discharge Member
+                                            </DropdownMenuItem>
+                                            <DropdownMenuItem v-if="member.member_state !== MemberState.Suspended"
+                                                @click="onSuspend(member)"
+                                                class="text-destructive focus:bg-destructive focus:text-destructive-foreground font-medium">
+                                                Suspend Member
+                                            </DropdownMenuItem>
+                                            <DropdownMenuItem v-else @click="onUnsuspend(member)"
+                                                class="text-destructive focus:bg-destructive focus:text-destructive-foreground font-medium">
+                                                Remove Suspension
+                                            </DropdownMenuItem>
+                                        </DropdownMenuContent>
+                                    </DropdownMenu>
+                                </TableCell>
+                            </TableRow>
+                            <TableRow v-if="paginatedMembers.length === 0" class="hover:bg-transparent">
+                                <TableCell colspan="6" class="h-64 text-center">
+                                    <div class="flex flex-col items-center justify-center gap-2 text-muted-foreground">
+                                        <UserX class="size-10 opacity-20 mb-2" />
+                                        <p class="font-medium">No results found</p>
+                                        <p class="text-xs">Try adjusting your filters or search query.</p>
+                                    </div>
+                                </TableCell>
+                            </TableRow>
+                        </template>
+                        <TableRow v-else>
+                            <TableCell colspan="6" class="h-64 text-center">
+                                <div class="flex flex-col items-center justify-center gap-4 text-muted-foreground">
+                                    <Spinner class="size-8" />
+                                </div>
+                            </TableCell>
+                        </TableRow>
+                    </TableBody>
+                </Table>
+            </div>
+            <div class="mt-8 flex flex-col sm:flex-row items-center justify-between gap-4 border-t pt-6">
+                <div class="flex items-center gap-3 text-sm">
+                    <p class="text-muted-foreground text-nowrap">Items per page:</p>
+                    <div class="flex bg-muted/50 p-1 rounded-md">
+                        <button v-for="size in pageSizeOptions" :key="size" @click="setPageSize(size)"
+                            class="px-3 py-1 rounded transition-all text-xs"
+                            :class="pageSize === size ? 'bg-background shadow-sm font-bold' : 'hover:text-foreground opacity-60'">
+                            {{ size }}
+                        </button>
+                    </div>
+                </div>
+                <Pagination v-if="totalItems > 0" :total="totalItems" :items-per-page="pageSize" :page="pageNum"
+                    :sibling-count="1" :show-edges="true" @update:page="setPage">
+                    <PaginationContent v-slot="{ items }">
+                        <PaginationPrevious />
+                        <template v-for="(item, index) in items" :key="index">
+                            <PaginationItem v-if="item.type === 'page'" :value="item.value"
+                                :is-active="item.value === pageNum">
+                                <Button variant="ghost" size="sm" :class="{ 'bg-muted': pageNum === item.value }"
+                                    @click="setPage(item.value)">
+                                    {{ item.value }}
+                                </Button>
+                            </PaginationItem>
+                            <PaginationEllipsis v-else-if="item.type === 'ellipsis'" :key="`ellipsis-${index}`" />
+                        </template>
+                        <PaginationNext />
+                    </PaginationContent>
+                </Pagination>
+                <p class="text-xs text-muted-foreground w-[100px] text-right">
+                    Total: {{ totalItems }}
+                </p>
+            </div>
         </div>
-        <Table>
-            <TableHeader>
-                <TableRow>
-                    <TableHead class="w-[100px]">
-                        Member
-                    </TableHead>
-                    <TableHead>Rank</TableHead>
-                    <TableHead>Unit</TableHead>
-                    <TableHead>Status</TableHead>
-                </TableRow>
-            </TableHeader>
-            <TableBody>
-                <TableRow v-for="member in searchedMembers" :key="member.member_id"
-                    :onClick="() => { viewMember(member.member_id) }" class="cursor-pointer">
-                    <TableCell class="font-medium">
-                        {{ member.member_name }}
-                    </TableCell>
-                    <TableCell>{{ member.rank }}</TableCell>
-                    <TableCell>{{ member.unit }}</TableCell>
-                    <TableCell>{{ member.status }}</TableCell>
-                    <TableCell><Badge v-if="member.on_loa">On LOA</Badge></TableCell>
-                    <TableCell @click.stop="" class="text-right">
-                        <DropdownMenu>
-                            <DropdownMenuTrigger class="cursor-pointer">
-                                <Ellipsis></Ellipsis>
-                            </DropdownMenuTrigger>
-                            <DropdownMenuContent>
-                                <DropdownMenuItem>Change Rank</DropdownMenuItem>
-                                <DropdownMenuItem>Transfer</DropdownMenuItem>
-                                <DropdownMenuItem :variant="'destructive'">Retire</DropdownMenuItem>
-                            </DropdownMenuContent>
-                        </DropdownMenu>
-                    </TableCell>
-                </TableRow>
-            </TableBody>
-        </Table>
     </div>
 </template>

ui/src/router/index.ts

@@ -1,4 +1,5 @@
 import { useUserStore } from '@/stores/user'
+import { MemberState } from '@shared/types/member';
 import { createRouter, createWebHistory } from 'vue-router'
 
 const router = createRouter({
@@ -13,7 +14,6 @@ const router = createRouter({
     { 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: '/profile', component: () => import('@/pages/MyProfile.vue'), meta: { requiresAuth: true } },
 
@@ -28,10 +28,12 @@ const router = createRouter({
     { 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 } },
 
+    { path: '/developer', component: () => import('@/pages/DeveloperTools.vue'), meta: { requiresAuth: true, memberOnly: true, roles: ['Dev'] } },
+
     // ADMIN / STAFF ROUTES
     {
       path: '/administration',
-      meta: { requiresAuth: true, memberOnly: true, roles: ['17th Administrator', '17th HQ', '17th Command'] },
+      meta: { requiresAuth: true, memberOnly: true, roles: ['17th Administrator', '17th HQ', '17th Command', '17th Recruiter'] },
       children: [
         { path: 'applications', component: () => import('@/pages/ManageApplications.vue') },
         { path: 'applications/:id', component: () => import('@/pages/ManageApplications.vue') },
@@ -39,7 +41,8 @@ const router = createRouter({
         { path: 'applications/:id', component: () => import('@/pages/Application.vue') },
         { path: 'loa', component: () => import('@/pages/ManageLOA.vue') },
         { path: 'roles', component: () => import('@/pages/ManageRoles.vue') },
-        { path: 'roles/:id', component: () => import('@/pages/ManageRoles.vue') }
+        { path: 'roles/:id', component: () => import('@/pages/ManageRoles.vue') },
+        { path: 'members', component: () => import('@/pages/memberList.vue') },
       ]
     },
 
@@ -48,6 +51,7 @@ const router = createRouter({
   ]
 })
 
+//@ts-ignore
 const addr = import.meta.env.VITE_APIHOST;
 
 
@@ -69,12 +73,12 @@ router.beforeEach(async (to) => {
 
 
   // Must be a member
-  if (to.meta.memberOnly && user.state !== 'member') {
+  if (to.meta.memberOnly && user.state !== MemberState.Member) {
     return '/unauthorized'
   }
 
   // Must have specific role
-  if (to.meta.roles && !user.hasRole('Dev') && !user.hasAnyRole(to.meta.roles)) {
+  if (to.meta.roles && !user.hasRole('Dev') && !user.hasAnyRole(to.meta.roles as string[])) {
     return '/unauthorized'
   }
 })

ui/src/stores/user.ts

@@ -1,7 +1,7 @@
 import { ref, computed, watch } from 'vue'
 import { defineStore } from 'pinia'
 import { useRoute, useRouter } from 'vue-router'
-import { myData } from '@shared/types/member'
+import { MemberState, myData } from '@shared/types/member'
 
 
 const POLL_INTERVAL = 10_000
@@ -10,7 +10,7 @@ export const useUserStore = defineStore('user', () => {
     const user = ref<myData>(null)
     const roles = computed(() => new Set(user.value?.roles?.map(r => r.name) ?? []));
     const loaded = ref(false);
-    const state = computed<string | undefined>(() => user.value?.state || undefined);
+    const state = computed<MemberState | undefined>(() => user.value?.state || undefined);
     const isLoggedIn = computed(() => user.value !== null)
     const displayName = computed(() => user.value?.member.displayName || user.value?.member.member_name)
 
@@ -38,6 +38,7 @@ export const useUserStore = defineStore('user', () => {
         return requiredRoles.some(r => roles.value.has(r))
     }
 
+    //watcher to kick you off a page if your perms are revoked
     const route = useRoute();
     const router = useRouter();
     watch(user, (newUser) => {
@@ -46,7 +47,7 @@ export const useUserStore = defineStore('user', () => {
         const currentRoute = route.meta
 
         // Member-only route
-        if (currentRoute.memberOnly && state.value !== 'member') {
+        if (currentRoute.memberOnly && state.value !== MemberState.Member) {
             router.replace('/unauthorized')
             return
         }