Added documentation page

Reviewed-on: #52

.gitea/workflows/cd-deploy.yaml

@@ -0,0 +1,62 @@
+name: Continuous Deployment
+on:
+  push:
+
+jobs:
+  Deploy:
+    name: Update Deployment
+    runs-on: ubuntu-latest
+    container:
+      volumes:
+        - /var/www/html/milsim-site-v4:/var/www/html/milsim-site-v4:rw
+    steps:
+      - name: Setup Local Environment
+        run: |
+          groupadd -g 989 nginx || true
+          useradd nginx -u 990 -g nginx -m || true
+
+      - name: Verify Node Environment
+        run: |
+          npm -v
+          node -v
+
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+          ref: 'main'
+
+      - name: Token Copy
+        run: |
+          cd /var/www/html/milsim-site-v4
+          cp /workspace/17th-Ranger-Battalion-ORG/milsim-site-v4/.git/config .git/config
+          chown nginx:nginx .git/config
+
+      - name: Fix File Permissions
+        run: |
+          sudo chown -R nginx:nginx /var/www/html/milsim-site-v4
+          sudo chmod -R u+w /var/www/html/milsim-site-v4
+
+      - name: Update Application Code
+        run: |
+          sudo -u nginx bash -c "cd /var/www/html/milsim-site-v4 && git reset --hard && git pull origin main"
+
+      - name: Update Shared Dependencies
+        run: |
+          sudo -u nginx bash -c "cd /var/www/html/milsim-site-v4/shared && npm install"
+
+      - name: Update UI Dependencies
+        run: |
+          sudo -u nginx bash -c "cd /var/www/html/milsim-site-v4/ui && npm install"
+
+      - name: Update API Dependencies
+        run: |
+          sudo -u nginx bash -c "cd /var/www/html/milsim-site-v4/api && npm install"
+
+      - name: Build UI
+        run: |
+          sudo -u nginx bash -c "cd /var/www/html/milsim-site-v4/ui && npm run build"
+
+      - name: Build API
+        run: |
+          sudo -u nginx bash -c "cd /var/www/html/milsim-site-v4/api && npm run build"

api/src/routes/applications.ts

@@ -38,12 +38,27 @@ router.get('/all', async (req, res) => {
 });
 
 router.get('/me', async (req, res) => {
+
   let userID = req.user.id;
 
-  console.log("application/me")
+  try {
+    let application = await getMemberApplication(userID);
 
-  let app = getMemberApplication(userID);
+    if (application === undefined)
-  console.log(app);
+      res.sendStatus(204);
+
+    const comments: CommentRow[] = await getApplicationComments(application.id);
+
+    const output: ApplicationFull = {
+      application,
+      comments,
+    }
+
+    return res.status(200).json(output);
+  } catch (error) {
+    console.error('Failed to load application:', error);
+    return res.status(500).json(error);
+  }
 })
 
 // GET /application/:id
