Tried my damndest, will pick this up again another time

.gitea/workflows/cd-deploy.yaml

@@ -1,73 +0,0 @@
-name: Continuous Deployment
-on:
-  push:
-    branches:
-      - main
-
-jobs:
-  Deploy:
-    name: Update Deployment
-    runs-on: ubuntu-latest
-    container:
-      volumes:
-        - /var/www/html/milsim-site-v4:/var/www/html/milsim-site-v4:z
-    steps:
-      - name: Setup Local Environment
-        run: |
-          groupadd -g 989 nginx || true
-          useradd nginx -u 990 -g nginx -m || true
-
-      - name: Verify Node Environment
-        run: |
-          which npm
-          npm -v
-          which node
-          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: |
-          cd /var/www/html/milsim-site-v4
-          sudo -u nginx git reset --hard
-          sudo -u nginx git pull origin main
-
-      - name: Update Shared Dependencies
-        run: |
-          cd /var/www/html/milsim-site-v4/shared
-          sudo -u nginx -E npm install
-
-      - name: Update UI Dependencies
-        run: |
-          cd /var/www/html/milsim-site-v4/ui
-          sudo -u nginx -E npm install
-
-      - name: Update API Dependencies
-        run: |
-          cd /var/www/html/milsim-site-v4/api
-          sudo -u nginx -E npm install
-
-      - name: Build UI
-        run: |
-          cd /var/www/html/milsim-site-v4/ui
-          sudo -u nginx -E npm run build
-
-      - name: Build API
-        run: |
-          cd /var/www/html/milsim-site-v4/api
-          sudo -u nginx -E npm run build

api/src/index.js

@@ -20,8 +20,8 @@ const port = process.env.SERVER_PORT;
 
 //glitchtip setup
 const sentry = require('@sentry/node');
-if (process.env.DISABLE_GLITCHTIP) {
-  console.log("Glitchtip disabled")
+if (!process.env.DISABLE_GLITCHTIP) {
+  console.log("Glitchtip disabled AAAAAA")
 } else {
   let dsn = process.env.GLITCHTIP_DSN;
   sentry.init({ dsn: dsn });

api/src/routes/applications.ts

@@ -38,27 +38,12 @@ router.get('/all', async (req, res) => {
 });
 
 router.get('/me', async (req, res) => {
-
   let userID = req.user.id;
 
-  try {
-    let application = await getMemberApplication(userID);
+  console.log("application/me")
 
-    if (application === undefined)
-      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);
-  }
+  let app = getMemberApplication(userID);
+  console.log(app);
 })
 
 // GET /application/:id
@@ -69,7 +54,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/routes/loa.js

@@ -0,0 +1,56 @@
+const express = require('express');
+const router = express.Router();
+
+import pool from '../db';
+
+//post a new LOA
+router.post("/", async (req, res) => {
+    const { member_id, filed_date, start_date, end_date, reason } = req.body;
+
+    if (!member_id || !filed_date || !start_date || !end_date) {
+        return res.status(400).json({ error: "Missing required fields" });
+    }
+
+    try {
+        const result = await pool.query(
+            `INSERT INTO leave_of_absences 
+                (member_id, filed_date, start_date, end_date, reason) 
+             VALUES (?, ?, ?, ?, ?)`,
+            [member_id, filed_date, start_date, end_date, reason]
+        );
+        res.sendStatus(201);
+    } catch (error) {
+        console.error(error);
+        res.status(500).send('Something went wrong', error);
+    }
+});
+
+//get my current LOA
+router.get("/me", async (req, res) => {
+    //TODO: implement current user getter
+    const user = 89;
+
+    try {
+        const result = await pool.query("SELECT * FROM leave_of_absences WHERE member_id = ?", [user])
+        res.status(200).json(result)
+    } catch (error) {
+        console.error(error);
+        res.status(500).send(error);
+    }
+})
+
+router.get('/all', async (req, res) => {
+    try {
+        const result = await pool.query(
+            `SELECT loa.*, members.name
+            FROM leave_of_absences AS loa
+            INNER JOIN members ON loa.member_id = members.id;
+            `);
+        res.status(200).json(result)
+    } catch (error) {
+        console.error(error);
+        res.status(500).send(error);
+    }
+})
+
+module.exports = router;

api/src/routes/loa.ts

@@ -1,76 +0,0 @@
-const express = require('express');
-const router = express.Router();
-
-import { Request, Response } from 'express';
-import pool from '../db';
-import { createNewLOA, getAllLOA, getLoaTypes, getUserLOA } from '../services/loaService';
-import { LOARequest } from '@app/shared/types/loa';
-
-//member posts LOA
-router.post("/", async (req: Request, res: Response) => {
-    let LOARequest = req.body as LOARequest;
-    LOARequest.member_id = req.user.id;
-    LOARequest.created_by = req.user.id;
-    LOARequest.filed_date = new Date();
-
-    console.log(LOARequest);
-
-    try {
-        await createNewLOA(LOARequest);
-        res.sendStatus(201);
-    } catch (error) {
-        console.error(error);
-        res.status(500).send(error);
-    }
-});
-
-//admin posts LOA
-router.post("/admin", async (req: Request, res: Response) => {
-    let LOARequest = req.body as LOARequest;
-    LOARequest.created_by = req.user.id;
-    LOARequest.filed_date = new Date();
-
-    console.log(LOARequest);
-
-    try {
-        await createNewLOA(LOARequest);
-        res.sendStatus(201);
-    } catch (error) {
-        console.error(error);
-        res.status(500).send(error);
-    }
-});
-
-//get my current LOA
-router.get("/me", async (req: Request, res: Response) => {
-    const user = req.user.id;
-    try {
-        const result = await getUserLOA(user);
-        res.status(200).json(result)
-    } catch (error) {
-        console.error(error);
-        res.status(500).send(error);
-    }
-})
-
-router.get('/all', async (req, res) => {
-    try {
-        const result = await getAllLOA();
-        res.status(200).json(result)
-    } catch (error) {
-        console.error(error);
-        res.status(500).send(error);
-    }
-})
-
-router.get('/types', async (req: Request, res: Response) => {
-    try {
-        let out = await getLoaTypes();
-        res.status(200).json(out);
-    } catch (error) {
-        res.status(500).json(error);
-        console.error(error);
-    }
-})
-
-module.exports = router;

api/src/services/loaService.ts

@@ -1,30 +0,0 @@
-import { toDateTime } from "@app/shared/utils/time";
-import pool from "../db";
-import { LOARequest, LOAType } from '@app/shared/types/loa'
-
-export async function getLoaTypes(): Promise<LOAType[]> {
-    return await pool.query('SELECT * FROM leave_of_absences_types;');
-}
-
-export async function getAllLOA(): Promise<LOARequest[]> {
-    let res: LOARequest[] = await pool.query(
-        `SELECT loa.*, members.name, t.name AS type_name
-            FROM leave_of_absences AS loa
-            LEFT JOIN members ON loa.member_id = members.id
-            LEFT JOIN leave_of_absences_types AS t ON loa.type_id = t.id;
-            `) as LOARequest[];
-    return res;
-}
-
-export async function getUserLOA(userId: number): Promise<LOARequest[]> {
-    const result: LOARequest[] = await pool.query("SELECT * FROM leave_of_absences WHERE member_id = ?", [userId])
-    return result;
-}
-
-export async function createNewLOA(data: LOARequest) {
-    const sql = `INSERT INTO leave_of_absences 
-                (member_id, filed_date, start_date, end_date, type_id, reason) 
-             VALUES (?, ?, ?, ?, ?, ?)`;
-    await pool.query(sql, [data.member_id, toDateTime(data.filed_date), toDateTime(data.start_date), toDateTime(data.end_date), data.type_id, data.reason])
-    return;
-}

api/src/services/rolesService.ts

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

shared/schemas/loaSchema.ts

@@ -1,51 +0,0 @@
-import * as z from "zod";
-import { LOAType } from "../types/loa";
-
-export const loaTypeSchema = z.object({
-    id: z.number(),
-    name: z.string(),
-    max_length_days: z.number(),
-});
-
-export const loaSchema = z.object({
-    member_id: z.number(),
-    start_date: z.date(),
-    end_date: z.date(),
-    type: loaTypeSchema,
-    reason: z.string(),
-})
-    .superRefine((data, ctx) => {
-        const { start_date, end_date, type } = data;
-
-        const today = new Date();
-        today.setHours(0, 0, 0, 0);
-
-        if (start_date < today) {
-            ctx.addIssue({
-            code: z.ZodIssueCode.custom,
-            path: ["start_date"],
-            message: "Start date cannot be in the past.",
-            });
-        }
-
-        // 1. end > start
-        if (end_date <= start_date) {
-            ctx.addIssue({
-                code: z.ZodIssueCode.custom,
-                path: ["end_date"],
-                message: "End date must be after start date.",
-            });
-        }
-
-        // 2. calculate max
-        const maxEnd = new Date(start_date);
-        maxEnd.setDate(maxEnd.getDate() + type.max_length_days);
-
-        if (end_date > maxEnd) {
-            ctx.addIssue({
-                code: z.ZodIssueCode.custom,
-                path: ["end_date"],
-                message: `This LOA type allows a maximum of ${type.max_length_days} days.`,
-            });
-        }
-    });

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,42 +19,5 @@ 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/loa.ts

@@ -1,24 +0,0 @@
-export interface LOARequest {
-    id?: number;
-    member_id?: number;
-    filed_date?: Date;   // ISO 8601 string
-    start_date: Date;   // ISO 8601 string
-    end_date: Date;     // ISO 8601 string
-    extended_till?: Date;
-    type_id?: number;
-    reason?: string;
-    expired?: boolean;
-    closed?: boolean;
-    closed_by?: number;
-    created_by?: number;
-
-    name?: string;  //member name
-    type_name?: string;
-};
-
-export interface LOAType {
-    id: number;
-    name: string;
-    max_length_days: number;
-    extendable: boolean;
-}

shared/types/roles.ts

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

shared/utils/time.ts

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

ui/.env.example

@@ -1,8 +1,10 @@
 # SITE SETTINGS
 VITE_APIHOST=
-VITE_DOCHOST= # https://bookstack.whatever.com/api
 VITE_ENVIRONMENT= # dev / prod
 
 # Glitchtip
 VITE_GLITCHTIP_DSN=
-VITE_DISABLE_GLITCHTIP= # true/false
+VITE_DISABLE_GLITCHTIP= # true/false
+
+# Matomo
+VITE_DISABLE_MATOMO= # true/false

ui/package-lock.json

@@ -8,6 +8,7 @@
       "name": "milsimsitev4",
       "version": "0.0.0",
       "dependencies": {
+        "@certible/use-matomo": "^1.1.0",
         "@fullcalendar/core": "^6.1.19",
         "@fullcalendar/daygrid": "^6.1.19",
         "@fullcalendar/interaction": "^6.1.19",
@@ -22,7 +23,7 @@
         "clsx": "^2.1.1",
         "lucide-vue-next": "^0.539.0",
         "pinia": "^3.0.3",
-        "reka-ui": "^2.6.1",
+        "reka-ui": "^2.6.0",
         "tailwind-merge": "^3.3.1",
         "tailwindcss": "^4.1.11",
         "tw-animate-css": "^1.3.6",
@@ -510,6 +511,12 @@
         "node": ">=6.9.0"
       }
     },
