Tried my damndest, will pick this up again another time

2025-12-01 14:58:45 -05:00
30 changed files with 221 additions and 721 deletions
--- a/.gitea/workflows/cd-deploy.yaml
+++ b/.gitea/workflows/cd-deploy.yaml
@@ -1,62 +0,0 @@
-name: Continuous Deployment
-on:
-  push:
-
-jobs:
-  Deploy:
-    name: Update Deployment
-    runs-on: ubuntu-latest
-    container:
-      volumes:
-        - /var/www/html/milsim-site-v4:/var/www/html/milsim-site-v4:rw
-    steps:
-      - name: Setup Local Environment
-        run: |
-          groupadd -g 989 nginx || true
-          useradd nginx -u 990 -g nginx -m || true
-
-      - name: Verify Node Environment
-        run: |
-          npm -v
-          node -v
-
-      - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-          ref: 'main'
-
-      - name: Token Copy
-        run: |
-          cd /var/www/html/milsim-site-v4
-          cp /workspace/17th-Ranger-Battalion-ORG/milsim-site-v4/.git/config .git/config
-          chown nginx:nginx .git/config
-
-      - name: Fix File Permissions
-        run: |
-          sudo chown -R nginx:nginx /var/www/html/milsim-site-v4
-          sudo chmod -R u+w /var/www/html/milsim-site-v4
-
-      - name: Update Application Code
-        run: |
-          sudo -u nginx bash -c "cd /var/www/html/milsim-site-v4 && git reset --hard && git pull origin main"
-
-      - name: Update Shared Dependencies
-        run: |
-          sudo -u nginx bash -c "cd /var/www/html/milsim-site-v4/shared && npm install"
-
-      - name: Update UI Dependencies
-        run: |
-          sudo -u nginx bash -c "cd /var/www/html/milsim-site-v4/ui && npm install"
-
-      - name: Update API Dependencies
-        run: |
-          sudo -u nginx bash -c "cd /var/www/html/milsim-site-v4/api && npm install"
-
-      - name: Build UI
-        run: |
-          sudo -u nginx bash -c "cd /var/www/html/milsim-site-v4/ui && npm run build"
-
-      - name: Build API
-        run: |
-          sudo -u nginx bash -c "cd /var/www/html/milsim-site-v4/api && npm run build"
--- a/api/src/services/rolesService.ts
+++ b/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
--- a/shared/schemas/trainingReportSchema.ts
+++ b/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.",
-            });
-        }
-    })
 })

--- a/shared/types/roles.ts
+++ b/shared/types/roles.ts
@@ -1,6 +0,0 @@
-export interface Role {
-    id: number;
-    name: string;
-    color?: string;
-    description?: string;
-}
--- a/ui/.env.example
+++ b/ui/.env.example
@@ -5,3 +5,6 @@ VITE_ENVIRONMENT= # dev / prod
 # Glitchtip
 VITE_GLITCHTIP_DSN=
 VITE_DISABLE_GLITCHTIP= # true/false
+
+# Matomo
+VITE_DISABLE_MATOMO= # true/false
--- a/ui/package-lock.json
+++ b/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"
--- a/ui/package.json
+++ b/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",
--- a/ui/public/17RBN_Logo.png
+++ b/ui/public/17RBN_Logo.png
--- a/ui/src/App.vue
+++ b/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,8 +49,77 @@ const environment = import.meta.env.VITE_ENVIRONMENT;
 </script>

 <template>
-  <div class="flex flex-col min-h-screen">
-    <Navbar class="flex"></Navbar>
+  <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>
+
+      </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>
@@ -35,7 +132,7 @@ const environment = import.meta.env.VITE_ENVIRONMENT;
      </AlertDescription>
    </Alert>

-    <RouterView class="flex-1 min-h-0"></RouterView>
+    <RouterView class=""></RouterView>
  </div>
 </template>

--- a/ui/src/assets/base.css
+++ b/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 {
--- a/ui/src/components/Navigation/Navbar.vue
+++ b/ui/src/components/Navigation/Navbar.vue
@@ -1,180 +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 :variant="'destructive'" @click="logout()">Logout</DropdownMenuItem>
-                    </DropdownMenuContent>
-                </DropdownMenu>
-                <a v-else :href="APIHOST + '/login'">Login</a>
-            </div>
-        </div>
-        <!-- <Separator></Separator> -->
-    </div>
-</template>
--- a/ui/src/components/loa/loaForm.vue
+++ b/ui/src/components/loa/loaForm.vue
@@ -101,7 +101,7 @@ function toMariaDBDatetime(date: Date): string {
 </script>

 <template>
-    <div class="flex flex-row-reverse gap-6 mx-auto 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">
--- a/ui/src/components/trainingReport/trainingReportForm.vue
+++ b/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">

--- a/ui/src/components/ui/navigation-menu/NavigationMenu.vue
+++ b/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>
--- a/ui/src/components/ui/navigation-menu/NavigationMenuContent.vue
+++ b/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>
--- a/ui/src/components/ui/navigation-menu/NavigationMenuIndicator.vue
+++ b/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>
--- a/ui/src/components/ui/navigation-menu/NavigationMenuItem.vue
+++ b/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>
--- a/ui/src/components/ui/navigation-menu/NavigationMenuLink.vue
+++ b/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>
--- a/ui/src/components/ui/navigation-menu/NavigationMenuList.vue
+++ b/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>
--- a/ui/src/components/ui/navigation-menu/NavigationMenuTrigger.vue
+++ b/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>
--- a/ui/src/components/ui/navigation-menu/NavigationMenuViewport.vue
+++ b/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>
--- a/ui/src/components/ui/navigation-menu/index.js
+++ b/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",
-);
--- a/ui/src/composables/useAuth.ts
+++ b/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 }
-}
--- a/ui/src/main.js
+++ b/ui/src/main.js
@@ -9,14 +9,10 @@ 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)

@@ -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']);
--- a/ui/src/pages/Homepage.vue
+++ b/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>
--- a/ui/src/pages/ManageApplications.vue
+++ b/ui/src/pages/ManageApplications.vue
@@ -69,7 +69,7 @@ onMounted(async () => {
 })
 </script>
 <template>
-    <div class="mx-auto w-full max-w-5xl">
+    <div class="mx-auto max-w-5xl">
        <h1 class="my-4">Manage Applications</h1>
        <Table>
            <!-- <TableCaption>A list of your recent invoices.</TableCaption> -->
--- a/ui/src/pages/ManageTransfers.vue
+++ b/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>
--- a/ui/src/pages/TrainingReport.vue
+++ b/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">
--- a/ui/src/router/index.js
+++ b/ui/src/router/index.js
@@ -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;
--- a/ui/src/stores/user.ts
+++ b/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;
        }