@@ -54,7 +69,7 @@ router.get('/:id', async (req, res) => {
     const application = await getApplicationByID(appID);
     if (application === undefined)
       return res.sendStatus(204);
-    
+
     const comments: CommentRow[] = await getApplicationComments(appID);
 
     const output: ApplicationFull = {

api/src/services/rolesService.ts

@@ -1,4 +1,5 @@
 import pool from '../db';
+import { Role } from '@app/shared/types/roles'
 
 export async function assignUserGroup(userID: number, roleID: number) {
 
@@ -16,7 +17,7 @@ export async function createGroup(name: string, color: string, description: stri
     return { id: result.insertId, name, color, description };
 }
 
-export async function getUserRoles(userID: number) {
+export async function getUserRoles(userID: number): Promise<Role[]> {
     const sql = `SELECT r.id, r.name
         FROM members_roles mr
         INNER JOIN roles r ON mr.role_id = r.id

shared/schemas/trainingReportSchema.ts

@@ -1,11 +1,11 @@
 import { z } from "zod";
 
 export const courseEventAttendeeSchema = z.object({
-    attendee_id: z.number({invalid_type_error: "Must select a member"}).int().positive(),
+    attendee_id: z.number({ invalid_type_error: "Must select a member" }).int().positive(),
     passed_bookwork: z.boolean(),
     passed_qual: z.boolean(),
     remarks: z.string(),
-    attendee_role_id: z.number({invalid_type_error: "Must select a role"}).int().positive()
+    attendee_role_id: z.number({ invalid_type_error: "Must select a role" }).int().positive()
 })
 
 export const trainingReportSchema = z.object({
@@ -19,5 +19,42 @@ export const trainingReportSchema = z.object({
         ),
     remarks: z.string().nullable().optional(),
     attendees: z.array(courseEventAttendeeSchema).default([]),
+}).superRefine((data, ctx) => {
+    const trainerRole = 1;
+    const traineeRole = 2;
+
+    const hasTrainer = data.attendees.some((a) => a.attendee_role_id === trainerRole);
+    const hasTrainee = data.attendees.some((a) => a.attendee_role_id === traineeRole);
+
+    if (!hasTrainer) {
+        ctx.addIssue({
+            code: z.ZodIssueCode.custom,
+            path: ["attendees"],
+            message: "At least one Primary Trainer is required.",
+        });
+    }
+
+    if (!hasTrainee) {
+        ctx.addIssue({
+            code: z.ZodIssueCode.custom,
+            path: ["attendees"],
+            message: "At least one Trainee is required.",
+        });
+    }
+
+    //no duplicates
+    const idCounts = new Map<number, number>();
+
+    data.attendees.forEach((a, index) => {
+        idCounts.set(a.attendee_id, (idCounts.get(a.attendee_id) ?? 0) + 1);
+
+        if (idCounts.get(a.attendee_id)! > 1) {
+            ctx.addIssue({
+                code: z.ZodIssueCode.custom,
+                path: ["attendees"],
+                message: "Cannot have duplicate attendee.",
+            });
+        }
+    })
 })
 

shared/types/roles.ts

@@ -0,0 +1,6 @@
+export interface Role {
+    id: number;
+    name: string;
+    color?: string;
+    description?: string;
+}

ui/package-lock.json

@@ -22,7 +22,7 @@
         "clsx": "^2.1.1",
         "lucide-vue-next": "^0.539.0",
         "pinia": "^3.0.3",
-        "reka-ui": "^2.6.0",
+        "reka-ui": "^2.6.1",
         "tailwind-merge": "^3.3.1",
         "tailwindcss": "^4.1.11",
         "tw-animate-css": "^1.3.6",
@@ -3333,9 +3333,9 @@
       }
     },
     "node_modules/reka-ui": {
-      "version": "2.6.0",
+      "version": "2.6.1",
-      "resolved": "https://registry.npmjs.org/reka-ui/-/reka-ui-2.6.0.tgz",
+      "resolved": "https://registry.npmjs.org/reka-ui/-/reka-ui-2.6.1.tgz",
-      "integrity": "sha512-NrGMKrABD97l890mFS3TNUzB0BLUfbL3hh0NjcJRIUSUljb288bx3Mzo31nOyUcdiiW0HqFGXJwyCBh9cWgb0w==",
+      "integrity": "sha512-XK7cJDQoNuGXfCNzBBo/81Yg/OgjPwvbabnlzXG2VsdSgNsT6iIkuPBPr+C0Shs+3bb0x0lbPvgQAhMSCKm5Ww==",
       "license": "MIT",
       "dependencies": {
         "@floating-ui/dom": "^1.6.13",

ui/package.json

@@ -26,7 +26,7 @@
     "clsx": "^2.1.1",
     "lucide-vue-next": "^0.539.0",
     "pinia": "^3.0.3",
-    "reka-ui": "^2.6.0",
+    "reka-ui": "^2.6.1",
     "tailwind-merge": "^3.3.1",
     "tailwindcss": "^4.1.11",
     "tw-animate-css": "^1.3.6",

ui/src/App.vue

@@ -1,41 +1,13 @@
 <script setup>
-import { RouterLink, RouterView } from 'vue-router';
+import { RouterView } from 'vue-router';
-import Separator from './components/ui/separator/Separator.vue';
 import Button from './components/ui/button/Button.vue';
-import { Popover, PopoverContent, PopoverTrigger } from './components/ui/popover';
-import {
-  DropdownMenu,
-  DropdownMenuContent,
-  DropdownMenuItem,
-  DropdownMenuTrigger,
-} from './components/ui/dropdown-menu';
-import { onMounted } from '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';
 
 const userStore = useUserStore();
 
-// onMounted(async () => {
-//   const res = await fetch(`${import.meta.env.VITE_APIHOST}/members/me`, {
-//     credentials: 'include',
-//   });
-//   const data = await res.json();
-//   console.log(data);
-//   userStore.user = data;
-// });
-const APIHOST = import.meta.env.VITE_APIHOST;
-
-async function logout() {
-  // await fetch(`${APIHOST}/logout`, {
-  //   method: 'GET',
-  //   credentials: 'include',
-  // });
-
-  userStore.user = null;
-  window.location.href = APIHOST + "/logout";
-}
-
 function formatDate(dateStr) {
   if (!dateStr) return "";
   return new Date(dateStr).toLocaleDateString("en-US", {
@@ -49,90 +21,23 @@ const environment = import.meta.env.VITE_ENVIRONMENT;
 </script>
 
 <template>
-  <div>
+  <div class="flex flex-col min-h-screen">
-    <div class="flex items-center justify-between px-10">
+    <div class="sticky top-0 bg-background z-50">
-      <div></div>
+      <Navbar class="flex"></Navbar>
-      <div class="h-15 flex items-center justify-center gap-20">
+      <Alert v-if="environment == 'dev'" class="m-2 mx-auto w-5xl" variant="info">
-        <RouterLink to="/">
+        <AlertDescription class="flex flex-row items-center text-nowrap gap-5 mx-auto">
-          <Button variant="link">Home</Button>
+          <p>This is a development build of the application. Some features will be unavailable or unstable.</p>
-        </RouterLink>
+        </AlertDescription>
-        <RouterLink to="/calendar">
+      </Alert>
-          <Button variant="link">Calendar</Button>
+      <Alert v-if="userStore.user?.loa?.[0]" class="m-2 mx-auto w-5xl" variant="info">
-        </RouterLink>
+        <AlertDescription class="flex flex-row items-center text-nowrap gap-5 mx-auto">
-        <RouterLink to="/members">
+          <p>You are on LOA until <strong>{{ formatDate(userStore.user?.loa?.[0].end_date) }}</strong></p>
-          <Button variant="link">Members</Button>
+          <Button variant="secondary">End LOA</Button>
-        </RouterLink>
+        </AlertDescription>
-        <Popover>
+      </Alert>
-          <PopoverTrigger as-child>
-            <Button variant="link">Forms</Button>
-          </PopoverTrigger>
-          <PopoverContent class="flex flex-col gap-4 items-center w-min">
-            <RouterLink to="/transfer">
-              <Button variant="link">Transfer Request</Button>
-            </RouterLink>
-            <RouterLink to="/trainingReport">
-              <Button variant="link">Training Report</Button>
-            </RouterLink>
-          </PopoverContent>
-        </Popover>
-        <Popover>
-          <PopoverTrigger as-child>
-            <Button variant="link">Administration</Button>
-          </PopoverTrigger>
-          <PopoverContent class="flex flex-col gap-4 items-center w-min">
-            <RouterLink to="/administration/rankChange">
-              <Button variant="link">Promotions</Button>
-            </RouterLink>
-            <RouterLink to="/administration/loa">
-              <Button variant="link">Leave of Absence</Button>
-            </RouterLink>
-            <RouterLink to="/administration/transfer">
-              <Button variant="link">Transfer Requests</Button>
-            </RouterLink>
-            <RouterLink to="/administration/applications">
-              <Button variant="link">Recruitment</Button>
-            </RouterLink>
-            <RouterLink to="/administration/roles">
-              <Button variant="link">Role Management</Button>
-            </RouterLink>
-          </PopoverContent>
-        </Popover>
-
-      </div>
-      <div>
-        <DropdownMenu v-if="userStore.isLoggedIn">
-          <DropdownMenuTrigger class="cursor-pointer">
-            <p>{{ userStore.user.name }}</p>
-          </DropdownMenuTrigger>
-          <DropdownMenuContent>
-            <DropdownMenuItem>My Profile</DropdownMenuItem>
-            <DropdownMenuItem>Settings</DropdownMenuItem>
-            <DropdownMenuItem>
-              <RouterLink to="/loa">
-                Submit LOA
-              </RouterLink>
-            </DropdownMenuItem>
-            <DropdownMenuItem :variant="'destructive'" @click="logout()">Logout</DropdownMenuItem>
-          </DropdownMenuContent>
-        </DropdownMenu>
-
-        <a v-else :href="APIHOST + '/login'">Login</a>
-      </div>
     </div>
-    <Separator></Separator>
-    <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">
-        <p>This is a development build of the application. Some features will be unavailable or unstable.</p>
-      </AlertDescription>
-    </Alert>
-    <Alert v-if="userStore.user?.loa?.[0]" class="m-2 mx-auto w-5xl" variant="info">
-      <AlertDescription class="flex flex-row items-center text-nowrap gap-5 mx-auto">
-        <p>You are on LOA until <strong>{{ formatDate(userStore.user?.loa?.[0].end_date) }}</strong></p>
-        <Button variant="secondary">End LOA</Button>
-      </AlertDescription>
-    </Alert>
 
-    <RouterView class=""></RouterView>
+    <RouterView class="flex-1 min-h-0"></RouterView>
   </div>
 </template>
 

ui/src/api/application.ts

@@ -74,7 +74,7 @@ export enum ApplicationStatus {
 const addr = import.meta.env.VITE_APIHOST;
 
 export async function loadApplication(id: number | string): Promise<ApplicationFull | null> {
-  const res = await fetch(`${addr}/application/${id}`)
+  const res = await fetch(`${addr}/application/${id}`, { credentials: 'include' })
   if (res.status === 204) return null
   if (!res.ok) throw new Error('Failed to load application')
   const json = await res.json()

ui/src/assets/base.css

@@ -16,8 +16,8 @@
   --secondary-foreground: oklch(0.9219 0 0);
   --muted: oklch(0.2686 0 0);
   --muted-foreground: oklch(0.7155 0 0);
-  --accent: oklch(0.4732 0.1247 46.2007);
+  --accent: oklch(100% 0.00011 271.152 / 0.253);
-  --accent-foreground: oklch(0.9243 0.1151 95.7459);
+  --accent-foreground: oklch(100% 0.00011 271.152);
   --destructive: oklch(0.6368 0.2078 25.3313);
   --destructive-foreground: oklch(1.0000 0 0);
   --success: oklch(66.104% 0.16937 144.153);
@@ -52,7 +52,7 @@
   --shadow-2xl: 0px 4px 8px -1px hsl(0 0% 0% / 0.35);
 }
 
-.dark {
+/* .dark {
   --background: oklch(0.2046 0 0);
   --foreground: oklch(0.9219 0 0);
   --card: oklch(23.075% 0.00003 271.152);
@@ -99,7 +99,7 @@
   --shadow-lg: 0px 4px 8px -1px hsl(0 0% 0% / 0.14), 0px 4px 6px -2px hsl(0 0% 0% / 0.14);
   --shadow-xl: 0px 4px 8px -1px hsl(0 0% 0% / 0.14), 0px 8px 10px -2px hsl(0 0% 0% / 0.14);
   --shadow-2xl: 0px 4px 8px -1px hsl(0 0% 0% / 0.35);
-}
+} */
 
 
 @theme inline {

ui/src/components/Navigation/Navbar.vue

@@ -0,0 +1,181 @@
+<script setup lang="ts">
+import { RouterLink } from 'vue-router';
+import Separator from '../ui/separator/Separator.vue';
+import { Popover, PopoverContent, PopoverTrigger } from '../ui/popover';
+import {
+    DropdownMenu,
+    DropdownMenuContent,
+    DropdownMenuItem,
+    DropdownMenuTrigger,
+} from '../ui/dropdown-menu';
+import { useUserStore } from '@/stores/user';
+import Button from '../ui/button/Button.vue';
+import NavigationMenu from '../ui/navigation-menu/NavigationMenu.vue';
+import NavigationMenuList from '../ui/navigation-menu/NavigationMenuList.vue';
+import NavigationMenuItem from '../ui/navigation-menu/NavigationMenuItem.vue';
+import NavigationMenuLink from '../ui/navigation-menu/NavigationMenuLink.vue';
+import NavigationMenuTrigger from '../ui/navigation-menu/NavigationMenuTrigger.vue';
+import NavigationMenuContent from '../ui/navigation-menu/NavigationMenuContent.vue';
+import { navigationMenuTriggerStyle } from '../ui/navigation-menu/'
+import { useAuth } from '@/composables/useAuth';
+import { CircleArrowOutUpRight } from 'lucide-vue-next';
+
+const userStore = useUserStore();
+const auth = useAuth();
+
+//@ts-ignore
+const APIHOST = import.meta.env.VITE_APIHOST;
+
+async function logout() {
+    userStore.user = null;
+    window.location.href = APIHOST + "/logout";
+}
+
+function blurAfter() {
+    requestAnimationFrame(() => {
+        (document.activeElement as HTMLElement)?.blur();
+    });
+}
+</script>
+
+<template>
+    <div class="w-full border-b">
+        <div class="max-w-screen-3xl w-full mx-auto flex items-center justify-between pr-10 pl-7">
+            <!-- left side -->
+            <div class="flex items-center gap-7">
+                <RouterLink to="/">
+                    <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">
+                    <NavigationMenu>
+                        <NavigationMenuList class="gap-3">
+
+                            <!-- Calendar -->
+                            <NavigationMenuItem>
+                                <NavigationMenuLink as-child :class="navigationMenuTriggerStyle()">
+                                    <RouterLink to="/calendar" @click="blurAfter">Calendar</RouterLink>
+                                </NavigationMenuLink>
+                            </NavigationMenuItem>
+
+                            <!-- Members -->
+                            <NavigationMenuItem>
+                                <NavigationMenuLink as-child :class="navigationMenuTriggerStyle()">
+                                    <RouterLink to="/documents" @click="blurAfter">Documents</RouterLink>
+                                </NavigationMenuLink>
+                            </NavigationMenuItem>
+
+                            <!-- Forms (Dropdown) -->
+                            <NavigationMenuItem class="bg-none !focus:bg-none !active:bg-none">
+                                <NavigationMenuTrigger>Forms</NavigationMenuTrigger>
+                                <NavigationMenuContent
+                                    class="grid gap-1 p-2 text-left [&_a]:w-full [&_a]:block [&_a]:whitespace-nowrap *:bg-transparent">
+                                    <NavigationMenuLink as-child :class="navigationMenuTriggerStyle()">
+                                        <RouterLink to="/loa" @click="blurAfter">
+                                            Leave of Absence
+                                        </RouterLink>
+                                    </NavigationMenuLink>
+
+                                    <NavigationMenuLink as-child :class="navigationMenuTriggerStyle()">
+                                        <RouterLink to="/transfer" @click="blurAfter">
+                                            Transfer Request
+                                        </RouterLink>
+                                    </NavigationMenuLink>
+
+                                    <NavigationMenuLink as-child :class="navigationMenuTriggerStyle()">
+                                        <RouterLink to="/trainingReport" @click="blurAfter">
+                                            Training Report
+                                        </RouterLink>
+                                    </NavigationMenuLink>
+
+                                </NavigationMenuContent>
+                            </NavigationMenuItem>
+
+                            <!-- Administration (Dropdown) -->
+                            <NavigationMenuItem
+                                v-if="auth.hasAnyRole(['17th Administrator', '17th HQ', '17th Command', 'Recruiter'])">
+                                <NavigationMenuTrigger>Administration</NavigationMenuTrigger>
+                                <NavigationMenuContent
+                                    class="grid gap-1 p-2 text-left [&_a]:w-full [&_a]:block [&_a]:whitespace-nowrap *:bg-transparent">
+
+                                    <NavigationMenuLink
+                                        v-if="auth.hasAnyRole(['17th Administrator', '17th HQ', '17th Command'])"
+                                        as-child :class="navigationMenuTriggerStyle()">
+                                        <RouterLink to="/administration/rankChange" @click="blurAfter">
+                                            Promotions
+                                        </RouterLink>
+                                    </NavigationMenuLink>
+
+                                    <NavigationMenuLink
+                                        v-if="auth.hasAnyRole(['17th Administrator', '17th HQ', '17th Command'])"
+                                        as-child :class="navigationMenuTriggerStyle()">
+                                        <RouterLink to="/administration/loa" @click="blurAfter">
+                                            Leave of Absence
+                                        </RouterLink>
+                                    </NavigationMenuLink>
+
+                                    <NavigationMenuLink
+                                        v-if="auth.hasAnyRole(['17th Administrator', '17th HQ', '17th Command'])"
+                                        as-child :class="navigationMenuTriggerStyle()">
+                                        <RouterLink to="/administration/transfer" @click="blurAfter">
+                                            Transfer Requests
+                                        </RouterLink>
+                                    </NavigationMenuLink>
+
+                                    <NavigationMenuLink v-if="auth.hasRole('Recruiter')" as-child
+                                        :class="navigationMenuTriggerStyle()">
+                                        <RouterLink to="/administration/applications" @click="blurAfter">
+                                            Recruitment
+                                        </RouterLink>
+                                    </NavigationMenuLink>
+
+                                    <NavigationMenuLink v-if="auth.hasRole('17th Administrator')" as-child
+                                        :class="navigationMenuTriggerStyle()">
+                                        <RouterLink to="/administration/roles" @click="blurAfter">
+                                            Role Management
+                                        </RouterLink>
+                                    </NavigationMenuLink>
+                                </NavigationMenuContent>
+                            </NavigationMenuItem>
+
+                            <NavigationMenuItem as-child :class="navigationMenuTriggerStyle()">
+                                <RouterLink to="/members" @click="blurAfter">
+                                    Members (debug)
+                                </RouterLink>
+                            </NavigationMenuItem>
+
+                        </NavigationMenuList>
+                    </NavigationMenu>
+                </div>
+                <!-- Guest navigation -->
+                <div v-else class="h-15 flex items-center justify-center">
+                    <NavigationMenu>
+                        <NavigationMenuList>
+                            <NavigationMenuItem>
+                                <NavigationMenuLink as-child :class="navigationMenuTriggerStyle()">
+                                    <RouterLink to="/join" @click="blurAfter">Join</RouterLink>
+                                </NavigationMenuLink>
+                            </NavigationMenuItem>
+                        </NavigationMenuList>
+                    </NavigationMenu>
+                </div>
+            </div>
+            <!-- right side -->
+            <div>
+                <DropdownMenu v-if="userStore.isLoggedIn">
+                    <DropdownMenuTrigger class="cursor-pointer">
+                        <p>{{ userStore.user.name }}</p>
+                    </DropdownMenuTrigger>
+                    <DropdownMenuContent>
+                        <!-- <DropdownMenuItem>My Profile</DropdownMenuItem> -->
+                        <!-- <DropdownMenuItem>Settings</DropdownMenuItem> -->
+                        <DropdownMenuItem @click="$router.push('/join')">My Application</DropdownMenuItem>
+                        <DropdownMenuItem :variant="'destructive'" @click="logout()">Logout</DropdownMenuItem>
+                    </DropdownMenuContent>
+                </DropdownMenu>
+                <a v-else :href="APIHOST + '/login'">Login</a>
+            </div>
+        </div>
+        <!-- <Separator></Separator> -->
+    </div>
+</template>

ui/src/components/application/ApplicationChat.vue

@@ -38,7 +38,7 @@ function onSubmit(values: { text: string }, { resetForm }: { resetForm: () => vo
     <Form :validation-schema="commentSchema" @submit="onSubmit">
       <FormField name="text" v-slot="{ componentField }">
         <FormItem>
-          <FormLabel class="sr-only">Comment</FormLabel>
+          <FormLabel>Comment</FormLabel>
           <FormControl>
             <Textarea v-bind="componentField" rows="3" placeholder="Write a comment…"
               class="bg-neutral-800 resize-none w-full" />

ui/src/components/application/ApplicationForm.vue

@@ -82,7 +82,7 @@ onMounted(() => {
         <FormControl>
           <DateInput :model-value="(value as string) ?? ''" :disabled="readOnly" @update:model-value="handleChange" />
         </FormControl>
-        <FormMessage />
+        <FormMessage class="text-destructive"/>
       </FormItem>
     </FormField>
 

ui/src/components/loa/loaForm.vue

@@ -101,7 +101,7 @@ function toMariaDBDatetime(date: Date): string {
 </script>
 
 <template>
-    <div class="flex flex-row-reverse gap-6 mx-auto " :class="!adminMode ? 'max-w-5xl' : 'max-w-5xl'">
+    <div class="flex flex-row-reverse gap-6 mx-auto w-full" :class="!adminMode ? 'max-w-5xl' : 'max-w-5xl'">
         <div v-if="!adminMode" class="flex-1 flex space-x-4 rounded-md border p-4">
             <div class="flex-2 space-y-1">
                 <p class="text-sm font-medium leading-none">

ui/src/components/trainingReport/trainingReportForm.vue

@@ -18,10 +18,12 @@ import FieldSet from '../ui/field/FieldSet.vue'
 import FieldLegend from '../ui/field/FieldLegend.vue'
 import FieldDescription from '../ui/field/FieldDescription.vue'
 import Checkbox from '../ui/checkbox/Checkbox.vue'
+import { configure } from 'vee-validate'
 
 
 const { handleSubmit, resetForm, errors, values, setFieldValue } = useForm({
     validationSchema: toTypedSchema(trainingReportSchema),
+    validateOnMount: false,
     initialValues: {
         course_id: null,
         event_date: "",
@@ -129,8 +131,17 @@ onMounted(async () => {
 
         <VeeFieldArray name="attendees" v-slot="{ fields, push, remove }">
             <FieldSet class="gap-4">
-                <FieldLegend class="scroll-m-20 text-lg tracking-tight">Attendees</FieldLegend>
+                <div class="flex flex-col gap-2">
-                <FieldDescription>Add members who attended this session.</FieldDescription>
+                    <FieldLegend class="scroll-m-20 text-lg tracking-tight mb-0">Attendees</FieldLegend>
+                    <FieldDescription class="mb-0">Add members who attended this session.</FieldDescription>
+                    <div class="h-4">
+                        <div class="text-red-500 text-sm"
+                            v-if="errors.attendees && typeof errors.attendees === 'string'">
+                            {{ errors.attendees }}
+                        </div>
+                    </div>
+                </div>
+
 
                 <FieldGroup class="gap-4">
 

ui/src/components/ui/navigation-menu/NavigationMenu.vue

@@ -0,0 +1,45 @@
+<script setup>
+import { reactiveOmit } from "@vueuse/core";
+import { NavigationMenuRoot, useForwardPropsEmits } from "reka-ui";
+import { cn } from "@/lib/utils";
+import NavigationMenuViewport from "./NavigationMenuViewport.vue";
+
+const props = defineProps({
+  modelValue: { type: String, required: false },
+  defaultValue: { type: String, required: false },
+  dir: { type: String, required: false },
+  orientation: { type: String, required: false },
+  delayDuration: { type: Number, required: false },
+  skipDelayDuration: { type: Number, required: false },
+  disableClickTrigger: { type: Boolean, required: false },
+  disableHoverTrigger: { type: Boolean, required: false },
+  disablePointerLeaveClose: { type: Boolean, required: false },
+  unmountOnHide: { type: Boolean, required: false },
+  asChild: { type: Boolean, required: false },
+  as: { type: null, required: false },
+  class: { type: null, required: false },
+  viewport: { type: Boolean, required: false, default: true },
+});
+const emits = defineEmits(["update:modelValue"]);
+
+const delegatedProps = reactiveOmit(props, "class", "viewport");
+const forwarded = useForwardPropsEmits(delegatedProps, emits);
+</script>
+
+<template>
+  <NavigationMenuRoot
+    v-slot="slotProps"
+    data-slot="navigation-menu"
+    :data-viewport="viewport"
+    v-bind="forwarded"
+    :class="
+      cn(
+        'group/navigation-menu relative flex max-w-max flex-1 items-center justify-center',
+        props.class,
+      )
+    "
+  >
+    <slot v-bind="slotProps" />
+    <NavigationMenuViewport v-if="viewport" />
+  </NavigationMenuRoot>
+</template>

ui/src/components/ui/navigation-menu/NavigationMenuContent.vue

@@ -0,0 +1,39 @@
+<script setup>
+import { reactiveOmit } from "@vueuse/core";
+import { NavigationMenuContent, useForwardPropsEmits } from "reka-ui";
+import { cn } from "@/lib/utils";
+
+const props = defineProps({
+  forceMount: { type: Boolean, required: false },
+  disableOutsidePointerEvents: { type: Boolean, required: false },
+  asChild: { type: Boolean, required: false },
+  as: { type: null, required: false },
+  class: { type: null, required: false },
+});
+const emits = defineEmits([
+  "escapeKeyDown",
+  "pointerDownOutside",
+  "focusOutside",
+  "interactOutside",
+]);
+
+const delegatedProps = reactiveOmit(props, "class");
+
+const forwarded = useForwardPropsEmits(delegatedProps, emits);
+</script>
+
+<template>
+  <NavigationMenuContent
+    data-slot="navigation-menu-content"
+    v-bind="forwarded"
+    :class="
+      cn(
+        'data-[motion^=from-]:animate-in data-[motion^=to-]:animate-out data-[motion^=from-]:fade-in data-[motion^=to-]:fade-out data-[motion=from-end]:slide-in-from-right-52 data-[motion=from-start]:slide-in-from-left-52 data-[motion=to-end]:slide-out-to-right-52 data-[motion=to-start]:slide-out-to-left-52 top-0 left-0 w-full p-2 pr-2.5 md:absolute md:w-auto',
+        'group-data-[viewport=false]/navigation-menu:bg-popover group-data-[viewport=false]/navigation-menu:text-popover-foreground group-data-[viewport=false]/navigation-menu:data-[state=open]:animate-in group-data-[viewport=false]/navigation-menu:data-[state=closed]:animate-out group-data-[viewport=false]/navigation-menu:data-[state=closed]:zoom-out-95 group-data-[viewport=false]/navigation-menu:data-[state=open]:zoom-in-95 group-data-[viewport=false]/navigation-menu:data-[state=open]:fade-in-0 group-data-[viewport=false]/navigation-menu:data-[state=closed]:fade-out-0 group-data-[viewport=false]/navigation-menu:top-full group-data-[viewport=false]/navigation-menu:mt-1.5 group-data-[viewport=false]/navigation-menu:overflow-hidden group-data-[viewport=false]/navigation-menu:rounded-md group-data-[viewport=false]/navigation-menu:border group-data-[viewport=false]/navigation-menu:shadow group-data-[viewport=false]/navigation-menu:duration-200 **:data-[slot=navigation-menu-link]:focus:ring-0 **:data-[slot=navigation-menu-link]:focus:outline-none',
+        props.class,
+      )
+    "
+  >
+    <slot />
+  </NavigationMenuContent>
+</template>

ui/src/components/ui/navigation-menu/NavigationMenuIndicator.vue

@@ -0,0 +1,33 @@
+<script setup>
+import { reactiveOmit } from "@vueuse/core";
+import { NavigationMenuIndicator, useForwardProps } from "reka-ui";
+import { cn } from "@/lib/utils";
+
+const props = defineProps({
+  forceMount: { type: Boolean, required: false },
+  asChild: { type: Boolean, required: false },
+  as: { type: null, required: false },
+  class: { type: null, required: false },
+});
+
+const delegatedProps = reactiveOmit(props, "class");
+
+const forwardedProps = useForwardProps(delegatedProps);
+</script>
+
+<template>
+  <NavigationMenuIndicator
+    data-slot="navigation-menu-indicator"
+    v-bind="forwardedProps"
+    :class="
+      cn(
+        'data-[state=visible]:animate-in data-[state=hidden]:animate-out data-[state=hidden]:fade-out data-[state=visible]:fade-in top-full z-[1] flex h-1.5 items-end justify-center overflow-hidden',
+        props.class,
+      )
+    "
+  >
+    <div
+      class="bg-border relative top-[60%] h-2 w-2 rotate-45 rounded-tl-sm shadow-md"
+    />
+  </NavigationMenuIndicator>
+</template>

ui/src/components/ui/navigation-menu/NavigationMenuItem.vue

@@ -0,0 +1,24 @@
+<script setup>
+import { reactiveOmit } from "@vueuse/core";
+import { NavigationMenuItem } from "reka-ui";
+import { cn } from "@/lib/utils";
+
+const props = defineProps({
+  value: { type: String, required: false },
+  asChild: { type: Boolean, required: false },
+  as: { type: null, required: false },
+  class: { type: null, required: false },
+});
+
+const delegatedProps = reactiveOmit(props, "class");
+</script>
+
+<template>
+  <NavigationMenuItem
+    data-slot="navigation-menu-item"
+    v-bind="delegatedProps"
+    :class="cn('relative', props.class)"
+  >
+    <slot />
+  </NavigationMenuItem>
+</template>

ui/src/components/ui/navigation-menu/NavigationMenuLink.vue

@@ -0,0 +1,31 @@
+<script setup>
+import { reactiveOmit } from "@vueuse/core";
+import { NavigationMenuLink, useForwardPropsEmits } from "reka-ui";
+import { cn } from "@/lib/utils";
+
+const props = defineProps({
+  active: { type: Boolean, required: false },
+  asChild: { type: Boolean, required: false },
+  as: { type: null, required: false },
+  class: { type: null, required: false },
+});
+const emits = defineEmits(["select"]);
+
+const delegatedProps = reactiveOmit(props, "class");
+const forwarded = useForwardPropsEmits(delegatedProps, emits);
+</script>
+
+<template>
+  <NavigationMenuLink
+    data-slot="navigation-menu-link"
+    v-bind="forwarded"
+    :class="
+      cn(
+        'data-active:focus:bg-accent data-active:hover:bg-accent data-active:bg-accent/50 data-active:text-accent-foreground hover:bg-accent hover:text-accent-foreground focus:bg-accent focus:text-accent-foreground ring-ring/10 dark:ring-ring/20 dark:outline-ring/40 outline-ring/50 [&_svg:not([class*=\'text-\'])]:text-muted-foreground flex flex-col gap-1 rounded-sm p-2 text-sm transition-[color,box-shadow] focus-visible:ring-4 focus-visible:outline-1 [&_svg:not([class*=\'size-\'])]:size-4',
+        props.class,
+      )
+    "
+  >
+    <slot />
+  </NavigationMenuLink>
+</template>

ui/src/components/ui/navigation-menu/NavigationMenuList.vue

@@ -0,0 +1,30 @@
+<script setup>
+import { reactiveOmit } from "@vueuse/core";
+import { NavigationMenuList, useForwardProps } from "reka-ui";
+import { cn } from "@/lib/utils";
+
+const props = defineProps({
+  asChild: { type: Boolean, required: false },
+  as: { type: null, required: false },
+  class: { type: null, required: false },
+});
+
+const delegatedProps = reactiveOmit(props, "class");
+
+const forwardedProps = useForwardProps(delegatedProps);
+</script>
+
+<template>
+  <NavigationMenuList
+    data-slot="navigation-menu-list"
+    v-bind="forwardedProps"
+    :class="
+      cn(
+        'group flex flex-1 list-none items-center justify-center gap-1',
+        props.class,
+      )
+    "
+  >
+    <slot />
+  </NavigationMenuList>
+</template>

ui/src/components/ui/navigation-menu/NavigationMenuTrigger.vue

@@ -0,0 +1,32 @@
+<script setup>
+import { reactiveOmit } from "@vueuse/core";
+import { ChevronDown } from "lucide-vue-next";
+import { NavigationMenuTrigger, useForwardProps } from "reka-ui";
+import { cn } from "@/lib/utils";
+import { navigationMenuTriggerStyle } from ".";
+
+const props = defineProps({
+  disabled: { type: Boolean, required: false },
+  asChild: { type: Boolean, required: false },
+  as: { type: null, required: false },
+  class: { type: null, required: false },
+});
+
+const delegatedProps = reactiveOmit(props, "class");
+
+const forwardedProps = useForwardProps(delegatedProps);
+</script>
+
+<template>
+  <NavigationMenuTrigger
+    data-slot="navigation-menu-trigger"
+    v-bind="forwardedProps"
+    :class="cn(navigationMenuTriggerStyle(), 'group', props.class)"
+  >
+    <slot />
+    <ChevronDown
+      class="relative top-[1px] ml-1 size-3 transition duration-300 group-data-[state=open]:rotate-180"
+      aria-hidden="true"
+    />
+  </NavigationMenuTrigger>
+</template>

ui/src/components/ui/navigation-menu/NavigationMenuViewport.vue

@@ -0,0 +1,32 @@
+<script setup>
+import { reactiveOmit } from "@vueuse/core";
+import { NavigationMenuViewport, useForwardProps } from "reka-ui";
+import { cn } from "@/lib/utils";
+
+const props = defineProps({
+  forceMount: { type: Boolean, required: false },
+  align: { type: String, required: false },
+  asChild: { type: Boolean, required: false },
+  as: { type: null, required: false },
+  class: { type: null, required: false },
+});
+
+const delegatedProps = reactiveOmit(props, "class");
+
+const forwardedProps = useForwardProps(delegatedProps);
+</script>
+
+<template>
+  <div class="absolute top-full left-0 isolate z-50 flex justify-center">
+    <NavigationMenuViewport
+      data-slot="navigation-menu-viewport"
+      v-bind="forwardedProps"
+      :class="
+        cn(
+          'origin-top-center bg-popover text-popover-foreground data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-90 relative mt-1.5 h-[var(--reka-navigation-menu-viewport-height)] w-full overflow-hidden rounded-md border shadow md:w-[var(--reka-navigation-menu-viewport-width)] left-[var(--reka-navigation-menu-viewport-left)]',
+          props.class,
+        )
+      "
+    />
+  </div>
+</template>

ui/src/components/ui/navigation-menu/index.js

@@ -0,0 +1,14 @@
+import { cva } from "class-variance-authority";
+
+export { default as NavigationMenu } from "./NavigationMenu.vue";
+export { default as NavigationMenuContent } from "./NavigationMenuContent.vue";
+export { default as NavigationMenuIndicator } from "./NavigationMenuIndicator.vue";
+export { default as NavigationMenuItem } from "./NavigationMenuItem.vue";
+export { default as NavigationMenuLink } from "./NavigationMenuLink.vue";
+export { default as NavigationMenuList } from "./NavigationMenuList.vue";
+export { default as NavigationMenuTrigger } from "./NavigationMenuTrigger.vue";
+export { default as NavigationMenuViewport } from "./NavigationMenuViewport.vue";
+
+export const navigationMenuTriggerStyle = cva(
+  "group inline-flex h-9 w-max items-center justify-center rounded-md bg-background px-4 py-2 text-sm font-medium hover:bg-accent hover:text-accent-foreground focus:bg-accent focus:text-accent-foreground disabled:pointer-events-none disabled:opacity-50 data-[state=open]:hover:bg-accent data-[state=open]:text-accent-foreground data-[state=open]:focus:bg-accent data-[state=open]:bg-accent/50 focus-visible:ring-ring/50 outline-none transition-[color,box-shadow] focus-visible:ring-[3px] focus-visible:outline-1",
+);

ui/src/components/ui/stepper/Stepper.vue

@@ -0,0 +1,31 @@
+<script setup>
+import { reactiveOmit } from "@vueuse/core";
+import { StepperRoot, useForwardPropsEmits } from "reka-ui";
+import { cn } from "@/lib/utils";
+
+const props = defineProps({
+  defaultValue: { type: Number, required: false },
+  orientation: { type: String, required: false },
+  dir: { type: String, required: false },
+  modelValue: { type: Number, required: false },
+  linear: { type: Boolean, required: false },
+  asChild: { type: Boolean, required: false },
+  as: { type: null, required: false },
+  class: { type: null, required: false },
+});
+const emits = defineEmits(["update:modelValue"]);
+
+const delegatedProps = reactiveOmit(props, "class");
+
+const forwarded = useForwardPropsEmits(delegatedProps, emits);
+</script>
+
+<template>
+  <StepperRoot
+    v-slot="slotProps"
+    :class="cn('flex gap-2', props.class)"
+    v-bind="forwarded"
+  >
+    <slot v-bind="slotProps" />
+  </StepperRoot>
+</template>

ui/src/components/ui/stepper/StepperDescription.vue

@@ -0,0 +1,25 @@
+<script setup>
+import { reactiveOmit } from "@vueuse/core";
+import { StepperDescription, useForwardProps } from "reka-ui";
+import { cn } from "@/lib/utils";
+
+const props = defineProps({
+  asChild: { type: Boolean, required: false },
+  as: { type: null, required: false },
+  class: { type: null, required: false },
+});
+
+const delegatedProps = reactiveOmit(props, "class");
+
+const forwarded = useForwardProps(delegatedProps);
+</script>
+
+<template>
+  <StepperDescription
+    v-slot="slotProps"
+    v-bind="forwarded"
+    :class="cn('text-xs text-muted-foreground', props.class)"
+  >
+    <slot v-bind="slotProps" />
+  </StepperDescription>
+</template>

ui/src/components/ui/stepper/StepperIndicator.vue

@@ -0,0 +1,36 @@
+<script setup>
+import { reactiveOmit } from "@vueuse/core";
+import { StepperIndicator, useForwardProps } from "reka-ui";
+import { cn } from "@/lib/utils";
+
+const props = defineProps({
+  asChild: { type: Boolean, required: false },
+  as: { type: null, required: false },
+  class: { type: null, required: false },
+});
+
+const delegatedProps = reactiveOmit(props, "class");
+
+const forwarded = useForwardProps(delegatedProps);
+</script>
+
+<template>
+  <StepperIndicator
+    v-slot="slotProps"
+    v-bind="forwarded"
+    :class="
+      cn(
+        'inline-flex items-center justify-center rounded-full text-muted-foreground/50 w-8 h-8',
+        // Disabled
+        'group-data-[disabled]:text-muted-foreground group-data-[disabled]:opacity-50',
+        // Active
+        'group-data-[state=active]:bg-primary group-data-[state=active]:text-primary-foreground',
+        // Completed
+        'group-data-[state=completed]:bg-accent group-data-[state=completed]:text-accent-foreground',
+        props.class,
+      )
+    "
+  >
+    <slot v-bind="slotProps" />
+  </StepperIndicator>
+</template>

ui/src/components/ui/stepper/StepperItem.vue

@@ -0,0 +1,33 @@
+<script setup>
+import { reactiveOmit } from "@vueuse/core";
+import { StepperItem, useForwardProps } from "reka-ui";
+import { cn } from "@/lib/utils";
+
+const props = defineProps({
+  step: { type: Number, required: true },
+  disabled: { type: Boolean, required: false },
+  completed: { type: Boolean, required: false },
+  asChild: { type: Boolean, required: false },
+  as: { type: null, required: false },
+  class: { type: null, required: false },
+});
+
+const delegatedProps = reactiveOmit(props, "class");
+
+const forwarded = useForwardProps(delegatedProps);
+</script>
+
+<template>
+  <StepperItem
+    v-slot="slotProps"
+    v-bind="forwarded"
+    :class="
+      cn(
+        'flex items-center gap-2 group data-[disabled]:pointer-events-none',
+        props.class,
+      )
+    "
+  >
+    <slot v-bind="slotProps" />
+  </StepperItem>
+</template>

ui/src/components/ui/stepper/StepperSeparator.vue

@@ -0,0 +1,33 @@
+<script setup>
+import { reactiveOmit } from "@vueuse/core";
+import { StepperSeparator, useForwardProps } from "reka-ui";
+import { cn } from "@/lib/utils";
+
+const props = defineProps({
+  orientation: { type: String, required: false },
+  decorative: { type: Boolean, required: false },
+  asChild: { type: Boolean, required: false },
+  as: { type: null, required: false },
+  class: { type: null, required: false },
+});
+
+const delegatedProps = reactiveOmit(props, "class");
+
+const forwarded = useForwardProps(delegatedProps);
+</script>
+
+<template>
+  <StepperSeparator
+    v-bind="forwarded"
+    :class="
+      cn(
+        'bg-muted',
+        // Disabled
+        'group-data-[disabled]:bg-muted group-data-[disabled]:opacity-50',
+        // Completed
+        'group-data-[state=completed]:bg-accent',
+        props.class,
+      )
+    "
+  />
+</template>

ui/src/components/ui/stepper/StepperTitle.vue

@@ -0,0 +1,24 @@
+<script setup>
+import { reactiveOmit } from "@vueuse/core";
+import { StepperTitle, useForwardProps } from "reka-ui";
+import { cn } from "@/lib/utils";
+
+const props = defineProps({
+  asChild: { type: Boolean, required: false },
+  as: { type: null, required: false },
+  class: { type: null, required: false },
+});
+
+const delegatedProps = reactiveOmit(props, "class");
+
+const forwarded = useForwardProps(delegatedProps);
+</script>
+
+<template>
+  <StepperTitle
+    v-bind="forwarded"
+    :class="cn('text-md font-semibold whitespace-nowrap', props.class)"
+  >
+    <slot />
+  </StepperTitle>
+</template>

ui/src/components/ui/stepper/StepperTrigger.vue

@@ -0,0 +1,29 @@
+<script setup>
+import { reactiveOmit } from "@vueuse/core";
+import { StepperTrigger, useForwardProps } from "reka-ui";
+import { cn } from "@/lib/utils";
+
+const props = defineProps({
+  asChild: { type: Boolean, required: false },
+  as: { type: null, required: false },
+  class: { type: null, required: false },
+});
+
+const delegatedProps = reactiveOmit(props, "class");
+
+const forwarded = useForwardProps(delegatedProps);
+</script>
+
+<template>
+  <StepperTrigger
+    v-bind="forwarded"
+    :class="
+      cn(
+        'p-1 flex flex-col items-center text-center gap-1 rounded-md',
+        props.class,
+      )
+    "
+  >
+    <slot />
+  </StepperTrigger>
+</template>

ui/src/components/ui/stepper/index.js

@@ -0,0 +1,7 @@
+export { default as Stepper } from "./Stepper.vue";
+export { default as StepperDescription } from "./StepperDescription.vue";
+export { default as StepperIndicator } from "./StepperIndicator.vue";
+export { default as StepperItem } from "./StepperItem.vue";
+export { default as StepperSeparator } from "./StepperSeparator.vue";
+export { default as StepperTitle } from "./StepperTitle.vue";
+export { default as StepperTrigger } from "./StepperTrigger.vue";

ui/src/composables/useAuth.ts

@@ -0,0 +1,36 @@
+import { useUserStore } from "@/stores/user"
+import { computed } from "vue";
+import { Role } from "@shared/types/roles"
+
+export function useAuth() {
+    const userStore = useUserStore();
+
+    // Account status control
+    const accountStatus = computed(() => userStore.state);
+
+    // RBAC
+    const roles = computed<string[]>(() => {
+        return userStore.user?.roleData?.map((r: Role) => r.name) ?? [];
+    });
+
+    function isDev() {
+        return roles.value.includes('Dev');
+    }
+
+    function hasRole(roleName: string): boolean {
+        if (isDev()) return true;
+        return roles.value.includes(roleName);
+    }
+
+    function hasAnyRole(roleNames: string[]): boolean {
+        if (isDev()) return true;
+        return roles.value.some(name => roleNames.includes(name))
+    }
+
+    function hasAllRoles(roleNames: string[]): boolean {
+        if (isDev()) return true;
+        return roles.value.every(name => roleNames.includes(name))
+    }
+
+    return { hasRole, hasAnyRole, hasAllRoles, accountStatus }
+}

ui/src/pages/Application.vue

@@ -17,48 +17,95 @@ const decisionDate = ref<Date | null>(null);
 const submitDate = ref<Date | null>(null);
 const loading = ref<boolean>(true);
 const member_name = ref<string>();
+
+const props = defineProps<{
+    mode?: "create" | "view-self" | "view-recruiter"
+}>()
+
+const finalMode = ref<"create" | "view-self" | "view-recruiter">("create");
+
+async function loadByID(id: number | string) {
+    const raw = await loadApplication(id);
+
+    const data = raw.application;
+
+    appID.value = data.id;
+    appData.value = data.app_data;
+    chatData.value = raw.comments;
+    status.value = data.app_status;
+    decisionDate.value = new Date(data.decision_at);
+    submitDate.value = data.submitted_at ? new Date(data.submitted_at) : null;
+    member_name.value = data.member_name;
+    newApp.value = false;
+    readOnly.value = true;
+}
+
+const router = useRoute();
+
 onMounted(async () => {
-    try {
-        //get app ID from URL param
-        const router = useRoute();
-        const appIDRaw = router.params.id;
-        if (appIDRaw === undefined) {
-            //new app
-            appData.value = null
-            readOnly.value = false;
-            newApp.value = true;
-        } else {
-            //load app
-            const raw = await loadApplication(appIDRaw.toString());
 
-            const data = raw.application;
+    //recruiter mode
-
+    if (props.mode === 'view-recruiter') {
-            appID.value = data.id;
+        finalMode.value = 'view-recruiter';
-            appData.value = data.app_data;
+        await loadByID(Number(router.params.id));
-            chatData.value = raw.comments;
-            status.value = data.app_status;
-            decisionDate.value = new Date(data.decision_at);
-            submitDate.value = data.submitted_at ? new Date(data.submitted_at) : null;
-            member_name.value = data.member_name;
-            newApp.value = false;
-            readOnly.value = true;
-        }
-    } catch (e) {
-        console.error(e);
     }
+
+    //viewer mode
+    if (props.mode === 'view-self') {
+        finalMode.value = 'view-self';
+        await loadByID('me');
+    }
+
+    //creator mode
+    if (props.mode === 'create') {
+        finalMode.value = 'create';
+        appData.value = null
+        readOnly.value = false;
+        newApp.value = true;
+    }
+
     loading.value = false;
+
+    // try {
+    //     //get app ID from URL param
+    //     if (appIDRaw === undefined) {
+    //         //new app
+    //         appData.value = null
+    //         readOnly.value = false;
+    //         newApp.value = true;
+    //     } else {
+    //         //load app
+    //         const raw = await loadApplication(appIDRaw.toString());
+
+    //         const data = raw.application;
+
+    //         appID.value = data.id;
+    //         appData.value = data.app_data;
+    //         chatData.value = raw.comments;
+    //         status.value = data.app_status;
+    //         decisionDate.value = new Date(data.decision_at);
+    //         submitDate.value = data.submitted_at ? new Date(data.submitted_at) : null;
+    //         member_name.value = data.member_name;
+    //         newApp.value = false;
+    //         readOnly.value = true;
+    //     }
+    // } catch (e) {
+    //     console.error(e);
+    // }
 })
 
 async function postComment(comment) {
     chatData.value.push(await postChatMessage(comment, appID.value));
 }
 
+const emit = defineEmits(['submit']);
+
 async function postApp(appData) {
-    console.log("test")
     const res = await postApplication(appData);
     if (res.ok) {
         readOnly.value = true;
         newApp.value = false;
+        emit('submit');
     }
     // TODO: Handle fail to post
 }
@@ -74,7 +121,7 @@ async function handleDeny(id) {
 </script>
 
 <template>
-    <div v-if="!loading" class="max-w-3xl mx-auto my-20">
+    <div v-if="!loading" class="w-full h-20">
         <div v-if="!newApp" class="flex flex-row justify-between items-center py-2 mb-8">
             <!-- Application header -->
             <div>
@@ -102,7 +149,7 @@ async function handleDeny(id) {
                         hour: "2-digit",
                         minute: "2-digit"
                     }) }}</p>
-                <div class="mt-2" v-else>
+                <div class="mt-2" v-else-if="finalMode === 'view-recruiter'">
                     <Button variant="success" class="mr-2" :onclick="() => { handleApprove(appID) }">
                         <CheckIcon></CheckIcon>
                     </Button>
@@ -123,5 +170,5 @@ async function handleDeny(id) {
         </div>
     </div>
     <!-- TODO: Implement some kinda loading screen -->
-    <div v-else>Loading</div>
+    <div v-else class="flex items-center justify-center h-full">Loading</div>
 </template>

ui/src/pages/Documentation.vue

@@ -0,0 +1,11 @@
+<script setup lang="ts">
+
+
+</script>
+
+<template>
+    <div>
+        Alo
+        <iframe src="https://docs.iceberg-gaming.com/" ></iframe>
+    </div>
+</template>

ui/src/pages/Homepage.vue

@@ -13,17 +13,18 @@ function goToApplication() {
 </script>
 
 <template>
-    <div v-if="user.state == 'guest'"
+    <div>
-        class="min-h-screen flex flex-col items-center justify-center text-center bg-neutral-950 text-white px-4">
+        <div v-if="user.state == 'guest'" class="flex flex-col items-center justify-center">
-        <h1 class="text-4xl font-bold mb-4">Welcome to the 17th</h1>
+            <h1 class="text-4xl font-bold mb-4">Welcome to the 17th</h1>
-        <p class="text-neutral-400 mb-8 max-w-md">
+            <p class="text-neutral-400 mb-8 max-w-md">
-            To join our unit, please fill out an application to continue.
+                To join our unit, please fill out an application to continue.
-        </p>
+            </p>
-        <Button @click="goToApplication" class="px-6 py-3 text-lg">
+            <Button @click="goToApplication" class="px-6 py-3 text-lg">
-            Begin Application
+                Begin Application
-        </Button>
+            </Button>
-    </div>
+        </div>
-    <div v-else>
+        <div v-else>
-        HOMEPAGEEEEEEEEEEEEEEEEEEE
+            HOMEPAGEEEEEEEEEEEEEEEEEEE
+        </div>
     </div>
 </template>

ui/src/pages/Join.vue

@@ -1,24 +1,258 @@
-<template>
+<script setup lang="ts">
-    <div class="min-h-screen flex items-center justify-center ">
+import ApplicationForm from '@/components/application/ApplicationForm.vue';
-        <div class="w-full max-w-2xl mx-auto p-8 text-center">
+import Button from '@/components/ui/button/Button.vue';
-            <h1 class="text-4xl sm:text-5xl font-extrabold  mb-4">
+import {
-                welcome to the 17th
+    Stepper,
-            </h1>
+    StepperDescription,
-            <p class=" mb-8">
+    StepperIndicator,
-                Welcome — click below to get started.
+    StepperItem,
-            </p>
+    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';
 
-            <Button class="w-44" @click="goToLogin">Get started</Button>
+function goToLogin() {
+    const redirectUrl = encodeURIComponent(window.location.origin + '/join')
+    window.location.href = `https://aj17thdevapi.nexuszone.net/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;
+    }
+})
+
+const finalPanel = ref<'app' | 'message'>('message');
+</script>
+
+<template>
+    <div class="flex flex-col items-center mt-10 w-full">
+
+        <!-- Stepper Container -->
+        <div class="w-full flex justify-center">
+            <div class="w-full max-w-7xl">
+                <Stepper class="flex w-full items-start gap-2" v-model="currentStep">
+                    <StepperItem v-for="step in steps" :key="step.step" v-slot="{ state }"
+                        class="relative flex w-full flex-col items-center" :step="step.step">
+                        <StepperSeparator v-if="step.step !== steps[steps.length - 1]?.step"
+                            class="absolute left-[calc(50%+20px)] right-[calc(-50%+10px)] top-5 block h-0.5 rounded-full bg-muted group-data-[state=completed]:bg-primary" />
+
+                        <StepperTrigger as-child>
+                            <Button :variant="state === 'completed' || state === 'active' ? 'default' : 'outline'"
+                                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" />
+                                    <Check v-else class="size-5" />
+                                </template>
+                                <Circle v-if="state === 'active'" />
+                                <Dot v-if="state === 'inactive'" />
+                            </Button>
+                        </StepperTrigger>
+
+                        <div class="mt-2 flex flex-col items-center text-center">
+                            <StepperTitle class="text-sm font-semibold transition lg:text-base"
+                                :class="[state === 'active' && 'text-primary']">
+                                {{ step.title }}
+                            </StepperTitle>
+
+                            <StepperDescription
+                                class="sr-only text-xs text-muted-foreground transition md:not-sr-only lg:text-sm"
+                                :class="[state === 'active' && 'text-primary']">
+                                {{ step.description }}
+                            </StepperDescription>
+                        </div>
+                    </StepperItem>
+                </Stepper>
+            </div>
+        </div>
+
+        <!-- Content -->
+        <div class="mt-12 mb-20 flex w-full max-w-6xl justify-center">
+            <div v-if="currentStep === 1" class="w-full max-w-2xl p-8">
+                <h1 class="text-3xl sm:text-4xl font-bold mb-4 text-left">
+                    Create your account
+                </h1>
+
+                <p class="text-left text-muted-foreground mb-6">
+                    You'll be redirected to our secure sign-in system to set up your account
+                    and begin your application.
+                </p>
+
+                <Button class="px-6 py-3" @click="goToLogin">
+                    Continue to account creation
+                </Button>
+            </div>
+            <Application v-else-if="currentStep === 2" @submit="userStore.loadUser()" :mode="'create'"></Application>
+            <Application v-else-if="currentStep === 3" :mode="'view-self'"></Application>
+            <div v-if="currentStep === 5" class="w-full p-8 pt-0">
+                <div class="mb-5">
+                    <div class="flex w-min *:px-10 pt-2 border-b *:w-full *:text-center *:pb-1 *:cursor-pointer">
+                        <label :class="finalPanel === 'message' ? 'border-b-3 border-foreground' : 'mb-[2px]'"
+                            @click="finalPanel = 'message'">Message
+                        </label>
+                        <label :class="finalPanel === 'app' ? 'border-b-3 border-foreground' : 'mb-[2px]'"
+                            @click="finalPanel = 'app'">Application
+                        </label>
+                    </div>
+                </div>
+                <div v-if="finalPanel === 'message'">
+                    <!-- Accepted message -->
+                    <div v-if="userStore.state === 'member'">
+                        <h1 class="text-3xl sm:text-4xl font-bold mb-4 text-left">
+                            Welcome to the 17th Ranger Battalion
+                        </h1>
+                        <div class="space-y-4 text-muted-foreground text-left leading-relaxed">
+                            <p>
+                                Your application to the 17th Ranger Battalion has been <strong>accepted</strong>!
+                                We’re excited to welcome you to the community.
+                            </p>
+                            <p>
+                                There are just a couple of steps to complete before joining us on the battlefield:
+                            </p>
+                            <!-- MODPACK SECTION -->
+                            <h2 class="text-xl font-semibold text-foreground mt-6">1. Download the Modpack</h2>
+                            <p>
+                                You’ll need to download our private server modpack. This can take some time, so we
+                                recommend
+                                starting as soon as possible. The link below leads to our
+                                <strong>Shadow Mod</strong>, which automatically pulls all required dependencies.
+                            </p>
+                            <ul class="list-disc pl-6 space-y-1">
+                                <li>Subscribe to the Shadow Mod.</li>
+                                <li>When prompted, choose <em>“Yes”</em> to download all associated mods.</li>
+                            </ul>
+                            <p>
+                                <a href="https://www.guilded.gg/Iceberg-gaming/groups/v3j2vAP3/channels/6979335e-60f7-4ab9-9590-66df69367d1e/docs/2013948655"
+                                    class="text-primary underline" target="_blank">
+                                    Click here for the full installation guide
+                                </a>
+                            </p>
+                            <!-- CONTACT SECTION -->
+                            <h2 class="text-xl font-semibold text-foreground mt-6">2. Contact a Corporal or Higher</h2>
+                            <p>
+                                Once you have the modpack installed, connect on TeamSpeak or post in Discord. Anyone
+                                with
+                                the
+                                rank of <strong>Corporal or above</strong> can help get you set up.
+                            </p>
+                            <ul class="list-none pl-0 space-y-1">
+                                <li><strong>TeamSpeak:</strong><a href="ts3server://ts.iceberg-gaming.com"
+                                        class="text-primary underline"
+                                        target="_blank">ts3server://ts.iceberg-gaming.com</a>
+                                </li>
+                                <li>
+                                    <strong>Discord:</strong>
+                                    <a href="https://discord.gg/7hDQCEb" class="text-primary underline"
+                                        target="_blank">https://discord.gg/7hDQCEb</a>
+                                </li>
+                            </ul>
+                            <p>
+                                They will assist you with your initial assessments and training. Basic trainings run on
+                                a
+                                rotating schedule or can be requested through our Battalion Forms. Don’t hesitate to hop
+                                in
+                                during weeknights or Saturday operations to start playing with us!
+                            </p>
+                            <!-- FINAL NOTES -->
+                            <h2 class="text-xl font-semibold text-foreground mt-6">3. Get Familiar with the Unit</h2>
+                            <p>
+                                Please take a moment to read through our <strong>Code of Conduct</strong>,
+                                <strong>Ranks</strong>, and <strong>Structure</strong> pages. We also encourage you to
+                                browse
+                                our forums and introduce yourself.
+                            </p>
+                            <p>
+                                If you have any questions, feel free to reach out on TeamSpeak, Discord, or Guilded,
+                                someone
+                                will always be around to help.
+                            </p>
+                        </div>
+                    </div>
+                    <!-- Denied message -->
+                    <div v-else-if="userStore.state === 'denied'">
+                        <div class="w-full max-w-2xl p-8">
+                            <h1 class="text-3xl sm:text-4xl font-bold mb-4 text-left text-destructive">
+                                Application Not Approved
+                            </h1>
+                            <div class="space-y-4 text-muted-foreground text-left leading-relaxed">
+                                <p>
+                                    Thank you for your interest in joining the <strong>17th Ranger Battalion</strong>.
+                                    After reviewing your application, we regret to inform you that we are not able to
+                                    approve it at this time.
+                                </p>
+                                <p>
+                                    If you would like more information, you are encouraged to
+                                    <strong>reach out and inquire</strong> about the reason your application was not
+                                    approved.
+                                    We are always happy to provide clarification where possible.
+                                </p>
+                                <p>
+                                    You are welcome to <strong>resubmit your application in the future</strong> should
+                                    your
+                                    circumstances change or when we may be better able to incorporate you into the unit.
+                                </p>
+                                <p>
+                                    All the best,<br />
+                                    <span class="text-foreground font-medium">The 17th Ranger Battalion Recruitment
+                                        Team</span>
+                                </p>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div v-if="finalPanel === 'app'">
+                    <Application :mode="'view-self'"></Application>
+                </div>
+            </div>
         </div>
     </div>
 </template>
-
-<script setup>
-import Button from '@/components/ui/button/Button.vue';
-
-
-function goToLogin() {
-    window.location.href = 'https://aj17thdevapi.nexuszone.net/login';
-}
-
-</script>

ui/src/pages/ManageApplications.vue

@@ -10,9 +10,10 @@ import {
     TableRow,
 } from '@/components/ui/table'
 import Button from '@/components/ui/button/Button.vue';
-import { onMounted, ref } from 'vue';
+import { onMounted, ref, watch } from 'vue';
-import { useRouter } from 'vue-router';
+import { useRoute, useRouter } from 'vue-router';
 import { CheckIcon, XIcon } from 'lucide-vue-next';
+import Application from './Application.vue';
 
 const appList = ref([]);
 const now = Date.now();
@@ -61,48 +62,113 @@ async function handleDeny(id) {
 
 const router = useRouter();
 function openApplication(id) {
-    router.push(`./application/${id}`)
+    router.push(`/administration/applications/${id}`)
+    openPanel.value = true;
 }
 
+function closeApplication() {
+    router.push('/administration/applications')
+    openPanel.value = false;
+}
+
+const route = useRoute();
+
+watch(() => route.params.id, (newId) => {
+    if (newId === undefined) {
+        openPanel.value = false;
+    }
+})
+
+const openPanel = ref(false);
+
 onMounted(async () => {
     appList.value = await getAllApplications();
+
+    //preload application
+    if (route.params.id != undefined) {
+        openApplication(route.params.id)
+    }
 })
 </script>
 <template>
-    <div class="mx-auto max-w-5xl">
+    <div class="px-20 mx-auto max-w-[100rem] w-full flex mt-5 h-52 min-h-0 overflow-hidden">
-        <h1 class="my-4">Manage Applications</h1>
+        <!-- application list -->
-        <Table>
+        <div :class="openPanel == false ? 'w-full' : 'w-2/5'" class="pr-9">
-            <!-- <TableCaption>A list of your recent invoices.</TableCaption> -->
+            <h1 class="scroll-m-20 text-2xl font-semibold tracking-tight">Manage Applications</h1>
-            <TableHeader>
+            <Table>
-                <TableRow>
+                <TableHeader>
-                    <TableHead>User</TableHead>
+                    <TableRow>
-                    <TableHead>Date Submitted</TableHead>
+                        <TableHead>User</TableHead>
-                    <TableHead class="text-right">Status</TableHead>
+                        <TableHead>Date Submitted</TableHead>
-                </TableRow>
+                        <TableHead class="text-right">Status</TableHead>
-            </TableHeader>
+                    </TableRow>
-            <TableBody>
+                </TableHeader>
-                <TableRow v-for="app in appList" :key="app.id" class="cursor-pointer"
+                <TableBody class="overflow-y-auto scrollbar-themed">
-                    :onClick="() => { openApplication(app.id) }">
+                    <TableRow v-for="app in appList" :key="app.id" class="cursor-pointer"
-                    <TableCell class="font-medium">{{ app.member_name }}</TableCell>
+                        :onClick="() => { openApplication(app.id) }">
-                    <TableCell :title="formatExact(app.submitted_at)">
+                        <TableCell class="font-medium">{{ app.member_name }}</TableCell>
-                        {{ formatAgo(app.submitted_at) }}
+                        <TableCell :title="formatExact(app.submitted_at)">
-                    </TableCell>
+                            {{ formatAgo(app.submitted_at) }}
-                    <TableCell v-if="app.app_status === ApplicationStatus.Pending" class="inline-flex items-end gap-2">
+                        </TableCell>
-                        <Button variant="success" @click.stop="() => { handleApprove(app.id) }">
+                        <TableCell v-if="app.app_status === ApplicationStatus.Pending"
-                            <CheckIcon></CheckIcon>
+                            class="inline-flex items-end gap-2">
-                        </Button>
+                            <Button variant="success" @click.stop="() => { handleApprove(app.id) }">
-                        <Button variant="destructive" @click.stop="() => { handleDeny(app.id) }">
+                                <CheckIcon></CheckIcon>
-                            <XIcon></XIcon>
+                            </Button>
-                        </Button>
+                            <Button variant="destructive" @click.stop="() => { handleDeny(app.id) }">
-                    </TableCell>
+                                <XIcon></XIcon>
-                    <TableCell class="text-right font-semibold" :class="[
+                            </Button>
-                        ,
+                        </TableCell>
-                        app.app_status === ApplicationStatus.Pending && 'text-yellow-500',
+                        <TableCell class="text-right font-semibold" :class="[
-                        app.app_status === ApplicationStatus.Accepted && 'text-green-500',
+                            ,
-                        app.app_status === ApplicationStatus.Denied && 'text-destructive'
+                            app.app_status === ApplicationStatus.Pending && 'text-yellow-500',
-                    ]">{{ app.app_status }}</TableCell>
+                            app.app_status === ApplicationStatus.Accepted && 'text-green-500',
-                </TableRow>
+                            app.app_status === ApplicationStatus.Denied && 'text-destructive'
-            </TableBody>
+                        ]">{{ app.app_status }}</TableCell>
-        </Table>
+                    </TableRow>
+                </TableBody>
+            </Table>
+        </div>
+        <div v-if="openPanel" class="pl-9 border-l w-3/5" :key="$route.params.id">
+            <div class="mb-5 flex justify-between">
+                <p class="scroll-m-20 text-2xl font-semibold tracking-tight"> Application</p>
+                <button @click="closeApplication()" class="cursor-pointer">
+                    <XIcon></XIcon>
+                </button>
+            </div>
+            <div class="overflow-y-auto max-h-[80vh] h-full mt-5 scrollbar-themed">
+                <Application :mode="'view-recruiter'"></Application>
+            </div>
+        </div>
     </div>
-</template>
+</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>

ui/src/pages/ManageTransfers.vue

@@ -68,7 +68,7 @@ onMounted(async () => {
         </DialogContent>
     </Dialog>
 
-    <div class="max-w-5xl mx-auto">
+    <div class="max-w-5xl w-full mx-auto">
         Active
         <div>
             <Card>

ui/src/pages/TrainingReport.vue

@@ -95,7 +95,7 @@ onMounted(async () => {
 </script>
 
 <template>
-    <div class="px-20 mx-auto max-w-[100rem] flex mt-5">
+    <div class="px-20 mx-auto max-w-[100rem] w-full flex mt-5">
         <!-- training report list -->
         <div class="px-4 my-3" :class="sidePanel == sidePanelState.closed ? 'w-full' : 'w-2/5'">
             <div class="flex justify-between mb-4">

ui/src/pages/Unauthorized.vue

@@ -1,5 +1,5 @@
 <template>
-    <div class="min-h-screen flex flex-col items-center justify-center text-center px-6">
+    <div class="flex flex-col items-center justify-center text-center px-6">
         <h1 class="text-5xl font-bold mb-4">Unauthorized</h1>
         <p class="text-lg text-muted-foreground max-w-md mb-6">
             You don't have permission to access this page.

ui/src/router/index.js

@@ -9,7 +9,7 @@ const router = createRouter({
 
     // AUTH REQUIRED
     { path: '/apply', component: () => import('@/pages/Application.vue'), meta: { requiresAuth: true } },
-    { path: '/', component: () => import('@/pages/Homepage.vue'), meta: { requiresAuth: true } },
+    { path: '/', component: () => import('@/pages/Homepage.vue') },
 
     // MEMBER ROUTES
     { path: '/members', component: () => import('@/pages/memberList.vue'), meta: { requiresAuth: true, memberOnly: true } },
@@ -18,6 +18,8 @@ const router = createRouter({
     
     { path: '/calendar', component: () => import('@/pages/Calendar.vue'), meta: { requiresAuth: true, memberOnly: true }, },
     { path: '/calendar/event/:id', component: () => import('@/pages/Calendar.vue'), meta: { requiresAuth: true, memberOnly: true }, },
+
+    { path: '/documents', component: () => import('@/pages/Documentation.vue'), meta: { requiresAuth: true, memberOnly: true }, },
     
     { path: '/trainingReport', component: () => import('@/pages/TrainingReport.vue'), meta: { requiresAuth: true, memberOnly: true } },
     { path: '/trainingReport/new', component: () => import('@/pages/TrainingReport.vue'), meta: { requiresAuth: true, memberOnly: true } },
@@ -29,7 +31,7 @@ const router = createRouter({
       meta: { requiresAuth: true, memberOnly: true, roles: ['staff', 'admin'] },
       children: [
         { path: 'applications', component: () => import('@/pages/ManageApplications.vue') },
-        { path: 'application/:id', component: () => import('@/pages/Application.vue') },
+        { path: 'applications/:id', component: () => import('@/pages/ManageApplications.vue') },
         { path: 'rankChange', component: () => import('@/pages/RankChange.vue') },
         { path: 'applications/:id', component: () => import('@/pages/Application.vue') },
         { path: 'transfer', component: () => import('@/pages/ManageTransfers.vue') },
@@ -63,15 +65,15 @@ router.beforeEach(async (to) => {
   }
 
 
-  // // Must be a member
+  // Must be a member
-  // if (to.meta.memberOnly && user.state !== 'member') {
+  if (to.meta.memberOnly && user.state !== 'member') {
-  //   return '/unauthorized'
+    return '/unauthorized'
-  // }
+  }
 
-  // // Must have specific role
+  // 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)) {
-  //   return '/unauthorized'
+    return '/unauthorized'
-  // }
+  }
 })
 
 export default router;

ui/src/stores/user.ts

@@ -5,7 +5,7 @@ export const useUserStore = defineStore('user', () => {
     const user = ref(null)
     const roles = computed(() => new Set(user.value?.roleData?.map(r => r.name) ?? []));
     const loaded = ref(false);
-    const state = computed(() => user.value.state);
+    const state = computed<string | undefined>(() => user.value?.state || undefined);
     const isLoggedIn = computed(() => user.value !== null)
 
     async function loadUser() {
@@ -16,6 +16,7 @@ export const useUserStore = defineStore('user', () => {
 
         if (res.ok) {
             const data = await res.json();
+            console.log(data);
             user.value = data;
         }