+    "node_modules/@certible/use-matomo": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@certible/use-matomo/-/use-matomo-1.1.0.tgz",
+      "integrity": "sha512-9kOTj0ldP+RX2Rhlosxm/+1uQ2deDefMb4p2DQGFi3Gqi3TuTSrOtx+beUNKGN7D8up/8SsBPJS+ipY1ZHMfrA==",
+      "license": "MIT"
+    },
     "node_modules/@esbuild/aix-ppc64": {
       "version": "0.25.9",
       "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.25.9.tgz",
@@ -3333,9 +3340,9 @@
       }
     },
     "node_modules/reka-ui": {
-      "version": "2.6.1",
-      "resolved": "https://registry.npmjs.org/reka-ui/-/reka-ui-2.6.1.tgz",
-      "integrity": "sha512-XK7cJDQoNuGXfCNzBBo/81Yg/OgjPwvbabnlzXG2VsdSgNsT6iIkuPBPr+C0Shs+3bb0x0lbPvgQAhMSCKm5Ww==",
+      "version": "2.6.0",
+      "resolved": "https://registry.npmjs.org/reka-ui/-/reka-ui-2.6.0.tgz",
+      "integrity": "sha512-NrGMKrABD97l890mFS3TNUzB0BLUfbL3hh0NjcJRIUSUljb288bx3Mzo31nOyUcdiiW0HqFGXJwyCBh9cWgb0w==",
       "license": "MIT",
       "dependencies": {
         "@floating-ui/dom": "^1.6.13",
@@ -3594,13 +3601,13 @@
       }
     },
     "node_modules/tinyglobby": {
-      "version": "0.2.14",
-      "resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.14.tgz",
-      "integrity": "sha512-tX5e7OM1HnYr2+a2C/4V0htOcSQcoSTH9KgJnVvNm5zm/cyEWKJ7j7YutsH9CxMdtOkkLFy2AHrMci9IM8IPZQ==",
+      "version": "0.2.15",
+      "resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.15.tgz",
+      "integrity": "sha512-j2Zq4NyQYG5XMST4cbs02Ak8iJUdxRM0XI5QyxXuZOzKOINmWurp3smXu3y5wDcJrptwpSjgXHzIQxR0omXljQ==",
       "license": "MIT",
       "dependencies": {
-        "fdir": "^6.4.4",
-        "picomatch": "^4.0.2"
+        "fdir": "^6.5.0",
+        "picomatch": "^4.0.3"
       },
       "engines": {
         "node": ">=12.0.0"
@@ -3728,17 +3735,17 @@
       }
     },
     "node_modules/vite": {
-      "version": "7.1.2",
-      "resolved": "https://registry.npmjs.org/vite/-/vite-7.1.2.tgz",
-      "integrity": "sha512-J0SQBPlQiEXAF7tajiH+rUooJPo0l8KQgyg4/aMunNtrOa7bwuZJsJbDWzeljqQpgftxuq5yNJxQ91O9ts29UQ==",
+      "version": "7.2.4",
+      "resolved": "https://registry.npmjs.org/vite/-/vite-7.2.4.tgz",
+      "integrity": "sha512-NL8jTlbo0Tn4dUEXEsUg8KeyG/Lkmc4Fnzb8JXN/Ykm9G4HNImjtABMJgkQoVjOBN/j2WAwDTRytdqJbZsah7w==",
       "license": "MIT",
       "dependencies": {
         "esbuild": "^0.25.0",
-        "fdir": "^6.4.6",
+        "fdir": "^6.5.0",
         "picomatch": "^4.0.3",
         "postcss": "^8.5.6",
         "rollup": "^4.43.0",
-        "tinyglobby": "^0.2.14"
+        "tinyglobby": "^0.2.15"
       },
       "bin": {
         "vite": "bin/vite.js"

ui/package.json

@@ -12,6 +12,7 @@
     "preview": "vite preview"
   },
   "dependencies": {
+    "@certible/use-matomo": "^1.1.0",
     "@fullcalendar/core": "^6.1.19",
     "@fullcalendar/daygrid": "^6.1.19",
     "@fullcalendar/interaction": "^6.1.19",
@@ -26,7 +27,7 @@
     "clsx": "^2.1.1",
     "lucide-vue-next": "^0.539.0",
     "pinia": "^3.0.3",
-    "reka-ui": "^2.6.1",
+    "reka-ui": "^2.6.0",
     "tailwind-merge": "^3.3.1",
     "tailwindcss": "^4.1.11",
     "tw-animate-css": "^1.3.6",

ui/src/App.vue

@@ -1,13 +1,41 @@
 <script setup>
-import { RouterView } from 'vue-router';
+import { RouterLink, 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", {
@@ -21,23 +49,90 @@ const environment = import.meta.env.VITE_ENVIRONMENT;
 </script>
 
 <template>
-  <div class="flex flex-col min-h-screen">
-    <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">
-          <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>
-    </div>
+  <div>
+    <div class="flex items-center justify-between px-10">
+      <div></div>
+      <div class="h-15 flex items-center justify-center gap-20">
+        <RouterLink to="/">
+          <Button variant="link">Home</Button>
+        </RouterLink>
+        <RouterLink to="/calendar">
+          <Button variant="link">Calendar</Button>
+        </RouterLink>
+        <RouterLink to="/members">
+          <Button variant="link">Members</Button>
+        </RouterLink>
+        <Popover>
+          <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>
 
-    <RouterView class="flex-1 min-h-0"></RouterView>
+      </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>
   </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}`, { credentials: 'include' })
+  const res = await fetch(`${addr}/application/${id}`)
   if (res.status === 204) return null
   if (!res.ok) throw new Error('Failed to load application')
   const json = await res.json()

ui/src/api/loa.ts

@@ -1,4 +1,12 @@
-import { LOARequest, LOAType } from '@shared/types/loa'
+export type LOARequest = {
+    id?: number;
+    name?: string;
+    member_id: number;
+    filed_date: string;   // ISO 8601 string
+    start_date: string;   // ISO 8601 string
+    end_date: string;     // ISO 8601 string
+    reason?: string;
+};
 // @ts-ignore
 const addr = import.meta.env.VITE_APIHOST;
 
@@ -9,7 +17,6 @@ export async function submitLOA(request: LOARequest): Promise<{ id?: number; err
             "Content-Type": "application/json",
         },
         body: JSON.stringify(request),
-        credentials: 'include',
     });
 
     if (res.ok) {
@@ -19,24 +26,6 @@ export async function submitLOA(request: LOARequest): Promise<{ id?: number; err
     }
 }
 
-export async function adminSubmitLOA(request: LOARequest): Promise<{ id?: number; error?: string }> {
-    const res = await fetch(`${addr}/loa/admin`, {
-        method: "POST",
-        headers: {
-            "Content-Type": "application/json",
-        },
-        body: JSON.stringify(request),
-        credentials: 'include',
-    });
-
-    if (res.ok) {
-        return res.json();
-    } else {
-        return { error: "Failed to submit LOA" };
-    }
-}
-
-
 export async function getMyLOA(): Promise<LOARequest | null> {
     const res = await fetch(`${addr}/loa/me`, {
         method: "GET",
@@ -71,38 +60,3 @@ export function getAllLOAs(): Promise<LOARequest[]> {
         }
     });
 }
-
-export async function getLoaTypes(): Promise<LOAType[]> {
-    const res = await fetch(`${addr}/loa/types`, {
-        method: "GET",
-        credentials: 'include',
-    });
-
-    if (res.ok) {
-        const out = res.json();
-        if (!out) {
-            return null;
-        }
-        return out;
-    } else {
-        return null;
-    }
-};
-
-export async function getLoaPolicy(): Promise<string> {
-    //@ts-ignore
-    const res = await fetch(`${import.meta.env.VITE_DOCHOST}/api/pages/42`, {
-        method: "GET",
-        credentials: 'include',
-    });
-    if (res.ok) {
-        const out = res.json();
-        console.log(out);
-        if (!out) {
-            return null;
-        }
-        return out;
-    } else {
-        return null;
-    }
-}

ui/src/assets/base.css

@@ -4,55 +4,6 @@
 @custom-variant dark (&:is(.dark *));
 
 :root {
-  --background: oklch(0.2046 0 0);
-  --foreground: oklch(0.9219 0 0);
-  --card: oklch(23.075% 0.00003 271.152);
-  --card-foreground: oklch(0.9219 0 0);
-  --popover: oklch(0.2686 0 0);
-  --popover-foreground: oklch(0.9219 0 0);
-  --primary: oklch(0.7686 0.1647 70.0804);
-  --primary-foreground: oklch(0 0 0);
-  --secondary: oklch(0.2686 0 0);
-  --secondary-foreground: oklch(0.9219 0 0);
-  --muted: oklch(0.2686 0 0);
-  --muted-foreground: oklch(0.7155 0 0);
-  --accent: oklch(100% 0.00011 271.152 / 0.253);
-  --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);
-  --success-foreground: oklch(1.0000 0 0);
-  --border: oklch(0.3715 0 0);
-  --input: oklch(0.3715 0 0);
-  --ring: oklch(0.7686 0.1647 70.0804);
-  --chart-1: oklch(0.8369 0.1644 84.4286);
-  --chart-2: oklch(0.6658 0.1574 58.3183);
-  --chart-3: oklch(0.4732 0.1247 46.2007);
-  --chart-4: oklch(0.5553 0.1455 48.9975);
-  --chart-5: oklch(0.4732 0.1247 46.2007);
-  --sidebar: oklch(0.1684 0 0);
-  --sidebar-foreground: oklch(0.9219 0 0);
-  --sidebar-primary: oklch(0.7686 0.1647 70.0804);
-  --sidebar-primary-foreground: oklch(1.0000 0 0);
-  --sidebar-accent: oklch(0.4732 0.1247 46.2007);
-  --sidebar-accent-foreground: oklch(0.9243 0.1151 95.7459);
-  --sidebar-border: oklch(0.3715 0 0);
-  --sidebar-ring: oklch(0.7686 0.1647 70.0804);
-  --font-sans: Inter, sans-serif;
-  --font-serif: Source Serif 4, serif;
-  --font-mono: JetBrains Mono, monospace;
-  --radius: 0.375rem;
-  --shadow-2xs: 0px 4px 8px -1px hsl(0 0% 0% / 0.07);
-  --shadow-xs: 0px 4px 8px -1px hsl(0 0% 0% / 0.07);
-  --shadow-sm: 0px 4px 8px -1px hsl(0 0% 0% / 0.14), 0px 1px 2px -2px hsl(0 0% 0% / 0.14);
-  --shadow: 0px 4px 8px -1px hsl(0 0% 0% / 0.14), 0px 1px 2px -2px hsl(0 0% 0% / 0.14);
-  --shadow-md: 0px 4px 8px -1px hsl(0 0% 0% / 0.14), 0px 2px 4px -2px hsl(0 0% 0% / 0.14);
-  --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);
-}
-
-/* .dark {
   --background: oklch(0.2046 0 0);
   --foreground: oklch(0.9219 0 0);
   --card: oklch(23.075% 0.00003 271.152);
@@ -99,7 +50,56 @@
   --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);
-} */
+}
+
+.dark {
+  --background: oklch(0.2046 0 0);
+  --foreground: oklch(0.9219 0 0);
+  --card: oklch(23.075% 0.00003 271.152);
+  --card-foreground: oklch(0.9219 0 0);
+  --popover: oklch(0.2686 0 0);
+  --popover-foreground: oklch(0.9219 0 0);
+  --primary: oklch(0.7686 0.1647 70.0804);
+  --primary-foreground: oklch(0 0 0);
+  --secondary: oklch(0.2686 0 0);
+  --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-foreground: oklch(0.9243 0.1151 95.7459);
+  --destructive: oklch(0.6368 0.2078 25.3313);
+  --destructive-foreground: oklch(1.0000 0 0);
+  --success: oklch(66.104% 0.16937 144.153);
+  --success-foreground: oklch(1.0000 0 0);
+  --border: oklch(0.3715 0 0);
+  --input: oklch(0.3715 0 0);
+  --ring: oklch(0.7686 0.1647 70.0804);
+  --chart-1: oklch(0.8369 0.1644 84.4286);
+  --chart-2: oklch(0.6658 0.1574 58.3183);
+  --chart-3: oklch(0.4732 0.1247 46.2007);
+  --chart-4: oklch(0.5553 0.1455 48.9975);
+  --chart-5: oklch(0.4732 0.1247 46.2007);
+  --sidebar: oklch(0.1684 0 0);
+  --sidebar-foreground: oklch(0.9219 0 0);
+  --sidebar-primary: oklch(0.7686 0.1647 70.0804);
+  --sidebar-primary-foreground: oklch(1.0000 0 0);
+  --sidebar-accent: oklch(0.4732 0.1247 46.2007);
+  --sidebar-accent-foreground: oklch(0.9243 0.1151 95.7459);
+  --sidebar-border: oklch(0.3715 0 0);
+  --sidebar-ring: oklch(0.7686 0.1647 70.0804);
+  --font-sans: Inter, sans-serif;
+  --font-serif: Source Serif 4, serif;
+  --font-mono: JetBrains Mono, monospace;
+  --radius: 0.375rem;
+  --shadow-2xs: 0px 4px 8px -1px hsl(0 0% 0% / 0.07);
+  --shadow-xs: 0px 4px 8px -1px hsl(0 0% 0% / 0.07);
+  --shadow-sm: 0px 4px 8px -1px hsl(0 0% 0% / 0.14), 0px 1px 2px -2px hsl(0 0% 0% / 0.14);
+  --shadow: 0px 4px 8px -1px hsl(0 0% 0% / 0.14), 0px 1px 2px -2px hsl(0 0% 0% / 0.14);
+  --shadow-md: 0px 4px 8px -1px hsl(0 0% 0% / 0.14), 0px 2px 4px -2px hsl(0 0% 0% / 0.14);
+  --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

@@ -1,181 +0,0 @@
-<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="/" @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>Comment</FormLabel>
+          <FormLabel class="sr-only">Comment</FormLabel>
           <FormControl>
             <Textarea v-bind="componentField" rows="3" placeholder="Write a comment…"
               class="bg-neutral-800 resize-none w-full" />

ui/src/components/loa/loaForm.vue

@@ -1,47 +1,26 @@
 <script setup lang="ts">
 import { Check, Search } from "lucide-vue-next"
-import { ComboboxAnchor, ComboboxEmpty, ComboboxGroup, ComboboxInput, ComboboxItem, ComboboxItemIndicator, ComboboxList } from "@/components/ui/combobox"
-import { computed, onMounted, ref, watch } from "vue";
+import { Combobox, ComboboxAnchor, ComboboxEmpty, ComboboxGroup, ComboboxInput, ComboboxItem, ComboboxItemIndicator, ComboboxList } from "@/components/ui/combobox"
+import { onMounted, ref } from "vue";
 import { Member, getMembers } from "@/api/member";
 import Button from "@/components/ui/button/Button.vue";
 import {
     CalendarDate,
     DateFormatter,
-    fromDate,
     getLocalTimeZone,
-    parseDate,
-    today,
 } from "@internationalized/date"
-import type { DateRange, DateValue } from "reka-ui"
+import type { DateRange } from "reka-ui"
 import type { Ref } from "vue"
 import Popover from "@/components/ui/popover/Popover.vue";
 import PopoverTrigger from "@/components/ui/popover/PopoverTrigger.vue";
 import PopoverContent from "@/components/ui/popover/PopoverContent.vue";
+import { RangeCalendar } from "@/components/ui/range-calendar"
 import { cn } from "@/lib/utils";
 import { CalendarIcon } from "lucide-vue-next"
 import Textarea from "@/components/ui/textarea/Textarea.vue";
-import { adminSubmitLOA, getLoaPolicy, getLoaTypes, submitLOA } from "@/api/loa"; // <-- import the submit function
-import { LOARequest, LOAType } from "@shared/types/loa";
-import { useForm, Field as VeeField } from "vee-validate";
-import {
-    Field,
-    FieldContent,
-    FieldDescription,
-    FieldGroup,
-    FieldLabel,
-} from '@/components/ui/field'
-import Combobox from "../ui/combobox/Combobox.vue";
-import Select from "../ui/select/Select.vue";
-import SelectTrigger from "../ui/select/SelectTrigger.vue";
-import SelectValue from "../ui/select/SelectValue.vue";
-import SelectContent from "../ui/select/SelectContent.vue";
-import SelectItem from "../ui/select/SelectItem.vue";
-import FieldError from "../ui/field/FieldError.vue";
+import { LOARequest, submitLOA } from "@/api/loa"; // <-- import the submit function
 
 const members = ref<Member[]>([])
-const loaTypes = ref<LOAType[]>();
-const policyString = ref<string | null>(null);
-
 const currentMember = ref<Member | null>(null);
 
 const props = withDefaults(defineProps<{
@@ -52,77 +31,77 @@ const props = withDefaults(defineProps<{
     member: null,
 });
 
-const df = new Intl.DateTimeFormat('en-US', {
-    year: 'numeric',
-    month: 'long',
-    day: 'numeric'
-});
 
-
-//form stuff
-import { loaSchema } from '@shared/schemas/loaSchema'
-import { toTypedSchema } from "@vee-validate/zod";
-import Calendar from "../ui/calendar/Calendar.vue";
-
-const { handleSubmit, values, resetForm } = useForm({
-    validationSchema: toTypedSchema(loaSchema),
+const df = new DateFormatter("en-US", {
+    dateStyle: "medium",
 })
 
-const onSubmit = handleSubmit(async (values) => {
-    console.log(values);
-    const out: LOARequest = {
-        member_id: values.member_id,
-        start_date: values.start_date,
-        end_date: values.end_date,
-        type_id: values.type.id,
-        reason: values.reason
-    };
-    if (props.adminMode) {
-        await adminSubmitLOA(out);
-    } else {
-        await submitLOA(out);
-    }
-})
+const value = ref({
+    // start: new CalendarDate(2022, 1, 20),
+    // end: new CalendarDate(2022, 1, 20).add({ days: 20 }),
+}) as Ref<DateRange>
+
+const reason = ref(""); // <-- reason for LOA
+const submitting = ref(false);
+const submitError = ref<string | null>(null);
+const submitSuccess = ref(false);
 
 onMounted(async () => {
     if (props.member) {
         currentMember.value = props.member;
     }
-    try {
-        if (!props.adminMode) {
-            policyString.value = await getLoaPolicy();
-        }
-    } catch (error) {
-        console.error(error);
+    if (props.adminMode) {
+        members.value = await getMembers();
     }
-
     members.value = await getMembers();
-    loaTypes.value = await getLoaTypes();
-    resetForm({ values: { member_id: currentMember.value?.member_id } });
 });
 
-const defaultPlaceholder = today(getLocalTimeZone())
+// Submit handler
+async function handleSubmit() {
+    submitError.value = null;
+    submitSuccess.value = false;
+    submitting.value = true;
 
-const minEndDate = computed(() => {
-    if (values.start_date) {
-        return new CalendarDate(values.start_date.getFullYear(), values.start_date.getMonth() + 1, values.start_date.getDate())
-    } else {
-        return null;
-    }
-})
+    // Use currentMember if adminMode, otherwise use your own member id (stubbed as 89 here)
+    const member_id = currentMember.value?.member_id ?? 89;
 
-const maxEndDate = computed(() => {
-    if (values.type && values.start_date) {
-        let endDateObj = new Date(values.start_date.getTime() + values.type.max_length_days * 24 * 60 * 60 * 1000);
-        return new CalendarDate(endDateObj.getFullYear(), endDateObj.getMonth() + 1, endDateObj.getDate())
-    } else {
-        return null;
+    // Format dates as ISO strings
+    const filed_date = toMariaDBDatetime(new Date());
+    const start_date = toMariaDBDatetime(value.value.start?.toDate(getLocalTimeZone()));
+    const end_date = toMariaDBDatetime(value.value.end?.toDate(getLocalTimeZone()));
+
+    if (!member_id || !filed_date || !start_date || !end_date) {
+        submitError.value = "Missing required fields";
+        submitting.value = false;
+        return;
     }
-})
+
+    const req: LOARequest = {
+        filed_date,
+        start_date,
+        end_date,
+        reason: reason.value,
+        member_id
+    };
+
+    const result = await submitLOA(req);
+    submitting.value = false;
+
+    if (result.id) {
+        submitSuccess.value = true;
+        reason.value = "";
+    } else {
+        submitError.value = result.error || "Failed to submit LOA";
+    }
+}
+
+function toMariaDBDatetime(date: Date): string {
+    return date.toISOString().slice(0, 19).replace('T', ' ');
+}
 </script>
 
 <template>
-    <div class="flex flex-row-reverse gap-6 mx-auto w-full" :class="!adminMode ? 'max-w-5xl' : 'max-w-5xl'">
+    <div class="flex flex-row-reverse gap-6 mx-auto " :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">
@@ -134,141 +113,60 @@ const maxEndDate = computed(() => {
             </div>
         </div>
         <div class="flex-1 flex flex-col gap-5">
-            <form @submit="onSubmit" class="flex flex-col gap-2">
-                <div class="flex w-full gap-5">
-                    <VeeField v-slot="{ field, errors }" name="member_id">
-                        <Field>
-                            <FieldContent>
-                                <FieldLabel>Member</FieldLabel>
-                                <Combobox :model-value="field.value" @update:model-value="field.onChange"
-                                    :disabled="!adminMode">
-                                    <ComboboxAnchor class="w-full">
-                                        <ComboboxInput placeholder="Search members..." class="w-full pl-3"
-                                            :display-value="(id) => {
-                                                const m = members.find(mem => mem.member_id === id)
-                                                return m ? m.member_name : ''
-                                            }" />
-                                    </ComboboxAnchor>
-                                    <ComboboxList class="*:w-64">
-                                        <ComboboxEmpty class="text-muted-foreground w-full">No results</ComboboxEmpty>
-                                        <ComboboxGroup>
-                                            <template v-for="member in members" :key="member.member_id">
-                                                <ComboboxItem :value="member.member_id"
-                                                    class="data-[highlighted]:bg-accent data-[highlighted]:text-accent-foreground relative cursor-pointer select-none px-2 py-1.5 w-full">
-                                                    {{ member.member_name }}
-                                                    <ComboboxItemIndicator
-                                                        class="absolute left-2 inline-flex items-center">
-                                                        <Check class="h-4 w-4" />
-                                                    </ComboboxItemIndicator>
-                                                </ComboboxItem>
-                                            </template>
-                                        </ComboboxGroup>
-                                    </ComboboxList>
-                                </Combobox>
-                                <div class="h-4">
-                                    <FieldError v-if="errors.length" :errors="errors"></FieldError>
-                                </div>
-                            </FieldContent>
-                        </Field>
-                    </VeeField>
-                    <VeeField v-slot="{ field, errors }" name="type">
-                        <Field class="w-full">
-                            <FieldContent>
-                                <FieldLabel>Type</FieldLabel>
-                                <Select :model-value="field.value" @update:model-value="field.onChange">
-                                    <SelectTrigger class="w-full">
-                                        <SelectValue></SelectValue>
-                                    </SelectTrigger>
-                                    <SelectContent>
-                                        <SelectItem v-for="type in loaTypes" :value="type">
-                                            {{ type.name }}
-                                        </SelectItem>
-                                    </SelectContent>
-                                </Select>
-                                <div class="h-4">
-                                    <FieldError v-if="errors.length" :errors="errors"></FieldError>
-                                </div>
-                            </FieldContent>
-                        </Field>
-                    </VeeField>
-                </div>
-                <div class="flex gap-5">
-                    <VeeField v-slot="{ field, errors }" name="start_date">
-                        <Field>
-                            <FieldContent>
-                                <FieldLabel>Start Date</FieldLabel>
-                                <Popover>
-                                    <PopoverTrigger as-child>
-                                        <Button variant="outline" :class="cn(
-                                            'w-[280px] justify-start text-left font-normal',
-                                            !field.value && 'text-muted-foreground',
-                                        )">
-                                            <CalendarIcon class="mr-2 h-4 w-4" />
-                                            {{ field.value ? df.format(field.value) : "Pick a date" }}
-                                        </Button>
-                                    </PopoverTrigger>
-                                    <PopoverContent class="w-auto p-0">
-                                        <Calendar
-                                            :model-value="field.value
-                                                ? new CalendarDate(field.value.getFullYear(), field.value.getMonth() + 1, field.value.getDate()) : null"
-                                            @update:model-value="(val: CalendarDate) => field.onChange(val.toDate(getLocalTimeZone()))"
-                                            layout="month-and-year" :min-value="today(getLocalTimeZone())" />
-                                    </PopoverContent>
-                                </Popover>
-                                <div class="h-4">
-                                    <FieldError v-if="errors.length" :errors="errors"></FieldError>
-                                </div>
-                            </FieldContent>
-                        </Field>
-                    </VeeField>
-                    <VeeField v-slot="{ field, errors }" name="end_date">
-                        <Field>
-                            <FieldContent>
-                                <FieldLabel>End Date</FieldLabel>
-                                <Popover>
-                                    <PopoverTrigger as-child>
-                                        <Button variant="outline" :class="cn(
-                                            'w-[280px] justify-start text-left font-normal',
-                                            !field.value && 'text-muted-foreground',
-                                        )">
-                                            <CalendarIcon class="mr-2 h-4 w-4" />
-                                            {{ field.value ? df.format(field.value) : "Pick a date" }}
-                                        </Button>
-                                    </PopoverTrigger>
-                                    <PopoverContent class="w-auto p-0">
-                                        <Calendar
-                                            :model-value="field.value ? new CalendarDate(field.value.getFullYear(), field.value.getMonth() + 1, field.value.getDate()) : null"
-                                            @update:model-value="(val: CalendarDate) => field.onChange(val.toDate(getLocalTimeZone()))"
-                                            :default-placeholder="defaultPlaceholder" :min-value="minEndDate"
-                                            :max-value="maxEndDate" layout="month-and-year">
-                                        </Calendar>
-                                    </PopoverContent>
-                                </Popover>
-                                <div class="h-4">
-                                    <FieldError v-if="errors.length" :errors="errors"></FieldError>
-                                </div>
-                            </FieldContent>
-                        </Field>
-                    </VeeField>
-                </div>
-                <div>
-                    <VeeField v-slot="{ field, errors }" name="reason">
-                        <Field>
-                            <FieldContent>
-                                <FieldLabel>Reason</FieldLabel>
-                                <Textarea :model-value="field.value" @update:model-value="field.onChange"
-                                    placeholder="Reason for LOA" class="resize-none h-28"></Textarea>
-                                <div class="h-4">
-                                    <FieldError v-if="errors.length" :errors="errors"></FieldError>
-                                </div>
-                            </FieldContent>
-                        </Field>
-                    </VeeField>
-                </div>
-                <div class="flex justify-end">
-                    <Button type="submit">Submit</Button>
-                </div>
-            </form>
+            <div class="flex w-full gap-5 ">
+                <Combobox class="w-1/2" v-model="currentMember" :disabled="!adminMode">
+                    <ComboboxAnchor class="w-full">
+                        <ComboboxInput placeholder="Search members..." class="w-full pl-9"
+                            :display-value="(v) => v ? v.member_name : ''" />
+                    </ComboboxAnchor>
+                    <ComboboxList class="w-full">
+                        <ComboboxEmpty class="text-muted-foreground">No results</ComboboxEmpty>
+                        <ComboboxGroup>
+                            <template v-for="member in members" :key="member.member_id">
+                                <ComboboxItem :value="member"
+                                    class="data-[highlighted]:bg-accent data-[highlighted]:text-accent-foreground relative cursor-pointer select-none px-2 py-1.5">
+                                    {{ member.member_name }}
+                                    <ComboboxItemIndicator class="absolute left-2 inline-flex items-center">
+                                        <Check class="h-4 w-4" />
+                                    </ComboboxItemIndicator>
+                                </ComboboxItem>
+                            </template>
+                        </ComboboxGroup>
+                    </ComboboxList>
+                </Combobox>
+                <Popover>
+                    <PopoverTrigger as-child>
+                        <Button variant="outline" :class="cn(
+                            'w-1/2 justify-start text-left font-normal',
+                            !value && 'text-muted-foreground',
+                        )">
+                            <CalendarIcon class="mr-2 h-4 w-4" />
+                            <template v-if="value.start">
+                                <template v-if="value.end">
+                                    {{ df.format(value.start.toDate(getLocalTimeZone())) }} - {{
+                                        df.format(value.end.toDate(getLocalTimeZone())) }}
+                                </template>
+                                <template v-else>
+                                    {{ df.format(value.start.toDate(getLocalTimeZone())) }}
+                                </template>
+                            </template>
+                            <template v-else>
+                                Pick a date
+                            </template>
+                        </Button>
+                    </PopoverTrigger>
+                    <PopoverContent class="w-auto p-0">
+                        <RangeCalendar v-model="value" initial-focus :number-of-months="2"
+                            @update:start-value="(startDate) => value.start = startDate" />
+                    </PopoverContent>
+                </Popover>
+            </div>
+            <Textarea v-model="reason" placeholder="Reason for LOA" class="w-full resize-none" />
+            <div class="flex justify-end">
+                <Button :onClick="handleSubmit" :disabled="submitting" class="w-min">Submit</Button>
+            </div>
+            <div v-if="submitError" class="text-red-500 text-sm mt-2">{{ submitError }}</div>
+            <div v-if="submitSuccess" class="text-green-500 text-sm mt-2">LOA submitted successfully!</div>
         </div>
     </div>
 </template>

ui/src/components/trainingReport/trainingReportForm.vue

@@ -18,12 +18,10 @@ 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: "",
@@ -131,17 +129,8 @@ onMounted(async () => {
 
         <VeeFieldArray name="attendees" v-slot="{ fields, push, remove }">
             <FieldSet class="gap-4">
-                <div class="flex flex-col gap-2">
-                    <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>
-
+                <FieldLegend class="scroll-m-20 text-lg tracking-tight">Attendees</FieldLegend>
+                <FieldDescription>Add members who attended this session.</FieldDescription>
 
                 <FieldGroup class="gap-4">
 

ui/src/components/ui/calendar/Calendar.vue

@@ -1,14 +1,7 @@
 <script setup>
-import { getLocalTimeZone, today } from "@internationalized/date";
-import { createReusableTemplate, reactiveOmit, useVModel } from "@vueuse/core";
-import { CalendarRoot, useDateFormatter, useForwardPropsEmits } from "reka-ui";
-import { createYear, createYearRange, toDate } from "reka-ui/date";
-import { computed, toRaw } from "vue";
+import { reactiveOmit } from "@vueuse/core";
+import { CalendarRoot, useForwardPropsEmits } from "reka-ui";
 import { cn } from "@/lib/utils";
-import {
-  NativeSelect,
-  NativeSelectOption,
-} from '@/components/ui/native-select';
 import {
   CalendarCell,
   CalendarCellTrigger,
@@ -45,165 +38,34 @@ const props = defineProps({
   dir: { type: String, required: false },
   nextPage: { type: Function, required: false },
   prevPage: { type: Function, required: false },
-  modelValue: { type: null, required: false, default: undefined },
+  modelValue: { type: null, required: false },
   multiple: { type: Boolean, required: false },
   disableDaysOutsideCurrentView: { type: Boolean, required: false },
   asChild: { type: Boolean, required: false },
-  as: { type: null, required: false },
+  as: { type: [String, Object, Function], required: false },
   class: { type: null, required: false },
-  layout: { type: null, required: false, default: undefined },
-  yearRange: { type: Array, required: false },
 });
 const emits = defineEmits(["update:modelValue", "update:placeholder"]);
 
-const delegatedProps = reactiveOmit(props, "class", "layout", "placeholder");
-
-const placeholder = useVModel(props, "placeholder", emits, {
-  passive: true,
-  defaultValue: props.defaultPlaceholder ?? today(getLocalTimeZone()),
-});
-
-const formatter = useDateFormatter(props.locale ?? "en");
-
-const yearRange = computed(() => {
-  return (
-    props.yearRange ??
-    createYearRange({
-      start:
-        props?.minValue ??
-        (
-          toRaw(props.placeholder) ??
-          props.defaultPlaceholder ??
-          today(getLocalTimeZone())
-        ).cycle("year", -100),
-
-      end:
-        props?.maxValue ??
-        (
-          toRaw(props.placeholder) ??
-          props.defaultPlaceholder ??
-          today(getLocalTimeZone())
-        ).cycle("year", 10),
-    })
-  );
-});
-
-const [DefineMonthTemplate, ReuseMonthTemplate] = createReusableTemplate();
-const [DefineYearTemplate, ReuseYearTemplate] = createReusableTemplate();
+const delegatedProps = reactiveOmit(props, "class");
 
 const forwarded = useForwardPropsEmits(delegatedProps, emits);
 </script>
 
 <template>
-  <DefineMonthTemplate v-slot="{ date }">
-    <div class="**:data-[slot=native-select-icon]:right-1">
-      <div class="relative">
-        <div
-          class="absolute inset-0 flex h-full items-center text-sm pl-2 pointer-events-none"
-        >
-          {{ formatter.custom(toDate(date), { month: "short" }) }}
-        </div>
-        <NativeSelect
-          class="text-xs h-8 pr-6 pl-2 text-transparent relative"
-          @change="
-            (e) => {
-              placeholder = placeholder.set({
-                month: Number(e?.target?.value),
-              });
-            }
-          "
-        >
-          <NativeSelectOption
-            v-for="month in createYear({ dateObj: date })"
-            :key="month.toString()"
-            :value="month.month"
-            :selected="date.month === month.month"
-          >
-            {{ formatter.custom(toDate(month), { month: "short" }) }}
-          </NativeSelectOption>
-        </NativeSelect>
-      </div>
-    </div>
-  </DefineMonthTemplate>
-
-  <DefineYearTemplate v-slot="{ date }">
-    <div class="**:data-[slot=native-select-icon]:right-1">
-      <div class="relative">
-        <div
-          class="absolute inset-0 flex h-full items-center text-sm pl-2 pointer-events-none"
-        >
-          {{ formatter.custom(toDate(date), { year: "numeric" }) }}
-        </div>
-        <NativeSelect
-          class="text-xs h-8 pr-6 pl-2 text-transparent relative"
-          @change="
-            (e) => {
-              placeholder = placeholder.set({
-                year: Number(e?.target?.value),
-              });
-            }
-          "
-        >
-          <NativeSelectOption
-            v-for="year in yearRange"
-            :key="year.toString()"
-            :value="year.year"
-            :selected="date.year === year.year"
-          >
-            {{ formatter.custom(toDate(year), { year: "numeric" }) }}
-          </NativeSelectOption>
-        </NativeSelect>
-      </div>
-    </div>
-  </DefineYearTemplate>
-
   <CalendarRoot
-    v-slot="{ grid, weekDays, date }"
-    v-bind="forwarded"
-    v-model:placeholder="placeholder"
+    v-slot="{ grid, weekDays }"
     data-slot="calendar"
     :class="cn('p-3', props.class)"
+    v-bind="forwarded"
   >
-    <CalendarHeader class="pt-0">
-      <nav
-        class="flex items-center gap-1 absolute top-0 inset-x-0 justify-between"
-      >
-        <CalendarPrevButton>
-          <slot name="calendar-prev-icon" />
-        </CalendarPrevButton>
-        <CalendarNextButton>
-          <slot name="calendar-next-icon" />
-        </CalendarNextButton>
-      </nav>
+    <CalendarHeader>
+      <CalendarHeading />
 
-      <slot
-        name="calendar-heading"
-        :date="date"
-        :month="ReuseMonthTemplate"
-        :year="ReuseYearTemplate"
-      >
-        <template v-if="layout === 'month-and-year'">
-          <div class="flex items-center justify-center gap-1">
-            <ReuseMonthTemplate :date="date" />
-            <ReuseYearTemplate :date="date" />
-          </div>
-        </template>
-        <template v-else-if="layout === 'month-only'">
-          <div class="flex items-center justify-center gap-1">
-            <ReuseMonthTemplate :date="date" />
-            {{ formatter.custom(toDate(date), { year: "numeric" }) }}
-          </div>
-        </template>
-        <template v-else-if="layout === 'year-only'">
-          <div class="flex items-center justify-center gap-1">
-            {{ formatter.custom(toDate(date), { month: "short" }) }}
-            <ReuseYearTemplate :date="date" />
-          </div>
-        </template>
-        <template v-else>
-          <CalendarHeading />
-        </template>
-      </slot>
+      <div class="flex items-center gap-1">
+        <CalendarPrevButton />
+        <CalendarNextButton />
+      </div>
     </CalendarHeader>
 
     <div class="flex flex-col gap-y-4 mt-4 sm:flex-row sm:gap-x-4 sm:gap-y-0">

ui/src/components/ui/calendar/CalendarCell.vue

@@ -6,7 +6,7 @@ import { cn } from "@/lib/utils";
 const props = defineProps({
   date: { type: null, required: true },
   asChild: { type: Boolean, required: false },
-  as: { type: null, required: false },
+  as: { type: [String, Object, Function], required: false },
   class: { type: null, required: false },
 });
 

ui/src/components/ui/calendar/CalendarCellTrigger.vue

@@ -8,7 +8,7 @@ const props = defineProps({
   day: { type: null, required: true },
   month: { type: null, required: true },
   asChild: { type: Boolean, required: false },
-  as: { type: null, required: false, default: "button" },
+  as: { type: [String, Object, Function], required: false, default: "button" },
   class: { type: null, required: false },
 });
 

ui/src/components/ui/calendar/CalendarGrid.vue

@@ -5,7 +5,7 @@ import { cn } from "@/lib/utils";
 
 const props = defineProps({
   asChild: { type: Boolean, required: false },
-  as: { type: null, required: false },
+  as: { type: [String, Object, Function], required: false },
   class: { type: null, required: false },
 });
 

ui/src/components/ui/calendar/CalendarGridBody.vue

@@ -3,7 +3,7 @@ import { CalendarGridBody } from "reka-ui";
 
 const props = defineProps({
   asChild: { type: Boolean, required: false },
-  as: { type: null, required: false },
+  as: { type: [String, Object, Function], required: false },
 });
 </script>
 

ui/src/components/ui/calendar/CalendarGridHead.vue

@@ -3,7 +3,7 @@ import { CalendarGridHead } from "reka-ui";
 
 const props = defineProps({
   asChild: { type: Boolean, required: false },
-  as: { type: null, required: false },
+  as: { type: [String, Object, Function], required: false },
   class: { type: null, required: false },
 });
 </script>

ui/src/components/ui/calendar/CalendarGridRow.vue

@@ -5,7 +5,7 @@ import { cn } from "@/lib/utils";
 
 const props = defineProps({
   asChild: { type: Boolean, required: false },
-  as: { type: null, required: false },
+  as: { type: [String, Object, Function], required: false },
   class: { type: null, required: false },
 });
 

ui/src/components/ui/calendar/CalendarHeadCell.vue

@@ -5,7 +5,7 @@ import { cn } from "@/lib/utils";
 
 const props = defineProps({
   asChild: { type: Boolean, required: false },
-  as: { type: null, required: false },
+  as: { type: [String, Object, Function], required: false },
   class: { type: null, required: false },
 });
 
@@ -19,7 +19,7 @@ const forwardedProps = useForwardProps(delegatedProps);
     data-slot="calendar-head-cell"
     :class="
       cn(
-        'text-muted-foreground rounded-md flex-1 font-normal text-[0.8rem]',
+        'text-muted-foreground rounded-md w-8 font-normal text-[0.8rem]',
         props.class,
       )
     "

ui/src/components/ui/calendar/CalendarHeader.vue

@@ -5,7 +5,7 @@ import { cn } from "@/lib/utils";
 
 const props = defineProps({
   asChild: { type: Boolean, required: false },
-  as: { type: null, required: false },
+  as: { type: [String, Object, Function], required: false },
   class: { type: null, required: false },
 });
 
@@ -18,10 +18,7 @@ const forwardedProps = useForwardProps(delegatedProps);
   <CalendarHeader
     data-slot="calendar-header"
     :class="
-      cn(
-        'flex justify-center pt-1 relative items-center w-full px-8',
-        props.class,
-      )
+      cn('flex justify-center pt-1 relative items-center w-full', props.class)
     "
     v-bind="forwardedProps"
   >

ui/src/components/ui/calendar/CalendarHeading.vue

@@ -5,7 +5,7 @@ import { cn } from "@/lib/utils";
 
 const props = defineProps({
   asChild: { type: Boolean, required: false },
-  as: { type: null, required: false },
+  as: { type: [String, Object, Function], required: false },
   class: { type: null, required: false },
 });
 

ui/src/components/ui/calendar/CalendarNextButton.vue

@@ -8,7 +8,7 @@ import { buttonVariants } from '@/components/ui/button';
 const props = defineProps({
   nextPage: { type: Function, required: false },
   asChild: { type: Boolean, required: false },
-  as: { type: null, required: false },
+  as: { type: [String, Object, Function], required: false },
   class: { type: null, required: false },
 });
 
@@ -23,6 +23,7 @@ const forwardedProps = useForwardProps(delegatedProps);
     :class="
       cn(
         buttonVariants({ variant: 'outline' }),
+        'absolute right-1',
         'size-7 bg-transparent p-0 opacity-50 hover:opacity-100',
         props.class,
       )

ui/src/components/ui/calendar/CalendarPrevButton.vue

@@ -8,7 +8,7 @@ import { buttonVariants } from '@/components/ui/button';
 const props = defineProps({
   prevPage: { type: Function, required: false },
   asChild: { type: Boolean, required: false },
-  as: { type: null, required: false },
+  as: { type: [String, Object, Function], required: false },
   class: { type: null, required: false },
 });
 
@@ -23,6 +23,7 @@ const forwardedProps = useForwardProps(delegatedProps);
     :class="
       cn(
         buttonVariants({ variant: 'outline' }),
+        'absolute left-1',
         'size-7 bg-transparent p-0 opacity-50 hover:opacity-100',
         props.class,
       )

ui/src/components/ui/native-select/NativeSelect.vue

@@ -1,51 +0,0 @@
-<script setup>
-import { reactiveOmit, useVModel } from "@vueuse/core";
-import { ChevronDownIcon } from "lucide-vue-next";
-import { cn } from "@/lib/utils";
-
-defineOptions({
-  inheritAttrs: false,
-});
-
-const props = defineProps({
-  modelValue: { type: null, required: false },
-  class: { type: null, required: false },
-});
-
-const emit = defineEmits(["update:modelValue"]);
-
-const modelValue = useVModel(props, "modelValue", emit, {
-  passive: true,
-  defaultValue: "",
-});
-
-const delegatedProps = reactiveOmit(props, "class");
-</script>
-
-<template>
-  <div
-    class="group/native-select relative w-fit has-[select:disabled]:opacity-50"
-    data-slot="native-select-wrapper"
-  >
-    <select
-      v-bind="{ ...$attrs, ...delegatedProps }"
-      v-model="modelValue"
-      data-slot="native-select"
-      :class="
-        cn(
-          'border-input placeholder:text-muted-foreground selection:bg-primary selection:text-primary-foreground dark:bg-input/30 dark:hover:bg-input/50 h-9 w-full min-w-0 appearance-none rounded-md border bg-transparent px-3 py-2 pr-9 text-sm shadow-xs transition-[color,box-shadow] outline-none disabled:pointer-events-none disabled:cursor-not-allowed',
-          'focus-visible:border-ring focus-visible:ring-ring/50 focus-visible:ring-[3px]',
-          'aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive',
-          props.class,
-        )
-      "
-    >
-      <slot />
-    </select>
-    <ChevronDownIcon
-      class="text-muted-foreground pointer-events-none absolute top-1/2 right-3.5 size-4 -translate-y-1/2 opacity-50 select-none"
-      aria-hidden="true"
-      data-slot="native-select-icon"
-    />
-  </div>
-</template>

ui/src/components/ui/native-select/NativeSelectOptGroup.vue

@@ -1,19 +0,0 @@
-<!-- @fallthroughAttributes true -->
-<!-- @strictTemplates true -->
-
-<script setup>
-import { cn } from "@/lib/utils";
-
-const props = defineProps({
-  class: { type: null, required: false },
-});
-</script>
-
-<template>
-  <optgroup
-    data-slot="native-select-optgroup"
-    :class="cn('bg-popover text-popover-foreground', props.class)"
-  >
-    <slot />
-  </optgroup>
-</template>

ui/src/components/ui/native-select/NativeSelectOption.vue

@@ -1,19 +0,0 @@
-<!-- @fallthroughAttributes true -->
-<!-- @strictTemplates true -->
-
-<script setup>
-import { cn } from "@/lib/utils";
-
-const props = defineProps({
-  class: { type: null, required: false },
-});
-</script>
-
-<template>
-  <option
-    data-slot="native-select-option"
-    :class="cn('bg-popover text-popover-foreground', props.class)"
-  >
-    <slot />
-  </option>
-</template>

ui/src/components/ui/native-select/index.js

@@ -1,3 +0,0 @@
-export { default as NativeSelect } from "./NativeSelect.vue";
-export { default as NativeSelectOptGroup } from "./NativeSelectOptGroup.vue";
-export { default as NativeSelectOption } from "./NativeSelectOption.vue";

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

@@ -1,45 +0,0 @@
-<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

@@ -1,39 +0,0 @@
-<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

@@ -1,33 +0,0 @@
-<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

@@ -1,24 +0,0 @@
-<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

@@ -1,31 +0,0 @@
-<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

@@ -1,30 +0,0 @@
-<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

@@ -1,32 +0,0 @@
-<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

@@ -1,32 +0,0 @@
-<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

@@ -1,14 +0,0 @@
-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

@@ -1,31 +0,0 @@
-<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

@@ -1,25 +0,0 @@
-<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

@@ -1,36 +0,0 @@
-<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

@@ -1,33 +0,0 @@
-<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

@@ -1,33 +0,0 @@
-<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

@@ -1,24 +0,0 @@
-<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

@@ -1,29 +0,0 @@
-<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

@@ -1,7 +0,0 @@
-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

@@ -1,36 +0,0 @@
-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/main.js

@@ -9,18 +9,14 @@ import FormCheckbox from './components/form/FormCheckbox.vue'
 import FormInput from './components/form/FormInput.vue'
 
 import * as Sentry from "@sentry/vue";
-
-
-
+import { initMatomo } from "@certible/use-matomo"
 
 const app = createApp(App)
 
-
-
 app.use(createPinia())
 app.use(router)
 
-if (!import.meta.env.VITE_DISABLE_GLITCHTIP) {
+if (!!import.meta.env.VITE_DISABLE_GLITCHTIP) {
     let dsn = import.meta.env.VITE_GLITCHTIP_DSN;
     let environment = import.meta.env.VITE_ENVIRONMENT;
 
@@ -36,7 +32,18 @@ if (!import.meta.env.VITE_DISABLE_GLITCHTIP) {
     });
 }
 
+if (!!import.meta.env.VITE_DISABLE_MATOMO) {
+    console.log("Matomo init")
+    app.use(initMatomo({
+        host: 'https://stats.nexuszone.net/',
+        siteId: 4,
+        trackRouter: true,
+    }));
+}
+
 app.component("FormInput", FormInput)
 app.component("FormCheckbox", FormCheckbox)
 
 app.mount('#app')
+
+// window._paq.push(['trackPageView']);

ui/src/pages/Application.vue

@@ -17,95 +17,48 @@ 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());
 
-    //recruiter mode
-    if (props.mode === 'view-recruiter') {
-        finalMode.value = 'view-recruiter';
-        await loadByID(Number(router.params.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;
+        }
+    } 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
 }
@@ -121,7 +74,7 @@ async function handleDeny(id) {
 </script>
 
 <template>
-    <div v-if="!loading" class="w-full h-20">
+    <div v-if="!loading" class="max-w-3xl mx-auto my-20">
         <div v-if="!newApp" class="flex flex-row justify-between items-center py-2 mb-8">
             <!-- Application header -->
             <div>
@@ -149,7 +102,7 @@ async function handleDeny(id) {
                         hour: "2-digit",
                         minute: "2-digit"
                     }) }}</p>
-                <div class="mt-2" v-else-if="finalMode === 'view-recruiter'">
+                <div class="mt-2" v-else>
                     <Button variant="success" class="mr-2" :onclick="() => { handleApprove(appID) }">
                         <CheckIcon></CheckIcon>
                     </Button>
@@ -170,5 +123,5 @@ async function handleDeny(id) {
         </div>
     </div>
     <!-- TODO: Implement some kinda loading screen -->
-    <div v-else class="flex items-center justify-center h-full">Loading</div>
+    <div v-else>Loading</div>
 </template>

ui/src/pages/Homepage.vue

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

ui/src/pages/Join.vue

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

ui/src/pages/ManageLOA.vue

@@ -18,16 +18,21 @@ const showLOADialog = ref(false);
 
 <template>
     <Dialog v-model:open="showLOADialog" v-on:update:open="showLOADialog = false">
-        <DialogContent class="sm:max-w-fit">
+        <DialogContent>
             <DialogHeader>
                 <DialogTitle>Post LOA</DialogTitle>
                 <DialogDescription>
                     Post an LOA on behalf of a member.
                 </DialogDescription>
             </DialogHeader>
-            <LoaForm :admin-mode="true" class="my-3"></LoaForm>
+            <LoaForm :admin-mode="true" class="my-5 w-full"></LoaForm>
+            <!-- <DialogFooter>
+                <Button variant="secondary" @click="showLOADialog = false">Cancel</Button>
+                <Button>Apply</Button>
+            </DialogFooter> -->
         </DialogContent>
-    </Dialog> 
+    </Dialog>
+
     <div class="max-w-5xl mx-auto pt-10">
         <div class="flex justify-end mb-4">
             <Button @click="showLOADialog = true">Post LOA</Button>

ui/src/pages/ManageTransfers.vue

@@ -68,7 +68,7 @@ onMounted(async () => {
         </DialogContent>
     </Dialog>
 
-    <div class="max-w-5xl w-full mx-auto">
+    <div class="max-w-5xl 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] w-full flex mt-5">
+    <div class="px-20 mx-auto max-w-[100rem] 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="flex flex-col items-center justify-center text-center px-6">
+    <div class="min-h-screen 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') },
+    { path: '/', component: () => import('@/pages/Homepage.vue'), meta: { requiresAuth: true } },
 
     // MEMBER ROUTES
     { path: '/members', component: () => import('@/pages/memberList.vue'), meta: { requiresAuth: true, memberOnly: true } },
@@ -29,7 +29,7 @@ const router = createRouter({
       meta: { requiresAuth: true, memberOnly: true, roles: ['staff', 'admin'] },
       children: [
         { path: 'applications', component: () => import('@/pages/ManageApplications.vue') },
-        { path: 'applications/:id', component: () => import('@/pages/ManageApplications.vue') },
+        { path: 'application/:id', component: () => import('@/pages/Application.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 +63,15 @@ router.beforeEach(async (to) => {
   }
 
 
-  // Must be a member
-  if (to.meta.memberOnly && user.state !== 'member') {
-    return '/unauthorized'
-  }
+  // // Must be a member
+  // if (to.meta.memberOnly && user.state !== 'member') {
+  //   return '/unauthorized'
+  // }
 
-  // Must have specific role
-  if (to.meta.roles && !user.hasRole('Dev') && !user.hasAnyRole(to.meta.roles)) {
-    return '/unauthorized'
-  }
+  // // Must have specific role
+  // if (to.meta.roles && !user.hasRole('Dev') && !user.hasAnyRole(to.meta.roles)) {
+  //   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<string | undefined>(() => user.value?.state || undefined);
+    const state = computed(() => user.value.state);
     const isLoggedIn = computed(() => user.value !== null)
 
     async function loadUser() {
@@ -16,7 +16,6 @@ export const useUserStore = defineStore('user', () => {
 
         if (res.ok) {
             const data = await res.json();
-            console.log(data);
             user.value = data;
         }