Create dossier

.gitea/workflows/cd-deploy.yaml

@@ -1,8 +1,6 @@
 name: Continuous Deployment
 on:
   push:
-    tags:
-      - '*'
 
 jobs:
   Deploy:
@@ -10,29 +8,20 @@ jobs:
     runs-on: ubuntu-latest
     container:
       volumes:
-        - /var/www/html/milsim-site-v4:/var/www/html/milsim-site-v4:z
+        - /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: Update Node Environment
-        uses: actions/setup-node@v6
-        with:
-          node-version: 20.19
-
-      - name: Verify Local Environment
+      - name: Verify Node Environment
         run: |
-          which npm
           npm -v
-          which node
           node -v
-          which sed
-          sed --version
 
       - name: Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
           ref: 'main'
@@ -43,53 +32,31 @@ jobs:
           cp /workspace/17th-Ranger-Battalion-ORG/milsim-site-v4/.git/config .git/config
           chown nginx:nginx .git/config
 
-      - name: Update Application Code
-        run: |
-          cd /var/www/html/milsim-site-v4
-          version=`git log -1 --format=%H`
-          echo "Current Revision: $version"
-          echo "Updating to: ${{ github.sha }}"
-          sudo -u nginx git reset --hard
-          sudo -u nginx git fetch --tags
-          sudo -u nginx git pull origin main
-          new_version=`git log -1 --format=%H`
-          echo "Successfully updated to: $new_version"
-
-      - name: Update Shared Dependencies and Fix Permissions
-        run: |
-          cd /var/www/html/milsim-site-v4/shared
-          npm install
-          chown -R nginx:nginx .
-
-      - name: Update UI Dependencies and Fix Permissions
-        run: |
-          cd /var/www/html/milsim-site-v4/ui
-          npm install
-          chown -R nginx:nginx .
-
-      - name: Update API Dependencies and Fix Permissions
-        run: |
-          cd /var/www/html/milsim-site-v4/api
-          npm install
-          chown -R nginx:nginx .
-
-      - name: Build UI / Update Version / Fix Permissions
-        run: |
-          cd /var/www/html/milsim-site-v4/ui
-          npm run build
-          version=`git describe --abbrev=0 --tags`
-          sed -i "s/VITE_APPLICATION_VERSION=.*/VITE_APPLICATION_VERSION=$version/" .env
-          chown -R nginx:nginx .
-
-      - name: Build API / Update Version / Fix Permissions
-        run: |
-          cd /var/www/html/milsim-site-v4/api
-          npm run build
-          version=`git describe --abbrev=0 --tags`
-          sed -i "s/APPLICATION_VERSION=.*/APPLICATION_VERSION=$version/" .env
-          chown -R nginx:nginx .
-
-      - name: Reset File Permissions
+      - 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
+          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"

.gitea/workflows/ci-deploy.yaml

@@ -1,89 +0,0 @@
-name: Continuous Integration
-on:
-  push:
-    branches:
-      - main
-
-jobs:
-  Deploy:
-    name: Update Development
-    runs-on: ubuntu-latest
-    container:
-      volumes:
-        - /var/www/html/milsim-site-v4-dev:/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: Update Node Environment
-        uses: actions/setup-node@v6
-        with:
-          node-version: 20.19
-
-      - name: Verify Local Environment
-        run: |
-          which npm
-          npm -v
-          which node
-          node -v
-          which sed
-          sed --version
-
-      - name: Checkout
-        uses: actions/checkout@v5
-        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: 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 and Fix Permissions
-        run: |
-          cd /var/www/html/milsim-site-v4/shared
-          npm install
-          chown -R nginx:nginx .
-
-      - name: Update UI Dependencies and Fix Permissions
-        run: |
-          cd /var/www/html/milsim-site-v4/ui
-          npm install
-          chown -R nginx:nginx .
-
-      - name: Update API Dependencies and Fix Permissions
-        run: |
-          cd /var/www/html/milsim-site-v4/api
-          npm install
-          chown -R nginx:nginx .
-
-      - name: Build UI / Update Version / Fix Permissions
-        run: |
-          cd /var/www/html/milsim-site-v4/ui
-          npm run build
-          version=`git rev-parse --short=10 HEAD`
-          sed -i "s/VITE_APPLICATION_VERSION=.*/VITE_APPLICATION_VERSION=$version/" .env
-          chown -R nginx:nginx .
-
-      - name: Build API / Update Version / Fix Permissions
-        run: |
-          cd /var/www/html/milsim-site-v4/api
-          npm run build
-          version=`git rev-parse --short=10 HEAD`
-          sed -i "s/APPLICATION_VERSION=.*/APPLICATION_VERSION=$version/" .env
-          chown -R nginx:nginx .
-
-      - name: Reset 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

api/.env.example

@@ -19,15 +19,7 @@ AUTH_END_SESSION_URI=
 SERVER_PORT=3000
 CLIENT_URL= # This is whatever URL the client web app is served on
 CLIENT_DOMAIN= #whatever.com
-APPLICATION_VERSION= # Should match release tag
-APPLICATION_ENVIRONMENT= # dev / prod
-CONFIG_ID= # configures 
 
 # Glitchtip
 GLITCHTIP_DSN=
-DISABLE_GLITCHTIP= # true/false
-
-# Bookstack
-DOC_HOST=  # https://bookstack.whatever.com/
-DOC_TOKEN_SECRET=
-DOC_TOKEN_ID=
+DISABLE_GLITCHTIP= # true/false

api/src/index.js

@@ -0,0 +1,82 @@
+const dotenv = require('dotenv')
+dotenv.config();
+
+const express = require('express')
+const cors = require('cors')
+const morgan = require('morgan')
+const app = express()
+app.use(morgan('dev'))
+
+app.use(cors({
+  origin: [process.env.CLIENT_URL], // your SPA origins
+  credentials: true
+}));
+
+app.use(express.json())
+
+app.set('trust proxy', 1);
+
+const port = process.env.SERVER_PORT;
+
+//glitchtip setup
+const sentry = require('@sentry/node');
+if (!process.env.DISABLE_GLITCHTIP) {
+  console.log("Glitchtip disabled AAAAAA")
+} else {
+  let dsn = process.env.GLITCHTIP_DSN;
+  sentry.init({ dsn: dsn });
+  console.log("Glitchtip initialized");
+}
+
+//session setup
+const path = require('path')
+const session = require('express-session')
+const passport = require('passport')
+const SQLiteStore = require('connect-sqlite3')(session);
+
+app.use(session({
+  secret: 'whatever',
+  resave: false,
+  saveUninitialized: false,
+  store: new SQLiteStore({ db: 'sessions.db', dir: './' }),
+  cookie: {
+    httpOnly: true,
+    sameSite: 'lax',
+    domain: process.env.CLIENT_DOMAIN
+  }
+}));
+app.use(passport.authenticate('session'));
+
+// Mount route modules
+const applicationsRouter = require('./routes/applications');
+const { memberRanks, ranks } = require('./routes/ranks');
+const members = require('./routes/members');
+const loaHandler = require('./routes/loa')
+const { status, memberStatus } = require('./routes/statuses')
+const authRouter = require('./routes/auth')
+const { roles, memberRoles } = require('./routes/roles');
+const { courseRouter, eventRouter } = require('./routes/course');
+const { calendarRouter } = require('./routes/calendar')
+const morgan = require('morgan');
+
+app.use('/application', applicationsRouter);
+app.use('/ranks', ranks);
+app.use('/memberRanks', memberRanks);
+app.use('/members', members);
+app.use('/loa', loaHandler);
+app.use('/status', status)
+app.use('/memberStatus', memberStatus)
+app.use('/roles', roles)
+app.use('/memberRoles', memberRoles)
+app.use('/course', courseRouter)
+app.use('/courseEvent', eventRouter)
+app.use('/calendar', calendarRouter)
+app.use('/', authRouter)
+
+app.get('/ping', (req, res) => {
+  res.status(200).json({ message: 'pong' });
+});
+
+app.listen(port, () => {
+  console.log(`Example app listening on port ${port} `)
+})

api/src/index.ts

@@ -1,88 +0,0 @@
-import dotenv = require('dotenv');
-dotenv.config();
-
-import express = require('express');
-import cors = require('cors');
-import morgan = require('morgan');
-const app = express()
-app.use(morgan('dev', {
-  skip: (req) => {
-    return req.path === '/members/me';
-  }
-}))
-
-app.use(cors({
-  origin: [process.env.CLIENT_URL], // your SPA origins
-  credentials: true
-}));
-
-app.use(express.json())
-
-app.set('trust proxy', 1);
-
-const port = process.env.SERVER_PORT;
-
-//glitchtip setup
-import sentry = require('@sentry/node');
-if (process.env.DISABLE_GLITCHTIP === "true") {
-  console.log("Glitchtip disabled")
-} else {
-  let dsn = process.env.GLITCHTIP_DSN;
-  let release = process.env.APPLICATION_VERSION;
-  let environment = process.env.APPLICATION_ENVIRONMENT;
-  console.log(release, environment)
-  sentry.init({ dsn: dsn, release: release, environment: environment, integrations: [sentry.captureConsoleIntegration({ levels: ['error'] })] });
-  console.log("Glitchtip initialized");
-}
-
-//session setup
-import path = require('path');
-import session = require('express-session');
-import passport = require('passport');
-const SQLiteStore = require('connect-sqlite3')(session);
-
-app.use(session({
-  secret: 'whatever',
-  resave: false,
-  saveUninitialized: false,
-  store: new SQLiteStore({ db: 'sessions.db', dir: './' }),
-  cookie: {
-    httpOnly: true,
-    sameSite: 'lax',
-    domain: process.env.CLIENT_DOMAIN
-  }
-}));
-app.use(passport.authenticate('session'));
-
-// Mount route modules
-import { applicationRouter } from './routes/applications';
-import { memberRanks, ranks } from './routes/ranks';
-import { memberRouter } from './routes/members';
-import { loaRouter } from './routes/loa';
-import { status, memberStatus } from './routes/statuses';
-import { authRouter } from './routes/auth';
-import { roles, memberRoles } from './routes/roles';
-import { courseRouter, eventRouter } from './routes/course';
-import { calendarRouter } from './routes/calendar';
-
-app.use('/application', applicationRouter);
-app.use('/ranks', ranks);
-app.use('/memberRanks', memberRanks);
-app.use('/members', memberRouter);
-app.use('/loa', loaRouter);
-app.use('/status', status)
-app.use('/memberStatus', memberStatus)
-app.use('/roles', roles)
-app.use('/memberRoles', memberRoles)
-app.use('/course', courseRouter)
-app.use('/courseEvent', eventRouter)
-app.use('/calendar', calendarRouter)
-app.use('/', authRouter)
-
-app.get('/ping', (req, res) => {
-  res.status(200).json({ message: 'pong' });
-});
-
-app.listen(port, () => {
-  console.log(`Example app listening on port ${port} `)
-})

api/src/middleware/auth.ts

@@ -1,49 +0,0 @@
-import { MemberState } from "@app/shared/types/member";
-import { NextFunction, Request, Response } from "express";
-import { stat } from "fs";
-
-export const requireLogin = function (req: Request, res: Response, next: NextFunction) {
-    if (req.user?.id)
-        next();
-    else
-        res.sendStatus(401)
-}
-
-export function requireMemberState(state: MemberState) {
-    return function (req: Request, res: Response, next: NextFunction) {
-        if (req.user?.state === state)
-            next();
-        else
-            res.status(403).send(`You must be a ${state} of the 17th RBN to access this resource`);
-    }
-}
-
-export function requireRole(requiredRoles: string | string[]) {
-    // Normalize the input to always be an array of lowercase required roles
-    const normalizedRequiredRoles: string[] = Array.isArray(requiredRoles)
-        ? requiredRoles.map(role => role.toLowerCase())
-        : [requiredRoles.toLowerCase()];
-
-    const DEV_ROLE = 'dev';
-
-    return function (req: Request, res: Response, next: NextFunction) {
-        if (!req.user || !req.user.roles) {
-            // User is not authenticated or has no roles array
-            return res.sendStatus(401);
-        }
-
-        const userRolesLowercase = req.user.roles.map(role => role.name.toLowerCase());
-
-        // Check if the user has *any* of the required roles OR the 'dev' role
-        const hasAccess = userRolesLowercase.some(userRole =>
-            userRole === DEV_ROLE || normalizedRequiredRoles.includes(userRole)
-        );
-
-        if (hasAccess) {
-            return next();
-        } else {
-            // User is authenticated but does not have the necessary permissions
-            return res.sendStatus(403);
-        }
-    };
-}

api/src/routes/applications.ts

@@ -2,54 +2,32 @@ const express = require('express');
 const router = express.Router();
 
 import pool from '../db';
-import { approveApplication, createApplication, denyApplication, getAllMemberApplications, getApplicationByID, getApplicationComments, getApplicationList, getMemberApplication } from '../services/applicationService';
-import { setUserState } from '../services/memberService';
-import { MemberState } from '@app/shared/types/member';
+import { approveApplication, createApplication, getApplicationByID, getApplicationComments, getApplicationList, getMemberApplication } from '../services/applicationService';
+import { MemberState, setUserState } from '../services/memberService';
 import { getRankByName, insertMemberRank } from '../services/rankService';
 import { ApplicationFull, CommentRow } from "@app/shared/types/application"
 import { assignUserToStatus } from '../services/statusService';
-import { Request, response, Response } from 'express';
-import { getUserRoles } from '../services/rolesService';
-import { requireLogin, requireRole } from '../middleware/auth';
-
-//get CoC
-router.get('/coc', async (req: Request, res: Response) => {
-  const output = await fetch(`${process.env.DOC_HOST}/api/pages/714`, {
-    headers: {
-      Authorization: `Token ${process.env.DOC_TOKEN_ID}:${process.env.DOC_TOKEN_SECRET}`,
-    }
-  })
-
-  if (output.ok) {
-    const out = await output.json();
-    res.status(200).json(out.html);
-  } else {
-    console.error("Failed to fetch LOA policy from bookstack");
-    res.sendStatus(500);
-  }
-})
-
 
 // POST /application
-router.post('/', [requireLogin], async (req, res) => {
+router.post('/', async (req, res) => {
   try {
     const App = req.body?.App || {};
     const memberID = req.user.id;
 
     const appVersion = 1;
 
-    await createApplication(memberID, appVersion, JSON.stringify(App))
-    await setUserState(memberID, MemberState.Applicant);
+    createApplication(memberID, appVersion, JSON.stringify(App))
+    setUserState(memberID, MemberState.Applicant);
 
     res.sendStatus(201);
   } catch (err) {
-    console.error('Failed to create application: \n', err);
-    res.status(500).json({ error: 'Failed to create application' });
+    console.error('Insert failed:', err);
+    res.status(500).json({ error: 'Failed to save application' });
   }
 });
 
 // GET /application/all
-router.get('/all', [requireLogin, requireRole("Recruiter")], async (req, res) => {
+router.get('/all', async (req, res) => {
   try {
     const rows = await getApplicationList();
     res.status(200).json(rows);
@@ -59,21 +37,7 @@ router.get('/all', [requireLogin, requireRole("Recruiter")], async (req, res) =>
   }
 });
 
-router.get('/meList', async (req, res) => {
-
-  let userID = req.user.id;
-
-  try {
-    let application = await getAllMemberApplications(userID);
-
-    return res.status(200).json(application);
-  } catch (error) {
-    console.error('Failed to load applications: \n', error);
-    return res.status(500).json(error);
-  }
-})
-
-router.get('/me', [requireLogin], async (req, res) => {
+router.get('/me', async (req, res) => {
 
   let userID = req.user.id;
 
@@ -98,17 +62,13 @@ router.get('/me', [requireLogin], async (req, res) => {
 })
 
 // GET /application/:id
-router.get('/me/:id', [requireLogin], async (req: Request, res: Response) => {
-  let appID = Number(req.params.id);
-  let member = req.user.id;
+router.get('/:id', async (req, res) => {
+  let appID = req.params.id;
+  console.log("HELLO")
   try {
     const application = await getApplicationByID(appID);
     if (application === undefined)
       return res.sendStatus(204);
-    console.log(application.member_id, member)
-    if (application.member_id != member) {
-      return res.sendStatus(403);
-    }
 
     const comments: CommentRow[] = await getApplicationComments(appID);
 
@@ -124,44 +84,30 @@ router.get('/me/:id', [requireLogin], async (req: Request, res: Response) => {
   }
 });
 
-// GET /application/:id
-router.get('/:id', [requireLogin, requireRole("Recruiter")], async (req: Request, res: Response) => {
-  let appID = Number(req.params.id);
-  let asAdmin = !!req.query.admin || false;
-
-  try {
-    const application = await getApplicationByID(appID);
-    if (application === undefined)
-      return res.sendStatus(204);
-
-    const comments: CommentRow[] = await getApplicationComments(appID, asAdmin);
-
-    const output: ApplicationFull = {
-      application,
-      comments,
-    }
-    return res.status(200).json(output);
-  }
-  catch (err) {
-    console.error('Query failed:', err);
-    return res.status(500).json({ error: 'Failed to load application' });
-  }
-});
-
 // POST /application/approve/:id
-router.post('/approve/:id', [requireLogin, requireRole("Recruiter")], async (req: Request, res: Response) => {
-  const appID = Number(req.params.id);
-  const approved_by = req.user.id;
+router.post('/approve/:id', async (req, res) => {
+  const appID = req.params.id;
 
   try {
     const app = await getApplicationByID(appID);
-    await approveApplication(appID, approved_by);
+    const result = await approveApplication(appID);
 
+    console.log("START");
+    console.log(app, result);
+
+    //guard against failures
+    if (result.affectedRows != 1) {
+      throw new Error("Something went wrong approving the application");
+    }
+
+    console.log(app.member_id);
     //update user profile
     await setUserState(app.member_id, MemberState.Member);
 
-    await pool.query('CALL sp_accept_new_recruit_validation(?, ?, ?, ?)', [Number(process.env.CONFIG_ID), app.member_id, approved_by, approved_by])
-
+    let nextRank = await getRankByName('Recruit')
+    await insertMemberRank(app.member_id, nextRank.id);
+    //assign user to "pending basic"
+    await assignUserToStatus(app.member_id, 1);
     res.sendStatus(200);
   } catch (err) {
     console.error('Approve failed:', err);
@@ -170,15 +116,29 @@ router.post('/approve/:id', [requireLogin, requireRole("Recruiter")], async (req
 });
 
 // POST /application/deny/:id
-router.post('/deny/:id', [requireLogin, requireRole("Recruiter")], async (req: Request, res: Response) => {
-  const appID = Number(req.params.id);
-  const approver = Number(req.user.id);
+router.post('/deny/:id', async (req, res) => {
+  const appID = req.params.id;
 
+  const sql = `
+      UPDATE applications
+         SET denied_at = NOW()
+       WHERE id = ?
+        AND approved_at IS NULL
+        AND denied_at IS NULL
+      `;
   try {
-    const app = await getApplicationByID(appID);
-    await denyApplication(appID, approver);
-    await setUserState(app.member_id, MemberState.Denied);
-    res.sendStatus(200);
+    const result = await pool.execute(sql, appID);
+
+    console.log(result);
+
+    if (result.affectedRows === 0) {
+      res.status(400).json('Something went wrong denying the application');
+    }
+
+    if (result.affectedRows == 1) {
+      res.sendStatus(200);
+    }
+
   } catch (err) {
     console.error('Approve failed:', err);
     res.status(500).json({ error: 'Failed to deny application' });
@@ -186,12 +146,10 @@ router.post('/deny/:id', [requireLogin, requireRole("Recruiter")], async (req: R
 });
 
 // POST /application/:id/comment
-router.post('/:id/comment', [requireLogin], async (req: Request, res: Response) => {
+router.post('/:id/comment', async (req, res) => {
   const appID = req.params.id;
   const data = req.body.message;
-  const user = req.user;
-
-  console.log(user)
+  const user = 1;
 
   const sql = `INSERT INTO application_comments(
     application_id,
@@ -200,11 +158,10 @@ router.post('/:id/comment', [requireLogin], async (req: Request, res: Response)
   )
 VALUES(?, ?, ?);`
 
-
   try {
-    var conn = await pool.getConnection();
+    const conn = await pool.getConnection();
 
-    const result = await conn.query(sql, [appID, user.id, data])
+    const result = await conn.query(sql, [appID, user, data])
     console.log(result)
     if (result.affectedRows !== 1) {
       conn.release();
@@ -226,67 +183,7 @@ VALUES(?, ?, ?);`
   } catch (err) {
     console.error('Comment failed:', err);
     res.status(500).json({ error: 'Could not post comment' });
-  } finally {
-    conn.release();
   }
 });
 
-// POST /application/:id/comment
-router.post('/:id/adminComment', [requireLogin, requireRole("Recruiter")], async (req: Request, res: Response) => {
-  const appID = req.params.id;
-  const data = req.body.message;
-  const user = req.user;
-
-  console.log(user)
-
-  const sql = `INSERT INTO application_comments(
-    application_id,
-    poster_id,
-    post_content,
-    admin_only
-  )
-VALUES(?, ?, ?, 1);`
-
-  try {
-    var conn = await pool.getConnection();
-
-    const result = await conn.query(sql, [appID, user.id, data])
-    console.log(result)
-    if (result.affectedRows !== 1) {
-      conn.release();
-      throw new Error("Insert Failure")
-    }
-
-    const getSQL = `SELECT app.id AS comment_id,
-      app.post_content,
-      app.poster_id,
-      app.post_time,
-      app.last_modified,
-      app.admin_only,
-      member.name AS poster_name
-        FROM application_comments AS app
-          INNER JOIN members AS member ON member.id = app.poster_id
-        WHERE app.id = ?; `;
-    const comment = await conn.query(getSQL, [result.insertId])
-    res.status(201).json(comment[0]);
-
-  } catch (err) {
-    console.error('Comment failed:', err);
-    res.status(500).json({ error: 'Could not post comment' });
-  } finally {
-    conn.release();
-  }
-});
-
-router.post('/restart', async (req: Request, res: Response) => {
-  const user = req.user.id;
-  try {
-    await setUserState(user, MemberState.Guest);
-    res.sendStatus(200);
-  } catch (error) {
-    console.error('Comment failed:', error);
-    res.status(500).json({ error: 'Could not rester application' });
-  }
-})
-
-export const applicationRouter = router;
+module.exports = router;

api/src/routes/auth.js

@@ -6,18 +6,9 @@ dotenv.config();
 const express = require('express');
 const { param } = require('./applications');
 const router = express.Router();
-import { Role } from '@app/shared/types/roles';
 import pool from '../db';
-import { requireLogin } from '../middleware/auth';
-import { getUserRoles } from '../services/rolesService';
-import { getUserState, mapDiscordtoID } from '../services/memberService';
-import { MemberState } from '@app/shared/types/member';
-import { toDateTime } from '@app/shared/utils/time';
 const querystring = require('querystring');
 
-function parseJwt(token) {
-    return JSON.parse(Buffer.from(token.split('.')[1], 'base64').toString());
-}
 
 passport.use(new OpenIDConnectStrategy({
     issuer: process.env.AUTH_ISSUER,
@@ -27,56 +18,36 @@ passport.use(new OpenIDConnectStrategy({
     clientID: process.env.AUTH_CLIENT_ID,
     clientSecret: process.env.AUTH_CLIENT_SECRET,
     callbackURL: process.env.AUTH_REDIRECT_URI,
-    scope: ['openid', 'profile', 'discord']
+    scope: ['openid', 'profile']
 }, async function verify(issuer, sub, profile, jwtClaims, accessToken, refreshToken, params, cb) {
 
     // console.log('--- OIDC verify() called ---');
     // console.log('issuer:', issuer);
     // console.log('sub:', sub);
-    // // console.log('discord:', discord);
-    // console.log('profile:', profile);
-    // console.log('jwt: ', parseJwt(jwtClaims));
-    // console.log('params:', params);
-
+    // console.log('profile:', JSON.stringify(profile, null, 2));
+    // console.log('id_token claims:', JSON.stringify(jwtClaims, null, 2));
+    // console.log('preferred_username:', jwtClaims?.preferred_username);
 
+    const con = await pool.getConnection();
     try {
-        var con = await pool.getConnection();
-
         await con.beginTransaction();
 
         //lookup existing user
         const existing = await con.query(`SELECT id FROM members WHERE authentik_issuer = ? AND authentik_sub = ? LIMIT 1;`, [issuer, sub]);
-        let memberId: number;
+        let memberId;
         //if member exists
         if (existing.length > 0) {
             memberId = existing[0].id;
         } else {
             //otherwise: create account
-            const jwt = parseJwt(jwtClaims);
-            const discordID = jwt.discord.id as number;
+            const username = sub.username;
 
-            //check if account is available to claim
-            memberId = await mapDiscordtoID(discordID);
-
-            if (memberId === null) {
-                // create new account
-                const username = sub.username;
-                const result = await con.query(
-                    `INSERT INTO members (name, authentik_sub, authentik_issuer) VALUES (?, ?, ?)`,
-                    [username, sub, issuer]
-                )
-                memberId = Number(result.insertId);
-            } else {
-                // claim existing account
-                const result = await con.query(
-                    `UPDATE members SET authentik_sub = ?, authentik_issuer = ? WHERE id = ?;`,
-                    [sub, issuer, memberId]
-                )
-            }
+            const result = await con.query(
+                `INSERT INTO members (name, authentik_sub, authentik_issuer) VALUES (?, ?, ?)`,
+                [username, sub, issuer]
+            )
+            memberId = Number(result.insertId);
         }
-
-        await con.query(`UPDATE members SET last_login = ? WHERE id = ?`, [toDateTime(new Date()), memberId])
-
         await con.commit();
         return cb(null, { memberId });
     } catch (error) {
@@ -94,6 +65,12 @@ router.get('/login', (req, res, next) => {
     next();
 }, passport.authenticate('openidconnect'));
 
+// router.get('/callback', (req, res, next) => {
+//     passport.authenticate('openidconnect', {
+//         successRedirect: req.session.redirectTo,
+//         failureRedirect: process.env.CLIENT_URL
+//     })
+// });
 
 router.get('/callback', (req, res, next) => {
     const redirectURI = req.session.redirectTo;
@@ -112,7 +89,7 @@ router.get('/callback', (req, res, next) => {
     })(req, res, next);
 });
 
-router.get('/logout', [requireLogin], function (req, res, next) {
+router.get('/logout', function (req, res, next) {
     req.logout(function (err) {
         if (err) { return next(err); }
         var params = {
@@ -132,17 +109,15 @@ passport.serializeUser(function (user, cb) {
 passport.deserializeUser(function (user, cb) {
     process.nextTick(async function () {
 
-        const memberID = user.memberId as number;
+        const memberID = user.memberId;
 
+        const con = await pool.getConnection();
 
-        var userData: { id: number, name: string, roles: Role[], state: MemberState };
+        var userData;
         try {
-            var con = await pool.getConnection();
             let userResults = await con.query(`SELECT id, name FROM members WHERE id = ?;`, [memberID])
             userData = userResults[0];
-            let userRoles = await getUserRoles(memberID);
-            userData.roles = userRoles || [];
-            userData.state = await getUserState(memberID);
+
         } catch (error) {
             console.error(error)
         } finally {
@@ -152,18 +127,5 @@ passport.deserializeUser(function (user, cb) {
     });
 });
 
-declare global {
-    namespace Express {
-        interface Request {
-            user: {
-                id: number;
-                name: string;
-                roles: Role[];
-                state: MemberState;
-            };
-        }
-    }
-}
 
-
-export const authRouter = router;
+module.exports = router;

api/src/routes/calendar.ts

@@ -1,8 +1,6 @@
 import { Request, Response } from "express";
 import { createEvent, getEventAttendance, getEventDetails, getShortEventsInRange, setAttendanceStatus, setEventCancelled, updateEvent } from "../services/calendarService";
 import { CalendarAttendance, CalendarEvent } from "@app/shared/types/calendar";
-import { requireLogin, requireMemberState, requireRole } from "../middleware/auth";
-import { MemberState } from "@app/shared/types/member";
 
 const express = require('express');
 const r = express.Router();
@@ -37,7 +35,7 @@ r.get('/upcoming', async (req, res) => {
     res.sendStatus(501);
 })
 
-r.post('/:id/cancel', [requireLogin, requireMemberState(MemberState.Member)], async (req: Request, res: Response) => {
+r.post('/:id/cancel', async (req: Request, res: Response) => {
     try {
         const eventID = Number(req.params.id);
         setEventCancelled(eventID, true);
@@ -47,7 +45,7 @@ r.post('/:id/cancel', [requireLogin, requireMemberState(MemberState.Member)], as
         res.status(500).send('Error setting cancel status');
     }
 })
-r.post('/:id/uncancel', [requireLogin, requireMemberState(MemberState.Member)], async (req: Request, res: Response) => {
+r.post('/:id/uncancel', async (req: Request, res: Response) => {
     try {
         const eventID = Number(req.params.id);
         setEventCancelled(eventID, false);
@@ -59,7 +57,7 @@ r.post('/:id/uncancel', [requireLogin, requireMemberState(MemberState.Member)],
 })
 
 
-r.post('/:id/attendance', [requireLogin, requireMemberState(MemberState.Member)], async (req: Request, res: Response) => {
+r.post('/:id/attendance', async (req: Request, res: Response) => {
     try {
         let member = req.user.id;
         let event = Number(req.params.id);
@@ -87,7 +85,7 @@ r.get('/:id', async (req: Request, res: Response) => {
 
 
 //post a new calendar event 
-r.post('/', [requireLogin, requireMemberState(MemberState.Member)], async (req: Request, res: Response) => {
+r.post('/', async (req: Request, res: Response) => {
     try {
         const member = req.user.id;
         let event: CalendarEvent = req.body;
@@ -102,7 +100,7 @@ r.post('/', [requireLogin, requireMemberState(MemberState.Member)], async (req:
     }
 })
 
-r.put('/', [requireLogin, requireMemberState(MemberState.Member)], async (req: Request, res: Response) => {
+r.put('/', async (req: Request, res: Response) => {
     try {
         let event: CalendarEvent = req.body;
         event.start = new Date(event.start);
@@ -116,4 +114,5 @@ r.put('/', [requireLogin, requireMemberState(MemberState.Member)], async (req: R
     }
 })
 
-export const calendarRouter = r;
+
+module.exports.calendarRouter = r;

api/src/routes/course.ts

@@ -1,18 +1,11 @@
 import { CourseAttendee, CourseEventDetails } from "@app/shared/types/course";
 import { getAllCourses, getCourseEventAttendees, getCourseEventDetails, getCourseEventRoles, getCourseEvents, insertCourseEvent } from "../services/CourseSerivce";
 import { Request, Response, Router } from "express";
-import { requireLogin, requireMemberState } from "../middleware/auth";
-import { MemberState } from "@app/shared/types/member";
 
-const cr = Router();
-const er = Router();
+const courseRouter = Router();
+const eventRouter = Router();
 
-cr.use(requireLogin)
-er.use(requireLogin)
-cr.use(requireMemberState(MemberState.Member))
-er.use(requireMemberState(MemberState.Member))
-
-cr.get('/', async (req, res) => {
+courseRouter.get('/', async (req, res) => {
     try {
         const courses = await getAllCourses();
         res.status(200).json(courses);
@@ -22,7 +15,7 @@ cr.get('/', async (req, res) => {
     }
 })
 
-cr.get('/roles', async (req, res) => {
+courseRouter.get('/roles', async (req, res) => {
     try {
         const roles = await getCourseEventRoles();
         res.status(200).json(roles);
@@ -32,27 +25,24 @@ cr.get('/roles', async (req, res) => {
     }
 })
 
-er.get('/', async (req: Request, res: Response) => {
+eventRouter.get('/', async (req: Request, res: Response) => {
+    const allowedSorts = new Map([
+        ["ascending", "ASC"],
+        ["descending", "DESC"]
+    ]);
+
+    const sort = String(req.query.sort || "").toLowerCase();
+    const search = String(req.query.search || "").toLowerCase();
+    if (!allowedSorts.has(sort)) {
+        return res.status(400).json({
+            message: `Invalid sort direction '${req.query.sort}'. Allowed values are 'ascending' or 'descending'.`
+        });
+    }
+
+    const sortDir = allowedSorts.get(sort);
+
     try {
-        const allowedSorts = new Map([
-            ["ascending", "ASC"],
-            ["descending", "DESC"]
-        ]);
-
-        const page = Number(req.query.page) || undefined;
-        const pageSize = Number(req.query.pageSize) || undefined;
-
-        const sort = String(req.query.sort || "").toLowerCase();
-        const search = String(req.query.search || "").toLowerCase();
-        if (!allowedSorts.has(sort)) {
-            return res.status(400).json({
-                message: `Invalid sort direction '${req.query.sort}'. Allowed values are 'ascending' or 'descending'.`
-            });
-        }
-
-        const sortDir = allowedSorts.get(sort);
-
-        let events = await getCourseEvents(sortDir, search, page, pageSize);
+        let events = await getCourseEvents(sortDir, search);
         res.status(200).json(events);
     } catch (error) {
         console.error('failed to fetch reports', error);
@@ -60,7 +50,7 @@ er.get('/', async (req: Request, res: Response) => {
     }
 });
 
-er.get('/:id', async (req: Request, res: Response) => {
+eventRouter.get('/:id', async (req: Request, res: Response) => {
     try {
         let out = await getCourseEventDetails(Number(req.params.id));
         res.status(200).json(out);
@@ -70,7 +60,7 @@ er.get('/:id', async (req: Request, res: Response) => {
     }
 });
 
-er.get('/attendees/:id', async (req: Request, res: Response) => {
+eventRouter.get('/attendees/:id', async (req: Request, res: Response) => {
     try {
         const attendees: CourseAttendee[] = await getCourseEventAttendees(Number(req.params.id));
         res.status(200).json(attendees);
@@ -80,7 +70,7 @@ er.get('/attendees/:id', async (req: Request, res: Response) => {
     }
 })
 
-er.post('/', async (req: Request, res: Response) => {
+eventRouter.post('/', async (req: Request, res: Response) => {
     const posterID: number = req.user.id;
     try {
         console.log();
@@ -95,5 +85,5 @@ er.post('/', async (req: Request, res: Response) => {
     }
 })
 
-export const courseRouter = cr;
-export const eventRouter = er;
+module.exports.courseRouter = courseRouter;
+module.exports.eventRouter = eventRouter;

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,153 +0,0 @@
-const express = require('express');
-const router = express.Router();
-
-import { Request, Response } from 'express';
-import pool from '../db';
-import { closeLOA, createNewLOA, getAllLOA, getLOAbyID, getLoaTypes, getUserLOA, setLOAExtension } from '../services/loaService';
-import { LOARequest } from '@app/shared/types/loa';
-import { requireLogin, requireRole } from '../middleware/auth';
-
-router.use(requireLogin);
-
-//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();
-
-    try {
-        await createNewLOA(LOARequest);
-        res.sendStatus(201);
-    } catch (error) {
-        console.error(error);
-        res.status(500).send(error);
-    }
-});
-
-//admin posts LOA
-router.post("/admin", [requireRole("17th Administrator")], 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);
-    }
-})
-
-//get my LOA history
-router.get("/history", async (req: Request, res: Response) => {
-    const user = req.user.id;
-    try {
-        const result = await getUserLOA(user);
-        res.status(200).json(result)
-    } catch (error) {
-        console.error(error);
-        res.status(500).send(error);
-    }
-})
-
-router.get('/all', [requireRole("17th Administrator")], async (req: Request, res: Response) => {
-    try {
-        const page = Number(req.query.page) || undefined;
-        const pageSize = Number(req.query.pageSize) || undefined;
-        const result = await getAllLOA(page, pageSize);
-        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);
-    }
-})
-
-router.post('/cancel/:id', async (req: Request, res: Response) => {
-    let closer = req.user.id;
-    let id = Number(req.params.id);
-    try {
-        let loa = await getLOAbyID(id);
-        if (loa.member_id != closer) {
-            return res.sendStatus(403);
-        }
-
-        await closeLOA(Number(req.params.id), closer);
-        res.sendStatus(200);
-    } catch (error) {
-        console.error(error);
-        res.status(500).json(error);
-    }
-})
-
-//TODO: enforce admin only
-router.post('/adminCancel/:id', [requireRole("17th Administrator")], async (req: Request, res: Response) => {
-    let closer = req.user.id;
-    try {
-        await closeLOA(Number(req.params.id), closer);
-        res.sendStatus(200);
-    } catch (error) {
-        console.error(error);
-        res.status(500).json(error);
-    }
-})
-
-// TODO: Enforce admin only
-router.post('/extend/:id', [requireRole("17th Administrator")], async (req: Request, res: Response) => {
-    const to: Date = req.body.to;
-
-    if (!to) {
-        res.status(400).send("Extension length is required");
-    }
-
-    try {
-        await setLOAExtension(Number(req.params.id), to);
-        res.sendStatus(200);
-    } catch (error) {
-        console.error(error)
-        res.status(500).json(error);
-    }
-})
-
-router.get('/policy', async (req: Request, res: Response) => {
-    const output = await fetch(`${process.env.DOC_HOST}/api/pages/42`, {
-        headers: {
-            Authorization: `Token ${process.env.DOC_TOKEN_ID}:${process.env.DOC_TOKEN_SECRET}`,
-        }
-    })
-
-    if (output.ok) {
-        const out = await output.json();
-        res.status(200).json(out.html);
-    } else {
-        console.error("Failed to fetch LOA policy from bookstack");
-        res.sendStatus(500);
-    }
-})
-
-export const loaRouter = router;

api/src/routes/members.js

@@ -0,0 +1,84 @@
+const express = require('express');
+const router = express.Router();
+
+import pool from '../db';
+import { getUserData } from '../services/memberService';
+import { getUserRoles } from '../services/rolesService';
+
+router.use((req, res, next) => {
+    console.log(req.user);
+    console.log('Time:', Date.now())
+    next()
+})
+
+//get all users
+router.get('/', async (req, res) => {
+    try {
+        const result = await pool.query(
+            `SELECT
+            v.*,
+            CASE
+                WHEN EXISTS (
+                SELECT 1
+                FROM leave_of_absences l
+                WHERE l.member_id = v.member_id
+                    AND l.deleted = 0
+                    AND UTC_TIMESTAMP() BETWEEN l.start_date AND l.end_date
+                ) THEN 1 ELSE 0
+            END AS on_loa
+            FROM view_member_rank_status_all v;`);
+        return res.status(200).json(result);
+    } catch (err) {
+        console.error('Error fetching users:', err);
+        return res.status(500).json({ error: 'Failed to fetch users' });
+    }
+});
+
+router.get('/me', async (req, res) => {
+    if (req.user === undefined)
+        return res.sendStatus(401)
+
+    try {
+        const { id, name, state } = await getUserData(req.user.id);
+        const LOAData = await pool.query(
+            `SELECT *
+            FROM leave_of_absences
+            WHERE member_id = ?
+            AND deleted = 0 
+            AND UTC_TIMESTAMP() BETWEEN start_date AND end_date;`, req.user.id);
+
+        const roleData = await getUserRoles(req.user.id);
+
+        const userDataFull = { id, name, state, LOAData, roleData };
+        console.log(userDataFull)
+        res.status(200).json(userDataFull);
+    } catch (error) {
+        console.error('Error fetching user data:', error);
+        return res.status(500).json({ error: 'Failed to fetch user data' });
+    }
+})
+
+router.get('/:id', async (req, res) => {
+    try {
+        const userId = req.params.id;
+        const result = await pool.query('SELECT * FROM view_member_rank_status_all WHERE id = $1;', [userId]);
+        if (result.rows.length === 0) {
+            return res.status(404).json({ error: 'User not found' });
+        }
+        return res.status(200).json(result.rows[0]);
+    } catch (err) {
+        console.error('Error fetching user:', err);
+        return res.status(500).json({ error: 'Failed to fetch user' });
+    }
+});
+
+//update a user's display name (stub)
+router.put('/:id/displayname', async (req, res) => {
+    // Stub: not implemented yet
+    return res.status(501).json({ error: 'Update display name not implemented' });
+});
+
+
+
+
+module.exports = router;

api/src/routes/members.ts

@@ -1,132 +0,0 @@
-const express = require('express');
-const router = express.Router();
-
-import { Request, Response } from 'express';
-import pool from '../db';
-import { requireLogin, requireMemberState, requireRole } from '../middleware/auth';
-import { getUserActiveLOA } from '../services/loaService';
-import { getAllMembersLite, getMemberSettings, getMembersFull, getMembersLite, getUserData, getUserState, setUserSettings } from '../services/memberService';
-import { getUserRoles } from '../services/rolesService';
-import { memberSettings, MemberState, myData } from '@app/shared/types/member';
-
-//get all users
-router.get('/', [requireLogin, requireMemberState(MemberState.Member)], async (req, res) => {
-    try {
-        const result = await pool.query(
-            `SELECT
-            v.*,
-            CASE
-                WHEN EXISTS (
-                SELECT 1
-                FROM leave_of_absences l
-                WHERE l.member_id = v.member_id
-                    AND l.deleted = 0
-                    AND UTC_TIMESTAMP() BETWEEN l.start_date AND l.end_date
-                ) THEN 1 ELSE 0
-            END AS on_loa
-            FROM view_member_rank_unit_status_latest v;`);
-        return res.status(200).json(result);
-    } catch (err) {
-        console.error('Error fetching users:', err);
-        return res.status(500).json({ error: 'Failed to fetch users' });
-    }
-});
-
-router.get('/me', [requireLogin], async (req, res) => {
-    if (req.user === undefined)
-        return res.sendStatus(401)
-
-    try {
-        const memData = await getUserData(req.user.id);
-        const LOAData = await getUserActiveLOA(req.user.id);
-        const memState = await getUserState(req.user.id);
-        const roleData = await getUserRoles(req.user.id);
-
-        const userDataFull: myData = { member: memData, LOAs: LOAData, roles: roleData, state: memState };
-        res.status(200).json(userDataFull);
-    } catch (error) {
-        console.error('Error fetching user data:', error);
-        return res.status(500).json({ error: 'Failed to fetch user data' });
-    }
-})
-
-router.get('/settings', [requireLogin], async (req: Request, res: Response) => {
-    try {
-        let user = req.user.id;
-        console.log(user);
-        let output = await getMemberSettings(user);
-        res.status(200).json(output);
-    } catch (error) {
-        console.error(error);
-        res.status(500).json(error);
-    }
-})
-
-router.put('/settings', [requireLogin], async (req: Request, res: Response) => {
-    try {
-        let user = req.user.id;
-        let settings: memberSettings = req.body;
-        console.log(settings)
-        await setUserSettings(user, settings);
-        res.sendStatus(200);
-    } catch (error) {
-        console.error(error);
-        res.status(500).json(error);
-    }
-})
-
-router.get('/lite', [requireLogin], async (req: Request, res: Response) => {
-    try {
-        let out = await getAllMembersLite();
-        res.status(200).json(out);
-    } catch (error) {
-        console.error(error);
-        res.status(500).json(error);
-    }
-})
-
-router.post('/lite/bulk', async (req: Request, res: Response) => {
-    try {
-        let ids = req.body.ids;
-        let out = await getMembersLite(ids);
-        res.status(200).json(out);
-    } catch (error) {
-        console.error(error);
-        res.status(500).json(error);
-    }
-})
-
-
-router.post('/full/bulk', async (req: Request, res: Response) => {
-    try {
-        let ids = req.body.ids;
-        let out = await getMembersFull(ids);
-        res.status(200).json(out);
-    } catch (error) {
-        console.error(error);
-        res.status(500).json(error);
-    }
-})
-
-router.get('/:id', [requireLogin], async (req, res) => {
-    try {
-        const userId = req.params.id;
-        const result = await pool.query('SELECT * FROM view_member_rank_unit_status_latest WHERE id = $1;', [userId]);
-        if (result.rows.length === 0) {
-            return res.status(404).json({ error: 'User not found' });
-        }
-        return res.status(200).json(result.rows[0]);
-    } catch (err) {
-        console.error('Error fetching user:', err);
-        return res.status(500).json({ error: 'Failed to fetch user' });
-    }
-});
-
-//update a user's display name (stub)
-router.put('/:id/displayname', async (req, res) => {
-    // Stub: not implemented yet
-    return res.status(501);
-});
-
-
-export const memberRouter = router;

api/src/routes/ranks.js

@@ -0,0 +1,31 @@
+const express = require('express');
+const r = express.Router();
+const ur = express.Router();
+const { getAllRanks, insertMemberRank } = require('../services/rankService')
+
+//insert a new latest rank for a user
+ur.post('/', async (req, res) => {3
+    try {
+        const change = req.body?.change;
+        await insertMemberRank(change.member_id, change.rank_id, change.date);
+
+        res.sendStatus(201);
+    } catch (err) {
+        console.error('Insert failed:', err);
+        res.status(500).json({ error: 'Failed to update ranks' });
+    }
+});
+
+//get all ranks
+r.get('/', async (req, res) => {
+    try {
+        const ranks = await getAllRanks();
+        res.json(ranks);
+    } catch (err) {
+        console.error(err);
+        res.status(500).json({ error: 'Internal server error' });
+    }
+});
+
+module.exports.ranks = r;
+module.exports.memberRanks = ur;

api/src/routes/ranks.ts

@@ -1,67 +0,0 @@
-import { MemberState } from "@app/shared/types/member";
-import { requireLogin, requireMemberState, requireRole } from "../middleware/auth";
-import { batchInsertMemberRank, getAllRanks, getPromotionHistorySummary, getPromotionsOnDay, insertMemberRank } from "../services/rankService";
-import { BatchPromotion, BatchPromotionMember } from '@app/shared/schemas/promotionSchema'
-
-import express = require('express');
-const r = express.Router();
-const ur = express.Router();
-
-
-r.use(requireLogin)
-ur.use(requireLogin)
-
-//insert a new latest rank for a user
-ur.post('/', [requireRole(["17th Command", "17th Administrator", "17th HQ"]), requireMemberState(MemberState.Member)], async (req: express.Request, res: express.Response) => {
-    try {
-        const change = req.body.promotions as BatchPromotionMember[];
-        const author = req.user.id;
-        if (!change) res.sendStatus(400);
-
-        await batchInsertMemberRank(change, author);
-
-        res.sendStatus(201);
-    } catch (err) {
-        console.error('Insert failed:', err);
-        res.status(500).json({ error: 'Failed to update ranks' });
-    }
-});
-
-ur.get('/', async (req: express.Request, res: express.Response) => {
-    try {
-        const promos = await getPromotionHistorySummary();
-        console.log(promos);
-        res.status(200).json(promos);
-    } catch (err) {
-        console.error(err);
-        res.status(500).json({ error: 'Internal server error' });
-    }
-});
-
-ur.get('/:day', async (req: express.Request, res: express.Response) => {
-    try {
-        if (!req.params.day) res.sendStatus(400);
-
-        let day = new Date(req.params.day)
-        const promos = await getPromotionsOnDay(day);
-        console.log(promos);
-        res.status(200).json(promos);
-    } catch (err) {
-        console.error(err);
-        res.status(500).json({ error: 'Internal server error' });
-    }
-})
-
-//get all ranks
-r.get('/', async (req, res) => {
-    try {
-        const ranks = await getAllRanks();
-        res.json(ranks);
-    } catch (err) {
-        console.error(err);
-        res.status(500).json({ error: 'Internal server error' });
-    }
-});
-
-export const ranks = r;
-export const memberRanks = ur;

api/src/routes/roles.js

@@ -2,16 +2,11 @@ const express = require('express');
 const r = express.Router();
 const ur = express.Router();
 
-import { MemberState } from '@app/shared/types/member';
 import pool from '../db';
-import { requireLogin, requireMemberState, requireRole } from '../middleware/auth';
 import { assignUserGroup, createGroup } from '../services/rolesService';
 
-r.use(requireLogin)
-ur.use(requireLogin)
-
 //manually assign a member to a group
-ur.post('/', [requireMemberState(MemberState.Member), requireRole("17th Administrator")], async (req, res) => {
+ur.post('/', async (req, res) => {
     try {
         const body = req.body;
 
@@ -25,7 +20,7 @@ ur.post('/', [requireMemberState(MemberState.Member), requireRole("17th Administ
 });
 
 //manually remove member from group
-ur.delete('/', [requireMemberState(MemberState.Member), requireRole("17th Administrator")], async (req, res) => {
+ur.delete('/', async (req, res) => {
     try {
         const body = req.body;
         console.log(body);
@@ -43,9 +38,9 @@ ur.delete('/', [requireMemberState(MemberState.Member), requireRole("17th Admini
 })
 
 //get all roles
-r.get('/', [requireMemberState(MemberState.Member)], async (req, res) => {
+r.get('/', async (req, res) => {
     try {
-        var con = await pool.getConnection();
+        const con = await pool.getConnection();
 
         // Get all roles
         const roles = await con.query('SELECT * FROM roles;');
@@ -54,7 +49,7 @@ r.get('/', [requireMemberState(MemberState.Member)], async (req, res) => {
         const membersRoles = await con.query(`
             SELECT mr.role_id, v.*
             FROM members_roles mr
-            JOIN view_member_rank_unit_status_latest v ON mr.member_id = v.member_id
+            JOIN view_member_rank_status_all v ON mr.member_id = v.member_id
             `);
 
 
@@ -73,17 +68,16 @@ r.get('/', [requireMemberState(MemberState.Member)], async (req, res) => {
             members: roleIdToMembers[role.id] || []
         }));
 
+        con.release();
         res.json(result);
     } catch (err) {
         console.error(err);
         res.status(500).json({ error: 'Internal server error' });
-    } finally {
-        con.release();
     }
 });
 
 //create a new role
-r.post('/', [requireMemberState(MemberState.Member), requireRole("17th Administrator")], async (req, res) => {
+r.post('/', async (req, res) => {
     try {
         const { name, color, description } = req.body;
         console.log('Creating role:', { name, color, description });
@@ -105,7 +99,7 @@ r.post('/', [requireMemberState(MemberState.Member), requireRole("17th Administr
     }
 })
 
-r.delete('/:id', [requireMemberState(MemberState.Member), requireRole("17th Administrator")], async (req, res) => {
+r.delete('/:id', async (req, res) => {
     try {
         const id = req.params.id;
 
@@ -118,5 +112,5 @@ r.delete('/:id', [requireMemberState(MemberState.Member), requireRole("17th Admi
     }
 })
 
-export const roles = r;
-export const memberRoles = ur;
+module.exports.roles = r;
+module.exports.memberRoles = ur;

api/src/routes/statuses.js

@@ -1,15 +1,11 @@
-import express = require('express');
-const statusR = express.Router();
-const memberStatusR = express.Router();
+const express = require('express');
+const status = express.Router();
+const memberStatus = express.Router();
 
 import pool from '../db';
-import { requireLogin } from '../middleware/auth';
-
-statusR.use(requireLogin);
-memberStatusR.use(requireLogin);
 
 //insert a new latest rank for a user
-memberStatusR.post('/', async (req, res) => {
+memberStatus.post('/', async (req, res) => {
     // try {
     //     const App = req.body?.App || {};
 
@@ -34,7 +30,7 @@ memberStatusR.post('/', async (req, res) => {
 });
 
 //get all statuses
-statusR.get('/', async (req, res) => {
+status.get('/', async (req, res) => {
     try {
         const result = await pool.query('SELECT * FROM statuses;');
         res.json(result);
@@ -44,8 +40,7 @@ statusR.get('/', async (req, res) => {
     }
 });
 
-export const status = statusR;
-export const memberStatus = memberStatusR;
-
+module.exports.status = status;
+module.exports.memberStatus = memberStatus;
 
 // TODO, implement get all ranks route with SQL stirng SELECT id, name, short_name, category, sort_id FROM ranks;

api/src/services/CourseSerivce.ts

@@ -1,6 +1,5 @@
 import pool from "../db"
 import { Course, CourseAttendee, CourseAttendeeRole, CourseEventDetails, CourseEventSummary, RawAttendeeRow } from "@app/shared/types/course"
-import { PagedData } from "@app/shared/types/pagination";
 import { toDateTime } from "@app/shared/utils/time";
 export async function getAllCourses(): Promise<Course[]> {
     const sql = "SELECT * FROM courses WHERE deleted = false ORDER BY name ASC;"
@@ -80,9 +79,9 @@ export async function getCourseEventDetails(id: number): Promise<CourseEventDeta
 }
 
 export async function insertCourseEvent(event: CourseEventDetails): Promise<number> {
+    console.log(event);
+    const con = await pool.getConnection();
     try {
-        var con = await pool.getConnection();
-
         await con.beginTransaction();
         const res = await con.query("INSERT INTO course_events (course_id, event_date, remarks, created_by) VALUES (?, ?, ?, ?);", [event.course_id, toDateTime(event.event_date), event.remarks, event.created_by]);
         var eventID: number = res.insertId;
@@ -99,17 +98,16 @@ export async function insertCourseEvent(event: CourseEventDetails): Promise<numb
                         VALUES (?, ?, ?, ?, ?, ?);`, [attendee.attendee_id, eventID, attendee.attendee_role_id, attendee.passed_bookwork, attendee.passed_qual, attendee.remarks]);
         }
         await con.commit();
+        await con.release();
         return Number(eventID);
     } catch (error) {
-        if (con) await con.rollback();
+        await con.rollback();
+        await con.release();
         throw error;
-    } finally {
-        if (con) await con.release();
     }
 }
 
-export async function getCourseEvents(sortDir: string, search: string = "", page = 1, pageSize = 10): Promise<PagedData<CourseEventSummary>> {
-    const offset = (page - 1) * pageSize;
+export async function getCourseEvents(sortDir: string, search: string = ""): Promise<CourseEventSummary[]> {
 
     let params = [];
     let searchString = "";
@@ -135,23 +133,11 @@ export async function getCourseEvents(sortDir: string, search: string = "", page
                 LEFT JOIN members AS M
                     ON E.created_by = M.id
                 ${searchString}
-                ORDER BY E.event_date ${sortDir}         
-                LIMIT ? OFFSET ?;`;
-
-    let countSQL = `SELECT COUNT(*) AS count
-                    FROM course_events AS E
-                    LEFT JOIN courses AS C
-                    ON E.course_id = C.id
-                    LEFT JOIN members AS M
-                    ON E.created_by = M.id ${searchString};`
-    let recordCount = Number((await pool.query(countSQL, [...params]))[0].count);
-    let pageCount = recordCount / pageSize;
-
-    let events: CourseEventSummary[] = await pool.query(sql, [...params, pageSize, offset]);
-
-    let output: PagedData<CourseEventSummary> = { data: events, pagination: { page: page, pageSize: pageSize, total: recordCount, totalPages: pageCount } }
-
-    return output;
+                ORDER BY E.event_date ${sortDir};`;
+    console.log(sql)
+    console.log(params)
+    let events: CourseEventSummary[] = await pool.query(sql, params);
+    return events;
 }
 
 export async function getCourseEventRoles(): Promise<CourseAttendeeRole[]> {

api/src/services/applicationService.ts

@@ -1,6 +1,5 @@
 import { ApplicationListRow, ApplicationRow, CommentRow } from "@app/shared/types/application";
 import pool from "../db";
-import { error } from "console";
 
 export async function createApplication(memberID: number, appVersion: number, app: string) {
   const sql = `INSERT INTO applications (member_id, app_version, app_data) VALUES (?, ?, ?);`;
@@ -13,13 +12,12 @@ export async function getMemberApplication(memberID: number): Promise<Applicatio
           member.name AS member_name
       FROM applications AS app
           INNER JOIN members AS member ON member.id = app.member_id
-      WHERE app.member_id = ? ORDER BY submitted_at DESC LIMIT 1;`;
+      WHERE app.member_id = ?;`;
 
   let app: ApplicationRow[] = await pool.query(sql, [memberID]);
   return app[0];
 }
 
-
 export async function getApplicationByID(appID: number): Promise<ApplicationRow> {
   const sql =
     `SELECT app.*,
@@ -31,7 +29,7 @@ export async function getApplicationByID(appID: number): Promise<ApplicationRow>
   return app[0];
 }
 
-export async function getApplicationList(page: number = 1, pageSize: number = 25): Promise<ApplicationListRow[]> {
+export async function getApplicationList(): Promise<ApplicationListRow[]> {
   const sql = `SELECT
       member.name AS member_name,
       app.id,
@@ -40,77 +38,34 @@ export async function getApplicationList(page: number = 1, pageSize: number = 25
       app.app_status
     FROM applications AS app
     LEFT JOIN members AS member
-      ON member.id = app.member_id
-    ORDER BY app.submitted_at DESC
-    LIMIT ? OFFSET ?;`
+      ON member.id = app.member_id;`
 
-  const rows: ApplicationListRow[] = await pool.query(sql, [pageSize, page]);
+  const rows: ApplicationListRow[] = await pool.query(sql);
   return rows;
 }
 
-export async function getAllMemberApplications(memberID: number): Promise<ApplicationListRow[]> {
-  const sql = `SELECT
-      app.id,
-      app.member_id,
-      app.submitted_at,
-      app.app_status
-      FROM applications AS app WHERE app.member_id = ? ORDER BY submitted_at DESC;`;
-
-  const rows: ApplicationListRow[] = await pool.query(sql, [memberID])
-  return rows;
-}
-
-
-export async function approveApplication(id: number, approver: number) {
+export async function approveApplication(id) {
   const sql = `
       UPDATE applications
-         SET approved_at = NOW(), approved_by = ?
+         SET approved_at = NOW()
        WHERE id = ?
         AND approved_at IS NULL
         AND denied_at IS NULL
       `;
 
-  const result = await pool.execute(sql, [approver, id]);
-  console.log(result);
-  if (result.affectedRows == 1) {
-    return
-  } else {
-    throw new Error(`"Something went wrong approving application with ID ${id}`);
-  }
+  const result = await pool.execute(sql, id);
+  return result;
 }
 
-export async function denyApplication(id: number, approver: number) {
-  const sql = `
-      UPDATE applications
-         SET denied_at = NOW(), approved_by = ?
-       WHERE id = ?
-        AND approved_at IS NULL
-        AND denied_at IS NULL
-      `;
-
-  const result = await pool.execute(sql, [approver, id]);
-  console.log(result);
-  if (result.affectedRows == 1) {
-    return
-  } else {
-    throw new Error(`"Something went wrong denying application with ID ${id}`);
-  }
-}
-
-export async function getApplicationComments(appID: number, admin: boolean = false): Promise<CommentRow[]> {
-  const excludeAdmin = ' AND app.admin_only = false';
-
-  const whereClause = `WHERE app.application_id = ?${!admin ? excludeAdmin : ''}`;
-
+export async function getApplicationComments(appID: number): Promise<CommentRow[]> {
   return await pool.query(`SELECT app.id AS comment_id,
           app.post_content,
           app.poster_id,
           app.post_time,
           app.last_modified,
-          app.admin_only,
           member.name AS poster_name
         FROM application_comments AS app
           INNER JOIN members AS member ON member.id = app.poster_id
-        ${whereClause}`,
+        WHERE app.application_id = ?;`,
     [appID]);
 }

api/src/services/calendarService.ts

@@ -123,9 +123,15 @@ export async function setAttendanceStatus(memberID: number, eventID: number, sta
 }
 
 export async function getEventAttendance(eventID: number): Promise<CalendarSignup[]> {
+    const sql = `
+        SELECT 
+            s.member_id,
+            s.status,
+            m.name AS member_name
+        FROM calendar_events_signups s
+        LEFT JOIN members m ON s.member_id = m.id
+        WHERE s.event_id = ?
+    `;
 
-    const sql = "CALL `sp_GetCalendarEventSignups`(?)"
-    const res = await pool.query(sql, [eventID]);
-    console.log(res[0]);
-    return res[0];
+    return await pool.query(sql, [eventID]);
 }

api/src/services/loaService.ts

@@ -1,104 +0,0 @@
-import { toDateTime } from "@app/shared/utils/time";
-import pool from "../db";
-import { LOARequest, LOAType } from '@app/shared/types/loa'
-import { PagedData } from '@app/shared/types/pagination'
-
-export async function getLoaTypes(): Promise<LOAType[]> {
-    return await pool.query('SELECT * FROM leave_of_absences_types;');
-}
-
-export async function getAllLOA(page = 1, pageSize = 10): Promise<PagedData<LOARequest>> {
-    const offset = (page - 1) * pageSize;
-
-    const sql = `
-        SELECT loa.*, members.name, t.name AS type_name
-        FROM leave_of_absences AS loa
-        LEFT JOIN members ON loa.member_id = members.id
-        LEFT JOIN leave_of_absences_types AS t ON loa.type_id = t.id
-        ORDER BY
-            CASE
-                WHEN loa.closed IS NULL 
-                     AND NOW() > COALESCE(loa.extended_till, loa.end_date) THEN 1
-                WHEN loa.closed IS NULL
-                     AND NOW() BETWEEN loa.start_date AND COALESCE(loa.extended_till, loa.end_date) THEN 2
-                WHEN loa.closed IS NULL AND NOW() < loa.start_date THEN 3
-                WHEN loa.closed IS NOT NULL THEN 4
-            END,
-            loa.start_date DESC
-        LIMIT ? OFFSET ?;
-    `;
-    let loaList: LOARequest[] = await pool.query(sql, [pageSize, offset]) as LOARequest[];
-
-    let loaCount = Number((await pool.query(`SELECT COUNT(*) as count FROM leave_of_absences;`))[0].count);
-    let pageCount = loaCount / pageSize;
-
-    let output: PagedData<LOARequest> = { data: loaList, pagination: { page: page, pageSize: pageSize, total: loaCount, totalPages: pageCount } }
-    return output;
-}
-
-export async function getUserLOA(userId: number): Promise<LOARequest[]> {
-    const result: LOARequest[] = await pool.query(`
-        SELECT loa.*, members.name, t.name AS type_name
-            FROM leave_of_absences AS loa
-            LEFT JOIN members ON loa.member_id = members.id
-            LEFT JOIN leave_of_absences_types AS t ON loa.type_id = t.id
-            WHERE member_id = ?         
-            ORDER BY
-                CASE
-                    WHEN loa.closed IS NULL 
-                        AND NOW() > COALESCE(loa.extended_till, loa.end_date) THEN 1
-                    WHEN loa.closed IS NULL
-                        AND NOW() BETWEEN loa.start_date AND COALESCE(loa.extended_till, loa.end_date) THEN 2
-                    WHEN loa.closed IS NULL AND NOW() < loa.start_date THEN 3
-                    WHEN loa.closed IS NOT NULL THEN 4
-                END,
-                loa.start_date DESC
-            `, [userId])
-    return result;
-}
-
-export async function getUserActiveLOA(userId: number): Promise<LOARequest[]> {
-    const sql = `SELECT *
-            FROM leave_of_absences
-            WHERE member_id = ?
-            AND closed IS NULL
-            AND UTC_TIMESTAMP() BETWEEN start_date AND end_date;`
-    const LOAData = await pool.query(sql, [userId]);
-    return LOAData;
-}
-
-export async function createNewLOA(data: LOARequest) {
-    const sql = `INSERT INTO leave_of_absences 
-                (member_id, filed_date, start_date, end_date, type_id, reason) 
-             VALUES (?, ?, ?, ?, ?, ?)`;
-    await pool.query(sql, [data.member_id, toDateTime(data.filed_date), toDateTime(data.start_date), toDateTime(data.end_date), data.type_id, data.reason])
-    return;
-}
-
-export async function closeLOA(id: number, closer: number) {
-    const sql = `UPDATE leave_of_absences
-                SET closed = 1,
-                closed_by = ?,
-                ended_at = NOW()
-                WHERE leave_of_absences.id = ?`;
-    let out = await pool.query(sql, [closer, id]);
-    console.log(out);
-    return out;
-}
-
-export async function getLOAbyID(id: number): Promise<LOARequest> {
-    let res = await pool.query(`SELECT * FROM leave_of_absences WHERE id = ?`, [id]);
-    console.log(res);
-    if (res.length != 1)
-        throw new Error(`LOA with id ${id} not found`);
-    return res[0];
-}
-
-export async function setLOAExtension(id: number, extendTo: Date) {
-    let res = await pool.query(`UPDATE leave_of_absences
-                                    SET extended_till = ?
-                                    WHERE leave_of_absences.id = ? `, [toDateTime(extendTo), id]);
-    if (res.affectedRows != 1)
-        throw new Error(`Could not extend LOA`);
-    return res[0];
-}

api/src/services/memberService.ts

@@ -1,74 +1,34 @@
 import pool from "../db";
-import { Member, MemberLight, memberSettings, MemberState } from '@app/shared/types/member'
 
-export async function getUserData(userID: number): Promise<Member> {
-  const sql = `SELECT * FROM view_member_rank_unit_status_latest WHERE member_id = ?`;
-  const res: Member = await pool.query(sql, [userID]);
-  return res[0] ?? null;
+export enum MemberState {
+    Guest = "guest",
+    Applicant = "applicant",
+    Member = "member",
+    Retired = "retired",
+    Banned = "banned",
+    Denied = "denied"
+}
+
+export async function getUserData(userID: number) {
+    const sql = `SELECT * FROM members WHERE id = ?`;
+    const res = await pool.query(sql, [userID]);
+    return res[0] ?? null;
 }
 
 export async function setUserState(userID: number, state: MemberState) {
-  const sql = `UPDATE members
+    const sql = `UPDATE members
         SET state = ?
         WHERE id = ?;`;
-  return await pool.query(sql, [state, userID]);
+    return await pool.query(sql, [state, userID]);
 }
 
-export async function getUserState(user: number): Promise<MemberState> {
-  let out = await pool.query(`SELECT state FROM members WHERE id = ?`, [user]);
-  return (out[0].state as MemberState);
+declare global {
+  namespace Express {
+    interface Request {
+      user: {
+        id: number;
+        name: string;
+      };
+    }
+  }
 }
-
-export async function getMemberSettings(id: number): Promise<memberSettings> {
-  const sql = `SELECT * FROM view_member_settings WHERE id = ?`;
-  let out: memberSettings[] = await pool.query(sql, [id]);
-
-  if (out.length != 1)
-    throw new Error("Could not get user settings");
-
-  return out[0];
-}
-
-export async function setUserSettings(id: number, settings: memberSettings) {
-  const sql = `UPDATE view_member_settings SET
-                displayName = ?
-                WHERE id = ?;`;
-  let result = await pool.query(sql, [settings.displayName, id])
-  console.log(result);
-}
-
-export async function getMembersLite(ids: number[]): Promise<MemberLight[]> {
-  const sql = `SELECT m.member_id AS id,
-                  m.member_name AS username,
-                  m.displayName,
-                  u.color
-              FROM view_member_rank_unit_status_latest m
-                  LEFT JOIN units u ON u.name = m.unit
-              WHERE member_id IN (?);`;
-  const res: MemberLight[] = await pool.query(sql, [ids]);
-  return res;
-}
-
-export async function getAllMembersLite(): Promise<MemberLight[]> {
-  const sql = `SELECT m.member_id AS id,
-                  m.member_name AS username,
-                  m.displayName,
-                  u.color
-              FROM view_member_rank_unit_status_latest m
-                  LEFT JOIN units u ON u.name = m.unit;`;
-
-  const res: MemberLight[] = await pool.query(sql);
-  return res;
-}
-
-export async function getMembersFull(ids: number[]): Promise<Member[]> {
-  const sql = `SELECT * FROM view_member_rank_unit_status_latest WHERE member_id IN (?);`;
-  const res: Member[] = await pool.query(sql, [ids]);
-  return res;
-}
-
-export async function mapDiscordtoID(id: number): Promise<number | null> {
-  const sql = `SELECT id FROM members WHERE discord_id = ?;`
-  let res = await pool.query(sql, [id]);
-  return res.length > 0 ? res[0].id : null;
-}

api/src/services/rankService.ts

@@ -1,8 +1,4 @@
-import { BatchPromotion, BatchPromotionMember } from "@app/shared/schemas/promotionSchema";
-import { PromotionSummary } from "@app/shared/types/rank"
 import pool from "../db";
-import { PagedData } from "@app/shared/types/pagination";
-import { toDateTime } from "@app/shared/utils/time";
 
 export async function getAllRanks() {
     const rows = await pool.query(
@@ -25,8 +21,8 @@ export async function insertMemberRank(member_id: number, rank_id: number): Prom
 
 export async function insertMemberRank(member_id: number, rank_id: number, date?: Date): Promise<void> {
     const sql = date
-        ? `INSERT INTO members_ranks (member_id, rank_id, start_date) VALUES (?, ?, ?);`
-        : `INSERT INTO members_ranks (member_id, rank_id, start_date) VALUES (?, ?, NOW());`;
+        ? `INSERT INTO members_ranks (member_id, rank_id, event_date) VALUES (?, ?, ?);`
+        : `INSERT INTO members_ranks (member_id, rank_id, event_date) VALUES (?, ?, NOW());`;
 
     const params = date
         ? [member_id, rank_id, date]
@@ -34,78 +30,3 @@ export async function insertMemberRank(member_id: number, rank_id: number, date?
 
     await pool.query(sql, params);
 }
-
-
-export async function batchInsertMemberRank(promos: BatchPromotionMember[], author: number) {
-    try {
-        var con = await pool.getConnection();
-        console.log(promos);
-        promos.forEach(p => {
-            con.query(`CALL sp_update_member_rank(?, ?, ?, ?, ?, ?)`, [p.member_id, p.rank_id, author, author, "Rank Change", toDateTime(new Date(p.start_date))])
-        });
-
-        con.commit();
-        return
-    } catch (error) {
-        throw error; //pass it up
-    } finally {
-        con.release();
-    }
-}
-
-export async function getPromotionHistorySummary(page: number = 1, pageSize: number = 15): Promise<PagedData<PromotionSummary>> {
-
-    const offset = (page - 1) * pageSize;
-
-    let sql = `SELECT
-                    DATE(start_date) AS entry_day
-                FROM
-                    members_ranks
-                GROUP BY
-                    entry_day
-                ORDER BY
-                    entry_day DESC
-                LIMIT ? OFFSET ?;`
-
-    let promoList: PromotionSummary[] = await pool.query(sql, [pageSize, offset]) as PromotionSummary[];
-
-    let loaCount = Number((await pool.query(`SELECT
-                                                COUNT(*) AS total_grouped_days_count
-                                            FROM
-                                                (
-                                                    SELECT DISTINCT DATE(start_date)
-                                                    FROM members_ranks
-                                                ) AS grouped_days;`))[0]);
-
-    console.log(loaCount);
-    let pageCount = loaCount / pageSize;
-
-    let output: PagedData<PromotionSummary> = { data: promoList, pagination: { page: page, pageSize: pageSize, total: loaCount, totalPages: pageCount } }
-    return output;
-}
-
-export async function getPromotionsOnDay(day: Date): Promise<BatchPromotion[]> {
-
-    // Convert the Date object to a 'YYYY-MM-DD' string for the SQL filter
-    // This assumes pool.query is used with a database that accepts this format for comparison.
-    const dayString = day.toISOString().split('T')[0];
-
-    // SQL query to fetch all records from members_unit for the specified day
-    let sql = `
-        SELECT
-            member_id,
-            unit_id AS rank_id,  -- Using unit_id as a proxy for rank_id based on the data structure
-            start_date
-        FROM
-            members_unit
-        WHERE
-            DATE(start_date) = ?
-        ORDER BY
-            start_date ASC;
-    `;
-
-
-    let batchPromotion = await pool.query(sql, [dayString]) as BatchPromotion[];
-
-    return batchPromotion;
-}

api/src/services/statusService.ts

@@ -1,6 +1,6 @@
 import pool from "../db"
 
 export async function assignUserToStatus(userID: number, statusID: number) {
-    const sql = `INSERT INTO members_statuses (member_id, status_id, start_date) VALUES (?, ?, NOW())`
+    const sql = `INSERT INTO members_statuses (member_id, status_id, event_date) VALUES (?, ?, NOW())`
     await pool.execute(sql, [userID, statusID]);
 }

ecosystem.config.js

@@ -5,7 +5,6 @@ module.exports = {
     script: 'built/api/src/index.js',
     watch: ['.env', 'built'],
     ignore_watch: ['.gitignore', '\.json', 'src', '\.db', 'node_modules'],
-    appendEnvToName: true,
     watch_options: {
       usePolling: true,
       interval: 10000

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/promotionSchema.ts

@@ -1,32 +0,0 @@
-import { z } from "zod";
-
-export const batchPromotionMemberSchema = z.object({
-    member_id: z.number({ invalid_type_error: "Must select a member" }).int().positive(),
-    rank_id: z.number({ invalid_type_error: "Must select a rank" }).int().positive(),
-    start_date: z.string().refine((val) => !isNaN(Date.parse(val)), {
-        message: "Must be a valid date",
-    }),
-});
-
-export const batchPromotionSchema = z.object({
-    promotions: z.array(batchPromotionMemberSchema, { message: "At least one promotion is required" }).nonempty({ message: "At least one promotion is required" }),
-
-})
-    .superRefine((data, ctx) => {
-        // optional: check for duplicate member_ids
-        const memberCounts = new Map<number, number>();
-        data.promotions.forEach((p, index) => {
-            memberCounts.set(p.member_id, (memberCounts.get(p.member_id) ?? 0) + 1);
-            if (memberCounts.get(p.member_id)! > 1) {
-                ctx.addIssue({
-                    code: z.ZodIssueCode.custom,
-                    path: ["promotions", index, "member_id"],
-                    message: "Duplicate member in batch is not allowed",
-                });
-            }
-        });
-    });
-
-
-export type BatchPromotion = z.infer<typeof batchPromotionSchema>;
-export type BatchPromotionMember = z.infer<typeof batchPromotionMemberSchema>;

shared/types/application.ts

@@ -40,7 +40,6 @@ export interface CommentRow {
     post_time: string;
     last_modified: string | null;
     poster_name: string;
-    admin_only: boolean;
 }
 
 export interface ApplicationFull {

shared/types/calendar.ts

@@ -26,7 +26,6 @@ export interface CalendarSignup {
     eventID: number;
     status: CalendarAttendance;
     member_name?: string;
-    unit_name?: string;
 }    
 
 export interface CalendarEventShort {

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/member.ts

@@ -1,42 +0,0 @@
-import { LOARequest } from "./loa";
-import { Role } from "./roles";
-
-export interface memberSettings {
-    displayName: string;
-}
-
-export enum MemberState {
-    Guest = "guest",
-    Applicant = "applicant",
-    Member = "member",
-    Retired = "retired",
-    Banned = "banned",
-    Denied = "denied"
-}
-
-export type Member = {
-    member_id: number;
-    member_name: string;
-    displayName?: string;
-    rank: string | null;
-    rank_date: string | null;
-    unit: string | null;
-    unit_date: string | null;
-    status: string | null;
-    status_date: string | null;
-    loa_until?: Date;
-};
-
-export interface MemberLight {
-    id: number
-    displayName: string
-    username: string
-    color: string
-}
-
-export interface myData {
-    member: Member;
-    LOAs: LOARequest[];
-    roles: Role[];
-    state: MemberState;
-}

shared/types/pagination.ts

@@ -1,11 +0,0 @@
-export interface PagedData<T> {
-    data: T[]
-    pagination: pagination
-}
-
-export interface pagination {
-    page: number
-    pageSize: number
-    total: number
-    totalPages: number
-}

shared/types/rank.ts

@@ -1,11 +0,0 @@
-export type Rank = {
-  id: number
-  name: string
-  short_name: string
-  category: string
-  sortOrder: number
-}
-
-export interface PromotionSummary {
-  entry_day: Date;
-}

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");
@@ -12,4 +9,4 @@ export function toDateTime(date: Date): string {
     const second = date.getSeconds().toString().padStart(2, "0");
 
     return `${year}-${month}-${day} ${hour}:${minute}:${second}`;
-}
+}

ui/.env.example

@@ -1,9 +1,6 @@
 # SITE SETTINGS
 VITE_APIHOST=
-VITE_DOCHOST= # https://bookstack.whatever.com/api
 VITE_ENVIRONMENT= # dev / prod
-VITE_APPLICATION_VERSION= # Should match release tag
-
 
 # Glitchtip
 VITE_GLITCHTIP_DSN=

ui/index.html

@@ -4,7 +4,7 @@
     <meta charset="UTF-8">
     <link rel="icon" href="/favicon.ico">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>17th Ranger Battalion</title>
+    <title>Vite App</title>
   </head>
   <body>
     <div id="app"></div>

ui/src/App.vue

@@ -5,7 +5,6 @@ import { useUserStore } from './stores/user';
 import Alert from './components/ui/alert/Alert.vue';
 import AlertDescription from './components/ui/alert/AlertDescription.vue';
 import Navbar from './components/Navigation/Navbar.vue';
-import { cancelLOA } from './api/loa';
 
 const userStore = useUserStore();
 
@@ -30,11 +29,10 @@ const environment = import.meta.env.VITE_ENVIRONMENT;
           <p>This is a development build of the application. Some features will be unavailable or unstable.</p>
         </AlertDescription>
       </Alert>
-      <Alert v-if="userStore.user?.LOAData?.[0]" class="m-2 mx-auto w-5xl" variant="info">
+      <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?.LOAData?.[0].end_date) }}</strong></p>
-          <Button variant="secondary" @click="async () => { await cancelLOA(userStore.user?.LOAData?.[0].id); userStore.loadUser(); }">End
-            LOA</Button>
+          <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>

ui/src/api/application.ts

@@ -1,11 +1,80 @@
-import { ApplicationFull } from "@shared/types/application";
+export type ApplicationDto = Partial<{
+  age: number | string
+  name: string
+  playtime: number | string
+  hobbies: string
+  military: boolean
+  communities: string
+  joinReason: string
+  milsimAttraction: string
+  referral: string
+  steamProfile: string
+  timezone: string
+  canAttendSaturday: boolean
+  interests: string
+  aknowledgeRules: boolean
+}>
+
+export interface ApplicationData {
+  dob: string;
+  name: string;
+  playtime: number;
+  hobbies: string;
+  military: boolean;
+  communities: string;
+  joinReason: string;
+  milsimAttraction: string;
+  referral: string;
+  steamProfile: string;
+  timezone: string;
+  canAttendSaturday: boolean;
+  interests: string;
+  aknowledgeRules: boolean;
+}
+
+//reflects how applications are stored in the database
+export interface ApplicationRow {
+  id: number;
+  member_id: number;
+  app_version: number;
+  app_data: ApplicationData;
+
+  submitted_at: string;        // ISO datetime from DB (e.g., "2025-08-25T18:04:29.000Z")
+  updated_at: string | null;
+  approved_at: string | null;
+  denied_at: string | null;
+
+  app_status: ApplicationStatus;       // generated column
+  decision_at: string | null;  // generated column
+
+  // present when you join members (e.g., SELECT a.*, m.name AS member_name)
+  member_name: string;
+}
+export interface CommentRow {
+  comment_id: number;
+  post_content: string;
+  poster_id: number;
+  post_time: string;
+  last_modified: string | null;
+  poster_name: string;
+}
+
+export interface ApplicationFull {
+  application: ApplicationRow;
+  comments: CommentRow[];
+}
 
 
+export enum ApplicationStatus {
+  Pending = "Pending",
+  Accepted = "Accepted",
+  Denied = "Denied",
+}
 //  @ts-ignore
 const addr = import.meta.env.VITE_APIHOST;
 
-export async function loadApplication(id: number | string, asAdmin: boolean = false): Promise<ApplicationFull | null> {
-  const res = await fetch(`${addr}/application/${id}?admin=${asAdmin}`, { credentials: 'include' })
+export async function loadApplication(id: number | string): Promise<ApplicationFull | null> {
+  const res = await fetch(`${addr}/application/${id}`, { credentials: 'include' })
   if (res.status === 204) return null
   if (!res.ok) throw new Error('Failed to load application')
   const json = await res.json()
@@ -35,22 +104,6 @@ export async function postChatMessage(message: any, post_id: number) {
 
   const response = await fetch(`${addr}/application/${post_id}/comment`, {
     method: 'POST',
-    credentials: 'include',
-    headers: { 'Content-Type': 'application/json' },
-    body: JSON.stringify(out),
-  })
-
-  return await response.json();
-}
-
-export async function postAdminChatMessage(message: any, post_id: number) {
-  const out = {
-    message: message
-  }
-
-  const response = await fetch(`${addr}/application/${post_id}/adminComment`, {
-    method: 'POST',
-    credentials: 'include',
     headers: { 'Content-Type': 'application/json' },
     body: JSON.stringify(out),
   })
@@ -59,9 +112,7 @@ export async function postAdminChatMessage(message: any, post_id: number) {
 }
 
 export async function getAllApplications(): Promise<ApplicationFull> {
-  const res = await fetch(`${addr}/application/all`, {
-    credentials: 'include',
-  })
+  const res = await fetch(`${addr}/application/all`)
 
   if (res.ok) {
     return res.json()
@@ -70,67 +121,18 @@ export async function getAllApplications(): Promise<ApplicationFull> {
   }
 }
 
-export async function loadMyApplications(): Promise<ApplicationFull> {
-  const res = await fetch(`${addr}/application/meList`, { credentials: 'include' })
-
-  if (res.ok) {
-    return res.json()
-  } else {
-    console.error("Something went wrong approving the application")
-  }
-}
-
-export async function getMyApplication(id: number): Promise<ApplicationFull> {
-  const res = await fetch(`${addr}/application/me/${id}`, { credentials: 'include' })
-  if (res.status === 204) return null
-  if (res.status === 403) throw new Error("Unauthorized");
-  if (!res.ok) throw new Error('Failed to load application')
-  const json = await res.json()
-  // Accept either the object at root or under `application`
-  return json;
-}
-
 export async function approveApplication(id: Number) {
-  const res = await fetch(`${addr}/application/approve/${id}`, { method: 'POST', credentials: 'include' })
+  const res = await fetch(`${addr}/application/approve/${id}`, { method: 'POST' })
 
   if (!res.ok) {
-    throw new Error("Something went wrong approving the application");
+    console.error("Something went wrong approving the application")
   }
-  return;
 }
 
 export async function denyApplication(id: Number) {
-  const res = await fetch(`${addr}/application/deny/${id}`, { method: 'POST', credentials: 'include' })
+  const res = await fetch(`${addr}/application/deny/${id}`, { method: 'POST' })
 
   if (!res.ok) {
-    throw new Error("Something went wrong denyting the application");
-  }
-  return;
-}
-
-export async function restartApplication() {
-  const res = await fetch(`${addr}/application/restart`, {
-    method: 'POST',
-    credentials: 'include'
-  })
-
-  if (!res.ok) {
-    console.error("Something went wrong restarting your application")
-  }
-}
-
-export async function getCoC(): Promise<string> {
-  const res = await fetch(`${addr}/application/coc`, {
-    method: "GET",
-    credentials: 'include',
-  });
-  if (res.ok) {
-    const out = res.json();
-    if (!out) {
-      return null;
-    }
-    return out;
-  } else {
-    return null;
+    console.error("Something went wrong denying the application")
   }
 }

ui/src/api/calendar.ts

@@ -100,6 +100,7 @@ export async function editCalendarEvent(eventData: CalendarEvent) {
 export async function setCancelCalendarEvent(eventID: number, cancel: boolean) {
     let route = cancel ? "cancel" : "uncancel";
 
+    console.log(route);
     let res = await fetch(`${addr}/calendar/${eventID}/${route}`, {
         method: "POST",
         credentials: "include"

ui/src/api/loa.ts

@@ -1,5 +1,12 @@
-import { LOARequest, LOAType } from '@shared/types/loa'
-import { PagedData } from '@shared/types/pagination'
+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;
 
@@ -10,24 +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) {
-        return;
-    } else {
-        throw new Error("Failed to submit LOA");
-    }
-}
-
-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) {
@@ -37,14 +26,12 @@ export async function adminSubmitLOA(request: LOARequest): Promise<{ id?: number
     }
 }
 
-
 export async function getMyLOA(): Promise<LOARequest | null> {
     const res = await fetch(`${addr}/loa/me`, {
         method: "GET",
         headers: {
             "Content-Type": "application/json",
         },
-        credentials: 'include',
     });
 
 
@@ -59,39 +46,12 @@ export async function getMyLOA(): Promise<LOARequest | null> {
     }
 }
 
-export async function getAllLOAs(page?: number, pageSize?: number): Promise<PagedData<LOARequest>> {
-    const params = new URLSearchParams();
-
-    if (page !== undefined) {
-        params.set("page", page.toString());
-    }
-
-    if (pageSize !== undefined) {
-        params.set("pageSize", pageSize.toString());
-    }
-
-    return fetch(`${addr}/loa/all?${params}`, {
+export function getAllLOAs(): Promise<LOARequest[]> {
+    return fetch(`${addr}/loa/all`, {
         method: "GET",
         headers: {
             "Content-Type": "application/json",
         },
-        credentials: 'include',
-    }).then((res) => {
-        if (res.ok) {
-            return res.json();
-        } else {
-            return [];
-        }
-    });
-}
-
-export function getMyLOAs(): Promise<LOARequest[]> {
-    return fetch(`${addr}/loa/history`, {
-        method: "GET",
-        credentials: 'include',
-        headers: {
-            "Content-Type": "application/json",
-        },
     }).then((res) => {
         if (res.ok) {
             return res.json();
@@ -99,69 +59,4 @@ export function getMyLOAs(): Promise<LOARequest[]> {
             return [];
         }
     });
-
 }
-
-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> {
-    const res = await fetch(`${addr}/loa/policy`, {
-        method: "GET",
-        credentials: 'include',
-    });
-    if (res.ok) {
-        const out = res.json();
-        if (!out) {
-            return null;
-        }
-        return out;
-    } else {
-        return null;
-    }
-}
-
-export async function cancelLOA(id: number, admin: boolean = false) {
-    let route = admin ? 'adminCancel' : 'cancel';
-    const res = await fetch(`${addr}/loa/${route}/${id}`, {
-        method: "POST",
-        credentials: 'include',
-    });
-
-    if (res.ok) {
-        return
-    } else {
-        throw new Error("Could not cancel LOA");
-    }
-}
-
-export async function extendLOA(id: number, to: Date) {
-    const res = await fetch(`${addr}/loa/extend/${id}`, {
-        method: "POST",
-        credentials: 'include',
-        body: JSON.stringify({ to }),
-        headers: {
-            "Content-Type": "application/json",
-        }
-    });
-
-    if (res.ok) {
-        return
-    } else {
-        throw new Error("Could not extend LOA");
-    }
-}

ui/src/api/member.ts

@@ -1,4 +1,12 @@
-import { memberSettings, Member, MemberLight } from "@shared/types/member";
+export type Member = {
+    member_id: number;
+    member_name: string;
+    rank: string | null;
+    rank_date: string | null;
+    status: string | null;
+    status_date: string | null;
+    on_loa: boolean | null;
+};
 
 //  @ts-ignore
 const addr = import.meta.env.VITE_APIHOST;
@@ -11,80 +19,4 @@ export async function getMembers(): Promise<Member[]> {
         throw new Error("Failed to fetch members");
     }
     return response.json();
-}
-
-export async function getMemberSettings(): Promise<memberSettings> {
-    const response = await fetch(`${addr}/members/settings`, {
-        credentials: 'include'
-    });
-    if (!response.ok) {
-        throw new Error("Failed to fetch settings");
-    }
-    return response.json();
-}
-
-export async function setMemberSettings(settings: memberSettings) {
-    const response = await fetch(`${addr}/members/settings`, {
-        credentials: 'include',
-        method: 'PUT',
-        headers: {
-            'Content-Type': 'Application/json',
-        },
-        body: JSON.stringify(settings)
-    });
-    if (!response.ok) {
-        throw new Error("Failed to fetch settings");
-    }
-    return;
-}
-
-export async function getAllLightMembers(): Promise<MemberLight[]> {
-    const response = await fetch(`${addr}/members/lite`, {
-        credentials: 'include',
-        headers: {
-            "Content-Type": "application/json",
-        }
-    });
-
-    if (!response.ok) {
-        throw new Error("Failed to fetch light members");
-    }
-    return response.json();
-}
-
-export async function getLightMembers(ids: number[]): Promise<MemberLight[]> {
-
-    if (ids.length === 0) return [];
-
-    const response = await fetch(`${addr}/members/lite/bulk`, {
-        credentials: 'include',
-        method: 'POST',
-        headers: {
-            "Content-Type": "application/json",
-        },
-        body: JSON.stringify({ ids })
-    });
-
-    if (!response.ok) {
-        throw new Error("Failed to fetch light members");
-    }
-    return response.json();
-}
-
-export async function getFullMembers(ids: number[]): Promise<Member[]> {
-
-    if (ids.length === 0) return [];
-
-    const response = await fetch(`${addr}/members/full/bulk`, {
-        credentials: 'include',
-        method: 'POST',
-        headers: {
-            "Content-Type": "application/json",
-        },
-        body: JSON.stringify({ ids })
-    });
-    if (!response.ok) {
-        throw new Error("Failed to fetch settings");
-    }
-    return response.json();
 }

ui/src/api/rank.ts

@@ -1,35 +1,38 @@
-import { BatchPromotion } from '@shared/schemas/promotionSchema';
-import { Rank } from '@shared/types/rank'
+export type Rank = {
+  id: number
+  name: string
+  short_name: string
+  sortOrder: number
+}
 
 //  @ts-ignore
 const addr = import.meta.env.VITE_APIHOST;
 
-export async function getAllRanks(): Promise<Rank[]> {
-  const res = await fetch(`${addr}/ranks`, {
-    credentials: 'include'
-  })
+export async function getRanks(): Promise<Rank[]> {
+  const res = await fetch(`${addr}/ranks`)
 
   if (res.ok) {
     return res.json()
   } else {
     console.error("Something went wrong approving the application")
   }
+
 }
 
 // Placeholder: submit a rank change
-export async function submitRankChange(promo: BatchPromotion) {
+export async function submitRankChange(member_id: number, rank_id: number, date: string): Promise<{ ok: boolean }> {
   const res = await fetch(`${addr}/memberRanks`, {
     method: "POST",
     headers: {
       "Content-Type": "application/json",
     },
-    credentials: 'include',
-    body: JSON.stringify(promo),
+    body: JSON.stringify({ change: { member_id, rank_id, date } }),
   })
 
   if (res.ok) {
-    return
+    return { ok: true }
   } else {
-    throw new Error("Failed to submit rank change: Server error");
+    console.error("Failed to submit rank change")
+    return { ok: false }
   }
 }

ui/src/api/trainingReport.ts

@@ -1,34 +1,13 @@
 import { Course, CourseAttendeeRole, CourseEventDetails, CourseEventSummary } from '@shared/types/course'
-import { PagedData } from '@shared/types/pagination';
 
 //@ts-ignore
 const addr = import.meta.env.VITE_APIHOST;
 
-export async function getTrainingReports(sortMode?: string, search?: string, page?: number, pageSize?: number): Promise<PagedData<CourseEventSummary>> {
-    const params = new URLSearchParams();
-
-    if (page !== undefined) {
-        params.set("page", page.toString());
-    }
-
-    if (pageSize !== undefined) {
-        params.set("pageSize", pageSize.toString());
-    }
-
-    if (sortMode !== undefined) {
-        params.set("sort", sortMode.toString());
-    }
-
-    if (search !== undefined || search !== "") {
-        params.set("search", search.toString());
-    }
-
-    const res = await fetch(`${addr}/courseEvent?${params}`, {
-        credentials: 'include',
-    });
+export async function getTrainingReports(sortMode: string, search: string): Promise<CourseEventSummary[]> {
+    const res = await fetch(`${addr}/courseEvent?sort=${sortMode}&search=${search}`);
 
     if (res.ok) {
-        return await res.json() as Promise<PagedData<CourseEventSummary>>;
+        return await res.json() as Promise<CourseEventSummary[]>;
     } else {
         console.error("Something went wrong");
         throw new Error("Failed to load training reports");
@@ -36,9 +15,7 @@ export async function getTrainingReports(sortMode?: string, search?: string, pag
 }
 
 export async function getTrainingReport(id: number): Promise<CourseEventDetails> {
-    const res = await fetch(`${addr}/courseEvent/${id}`, {
-        credentials: 'include',
-    });
+    const res = await fetch(`${addr}/courseEvent/${id}`);
 
     if (res.ok) {
         return await res.json() as Promise<CourseEventDetails>;
@@ -49,12 +26,10 @@ export async function getTrainingReport(id: number): Promise<CourseEventDetails>
 }
 
 export async function getAllTrainings(): Promise<Course[]> {
-    const res = await fetch(`${addr}/course`, {
-        credentials: 'include',
-    });
+    const res = await fetch(`${addr}/course`);
 
     if (res.ok) {
-        return await res.json() as Promise<Course[]>;
+        return await res.json() as Promise<Course[]>; 
     } else {
         console.error("Something went wrong");
         throw new Error("Failed to load training list");
@@ -62,9 +37,7 @@ export async function getAllTrainings(): Promise<Course[]> {
 }
 
 export async function getAllAttendeeRoles(): Promise<CourseAttendeeRole[]> {
-    const res = await fetch(`${addr}/course/roles`, {
-        credentials: 'include',
-    });
+    const res = await fetch(`${addr}/course/roles`);
 
     if (res.ok) {
         return await res.json() as Promise<CourseAttendeeRole[]>;

ui/src/assets/base.css

@@ -165,112 +165,4 @@
   body {
     @apply bg-background text-foreground;
   }
-}
-
-/* Root container */
-.bookstack-container {
-  font-family: var(--font-sans, system-ui), sans-serif;
-  color: var(--foreground);
-  line-height: 1.45;
-  max-width: 760px;
-  margin: 0 auto;
-  font-size: 0.9rem;
-}
-
-/* Headers */
-.bookstack-container h4 {
-  margin: 0.9rem 0 0.4rem 0;
-  font-weight: 600;
-  line-height: 1.35;
-  font-size: 1.05rem;
-  color: var(--foreground);
-}
-
-.bookstack-container h5 {
-  margin: 0.9rem 0 0.4rem 0;
-  font-weight: 600;
-  line-height: 1.35;
-  font-size: 0.95rem;
-  color: var(--foreground);
-}
-
-/* Lists */
-.bookstack-container ul {
-  list-style-type: disc;
-  margin-left: 1.1rem;
-  margin-bottom: 0.6rem;
-  padding-left: 0.6rem;
-  color: var(--muted-foreground);
-}
-
-/* Nested lists */
-.bookstack-container ul ul {
-  list-style-type: circle;
-  margin-left: 0.9rem;
-}
-
-/* List items */
-.bookstack-container li {
-  margin: 0.15rem 0;
-  padding-left: 0.1rem;
-  color: var(--muted-foreground);
-}
-
-/* Bullet color */
-.bookstack-container li::marker {
-  color: var(--muted-foreground);
-}
-
-/* Inline elements */
-.bookstack-container li p,
-.bookstack-container li span,
-.bookstack-container p {
-  display: inline;
-  margin: 0;
-  padding: 0;
-  color: var(--muted-foreground);
-}
-
-/* Top-level spacing */
-.bookstack-container>ul>li {
-  margin-top: 0.3rem;
-}
-
-/* links */
-.bookstack-container a {
-  color: var(--color-primary);
-  margin-top: 0.3rem;
-}
-
-.bookstack-container a:hover {
-  text-decoration: underline;
-}
-
-/* Scrollbar stuff */
-/* Firefox */
-.scrollbar-themed {
-  scrollbar-width: thin;
-  scrollbar-color: #555 #1f1f1f;
-  padding-right: 6px;
-}
-
-/* Chrome, Edge, Safari */
-.scrollbar-themed::-webkit-scrollbar {
-  width: 10px;
-  /* slightly wider to allow padding look */
-}
-
-.scrollbar-themed::-webkit-scrollbar-track {
-  background: #1f1f1f;
-  margin-left: 6px;
-  /* ❗ adds space between content + scrollbar */
-}
-
-.scrollbar-themed::-webkit-scrollbar-thumb {
-  background: #555;
-  border-radius: 9999px;
-}
-
-.scrollbar-themed::-webkit-scrollbar-thumb:hover {
-  background: #777;
 }

ui/src/components/Navigation/Navbar.vue

@@ -18,17 +18,13 @@ import NavigationMenuTrigger from '../ui/navigation-menu/NavigationMenuTrigger.v
 import NavigationMenuContent from '../ui/navigation-menu/NavigationMenuContent.vue';
 import { navigationMenuTriggerStyle } from '../ui/navigation-menu/'
 import { useAuth } from '@/composables/useAuth';
-import { ArrowUpRight, CircleArrowOutUpRight } from 'lucide-vue-next';
-import DropdownMenuGroup from '../ui/dropdown-menu/DropdownMenuGroup.vue';
-import DropdownMenuSeparator from '../ui/dropdown-menu/DropdownMenuSeparator.vue';
+import { CircleArrowOutUpRight } from 'lucide-vue-next';
 
 const userStore = useUserStore();
 const auth = useAuth();
 
 //@ts-ignore
 const APIHOST = import.meta.env.VITE_APIHOST;
-//@ts-ignore
-const DOCHOST = import.meta.env.VITE_DOCHOST;
 
 async function logout() {
     userStore.user = null;
@@ -62,15 +58,10 @@ function blurAfter() {
                                 </NavigationMenuLink>
                             </NavigationMenuItem>
 
-                            <!-- Docs -->
+                            <!-- Members -->
                             <NavigationMenuItem>
                                 <NavigationMenuLink as-child :class="navigationMenuTriggerStyle()">
-                                    <a href="https://docs.iceberg-gaming.com" target="_blank">
-                                        <span class="flex items-center gap-1">
-                                            Documents
-                                            <ArrowUpRight class="h-4 w-4" />
-                                        </span>
-                                    </a>
+                                    <RouterLink to="/" @click="blurAfter">Documents</RouterLink>
                                 </NavigationMenuLink>
                             </NavigationMenuItem>
 
@@ -85,11 +76,11 @@ function blurAfter() {
                                         </RouterLink>
                                     </NavigationMenuLink>
 
-                                    <!-- <NavigationMenuLink as-child :class="navigationMenuTriggerStyle()">
+                                    <NavigationMenuLink as-child :class="navigationMenuTriggerStyle()">
                                         <RouterLink to="/transfer" @click="blurAfter">
                                             Transfer Request
                                         </RouterLink>
-                                    </NavigationMenuLink> -->
+                                    </NavigationMenuLink>
 
                                     <NavigationMenuLink as-child :class="navigationMenuTriggerStyle()">
                                         <RouterLink to="/trainingReport" @click="blurAfter">
@@ -123,13 +114,13 @@ function blurAfter() {
                                         </RouterLink>
                                     </NavigationMenuLink>
 
-                                    <!-- <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>
 
                                     <NavigationMenuLink v-if="auth.hasRole('Recruiter')" as-child
                                         :class="navigationMenuTriggerStyle()">
@@ -165,12 +156,6 @@ function blurAfter() {
                                     <RouterLink to="/join" @click="blurAfter">Join</RouterLink>
                                 </NavigationMenuLink>
                             </NavigationMenuItem>
-                            <!-- Calendar -->
-                            <NavigationMenuItem>
-                                <NavigationMenuLink as-child :class="navigationMenuTriggerStyle()">
-                                    <RouterLink to="/calendar" @click="blurAfter">Calendar</RouterLink>
-                                </NavigationMenuLink>
-                            </NavigationMenuItem>
                         </NavigationMenuList>
                     </NavigationMenu>
                 </div>
@@ -179,17 +164,12 @@ function blurAfter() {
             <div>
                 <DropdownMenu v-if="userStore.isLoggedIn">
                     <DropdownMenuTrigger class="cursor-pointer">
-                        <Button variant="ghost" class="px-4">
-                            {{ userStore.displayName }}
-                        </Button>
+                        <p>{{ userStore.user.name }}</p>
                     </DropdownMenuTrigger>
                     <DropdownMenuContent>
-                        <DropdownMenuItem @click="$router.push('/profile')">My Profile</DropdownMenuItem>
-                        <DropdownMenuSeparator></DropdownMenuSeparator>
+                        <!-- <DropdownMenuItem>My Profile</DropdownMenuItem> -->
                         <!-- <DropdownMenuItem>Settings</DropdownMenuItem> -->
                         <DropdownMenuItem @click="$router.push('/join')">My Application</DropdownMenuItem>
-                        <DropdownMenuItem @click="$router.push('/applications')">Application History</DropdownMenuItem>
-                        <DropdownMenuSeparator></DropdownMenuSeparator>
                         <DropdownMenuItem :variant="'destructive'" @click="logout()">Logout</DropdownMenuItem>
                     </DropdownMenuContent>
                 </DropdownMenu>

ui/src/components/application/ApplicationChat.vue

@@ -11,22 +11,13 @@ import {
 import Textarea from '@/components/ui/textarea/Textarea.vue'
 import { toTypedSchema } from '@vee-validate/zod'
 import * as z from 'zod'
-import { useAuth } from '@/composables/useAuth'
-import { CommentRow } from '@shared/types/application'
-import { Dot } from 'lucide-vue-next'
-import { ref } from 'vue'
-import MemberCard from '../members/MemberCard.vue'
 
-const props = withDefaults(defineProps<{
-  messages: CommentRow[]
-  adminMode?: boolean
-}>(), {
-  adminMode: false,
-})
+const props = defineProps<{
+  messages: Array<Record<string, any>>
+}>()
 
 const emit = defineEmits<{
   (e: 'post', text: string): void
-  (e: 'postInternal', text: string): void
 }>()
 
 const commentSchema = toTypedSchema(
@@ -35,14 +26,9 @@ const commentSchema = toTypedSchema(
   })
 )
 
-const submitMode = ref("public");
-
 // vee-validate passes (values, actions) to @submit
 function onSubmit(values: { text: string }, { resetForm }: { resetForm: () => void }) {
-  if (submitMode.value === "internal")
-    emit('postInternal', values.text.trim())
-  else
-    emit('post', values.text.trim())
+  emit('post', values.text.trim())
   resetForm()
 }
 </script>
@@ -62,31 +48,25 @@ function onSubmit(values: { text: string }, { resetForm }: { resetForm: () => vo
       </FormField>
 
       <!-- Button below, right-aligned -->
-      <div class="mt-2 flex justify-end gap-2">
-        <Button v-if="adminMode" type="submit" @click="submitMode = 'internal'" variant="outline">Post (Internal)</Button>
-        <Button type="submit" @click="submitMode = 'public'">{{ adminMode ? 'Post (Public)' : 'Post' }}</Button>
+      <div class="mt-2 flex justify-end">
+        <Button type="submit">Post</Button>
       </div>
     </Form>
 
     <!-- Existing posts -->
     <div class="space-y-3">
-      <div v-for="(message, i) in props.messages" :key="message.comment_id ?? i" class="rounded-md border p-3 space-y-5"
-        :class="message.admin_only ? 'border-amber-300/70' : 'border-neutral-800'">
+      <div v-for="(message, i) in props.messages" :key="message.id ?? i"
+        class="rounded-md border border-neutral-800 p-3 space-y-5">
         <!-- Comment header -->
         <div class="flex justify-between">
-          <div class="flex">
-            <MemberCard :member-id="message.poster_id"></MemberCard>
-            <p v-if="message.admin_only" class="flex">
-              <Dot /><span class="text-amber-300">Internal</span>
-            </p>
-          </div>
+          <p>{{ message.poster_name }}</p>
           <p class="text-muted-foreground">{{ new Date(message.post_time).toLocaleString("EN-us", {
             year: "numeric",
             month: "long",
             day: "numeric",
             hour: "2-digit",
             minute: "2-digit"
-          }) }}</p>
+            }) }}</p>
         </div>
         <p>{{ message.post_content }}</p>
       </div>

ui/src/components/application/ApplicationForm.vue

@@ -13,38 +13,26 @@ import Input from '@/components/ui/input/Input.vue';
 import Textarea from '@/components/ui/textarea/Textarea.vue';
 import { toTypedSchema } from '@vee-validate/zod';
 import { Form } from 'vee-validate';
-import { nextTick, onMounted, ref, watch } from 'vue';
+import { onMounted, ref } from 'vue';
 import * as z from 'zod';
 import DateInput from '../form/DateInput.vue';
-import { ApplicationData } from '@shared/types/application';
-import Dialog from '../ui/dialog/Dialog.vue';
-import DialogTrigger from '../ui/dialog/DialogTrigger.vue';
-import DialogContent from '../ui/dialog/DialogContent.vue';
-import DialogHeader from '../ui/dialog/DialogHeader.vue';
-import DialogTitle from '../ui/dialog/DialogTitle.vue';
-import DialogDescription from '../ui/dialog/DialogDescription.vue';
-import { getCoC } from '@/api/application';
-import { startBrowserTracingPageLoadSpan } from '@sentry/vue';
-
-const regexA = /^https?:\/\/steamcommunity\.com\/id\/[A-Za-z0-9_]+\/?$/;
-const regexB = /^https?:\/\/steamcommunity\.com\/profiles\/\d+\/?$/;
-
+import { ApplicationData } from '@/api/application';
 
 const formSchema = toTypedSchema(z.object({
   dob: z.string().refine(v => v, { message: "A date of birth is required." }),
-  name: z.string().nonempty(),
-  playtime: z.preprocess((v) => (v === "" ? undefined : String(v)),z.string({ required_error: "Required" }).regex(/^\d+(\.\d+)?$/, "Must be a number").transform(Number).refine((n) => n >= 0, "Cannot be less than 0")),
-  hobbies: z.string().nonempty(),
+  name: z.string(),
+  playtime: z.coerce.number({ invalid_type_error: "Must be a number", }).min(0, "Cannot be less than 0"),
+  hobbies: z.string(),
   military: z.boolean(),
-  communities: z.string().nonempty(),
-  joinReason: z.string().nonempty(),
-  milsimAttraction: z.string().nonempty(),
-  referral: z.string().nonempty(),
-  steamProfile: z.string().nonempty().refine((val) => regexA.test(val) || regexB.test(val), { message: "Invalid Steam profile URL." }),
-  timezone: z.string().nonempty(),
+  communities: z.string(),
+  joinReason: z.string(),
+  milsimAttraction: z.string(),
+  referral: z.string(),
+  steamProfile: z.string(),
+  timezone: z.string(),
   canAttendSaturday: z.boolean(),
-  interests: z.string().nonempty(),
-  acknowledgeRules: z.literal(true, {
+  interests: z.string(),
+  aknowledgeRules: z.literal(true, {
     errorMap: () => ({ message: "Required" })
   }),
 }))
@@ -53,7 +41,7 @@ const formSchema = toTypedSchema(z.object({
 const fallbackInitials = {
   military: false,
   canAttendSaturday: false,
-  acknowledgeRules: false,
+  aknowledgeRules: false,
 }
 
 const props = defineProps<{
@@ -69,7 +57,7 @@ async function onSubmit(val: any) {
   emit('submit', val);
 }
 
-onMounted(async () => {
+onMounted(() => {
   if (props.data !== null) {
     const parsed = typeof props.data === "string"
       ? JSON.parse(props.data)
@@ -79,35 +67,8 @@ onMounted(async () => {
   } else {
     initialValues.value = { ...fallbackInitials };
   }
-
-  // CoCbox.value.innerHTML = await getCoC()
-  CoCString.value = await getCoC();
 })
 
-const showCoC = ref(false);
-const CoCbox = ref<HTMLElement>();
-const CoCString = ref<string>();
-
-async function onDialogToggle(state: boolean) {
-  showCoC.value = state;
-}
-
-function enforceExternalLinks() {
-  if (!CoCbox.value) return;
-
-  const links = CoCbox.value.querySelectorAll("a");
-  links.forEach(a => {
-    a.setAttribute("target", "_blank");
-    a.setAttribute("rel", "noopener noreferrer");
-  });
-}
-
-watch(() => showCoC.value, async () => {
-  if (showCoC) {
-    await nextTick(); // wait for v-html to update
-    enforceExternalLinks();
-  }
-});
 
 </script>
 
@@ -121,9 +82,7 @@ watch(() => showCoC.value, async () => {
         <FormControl>
           <DateInput :model-value="(value as string) ?? ''" :disabled="readOnly" @update:model-value="handleChange" />
         </FormControl>
-        <div class="h-4">
-          <FormMessage class="text-destructive" />
-        </div>
+        <FormMessage />
       </FormItem>
     </FormField>
 
@@ -135,9 +94,7 @@ watch(() => showCoC.value, async () => {
         <FormControl>
           <Input :model-value="value" @update:model-value="handleChange" :disabled="readOnly" />
         </FormControl>
-        <div class="h-4">
-          <FormMessage class="text-destructive" />
-        </div>
+        <FormMessage />
       </FormItem>
     </FormField>
 
@@ -148,9 +105,7 @@ watch(() => showCoC.value, async () => {
         <FormControl>
           <Input type="number" :model-value="value" @update:model-value="handleChange" :disabled="readOnly" />
         </FormControl>
-        <div class="h-4">
-          <FormMessage class="text-destructive" />
-        </div>
+        <FormMessage />
       </FormItem>
     </FormField>
 
@@ -162,9 +117,7 @@ watch(() => showCoC.value, async () => {
           <Textarea rows="4" class="resize-none" :model-value="value" @update:model-value="handleChange"
             :disabled="readOnly" />
         </FormControl>
-        <div class="h-4">
-          <FormMessage class="text-destructive" />
-        </div>
+        <FormMessage />
       </FormItem>
     </FormField>
 
@@ -174,13 +127,11 @@ watch(() => showCoC.value, async () => {
         <FormLabel>Have you ever served in the military?</FormLabel>
         <FormControl>
           <div class="flex items-center gap-2">
-            <Checkbox :model-value="value" @update:model-value="handleChange" :disabled="readOnly" />
+            <Checkbox :checked="value ?? false" @update:checked="handleChange" :disabled="readOnly" />
             <span>Yes (checked) / No (unchecked)</span>
           </div>
         </FormControl>
-        <div class="h-4">
-          <FormMessage class="text-destructive" />
-        </div>
+        <FormMessage />
       </FormItem>
     </FormField>
 
@@ -191,9 +142,7 @@ watch(() => showCoC.value, async () => {
         <FormControl>
           <Input :model-value="value" @update:model-value="handleChange" :disabled="readOnly" />
         </FormControl>
-        <div class="h-4">
-          <FormMessage class="text-destructive" />
-        </div>
+        <FormMessage />
       </FormItem>
     </FormField>
 
@@ -205,9 +154,7 @@ watch(() => showCoC.value, async () => {
           <Textarea rows="4" class="resize-none" :model-value="value" @update:model-value="handleChange"
             :disabled="readOnly" />
         </FormControl>
-        <div class="h-4">
-          <FormMessage class="text-destructive" />
-        </div>
+        <FormMessage />
       </FormItem>
     </FormField>
 
@@ -219,9 +166,7 @@ watch(() => showCoC.value, async () => {
           <Textarea rows="4" class="resize-none" :model-value="value" @update:model-value="handleChange"
             :disabled="readOnly" />
         </FormControl>
-        <div class="h-4">
-          <FormMessage class="text-destructive" />
-        </div>
+        <FormMessage />
       </FormItem>
     </FormField>
 
@@ -233,9 +178,7 @@ watch(() => showCoC.value, async () => {
           <Input placeholder="e.g., Reddit / Member: Alice" :model-value="value" @update:model-value="handleChange"
             :disabled="readOnly" />
         </FormControl>
-        <div class="h-4">
-          <FormMessage class="text-destructive" />
-        </div>
+        <FormMessage />
       </FormItem>
     </FormField>
 
@@ -251,9 +194,7 @@ watch(() => showCoC.value, async () => {
           <Input type="url" placeholder="https://steamcommunity.com/profiles/7656119..." :model-value="value"
             @update:model-value="handleChange" :disabled="readOnly" />
         </FormControl>
-        <div class="h-4">
-          <FormMessage class="text-destructive" />
-        </div>
+        <FormMessage />
       </FormItem>
     </FormField>
 
@@ -265,9 +206,7 @@ watch(() => showCoC.value, async () => {
           <Input placeholder="e.g., AEST, EST, UTC+10" :model-value="value" @update:model-value="handleChange"
             :disabled="readOnly" />
         </FormControl>
-        <div class="h-4">
-          <FormMessage class="text-destructive" />
-        </div>
+        <FormMessage />
       </FormItem>
     </FormField>
 
@@ -281,9 +220,7 @@ watch(() => showCoC.value, async () => {
             <span>Yes (checked) / No (unchecked)</span>
           </div>
         </FormControl>
-        <div class="h-4">
-          <FormMessage class="text-destructive" />
-        </div>
+        <FormMessage />
       </FormItem>
     </FormField>
 
@@ -295,44 +232,27 @@ watch(() => showCoC.value, async () => {
           <Input placeholder="e.g., Rifleman; Medic; Pilot" :model-value="value" @update:model-value="handleChange"
             :disabled="readOnly" />
         </FormControl>
-        <div class="h-4">
-          <FormMessage class="text-destructive" />
-        </div>
+        <FormMessage />
       </FormItem>
     </FormField>
 
     <!-- Code of Conduct (boolean, field name kept as-is) -->
-    <FormField name="acknowledgeRules" v-slot="{ value, handleChange }">
+    <FormField name="aknowledgeRules" v-slot="{ value, handleChange }">
       <FormItem>
         <FormLabel>Community Code of Conduct</FormLabel>
         <FormControl>
           <div class="flex items-center gap-2">
             <Checkbox :model-value="value" @update:model-value="handleChange" :disabled="readOnly" />
-            <span>By checking this box, you accept the <Button variant="link" class="p-0 h-min"
-                @click.prevent.stop="showCoC = true">Code of
+            <span>By checking this box, you accept the <Button variant="link" class="p-0">Code of
                 Conduct</Button>.</span>
           </div>
         </FormControl>
-        <div class="h-4">
-          <FormMessage class="text-destructive" />
-        </div>
+        <FormMessage />
       </FormItem>
     </FormField>
 
     <div class="pt-2" v-if="!readOnly">
-      <Button type="submit" :disabled="readOnly">Submit Application</Button>
+      <Button type="submit" :onClick="() => console.log('hi')" :disabled="readOnly">Submit Application</Button>
     </div>
-
-    <Dialog :open="showCoC" @update:open="onDialogToggle">
-      <DialogContent class="sm:max-w-fit">
-        <DialogHeader>
-          <DialogTitle>Community Code of Conduct</DialogTitle>
-          <DialogDescription class="w-full max-h-[75vh] overflow-y-auto scrollbar-themed">
-            <div v-html="CoCString" ref="CoCbox" class="bookstack-container w-full"></div>
-          </DialogDescription>
-        </DialogHeader>
-      </DialogContent>
-    </Dialog>
-
   </Form>
 </template>

ui/src/components/calendar/ViewCalendarEvent.vue

@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import type { CalendarEvent, CalendarSignup } from '@shared/types/calendar'
-import { CircleAlert, Clock4, EllipsisVertical, MapPin, User, X } from 'lucide-vue-next';
-import { computed, ref, watch } from 'vue';
+import { CircleAlert, Clock, EllipsisVertical, MapPin, User, X } from 'lucide-vue-next';
+import { computed, onMounted, ref, watch } from 'vue';
 import ButtonGroup from '../ui/button-group/ButtonGroup.vue';
 import Button from '../ui/button/Button.vue';
 import { CalendarAttendance, getCalendarEvent, setCalendarEventAttendance, setCancelCalendarEvent } from '@/api/calendar';
@@ -11,15 +11,24 @@ import DropdownMenu from '../ui/dropdown-menu/DropdownMenu.vue';
 import DropdownMenuTrigger from '../ui/dropdown-menu/DropdownMenuTrigger.vue';
 import DropdownMenuContent from '../ui/dropdown-menu/DropdownMenuContent.vue';
 import DropdownMenuItem from '../ui/dropdown-menu/DropdownMenuItem.vue';
-import { Calendar } from 'lucide-vue-next';
-import MemberCard from '../members/MemberCard.vue';
-import Spinner from '../ui/spinner/Spinner.vue';
 
 const route = useRoute();
+// const eventID = computed(() => {
+//     const id = route.params.id;
+//     if (typeof id === 'string') return id;
+//     return undefined;
+// });
 
 const loaded = ref<boolean>(false);
 const activeEvent = ref<CalendarEvent | null>(null);
 
+// onMounted(async () => {
+//     let eventID = route.params.id;
+//     console.log(eventID);
+//     activeEvent.value = await getCalendarEvent(Number(eventID));
+//     loaded.value = true;
+// });
+
 watch(
     () => route.params.id,
     async (id) => {
@@ -36,27 +45,23 @@ const emit = defineEmits<{
     (e: 'edit', event: CalendarEvent): void
 }>()
 
-const dateFmt = new Intl.DateTimeFormat(undefined, {
-    weekday: 'long', month: 'short', day: 'numeric',
-})
+// const activeEvent = computed(() => props.event)
 
-const timeFmt = new Intl.DateTimeFormat(undefined, {
+const startFmt = new Intl.DateTimeFormat(undefined, {
+    weekday: 'short', year: 'numeric', month: 'short', day: 'numeric',
+    hour: 'numeric', minute: '2-digit'
+})
+const endFmt = new Intl.DateTimeFormat(undefined, {
     hour: 'numeric', minute: '2-digit'
 })
 
-const dateText = computed(() => {
-    let start = dateFmt.format(new Date(activeEvent.value.start));
-    let end = dateFmt.format(new Date(activeEvent.value.end));
-    if (start === end)
-        return start;
-    else
-        return `${start} - ${end}`;
-})
-
-const timeText = computed(() => {
-    let startTime = timeFmt.format(new Date(activeEvent.value.start))
-    let endTime = timeFmt.format(new Date(activeEvent.value.end))
-    return [startTime, endTime]
+const whenText = computed(() => {
+    if (!activeEvent.value?.start) return ''
+    const s = new Date(activeEvent.value.start)
+    const e = activeEvent.value?.end ? new Date(activeEvent.value.end) : null
+    return e
+        ? `${startFmt.format(s)} – ${endFmt.format(e)}`
+        : `${startFmt.format(s)}`
 })
 
 const attending = computed<CalendarSignup[]>(() => { return activeEvent.value.eventSignups.filter((s) => s.status == CalendarAttendance.Attending) })
@@ -64,11 +69,10 @@ const maybe = computed<CalendarSignup[]>(() => { return activeEvent.value.eventS
 const declined = computed<CalendarSignup[]>(() => { return activeEvent.value.eventSignups.filter((s) => s.status == CalendarAttendance.NotAttending) })
 const viewedState = ref<CalendarAttendance>(CalendarAttendance.Attending);
 
-let userStore = useUserStore();
+let user = useUserStore();
 const myAttendance = computed<CalendarSignup | null>(() => {
-    if (!userStore.isLoggedIn) return null;
     return activeEvent.value.eventSignups.find(
-        (s) => s.member_id === userStore.user.member.member_id
+        (s) => s.member_id === user.user.id
     ) || null;
 });
 
@@ -79,8 +83,7 @@ async function setAttendance(state: CalendarAttendance) {
 }
 
 const canEditEvent = computed(() => {
-    if (!userStore.isLoggedIn) return false;
-    if (userStore.user.member.member_id == activeEvent.value.creator_id)
+    if (user.user.id == activeEvent.value.creator_id)
         return true;
 });
 
@@ -94,94 +97,17 @@ async function forceReload() {
     activeEvent.value = await getCalendarEvent(activeEvent.value.id);
 }
 
-const isPast = computed(() => {
-    const end = new Date(activeEvent.value.end)
-    // is current date later than end date
-    return new Date() < end;
-})
-
-const attendanceTab = ref<"Alpha" | "Echo" | "Other">("Alpha");
-const attendanceList = computed<CalendarSignup[]>(() => {
-    let out: CalendarSignup[] = [];
-    if (attendanceTab.value === 'Alpha') {
-        out = activeEvent.value.eventSignups?.filter((s) => s.unit_name === 'Alpha Company');
-    } else if (attendanceTab.value === 'Echo') {
-        out = activeEvent.value.eventSignups?.filter((s) => s.unit_name === 'Echo Company')
-    } else {
-        out = activeEvent.value.eventSignups?.filter((s) => s.unit_name != 'Alpha Company' && s.unit_name != 'Echo Company')
-    }
-
-    const statusOrder: Record<CalendarAttendance, number> = {
-        [CalendarAttendance.Attending]: 1,
-        [CalendarAttendance.Maybe]: 2,
-        [CalendarAttendance.NotAttending]: 3,
-    };
-
-    out.sort((a, b) => statusOrder[a.status] - statusOrder[b.status]);
-
-    return out;
-})
-
-const attendanceCountsByGroup = computed(() => {
-    const signups = activeEvent.value.eventSignups ?? [];
-
-    return {
-        Alpha: signups.filter(s => s.unit_name === "Alpha Company").length,
-        Echo: signups.filter(s => s.unit_name === "Echo Company").length,
-        Other: signups.filter(s =>
-            s.unit_name !== "Alpha Company" &&
-            s.unit_name !== "Echo Company"
-        ).length,
-    };
-});
-
-const attendanceStatusSummary = computed(() => {
-    const signups = activeEvent.value.eventSignups ?? [];
-
-    return {
-        attending: signups.filter(s => s.status === CalendarAttendance.Attending).length,
-        maybe: signups.filter(s => s.status === CalendarAttendance.Maybe).length,
-        notAttending: signups.filter(s => s.status === CalendarAttendance.NotAttending).length,
-    };
-});
-
-const statusColor = (status: CalendarAttendance) => {
-    switch (status) {
-        case CalendarAttendance.Attending:
-            return "text-success";
-        case CalendarAttendance.Maybe:
-            return "text-yellow-600";
-        case CalendarAttendance.NotAttending:
-            return "text-destructive";
-        default:
-            return "";
-    }
-};
-
-const displayStatus = (status: CalendarAttendance) => {
-    switch (status) {
-        case CalendarAttendance.Attending:
-            return "Attending";
-        case CalendarAttendance.Maybe:
-            return "Maybe";
-        case CalendarAttendance.NotAttending:
-            return "Declined";
-        default:
-            return status;
-    }
-};
-
-defineExpose({ forceReload })
+defineExpose({forceReload})
 </script>
 
 <template>
     <div v-if="loaded">
         <!-- Header -->
-        <div class="flex items-center justify-between gap-3 border-b px-4 py-3 h-14">
+        <div class="flex items-center justify-between gap-3 border-b px-4 py-3">
             <h2 class="text-lg font-semibold break-all">
                 {{ activeEvent?.name || 'Event' }}
             </h2>
-            <div class="flex gap-4 items-center">
+            <div class="flex gap-4">
                 <DropdownMenu v-if="canEditEvent">
                     <DropdownMenuTrigger>
                         <button
@@ -193,7 +119,8 @@ defineExpose({ forceReload })
                         <DropdownMenuItem @click="emit('edit', activeEvent)">
                             Edit
                         </DropdownMenuItem>
-                        <DropdownMenuItem v-if="activeEvent.cancelled" @click="setCancel(false)">
+                        <DropdownMenuItem v-if="activeEvent.cancelled"
+                            @click="setCancel(false)">
                             Un-Cancel
                         </DropdownMenuItem>
                         <DropdownMenuItem v-else @click="setCancel(true)">
@@ -215,7 +142,7 @@ defineExpose({ forceReload })
                     <CircleAlert></CircleAlert> This event has been cancelled
                 </div>
             </section>
-            <section v-if="isPast && userStore.isLoggedIn" class="w-full">
+            <section class="w-full">
                 <ButtonGroup class="flex w-full">
                     <Button variant="outline"
                         :class="myAttendance?.status === CalendarAttendance.Attending ? 'border-2 border-primary text-primary' : ''"
@@ -228,23 +155,25 @@ defineExpose({ forceReload })
                         @click="setAttendance(CalendarAttendance.NotAttending)">Declined</Button>
                 </ButtonGroup>
             </section>
-            <!-- Meta -->
-            <section class="space-y-3 w-full">
-                <p class="text-lg font-semibold">Details</p>
-                <div class="text-foreground/80 flex gap-3 items-center">
-                    <Calendar :size="20"></Calendar> {{ dateText }}
-                </div>
-                <div class="text-foreground/80 flex gap-3 items-center">
-                    <Clock4 :size="20"></Clock4> {{ timeText[0] }} - {{ timeText[1] }}
-                </div>
-                <div class="text-foreground/80 flex gap-3 items-center">
-                    <MapPin :size="20"></MapPin> {{ activeEvent.location || "Unknown" }}
-                </div>
-                <div class="text-foreground/80 flex gap-3 items-center">
-                    <User :size="20"></User>
-                    <MemberCard :member-id="activeEvent.creator_id"></MemberCard>
+            <!-- When -->
+            <section v-if="whenText" class="space-y-2 w-full">
+                <div class="inline-flex items-center gap-2 rounded-md border px-2.5 py-1.5 text-sm">
+                    <Clock class="size-4 opacity-80" />
+                    <span class="font-medium">{{ whenText }}</span>
                 </div>
             </section>
+            <!-- Quick meta chips -->
+            <section class="flex flex-wrap gap-2 w-full">
+                <span class="inline-flex items-center gap-1.5 rounded-md border px-2 py-1 text-xs">
+                    <MapPin class="size-3.5 opacity-80" />
+                    <span class="font-medium">{{ activeEvent.location || "Unknown" }}</span>
+                </span>
+                <span class="inline-flex items-center gap-1.5 rounded-md border px-2 py-1 text-xs">
+                    <User class="size-3.5 opacity-80" />
+                    <span class="font-medium">Created by: {{ activeEvent.creator_name || "Unknown User"
+                        }}</span>
+                </span>
+            </section>
             <!-- Description -->
             <section class="space-y-2 w-full">
                 <p class="text-lg font-semibold">Description</p>
@@ -252,52 +181,46 @@ defineExpose({ forceReload })
                     {{ activeEvent.description }}
                 </p>
             </section>
-            <!-- attendance -->
+            <!-- Attendance -->
             <section class="space-y-2 w-full">
-                <div class="flex items-center gap-5">
-                    <p class="text-lg font-semibold">Attendance</p>
-                    <!-- <div class="text-muted-foreground flex gap-6">
-                        <p>Going <span class="ml-1">{{ attendanceStatusSummary.attending }}</span></p>
-                        <p>Maybe <span class="ml-1">{{ attendanceStatusSummary.maybe }}</span></p>
-                        <p>Declined <span class="ml-1">{{ attendanceStatusSummary.notAttending }}</span></p>
-                    </div> -->
-                </div>
+                <p class="text-lg font-semibold">Attendance</p>
                 <div class="flex flex-col border bg-muted/50 rounded-lg min-h-24 my-2">
                     <div class="flex w-full pt-2 border-b *:w-full *:text-center *:pb-1 *:cursor-pointer">
-                        <label :class="attendanceTab === 'Alpha' ? 'border-b-3 border-foreground' : 'mb-[2px]'"
-                            @click="attendanceTab = 'Alpha'">Alpha {{ attendanceCountsByGroup.Alpha }}</label>
-                        <label :class="attendanceTab === 'Echo' ? 'border-b-3 border-foreground' : 'mb-[2px]'"
-                            @click="attendanceTab = 'Echo'">Echo {{ attendanceCountsByGroup.Echo }}</label>
-                        <label :class="attendanceTab === 'Other' ? 'border-b-3 border-foreground' : 'mb-[2px]'"
-                            @click="attendanceTab = 'Other'">Other {{ attendanceCountsByGroup.Other }}</label>
+                        <label
+                            :class="viewedState === CalendarAttendance.Attending ? 'border-b-3 border-foreground' : 'mb-[2px]'"
+                            @click="viewedState = CalendarAttendance.Attending">Going {{ attending.length }}</label>
+                        <label
+                            :class="viewedState === CalendarAttendance.Maybe ? 'border-b-3 border-foreground' : 'mb-[2px]'"
+                            @click="viewedState = CalendarAttendance.Maybe">Maybe {{ maybe.length }}</label>
+                        <label
+                            :class="viewedState === CalendarAttendance.NotAttending ? 'border-b-3 border-foreground' : 'mb-[2px]'"
+                            @click="viewedState = CalendarAttendance.NotAttending">Declined {{ declined.length
+                            }}</label>
                     </div>
-                    <div class="pb-1 min-h-48">
-                        <div class="grid grid-cols-2 font-semibold text-muted-foreground border-b py-1 px-3 mb-2">
-                            <p>Name</p>
-                            <p class="text-right">Status</p>
+                    <div class="px-5 py-4 min-h-28">
+                        <div v-if="viewedState === CalendarAttendance.Attending" v-for="person in attending">
+                            <p>{{ person.member_name }}</p>
                         </div>
-
-                        <div v-for="person in attendanceList" :key="person.member_id"
-                            class="grid grid-cols-2 py-1 *:px-3 hover:bg-muted">
-                            <div>
-                                <MemberCard :member-id="person.member_id"></MemberCard>
-                            </div>
-                            <p :class="statusColor(person.status)" class="text-right">
-                                {{ displayStatus(person.status) }}
-                            </p>
+                        <div v-if="viewedState === CalendarAttendance.Maybe" v-for="person in maybe">
+                            <p>{{ person.member_name }}</p>
+                        </div>
+                        <div v-if="viewedState === CalendarAttendance.NotAttending" v-for="person in declined">
+                            <p>{{ person.member_name }}</p>
                         </div>
                     </div>
                 </div>
             </section>
         </div>
-    </div>
-    <div v-else class="flex justify-center h-full items-center">
-        <button
-            class="absolute top-4 right-4 inline-flex flex-none size-8 items-center justify-center rounded-md border hover:bg-muted/40 transition cursor-pointer z-50"
-            aria-label="Close" @click="emit('close')">
-            <X class="size-4" />
-        </button>
+        <!-- Footer (optional actions) -->
+        <!-- <div class="border-t px-4 py-3 flex items-center justify-end gap-2">
+            <button class="rounded-md border px-3 py-1.5 text-sm hover:bg-muted/40 transition">
+                Edit
+            </button>
+            <button
+                class="rounded-md bg-primary text-primary-foreground px-3 py-1.5 text-sm hover:opacity-90 transition">
+                Open details
+            </button>
+        </div> -->
 
-        <Spinner class="size-8"></Spinner>
     </div>
 </template>

ui/src/components/loa/loaForm.vue

@@ -1,48 +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 { getMembers } from "@/api/member";
-import { Member } from "@shared/types/member";
+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<{
@@ -53,251 +31,142 @@ const props = withDefaults(defineProps<{
     member: null,
 });
 
-const df = new Intl.DateTimeFormat('en-US', {
-    year: 'numeric',
-    month: 'long',
-    day: 'numeric'
-});
 
-const userStore = useUserStore()
-
-//form stuff
-import { loaSchema } from '@shared/schemas/loaSchema'
-import { toTypedSchema } from "@vee-validate/zod";
-import Calendar from "../ui/calendar/Calendar.vue";
-import { useUserStore } from "@/stores/user";
-
-const { handleSubmit, values, resetForm } = useForm({
-    validationSchema: toTypedSchema(loaSchema),
+const df = new DateFormatter("en-US", {
+    dateStyle: "medium",
 })
 
-const formSubmitted = ref(false);
+const value = ref({
+    // start: new CalendarDate(2022, 1, 20),
+    // end: new CalendarDate(2022, 1, 20).add({ days: 20 }),
+}) as Ref<DateRange>
 
-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);
-        userStore.loadUser();
-    }
-    formSubmitted.value = true;
-})
+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) {
-            let policy = await getLoaPolicy() as any;
-            policyString.value = policy;
-            policyRef.value.innerHTML = policyString.value;
-        }
-    } catch (error) {
-        console.error(error);
-    }
-
     if (props.adminMode) {
         members.value = await getMembers();
-    } else {
-        members.value.push(props.member);
     }
-    loaTypes.value = await getLoaTypes();
-    resetForm({ values: { member_id: currentMember.value?.member_id } });
+    members.value = await getMembers();
 });
 
-const policyRef = ref<HTMLElement>(null);
+// Submit handler
+async function handleSubmit() {
+    submitError.value = null;
+    submitSuccess.value = false;
+    submitting.value = true;
 
-const defaultPlaceholder = today(getLocalTimeZone())
+    // Use currentMember if adminMode, otherwise use your own member id (stubbed as 89 here)
+    const member_id = currentMember.value?.member_id ?? 89;
 
-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;
+    // 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 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())
+    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 {
-        return null;
+        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 v-if="!adminMode" class="flex-1 flex flex-col space-x-4 rounded-md border p-4">
-            <p class="scroll-m-20 text-2xl font-semibold tracking-tight">LOA Policy</p>
-            <div ref="policyRef" class="bookstack-container">
-                <!-- LOA policy gets loaded here -->
+        <div v-if="!adminMode" class="flex-1 flex space-x-4 rounded-md border p-4">
+            <div class="flex-2 space-y-1">
+                <p class="text-sm font-medium leading-none">
+                    LOA Policy
+                </p>
+                <p class="text-sm text-muted-foreground">
+                    Policy goes here.
+                </p>
             </div>
         </div>
         <div class="flex-1 flex flex-col gap-5">
-            <form v-if="!formSubmitted" @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.displayName || 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.displayName || 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 placeholder="Select type"></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-full 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-full 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 v-else class="flex flex-col  gap-4 py-8 text-left">
-                <h2 class="text-xl font-semibold">
-                    LOA Request Submitted
-                </h2>
-
-                <p class="max-w-md text-muted-foreground">
-                    Your Leave of Absence request has been submitted successfully.
-                    It will take effect on your selected start date.
-                </p>
-
-
-                <div class="flex gap-3 mt-4">
-                    <Button variant="secondary" @click="formSubmitted = false">
-                        Submit another request
-                    </Button>
-                </div>
+            <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/loa/loaList.vue

@@ -15,66 +15,31 @@ import {
     DropdownMenuItem,
     DropdownMenuTrigger,
 } from "@/components/ui/dropdown-menu"
-import { ChevronDown, ChevronUp, Ellipsis, X } from "lucide-vue-next";
-import { cancelLOA, extendLOA, getAllLOAs, getMyLOAs } from "@/api/loa";
+import { Ellipsis } from "lucide-vue-next";
+import { getAllLOAs, LOARequest } from "@/api/loa";
 import { onMounted, ref, computed } from "vue";
-import { LOARequest } from "@shared/types/loa";
-import Dialog from "../ui/dialog/Dialog.vue";
-import DialogTrigger from "../ui/dialog/DialogTrigger.vue";
-import DialogContent from "../ui/dialog/DialogContent.vue";
-import DialogHeader from "../ui/dialog/DialogHeader.vue";
-import DialogTitle from "../ui/dialog/DialogTitle.vue";
-import DialogDescription from "../ui/dialog/DialogDescription.vue";
-import Button from "../ui/button/Button.vue";
-import Calendar from "../ui/calendar/Calendar.vue";
-import {
-    CalendarDate,
-    getLocalTimeZone,
-} from "@internationalized/date"
-import { el } from "@fullcalendar/core/internal-common";
-import MemberCard from "../members/MemberCard.vue";
-import {
-    Pagination,
-    PaginationContent,
-    PaginationEllipsis,
-    PaginationItem,
-    PaginationNext,
-    PaginationPrevious,
-} from '@/components/ui/pagination'
-import { pagination } from "@shared/types/pagination";
-
-const props = defineProps<{
-    adminMode?: boolean
-}>()
 
 const LOAList = ref<LOARequest[]>([]);
 
 onMounted(async () => {
-    await loadLOAs();
+    LOAList.value = await getAllLOAs();
 });
 
-async function loadLOAs() {
-    if (props.adminMode) {
-        let result = await getAllLOAs(pageNum.value, pageSize.value);
-        LOAList.value = result.data;
-        pageData.value = result.pagination;
-    } else {
-        LOAList.value = await getMyLOAs();
-    }
-}
-
-function formatDate(date: Date): string {
-    if (!date) return "";
-    date = typeof date === 'string' ? new Date(date) : date;
-    return date.toLocaleDateString("en-US", {
+function formatDate(dateStr: string): string {
+    if (!dateStr) return "";
+    return new Date(dateStr).toLocaleDateString("en-US", {
         year: "numeric",
         month: "short",
         day: "numeric",
     });
 }
 
-function loaStatus(loa: LOARequest): "Upcoming" | "Active" | "Overdue" | "Closed" {
-    if (loa.closed) return "Closed";
+function loaStatus(loa: {
+    start_date: string;
+    end_date: string;
+    deleted?: number;
+}): "Upcoming" | "Active" | "Expired" | "Cancelled" {
+    if (loa.deleted) return "Cancelled";
 
     const now = new Date();
     const start = new Date(loa.start_date);
@@ -82,203 +47,61 @@ function loaStatus(loa: LOARequest): "Upcoming" | "Active" | "Overdue" | "Closed
 
     if (now < start) return "Upcoming";
     if (now >= start && now <= end) return "Active";
-    if (now > end) return "Overdue";
+    if (now > end) return "Expired";
 
-    return "Overdue"; // fallback
+    return "Expired"; // fallback
 }
 
-async function cancelAndReload(id: number) {
-    await cancelLOA(id, props.adminMode);
-    await loadLOAs();
+function sortByStartDate(loas: LOARequest[]): LOARequest[] {
+    return [...loas].sort(
+        (a, b) => new Date(b.start_date).getTime() - new Date(a.start_date).getTime()
+    );
 }
 
-const isExtending = ref(false);
-const targetLOA = ref<LOARequest | null>(null);
-const extendTo = ref<CalendarDate | null>(null);
-
-const targetEnd = computed(() => { return targetLOA.value.extended_till ? targetLOA.value.extended_till : targetLOA.value.end_date })
-
-function toCalendarDate(date: Date): CalendarDate {
-    if (typeof date === 'string')
-        date = new Date(date);
-    return new CalendarDate(date.getFullYear(), date.getMonth() + 1, date.getDate())
-}
-
-async function commitExtend() {
-    await extendLOA(targetLOA.value.id, extendTo.value.toDate(getLocalTimeZone()));
-    isExtending.value = false;
-    await loadLOAs();
-}
-
-const expanded = ref<number | null>(null);
-const hoverID = ref<number | null>(null);
-
-const pageNum = ref<number>(1);
-const pageData = ref<pagination>();
-
-const pageSize = ref<number>(15)
-const pageSizeOptions = [10, 15, 30]
-
-function setPageSize(size: number) {
-    pageSize.value = size
-    pageNum.value = 1;
-    loadLOAs();
-}
-
-function setPage(pagenum: number) {
-    pageNum.value = pagenum;
-    loadLOAs();
-}
+const sortedLoas = computed(() => sortByStartDate(LOAList.value));
 </script>
 
 <template>
-    <div>
-        <Dialog :open="isExtending" @update:open="(val) => isExtending = val">
-            <DialogContent>
-                <DialogHeader>
-                    <DialogTitle>Extend {{ targetLOA.name }}'s Leave of Absence </DialogTitle>
-                </DialogHeader>
-                <div class="flex gap-5">
-                    <Calendar v-model="extendTo" class="rounded-md border shadow-sm w-min" layout="month-and-year"
-                        :min-value="toCalendarDate(targetEnd)"
-                        :max-value="toCalendarDate(targetEnd).add({ years: 1 })" />
-                    <div class="flex flex-col w-full gap-3 px-2">
-                        <p>Quick Options</p>
-                        <Button variant="outline" @click="extendTo = toCalendarDate(targetEnd).add({ days: 7 })">1
-                            Week</Button>
-                        <Button variant="outline" @click="extendTo = toCalendarDate(targetEnd).add({ months: 1 })">1
-                            Month</Button>
-                    </div>
-                </div>
-                <div class="flex justify-end gap-4">
-                    <Button variant="outline" @click="isExtending = false">Cancel</Button>
-                    <Button @click="commitExtend">Extend</Button>
-                </div>
-            </DialogContent>
-        </Dialog>
-        <div class="max-w-7xl w-full mx-auto">
-            <Table>
-                <TableHeader>
-                    <TableRow>
-                        <TableHead>Member</TableHead>
-                        <TableHead>Type</TableHead>
-                        <TableHead>Start</TableHead>
-                        <TableHead>End</TableHead>
-                        <!-- <TableHead class="w-[500px]">Reason</TableHead> -->
-                        <TableHead>Posted on</TableHead>
-                        <TableHead>Status</TableHead>
-                    </TableRow>
-                </TableHeader>
-                <TableBody>
-                    <template v-for="post in LOAList" :key="post.id">
-                        <TableRow class="hover:bg-muted/50 cursor-pointer" @click="expanded = post.id"
-                            @mouseenter="hoverID = post.id" @mouseleave="hoverID = null" :class="{
-                                'border-b-0': expanded === post.id,
-                                'bg-muted/50': hoverID === post.id
-                            }">
-                            <TableCell class="font-medium">
-                                <MemberCard :member-id="post.member_id"></MemberCard>
-                            </TableCell>
-                            <TableCell>{{ post.type_name }}</TableCell>
-                            <TableCell>{{ formatDate(post.start_date) }}</TableCell>
-                            <TableCell>{{ post.extended_till ? formatDate(post.extended_till) :
-                                formatDate(post.end_date) }}
-                            </TableCell>
-                            <!-- <TableCell>{{ post.reason }}</TableCell> -->
-                            <TableCell>{{ formatDate(post.filed_date) }}</TableCell>
-                            <TableCell>
-                                <Badge v-if="loaStatus(post) === 'Upcoming'" class="bg-blue-400">Upcoming</Badge>
-                                <Badge v-else-if="loaStatus(post) === 'Active'" class="bg-green-500">Active</Badge>
-                                <Badge v-else-if="loaStatus(post) === 'Overdue'" class="bg-yellow-400">Overdue</Badge>
-                                <Badge v-else class="bg-gray-400">Ended</Badge>
-                            </TableCell>
-                            <TableCell @click.stop="" class="text-right">
-                                <DropdownMenu>
-                                    <DropdownMenuTrigger class="cursor-pointer">
-                                        <Button variant="ghost">
-                                            <Ellipsis class="size-6"></Ellipsis>
-                                        </Button>
-                                    </DropdownMenuTrigger>
-                                    <DropdownMenuContent>
-                                        <DropdownMenuItem v-if="!post.closed && props.adminMode"
-                                            @click="isExtending = true; targetLOA = post">
-                                            Extend
-                                        </DropdownMenuItem>
-                                        <DropdownMenuItem v-if="!post.closed" :variant="'destructive'"
-                                            @click="cancelAndReload(post.id)">{{ loaStatus(post) === 'Upcoming' ?
-                                                'Cancel' :
-                                                'End' }}
-                                        </DropdownMenuItem>
-                                        <!-- Fallback: no actions available -->
-                                        <p v-if="post.closed || (!props.adminMode && post.closed)"
-                                            class="p-2 text-center text-sm">
-                                            No actions
-                                        </p>
-                                    </DropdownMenuContent>
-                                </DropdownMenu>
-                            </TableCell>
-                            <TableCell>
-                                <Button v-if="expanded === post.id" @click.stop="expanded = null" variant="ghost">
-                                    <ChevronUp class="size-6" />
-                                </Button>
-                                <Button v-else @click.stop="expanded = post.id" variant="ghost">
-                                    <ChevronDown class="size-6" />
-                                </Button>
-                            </TableCell>
-                        </TableRow>
-                        <TableRow v-if="expanded === post.id" @mouseenter="hoverID = post.id"
-                            @mouseleave="hoverID = null" :class="{ 'bg-muted/50 border-t-0': hoverID === post.id }">
-                            <TableCell :colspan="8" class="p-0">
-                                <div class="w-full p-3 mb-6 space-y-3">
-                                    <div class="flex justify-between items-start gap-4">
-                                        <div class="flex-1">
-                                            <!-- Title -->
-                                            <p class="text-md font-semibold text-foreground">
-                                                Reason
-                                            </p>
+    <div class="w-5xl mx-auto">
+        <Table>
+            <TableHeader>
+                <TableRow>
+                    <TableHead class="w-[100px]">Member</TableHead>
+                    <TableHead>Start</TableHead>
+                    <TableHead>End</TableHead>
+                    <TableHead>Reason</TableHead>
+                    <TableHead>Posted on</TableHead>
+                    <TableHead>Status</TableHead>
+                </TableRow>
+            </TableHeader>
+            <TableBody>
+                <TableRow v-for="post in sortedLoas" :key="post.id" class="hover:bg-muted/50">
+                    <TableCell class="font-medium">
+                        {{ post.name }}
+                    </TableCell>
+                    <TableCell>{{ formatDate(post.start_date) }}</TableCell>
+                    <TableCell>{{ formatDate(post.end_date) }}</TableCell>
+                    <TableCell>{{ post.reason }}</TableCell>
+                    <TableCell>{{ formatDate(post.filed_date) }}</TableCell>
+                    <TableCell>
+                        <Badge v-if="loaStatus(post) === 'Upcoming'" class="bg-blue-500">Upcoming</Badge>
+                        <Badge v-else-if="loaStatus(post) === 'Active'" class="bg-green-500">Active</Badge>
+                        <Badge v-else-if="loaStatus(post) === 'Expired'" class="bg-gray-400">Expired</Badge>
+                        <Badge v-else class="bg-red-500">Cancelled</Badge>
+                    </TableCell>
+                    <TableCell @click.stop="console.log('hi')" class="text-right">
+                        <DropdownMenu>
+                            <DropdownMenuTrigger class="cursor-pointer">
+                                <Ellipsis></Ellipsis>
+                            </DropdownMenuTrigger>
+                            <DropdownMenuContent>
+                                <DropdownMenuItem :variant="'destructive'">Cancel</DropdownMenuItem>
+                            </DropdownMenuContent>
+                        </DropdownMenu>
+                    </TableCell>
 
-                                            <!-- Content -->
-                                            <p
-                                                class="mt-1 text-md whitespace-pre-wrap leading-relaxed text-muted-foreground">
-                                                {{ post.reason }}
-                                            </p>
-                                        </div>
-                                    </div>
-                                </div>
-                            </TableCell>
-                        </TableRow>
-
-                    </template>
-                </TableBody>
-            </Table>
-            <div class="mt-5 flex justify-between">
-                <div></div>
-                <Pagination v-slot="{ page }" :items-per-page="pageData?.pageSize || 10" :total="pageData?.total || 10"
-                    :default-page="2" :page="pageNum" @update:page="setPage">
-                    <PaginationContent v-slot="{ items }">
-                        <PaginationPrevious />
-                        <template v-for="(item, index) in items" :key="index">
-                            <PaginationItem v-if="item.type === 'page'" :value="item.value"
-                                :is-active="item.value === page">
-                                {{ item.value }}
-                            </PaginationItem>
-                        </template>
-                        <PaginationEllipsis :index="4" />
-                        <PaginationNext />
-                    </PaginationContent>
-                </Pagination>
-                <div class="flex items-center gap-3 text-sm">
-                    <p class="text-muted-foreground text-nowrap">Per page:</p>
-
-                    <button v-for="size in pageSizeOptions" :key="size" @click="setPageSize(size)"
-                        class="px-2 py-1 rounded transition-colors" :class="{
-                            'bg-muted font-semibold': pageSize === size,
-                            'hover:bg-muted/50': pageSize !== size
-                        }">
-                        {{ size }}
-                    </button>
-                </div>
-            </div>
-        </div>
+                </TableRow>
+            </TableBody>
+        </Table>
     </div>
 </template>

ui/src/components/members/MemberCard.vue

@@ -1,154 +0,0 @@
-<script setup lang="ts">
-import { useMemberDirectory } from '@/stores/memberDirectory';
-import { ref, onMounted, computed } from 'vue';
-import { Member, type MemberLight } from '@shared/types/member'
-import Popover from '../ui/popover/Popover.vue';
-import PopoverTrigger from '../ui/popover/PopoverTrigger.vue';
-import PopoverContent from '../ui/popover/PopoverContent.vue';
-import { cn } from '@/lib/utils.js'
-import { watch } from 'vue';
-import { format } from 'path';
-import Spinner from '../ui/spinner/Spinner.vue';
-
-
-// Props
-const props = defineProps({
-    memberId: {
-        type: Number,
-        required: true
-    }
-});
-
-// Local state
-const memberLight = ref<MemberLight | null>(null);
-const memberFull = ref<Member | null>(null)
-const loadingFull = ref(false)
-const membersStore = useMemberDirectory();
-
-// Fetch the light member data on mount
-onMounted(async () => {
-    memberLight.value = await membersStore.getLight(props.memberId);
-});
-
-async function loadFull() {
-    if (memberFull.value || loadingFull.value) return
-
-    loadingFull.value = true
-    try {
-        memberFull.value = await membersStore.getFull(props.memberId)
-    } finally {
-        loadingFull.value = false
-    }
-}
-
-watch(() => props.memberId, async (newId) => {
-    memberLight.value = await membersStore.getLight(newId);
-    memberFull.value = null;
-    loadingFull.value = false;
-});
-
-// Compute display name (displayName fallback to username)
-const displayName = computed(() => {
-    if (!memberLight.value) return props.memberId;
-    return memberLight.value.displayName || memberLight.value.username;
-});
-
-const DEFAULT_TEXT_COLOR = '#9ca3af'      // muted gray for text
-const DEFAULT_BG_COLOR = '#d1d5db22'      // muted gray ~20% opacity
-
-const textColor = computed(() => memberLight.value?.color || DEFAULT_TEXT_COLOR)
-const bgColor = computed(() => (memberLight.value?.color ? `${memberLight.value.color}22` : DEFAULT_BG_COLOR))
-
-const hasFullInfo = computed(() => {
-    if (!memberFull.value) return false
-
-    // check if any field has a value
-    const { rank, unit, status } = memberFull.value
-    return !!(rank || unit || status)
-})
-
-function formatDate(date: Date): string {
-    if (!date) return "";
-    date = typeof date === 'string' ? new Date(date) : date;
-    return date.toLocaleDateString("en-US", {
-        year: "numeric",
-        month: "short",
-        day: "numeric",
-    });
-}
-</script>
-
-<template>
-    <Popover @update:open="open => open && loadFull()">
-        <PopoverTrigger @click.stop>
-            <p :class="cn(
-                'px-2 py-1 rounded font-medium inline-flex items-center cursor-pointer'
-            )" :style="{
-                color: textColor,
-                backgroundColor: bgColor
-            }">
-                {{ displayName }}
-            </p>
-        </PopoverTrigger>
-        <PopoverContent class="w-72 p-0 overflow-hidden">
-            <!-- Loading -->
-            <div v-if="loadingFull" class="p-4 text-sm text-muted-foreground mx-auto flex justify-center my-5">
-                <Spinner></Spinner>
-            </div>
-
-            <!-- Profile -->
-            <div v-else-if="memberFull">
-                <!-- Header -->
-                <div class="px-4 py-3 relative" :style="{ backgroundColor: `${memberLight?.color}22` }">
-                    <!-- Display name / username -->
-                    <div class="text-lg font-semibold leading-tight" :style="{ color: memberLight?.color }">
-                        {{ displayName }}
-                    </div>
-
-                    <div v-if="memberLight.displayName" class="text-xs text-muted-foreground">
-                        {{ memberLight?.username }}
-                    </div>
-                </div>
-
-                <!-- Body -->
-                <div class="p-4 space-y-3 text-sm">
-                    <!-- Full info -->
-                    <template v-if="hasFullInfo">
-                        <div v-if="memberFull.loa_until"
-                            class=" rounded-md text-center bg-yellow-500/10 px-2 py-1 text-xs text-yellow-600">
-                            On Leave of Absence until {{ formatDate(memberFull.loa_until) }}
-                        </div>
-
-                        <div v-if="memberFull.rank" class="flex justify-between">
-                            <span class="text-muted-foreground">Rank</span>
-                            <span class="font-medium">{{ memberFull.rank }}</span>
-                        </div>
-
-                        <div v-if="memberFull.unit" class="flex justify-between">
-                            <span class="text-muted-foreground">Unit</span>
-                            <span class="font-medium">{{ memberFull.unit }}</span>
-                        </div>
-
-                        <div v-if="memberFull.status" class="flex justify-between">
-                            <span class="text-muted-foreground">Status</span>
-                            <span class="font-medium">{{ memberFull.status }}</span>
-                        </div>
-
-                    </template>
-
-                    <!-- No info fallback -->
-                    <div v-else class="text-sm text-muted-foreground italic">
-                        No user info
-                    </div>
-                </div>
-
-            </div>
-
-            <!-- Not found -->
-            <div v-else class="p-4 text-sm text-muted-foreground">
-                Member not found
-            </div>
-        </PopoverContent>
-
-    </Popover>
-</template>

ui/src/components/promotions/promotionForm.vue

@@ -1,253 +0,0 @@
-<script setup lang="ts">
-import { batchPromotionSchema } from '@shared/schemas/promotionSchema';
-import { useForm, Field as VeeField, FieldArray as VeeFieldArray } from 'vee-validate';
-import { toTypedSchema } from '@vee-validate/zod';
-import FieldSet from '../ui/field/FieldSet.vue';
-import FieldLegend from '../ui/field/FieldLegend.vue';
-import FieldDescription from '../ui/field/FieldDescription.vue';
-import FieldGroup from '../ui/field/FieldGroup.vue';
-import Combobox from '../ui/combobox/Combobox.vue';
-import ComboboxAnchor from '../ui/combobox/ComboboxAnchor.vue';
-import ComboboxInput from '../ui/combobox/ComboboxInput.vue';
-import ComboboxList from '../ui/combobox/ComboboxList.vue';
-import ComboboxEmpty from '../ui/combobox/ComboboxEmpty.vue';
-import ComboboxGroup from '../ui/combobox/ComboboxGroup.vue';
-import ComboboxItem from '../ui/combobox/ComboboxItem.vue';
-import ComboboxItemIndicator from '../ui/combobox/ComboboxItemIndicator.vue';
-import { computed, onMounted, ref } from 'vue';
-import { MemberLight } from '@shared/types/member';
-import { Check, Plus, X } from 'lucide-vue-next';
-import Button from '../ui/button/Button.vue';
-import FieldError from '../ui/field/FieldError.vue';
-import { getAllLightMembers } from '@/api/member';
-import { Rank } from '@shared/types/rank';
-import { getAllRanks, submitRankChange } from '@/api/rank';
-import { error } from 'console';
-import Input from '../ui/input/Input.vue';
-import Field from '../ui/field/Field.vue';
-
-const { handleSubmit, errors, values, resetForm } = useForm({
-    validationSchema: toTypedSchema(batchPromotionSchema),
-    validateOnMount: false,
-})
-
-const submitForm = handleSubmit(
-    async (vals) => {
-        try {
-            let output = vals;
-            output.promotions.map(p => p.start_date = new Date(p.start_date).toISOString())
-            await submitRankChange(output);
-            formSubmitted.value = true;
-        } catch (error) {
-            submitError.value = error;
-            console.error(error);
-        }
-    }
-);
-
-const submitError = ref<string>(null);
-const formSubmitted = ref(false);
-
-const allmembers = ref<MemberLight[]>([]);
-const allRanks = ref<Rank[]>([]);
-
-const memberById = computed(() => {
-    const map = new Map<number, MemberLight>();
-    for (const m of allmembers.value) {
-        map.set(m.id, m);
-    }
-    return map;
-});
-
-const rankById = computed(() => {
-    const map = new Map<number, Rank>();
-    for (const r of allRanks.value) {
-        map.set(r.id, r);
-    }
-    return map;
-});
-
-const memberSearch = ref('');
-const rankSearch = ref('');
-
-const filteredMembers = computed(() => {
-    const q = memberSearch?.value?.toLowerCase() ?? ""
-    const results: MemberLight[] = []
-
-    for (const m of allmembers.value ?? []) {
-        if (!q || (m.displayName || m.username).toLowerCase().includes(q)) {
-            results.push(m)
-            if (results.length >= 50) break
-        }
-    }
-
-    return results
-})
-
-const filteredRanks = computed(() =>
-    filterRanks(rankSearch.value)
-);
-
-function filterRanks(query: string): Rank[] {
-    if (!query) return allRanks.value;
-
-    const q = query.toLowerCase();
-    return allRanks.value.filter(r =>
-        r.name.toLowerCase().includes(q) ||
-        r.short_name.toLowerCase().includes(q)
-    );
-}
-
-onMounted(async () => {
-    allmembers.value = await getAllLightMembers()
-    allRanks.value = await getAllRanks();
-})
-
-
-
-</script>
-
-<template>
-    <div class="w-xl">
-        <form v-if="!formSubmitted" id="trainingForm" @submit.prevent="submitForm"
-            class="w-full min-w-0 flex flex-col gap-6">
-            <VeeFieldArray name="promotions" v-slot="{ fields, push, remove }">
-                <FieldSet class="w-full min-w-0">
-                    <div class="flex flex-col gap-2">
-                        <div>
-                            <FieldLegend class="scroll-m-20 text-2xl font-semibold tracking-tight">
-                                Promotion Form
-                            </FieldLegend>
-                            <div class="h-6">
-                                <p v-if="errors.promotions && typeof errors.promotions === 'string'"
-                                    class="text-sm text-red-500">
-                                    {{ errors.promotions }}
-                                </p>
-                            </div>
-                        </div>
-                        <!-- TABLE SHELL -->
-                        <div class="">
-                            <FieldGroup class="">
-                                <!-- HEADER -->
-                                <div class="grid grid-cols-[200px_200px_150px_1fr_auto]
-                           gap-3 px-1 -mb-4
-                           text-sm font-medium text-muted-foreground">
-                                    <div>Member</div>
-                                    <div>Rank</div>
-                                    <div>Date</div>
-                                    <div></div>
-                                    <div></div>
-                                </div>
-                                <!-- BODY -->
-                                <div class="flex flex-col gap-2">
-                                    <div v-for="(row, index) in fields" :key="row.key" class="grid grid-cols-[200px_200px_150px_1fr_auto]
-                             gap-3 items-start">
-                                        <!-- Member -->
-                                        <VeeField :name="`promotions[${index}].member_id`" v-slot="{ field, errors }">
-                                            <div class="flex flex-col min-w-0">
-                                                <Combobox :model-value="field.value" @update:model-value="field.onChange"
-                                                    :ignore-filter="true">
-                                                    <ComboboxAnchor>
-                                                        <ComboboxInput class="w-full pl-3" placeholder="Search members…"
-                                                            :display-value="id =>
-                                                                memberById.get(id)?.displayName ||
-                                                                memberById.get(id)?.username
-                                                                " @input="memberSearch = $event.target.value" />
-                                                    </ComboboxAnchor>
-                                                    <ComboboxList>
-                                                        <ComboboxEmpty>No results</ComboboxEmpty>
-                                                        <ComboboxGroup>
-                                                            <div
-                                                                class="max-h-80 overflow-y-auto min-w-[12rem] scrollbar-themed">
-                                                                <ComboboxItem v-for="member in filteredMembers"
-                                                                    :key="member.id" :value="member.id">
-                                                                    {{ member.displayName || member.username }}
-                                                                    <ComboboxItemIndicator>
-                                                                        <Check />
-                                                                    </ComboboxItemIndicator>
-                                                                </ComboboxItem>
-                                                            </div>
-                                                        </ComboboxGroup>
-                                                    </ComboboxList>
-                                                </Combobox>
-                                                <div class="h-5">
-                                                    <FieldError v-if="errors.length" :errors="errors" />
-                                                </div>
-                                            </div>
-                                        </VeeField>
-                                        <!-- Rank -->
-                                        <VeeField :name="`promotions[${index}].rank_id`" v-slot="{ field, errors }">
-                                            <div class="flex flex-col min-w-0">
-                                                <Combobox :model-value="field.value" @update:model-value="field.onChange"
-                                                    :ignore-filter="true">
-                                                    <ComboboxAnchor>
-                                                        <ComboboxInput class="w-full pl-3" placeholder="Select rank…"
-                                                            :display-value="id => rankById.get(id)?.name"
-                                                            @input="rankSearch = $event.target.value" />
-                                                    </ComboboxAnchor>
-                                                    <ComboboxList>
-                                                        <ComboboxEmpty>No results</ComboboxEmpty>
-                                                        <ComboboxGroup>
-                                                            <div
-                                                                class="max-h-80 overflow-y-auto min-w-[12rem] scrollbar-themed">
-                                                                <ComboboxItem v-for="rank in filteredRanks" :key="rank.id"
-                                                                    :value="rank.id">
-                                                                    {{ rank.name }}
-                                                                    <ComboboxItemIndicator>
-                                                                        <Check />
-                                                                    </ComboboxItemIndicator>
-                                                                </ComboboxItem>
-                                                            </div>
-                                                        </ComboboxGroup>
-                                                    </ComboboxList>
-                                                </Combobox>
-                                                <div class="h-5">
-                                                    <FieldError v-if="errors.length" :errors="errors" />
-                                                </div>
-                                            </div>
-                                        </VeeField>
-                                        <!-- Date -->
-                                        <VeeField :name="`promotions[${index}].start_date`" v-slot="{ field, errors }">
-                                            <Field>
-                                                <div>
-                                                    <Input type="date" v-bind="field" />
-                                                    <div class="h-5">
-                                                        <FieldError v-if="errors.length" :errors="errors" />
-                                                    </div>
-                                                </div>
-                                            </Field>
-                                        </VeeField>
-                                        <!-- Remove -->
-                                        <div class="flex justify-end">
-                                            <Button type="button" variant="ghost" size="icon" @click="remove(index)">
-                                                <X />
-                                            </Button>
-                                        </div>
-                                    </div>
-                                </div>
-                            </FieldGroup>
-                        </div>
-                        <Button type="button" @click="push({})" class="w-full" variant="outline">
-                            <Plus /> Member
-                        </Button>
-                    </div>
-                </FieldSet>
-            </VeeFieldArray>
-            <div class="flex justify-end items-center gap-5">
-                <p v-if="submitError" class="text-destructive">{{ submitError }}</p>
-                <Button type="submit">Submit</Button>
-            </div>
-        </form>
-        <div v-else>
-            <div class="flex flex-col max-w-sm justify-center gap-4 py-24 mx-auto">
-                <div class="text-left">
-                    <h2 class="text-2xl font-semibold mb-2">Successfully Submitted</h2>
-                    <p class="text-muted-foreground">Your promotions have been recorded.</p>
-                </div>
-                <Button @click="() => { formSubmitted = false; resetForm(); }" variant="secondary">
-                    Submit Another
-                </Button>
-            </div>
-        </div>
-    </div>
-</template>

ui/src/components/promotions/promotionList.vue

@@ -1,175 +0,0 @@
-<script setup lang="ts">
-import { pagination } from '@shared/types/pagination';
-import { ref } from 'vue';
-
-const expanded = ref<number | null>(null);
-const hoverID = ref<number | null>(null);
-
-const pageNum = ref<number>(1);
-const pageData = ref<pagination>();
-
-const pageSize = ref<number>(15)
-const pageSizeOptions = [10, 15, 30]
-
-function setPageSize(size: number) {
-    pageSize.value = size
-    pageNum.value = 1;
-    // loadLOAs();
-}
-
-function setPage(pagenum: number) {
-    pageNum.value = pagenum;
-    // loadLOAs();
-}
-</script>
-<template>
-    <div>
-        <Dialog :open="isExtending" @update:open="(val) => isExtending = val">
-            <DialogContent>
-                <DialogHeader>
-                    <DialogTitle>Extend {{ targetLOA.name }}'s Leave of Absence </DialogTitle>
-                </DialogHeader>
-                <div class="flex gap-5">
-                    <Calendar v-model="extendTo" class="rounded-md border shadow-sm w-min" layout="month-and-year"
-                        :min-value="toCalendarDate(targetEnd)"
-                        :max-value="toCalendarDate(targetEnd).add({ years: 1 })" />
-                    <div class="flex flex-col w-full gap-3 px-2">
-                        <p>Quick Options</p>
-                        <Button variant="outline" @click="extendTo = toCalendarDate(targetEnd).add({ days: 7 })">1
-                            Week</Button>
-                        <Button variant="outline" @click="extendTo = toCalendarDate(targetEnd).add({ months: 1 })">1
-                            Month</Button>
-                    </div>
-                </div>
-                <div class="flex justify-end gap-4">
-                    <Button variant="outline" @click="isExtending = false">Cancel</Button>
-                    <Button @click="commitExtend">Extend</Button>
-                </div>
-            </DialogContent>
-        </Dialog>
-        <div class="max-w-7xl w-full mx-auto">
-            <Table>
-                <TableHeader>
-                    <TableRow>
-                        <TableHead>Member</TableHead>
-                        <TableHead>Type</TableHead>
-                        <TableHead>Start</TableHead>
-                        <TableHead>End</TableHead>
-                        <!-- <TableHead class="w-[500px]">Reason</TableHead> -->
-                        <TableHead>Posted on</TableHead>
-                        <TableHead>Status</TableHead>
-                    </TableRow>
-                </TableHeader>
-                <TableBody>
-                    <template v-for="post in LOAList" :key="post.id">
-                        <TableRow class="hover:bg-muted/50 cursor-pointer" @click="expanded = post.id"
-                            @mouseenter="hoverID = post.id" @mouseleave="hoverID = null" :class="{
-                                'border-b-0': expanded === post.id,
-                                'bg-muted/50': hoverID === post.id
-                            }">
-                            <TableCell class="font-medium">
-                                <MemberCard :member-id="post.member_id"></MemberCard>
-                            </TableCell>
-                            <TableCell>{{ post.type_name }}</TableCell>
-                            <TableCell>{{ formatDate(post.start_date) }}</TableCell>
-                            <TableCell>{{ post.extended_till ? formatDate(post.extended_till) :
-                                formatDate(post.end_date) }}
-                            </TableCell>
-                            <!-- <TableCell>{{ post.reason }}</TableCell> -->
-                            <TableCell>{{ formatDate(post.filed_date) }}</TableCell>
-                            <TableCell>
-                                <Badge v-if="loaStatus(post) === 'Upcoming'" class="bg-blue-400">Upcoming</Badge>
-                                <Badge v-else-if="loaStatus(post) === 'Active'" class="bg-green-500">Active</Badge>
-                                <Badge v-else-if="loaStatus(post) === 'Overdue'" class="bg-yellow-400">Overdue</Badge>
-                                <Badge v-else class="bg-gray-400">Ended</Badge>
-                            </TableCell>
-                            <TableCell @click.stop="" class="text-right">
-                                <DropdownMenu>
-                                    <DropdownMenuTrigger class="cursor-pointer">
-                                        <Button variant="ghost">
-                                            <Ellipsis class="size-6"></Ellipsis>
-                                        </Button>
-                                    </DropdownMenuTrigger>
-                                    <DropdownMenuContent>
-                                        <DropdownMenuItem v-if="!post.closed && props.adminMode"
-                                            @click="isExtending = true; targetLOA = post">
-                                            Extend
-                                        </DropdownMenuItem>
-                                        <DropdownMenuItem v-if="!post.closed" :variant="'destructive'"
-                                            @click="cancelAndReload(post.id)">{{ loaStatus(post) === 'Upcoming' ?
-                                                'Cancel' :
-                                                'End' }}
-                                        </DropdownMenuItem>
-                                        <!-- Fallback: no actions available -->
-                                        <p v-if="post.closed || (!props.adminMode && post.closed)"
-                                            class="p-2 text-center text-sm">
-                                            No actions
-                                        </p>
-                                    </DropdownMenuContent>
-                                </DropdownMenu>
-                            </TableCell>
-                            <TableCell>
-                                <Button v-if="expanded === post.id" @click.stop="expanded = null" variant="ghost">
-                                    <ChevronUp class="size-6" />
-                                </Button>
-                                <Button v-else @click.stop="expanded = post.id" variant="ghost">
-                                    <ChevronDown class="size-6" />
-                                </Button>
-                            </TableCell>
-                        </TableRow>
-                        <TableRow v-if="expanded === post.id" @mouseenter="hoverID = post.id"
-                            @mouseleave="hoverID = null" :class="{ 'bg-muted/50 border-t-0': hoverID === post.id }">
-                            <TableCell :colspan="8" class="p-0">
-                                <div class="w-full p-3 mb-6 space-y-3">
-                                    <div class="flex justify-between items-start gap-4">
-                                        <div class="flex-1">
-                                            <!-- Title -->
-                                            <p class="text-md font-semibold text-foreground">
-                                                Reason
-                                            </p>
-
-                                            <!-- Content -->
-                                            <p
-                                                class="mt-1 text-md whitespace-pre-wrap leading-relaxed text-muted-foreground">
-                                                {{ post.reason }}
-                                            </p>
-                                        </div>
-                                    </div>
-                                </div>
-                            </TableCell>
-                        </TableRow>
-
-                    </template>
-                </TableBody>
-            </Table>
-            <div class="mt-5 flex justify-between">
-                <div></div>
-                <Pagination v-slot="{ page }" :items-per-page="pageData?.pageSize || 10" :total="pageData?.total || 10"
-                    :default-page="2" :page="pageNum" @update:page="setPage">
-                    <PaginationContent v-slot="{ items }">
-                        <PaginationPrevious />
-                        <template v-for="(item, index) in items" :key="index">
-                            <PaginationItem v-if="item.type === 'page'" :value="item.value"
-                                :is-active="item.value === page">
-                                {{ item.value }}
-                            </PaginationItem>
-                        </template>
-                        <PaginationEllipsis :index="4" />
-                        <PaginationNext />
-                    </PaginationContent>
-                </Pagination>
-                <div class="flex items-center gap-3 text-sm">
-                    <p class="text-muted-foreground text-nowrap">Per page:</p>
-
-                    <button v-for="size in pageSizeOptions" :key="size" @click="setPageSize(size)"
-                        class="px-2 py-1 rounded transition-colors" :class="{
-                            'bg-muted font-semibold': pageSize === size,
-                            'hover:bg-muted/50': pageSize !== size
-                        }">
-                        {{ size }}
-                    </button>
-                </div>
-            </div>
-        </div>
-    </div>
-</template>

ui/src/components/trainingReport/trainingReportForm.vue

@@ -3,10 +3,9 @@ import { trainingReportSchema, courseEventAttendeeSchema } from '@shared/schemas
 import { Course, CourseAttendee, CourseAttendeeRole, CourseEventDetails } from '@shared/types/course'
 import { useForm, useFieldArray, FieldArray as VeeFieldArray, ErrorMessage, Field as VeeField } from 'vee-validate'
 import { toTypedSchema } from '@vee-validate/zod'
-import { computed, nextTick, onMounted, reactive, ref, watch } from 'vue'
+import { computed, onMounted, ref, watch } from 'vue'
 import { getAllAttendeeRoles, getAllTrainings, postTrainingReport } from '@/api/trainingReport'
-import { getAllLightMembers, getLightMembers, getMembers } from '@/api/member'
-import { Member, MemberLight } from '@shared/types/member'
+import { getMembers, Member } from '@/api/member'
 
 import FieldGroup from '../ui/field/FieldGroup.vue'
 import Field from '../ui/field/Field.vue'
@@ -14,17 +13,12 @@ import FieldLabel from '../ui/field/FieldLabel.vue'
 import FieldError from '../ui/field/FieldError.vue'
 import Button from '../ui/button/Button.vue'
 import Textarea from '../ui/textarea/Textarea.vue'
-import { Check, Plus, X } from 'lucide-vue-next';
+import { Plus, X } from 'lucide-vue-next';
 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'
-import { ComboboxAnchor, ComboboxEmpty, ComboboxGroup, ComboboxInput, ComboboxItem, ComboboxItemIndicator, ComboboxList } from "@/components/ui/combobox"
-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 Combobox from '../ui/combobox/Combobox.vue'
 
 
 const { handleSubmit, resetForm, errors, values, setFieldValue } = useForm({
@@ -85,44 +79,16 @@ const { remove, push, fields } = useFieldArray('attendees');
 const selectedCourse = computed<Course | undefined>(() => { return trainings.value?.find(c => c.id == values.course_id) })
 
 const trainings = ref<Course[] | null>(null);
-const members = ref<MemberLight[] | null>(null);
+const members = ref<Member[] | null>(null);
 const eventRoles = ref<CourseAttendeeRole[] | null>(null);
 
 const emit = defineEmits(['submit'])
 
 onMounted(async () => {
     trainings.value = await getAllTrainings();
-    members.value = await getAllLightMembers();
+    members.value = await getMembers();
     eventRoles.value = await getAllAttendeeRoles();
 })
-
-const selectCourse = ref(false);
-const openMap = reactive<Record<string, boolean>>({})
-
-const memberMap = computed(() =>
-    Object.fromEntries(
-        members.value?.map(m => [m.id, m.displayName || m.username]) ?? []
-    )
-)
-
-const memberSearch = ref('')
-
-const MAX_RESULTS = 50
-
-const filteredMembers = computed(() => {
-    const q = memberSearch?.value?.toLowerCase() ?? ""
-    const results: MemberLight[] = []
-
-    for (const m of members.value ?? []) {
-        if (!q || (m.displayName || m.username).toLowerCase().includes(q)) {
-            results.push(m)
-            if (results.length >= MAX_RESULTS) break
-        }
-    }
-
-    return results
-})
-
 </script>
 <template>
     <form id="trainingForm" @submit.prevent="submitForm" class="flex flex-col gap-5">
@@ -133,37 +99,13 @@ const filteredMembers = computed(() => {
                     <VeeField v-slot="{ field, errors }" name="course_id">
                         <Field :data-invalid="!!errors.length">
                             <FieldLabel class="scroll-m-20 text-lg tracking-tight">Training Course</FieldLabel>
-                            <Combobox :model-value="field.value" @update:open="selectCourse = $event"
-                                :open="selectCourse" @update:model-value="(v) => {
-                                    field.onChange(v);
-                                    selectCourse = false
-                                }" class="w-full">
-                                <ComboboxAnchor class="w-full">
-                                    <ComboboxInput @focus="selectCourse = true" placeholder="Search courses..."
-                                        class="w-full pl-3" :display-value="(id) => {
-                                            const c = trainings?.find(t => t.id === id)
-                                            return c ? c.name : '';
-                                        }" />
-                                </ComboboxAnchor>
-
-                                <ComboboxList class="w-full">
-                                    <ComboboxEmpty class="text-muted-foreground w-full">No results</ComboboxEmpty>
-                                    <ComboboxGroup>
-                                        <div class="max-h-80 overflow-y-scroll scrollbar-themed min-w-md">
-                                            <template v-for="course in trainings" :key="course.id">
-                                                <ComboboxItem :value="course.id"
-                                                    class="data-[highlighted]:bg-accent data-[highlighted]:text-accent-foreground relative cursor-pointer select-none px-2 py-1.5 w-full">
-                                                    {{ course.name }}
-                                                    <ComboboxItemIndicator
-                                                        class="absolute left-2 inline-flex items-center">
-                                                        <Check class="h-4 w-4" />
-                                                    </ComboboxItemIndicator>
-                                                </ComboboxItem>
-                                            </template>
-                                        </div>
-                                    </ComboboxGroup>
-                                </ComboboxList>
-                            </Combobox>
+                            <select v-bind="field"
+                                class="h-9 border rounded p-2 w-auto focus-visible:border-ring focus-visible:ring-ring/50 focus-visible:ring-[3px] bg-background outline-none">
+                                <option value="" disabled>Select a course</option>
+                                <option v-for="course in trainings" :key="course.id" :value="course.id">
+                                    {{ course.name }}
+                                </option>
+                            </select>
                             <div class="h-4">
                                 <FieldError v-if="errors.length" :errors="errors" />
                             </div>
@@ -171,7 +113,6 @@ const filteredMembers = computed(() => {
                     </VeeField>
                 </FieldGroup>
             </div>
-
             <div class="w-[150px]">
                 <FieldGroup>
                     <VeeField v-slot="{ field, errors }" name="event_date">
@@ -239,38 +180,13 @@ const filteredMembers = computed(() => {
                             <!-- Member Select -->
                             <VeeField :name="`attendees[${index}].attendee_id`" v-slot="{ field: f, errors: e }">
                                 <div>
-                                    <Combobox :model-value="f.value"
-                                        @update:open="openMap['member-' + field.key] = $event"
-                                        :open="openMap['member-' + field.key]" @update:model-value="(v) => {
-                                            f.onChange(v);
-                                            openMap['member-' + field.key] = false
-                                        }" class="w-full">
-                                        <ComboboxAnchor class="w-full">
-                                            <ComboboxInput
-                                                @focus="() => { openMap['member-' + field.key] = true; memberSearch = memberMap[f.value] }"
-                                                placeholder="Search members..." class="w-full pl-3"
-                                                :display-value="(id) => memberMap[id] || ''"
-                                                @input="memberSearch = $event.target.value" />
-                                        </ComboboxAnchor>
-                                        <ComboboxList class="w-full">
-                                            <ComboboxEmpty class="text-muted-foreground w-full">No results
-                                            </ComboboxEmpty>
-                                            <ComboboxGroup>
-                                                <div class="max-h-80 overflow-y-scroll scrollbar-themed min-w-3xs">
-                                                    <template v-for="m in filteredMembers" :key="m.id">
-                                                        <ComboboxItem :value="m.id"
-                                                            class="data-[highlighted]:bg-accent data-[highlighted]:text-accent-foreground relative cursor-pointer select-none px-2 py-1.5 w-full">
-                                                            {{ m.displayName || m.username }}
-                                                            <ComboboxItemIndicator
-                                                                class="absolute left-2 inline-flex items-center">
-                                                                <Check class="h-4 w-4" />
-                                                            </ComboboxItemIndicator>
-                                                        </ComboboxItem>
-                                                    </template>
-                                                </div>
-                                            </ComboboxGroup>
-                                        </ComboboxList>
-                                    </Combobox>
+                                    <select v-bind="f"
+                                        class="border rounded p-2 w-full focus-visible:border-ring focus-visible:ring-ring/50 focus-visible:ring-[3px] bg-background outline-none">
+                                        <option value="">Select member...</option>
+                                        <option v-for="m in members" :key="m.member_id" :value="m.member_id">
+                                            {{ m.member_name }}
+                                        </option>
+                                    </select>
                                     <div class="h-4">
                                         <FieldError v-if="e.length" :errors="e" />
                                     </div>
@@ -280,42 +196,13 @@ const filteredMembers = computed(() => {
                             <!-- Role Select -->
                             <VeeField :name="`attendees[${index}].attendee_role_id`" v-slot="{ field: f, errors: e }">
                                 <div>
-                                    <Combobox :model-value="f.value"
-                                        @update:open="openMap['role-' + field.key] = $event"
-                                        :open="openMap['role-' + field.key]" @update:model-value="(v) => {
-                                            f.onChange(v);
-                                            openMap['role-' + field.key] = false
-                                        }" class="w-full">
-                                        <ComboboxAnchor class="w-full">
-                                            <ComboboxInput @focus="openMap['role-' + field.key] = true"
-                                                placeholder="Search roles..." class="w-full pl-3" :display-value="(id) => {
-                                                    const er = eventRoles?.find(t => t.id === id)
-                                                    return er?.name;
-                                                }" />
-                                        </ComboboxAnchor>
-                                        <ComboboxList class="w-full">
-                                            <ComboboxEmpty class="text-muted-foreground w-full">No results
-                                            </ComboboxEmpty>
-                                            <ComboboxGroup>
-                                                <div class="max-h-80 overflow-y-scroll scrollbar-themed min-w-3xs">
-                                                    <template v-for="r in eventRoles" :key="r.id">
-                                                        <ComboboxItem :value="r.id"
-                                                            class="data-[highlighted]:bg-accent data-[highlighted]:text-accent-foreground relative cursor-pointer select-none px-2 py-1.5 w-full">
-                                                            <div class="flex justify-between w-full gap-8">
-                                                                <p>{{ r.name }}</p>
-                                                                <p class="text-muted-foreground">{{ r.description }}</p>
-                                                            </div>
-                                                            <ComboboxItemIndicator
-                                                                class="absolute left-2 inline-flex items-center">
-                                                                <Check class="h-4 w-4" />
-                                                            </ComboboxItemIndicator>
-                                                        </ComboboxItem>
-                                                    </template>
-                                                </div>
-                                            </ComboboxGroup>
-                                        </ComboboxList>
-                                    </Combobox>
-
+                                    <select v-bind="f"
+                                        class="border rounded p-2 w-full focus-visible:border-ring focus-visible:ring-ring/50 focus-visible:ring-[3px] bg-background outline-none">
+                                        <option value="">Select role...</option>
+                                        <option v-for="r in eventRoles" :key="r.id" :value="r.id">
+                                            {{ r.name }}
+                                        </option>
+                                    </select>
                                     <div class="h-4">
                                         <FieldError v-if="e.length" :errors="e" />
                                     </div>

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/pagination/Pagination.vue

@@ -1,33 +0,0 @@
-<script setup>
-import { reactiveOmit } from "@vueuse/core";
-import { PaginationRoot, useForwardPropsEmits } from "reka-ui";
-import { cn } from "@/lib/utils";
-
-const props = defineProps({
-  page: { type: Number, required: false },
-  defaultPage: { type: Number, required: false },
-  itemsPerPage: { type: Number, required: true },
-  total: { type: Number, required: false },
-  siblingCount: { type: Number, required: false },
-  disabled: { type: Boolean, required: false },
-  showEdges: { type: Boolean, required: false },
-  asChild: { type: Boolean, required: false },
-  as: { type: null, required: false },
-  class: { type: null, required: false },
-});
-const emits = defineEmits(["update:page"]);
-
-const delegatedProps = reactiveOmit(props, "class");
-const forwarded = useForwardPropsEmits(delegatedProps, emits);
-</script>
-
-<template>
-  <PaginationRoot
-    v-slot="slotProps"
-    data-slot="pagination"
-    v-bind="forwarded"
-    :class="cn('mx-auto flex w-full justify-center', props.class)"
-  >
-    <slot v-bind="slotProps" />
-  </PaginationRoot>
-</template>

ui/src/components/ui/pagination/PaginationContent.vue

@@ -1,24 +0,0 @@
-<script setup>
-import { reactiveOmit } from "@vueuse/core";
-import { PaginationList } 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");
-</script>
-
-<template>
-  <PaginationList
-    v-slot="slotProps"
-    data-slot="pagination-content"
-    v-bind="delegatedProps"
-    :class="cn('flex flex-row items-center gap-1', props.class)"
-  >
-    <slot v-bind="slotProps" />
-  </PaginationList>
-</template>

ui/src/components/ui/pagination/PaginationEllipsis.vue

@@ -1,27 +0,0 @@
-<script setup>
-import { reactiveOmit } from "@vueuse/core";
-import { MoreHorizontal } from "lucide-vue-next";
-import { PaginationEllipsis } 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");
-</script>
-
-<template>
-  <PaginationEllipsis
-    data-slot="pagination-ellipsis"
-    v-bind="delegatedProps"
-    :class="cn('flex size-9 items-center justify-center', props.class)"
-  >
-    <slot>
-      <MoreHorizontal class="size-4" />
-      <span class="sr-only">More pages</span>
-    </slot>
-  </PaginationEllipsis>
-</template>

ui/src/components/ui/pagination/PaginationFirst.vue

@@ -1,36 +0,0 @@
-<script setup>
-import { reactiveOmit } from "@vueuse/core";
-import { ChevronLeftIcon } from "lucide-vue-next";
-import { PaginationFirst, useForwardProps } from "reka-ui";
-import { cn } from "@/lib/utils";
-import { buttonVariants } from '@/components/ui/button';
-
-const props = defineProps({
-  asChild: { type: Boolean, required: false },
-  as: { type: null, required: false },
-  size: { type: null, required: false, default: "default" },
-  class: { type: null, required: false },
-});
-
-const delegatedProps = reactiveOmit(props, "class", "size");
-const forwarded = useForwardProps(delegatedProps);
-</script>
-
-<template>
-  <PaginationFirst
-    data-slot="pagination-first"
-    :class="
-      cn(
-        buttonVariants({ variant: 'ghost', size }),
-        'gap-1 px-2.5 sm:pr-2.5',
-        props.class,
-      )
-    "
-    v-bind="forwarded"
-  >
-    <slot>
-      <ChevronLeftIcon />
-      <span class="hidden sm:block">First</span>
-    </slot>
-  </PaginationFirst>
-</template>

ui/src/components/ui/pagination/PaginationItem.vue

@@ -1,35 +0,0 @@
-<script setup>
-import { reactiveOmit } from "@vueuse/core";
-import { PaginationListItem } from "reka-ui";
-import { cn } from "@/lib/utils";
-import { buttonVariants } from '@/components/ui/button';
-
-const props = defineProps({
-  value: { type: Number, required: true },
-  asChild: { type: Boolean, required: false },
-  as: { type: null, required: false },
-  size: { type: null, required: false, default: "icon" },
-  class: { type: null, required: false },
-  isActive: { type: Boolean, required: false },
-});
-
-const delegatedProps = reactiveOmit(props, "class", "size", "isActive");
-</script>
-
-<template>
-  <PaginationListItem
-    data-slot="pagination-item"
-    v-bind="delegatedProps"
-    :class="
-      cn(
-        buttonVariants({
-          variant: isActive ? 'outline' : 'ghost',
-          size,
-        }),
-        props.class,
-      )
-    "
-  >
-    <slot />
-  </PaginationListItem>
-</template>

ui/src/components/ui/pagination/PaginationLast.vue

@@ -1,36 +0,0 @@
-<script setup>
-import { reactiveOmit } from "@vueuse/core";
-import { ChevronRightIcon } from "lucide-vue-next";
-import { PaginationLast, useForwardProps } from "reka-ui";
-import { cn } from "@/lib/utils";
-import { buttonVariants } from '@/components/ui/button';
-
-const props = defineProps({
-  asChild: { type: Boolean, required: false },
-  as: { type: null, required: false },
-  size: { type: null, required: false, default: "default" },
-  class: { type: null, required: false },
-});
-
-const delegatedProps = reactiveOmit(props, "class", "size");
-const forwarded = useForwardProps(delegatedProps);
-</script>
-
-<template>
-  <PaginationLast
-    data-slot="pagination-last"
-    :class="
-      cn(
-        buttonVariants({ variant: 'ghost', size }),
-        'gap-1 px-2.5 sm:pr-2.5',
-        props.class,
-      )
-    "
-    v-bind="forwarded"
-  >
-    <slot>
-      <span class="hidden sm:block">Last</span>
-      <ChevronRightIcon />
-    </slot>
-  </PaginationLast>
-</template>

ui/src/components/ui/pagination/PaginationNext.vue

@@ -1,36 +0,0 @@
-<script setup>
-import { reactiveOmit } from "@vueuse/core";
-import { ChevronRightIcon } from "lucide-vue-next";
-import { PaginationNext, useForwardProps } from "reka-ui";
-import { cn } from "@/lib/utils";
-import { buttonVariants } from '@/components/ui/button';
-
-const props = defineProps({
-  asChild: { type: Boolean, required: false },
-  as: { type: null, required: false },
-  size: { type: null, required: false, default: "default" },
-  class: { type: null, required: false },
-});
-
-const delegatedProps = reactiveOmit(props, "class", "size");
-const forwarded = useForwardProps(delegatedProps);
-</script>
-
-<template>
-  <PaginationNext
-    data-slot="pagination-next"
-    :class="
-      cn(
-        buttonVariants({ variant: 'ghost', size }),
-        'gap-1 px-2.5 sm:pr-2.5',
-        props.class,
-      )
-    "
-    v-bind="forwarded"
-  >
-    <slot>
-      <span class="hidden sm:block">Next</span>
-      <ChevronRightIcon />
-    </slot>
-  </PaginationNext>
-</template>

ui/src/components/ui/pagination/PaginationPrevious.vue

@@ -1,36 +0,0 @@
-<script setup>
-import { reactiveOmit } from "@vueuse/core";
-import { ChevronLeftIcon } from "lucide-vue-next";
-import { PaginationPrev, useForwardProps } from "reka-ui";
-import { cn } from "@/lib/utils";
-import { buttonVariants } from '@/components/ui/button';
-
-const props = defineProps({
-  asChild: { type: Boolean, required: false },
-  as: { type: null, required: false },
-  size: { type: null, required: false, default: "default" },
-  class: { type: null, required: false },
-});
-
-const delegatedProps = reactiveOmit(props, "class", "size");
-const forwarded = useForwardProps(delegatedProps);
-</script>
-
-<template>
-  <PaginationPrev
-    data-slot="pagination-previous"
-    :class="
-      cn(
-        buttonVariants({ variant: 'ghost', size }),
-        'gap-1 px-2.5 sm:pr-2.5',
-        props.class,
-      )
-    "
-    v-bind="forwarded"
-  >
-    <slot>
-      <ChevronLeftIcon />
-      <span class="hidden sm:block">Previous</span>
-    </slot>
-  </PaginationPrev>
-</template>

ui/src/components/ui/pagination/index.js

@@ -1,8 +0,0 @@
-export { default as Pagination } from "./Pagination.vue";
-export { default as PaginationContent } from "./PaginationContent.vue";
-export { default as PaginationEllipsis } from "./PaginationEllipsis.vue";
-export { default as PaginationFirst } from "./PaginationFirst.vue";
-export { default as PaginationItem } from "./PaginationItem.vue";
-export { default as PaginationLast } from "./PaginationLast.vue";
-export { default as PaginationNext } from "./PaginationNext.vue";
-export { default as PaginationPrevious } from "./PaginationPrevious.vue";

ui/src/components/ui/spinner/Spinner.vue

@@ -1,16 +0,0 @@
-<script setup>
-import { Loader2Icon } from "lucide-vue-next";
-import { cn } from "@/lib/utils";
-
-const props = defineProps({
-  class: { type: null, required: false },
-});
-</script>
-
-<template>
-  <Loader2Icon
-    role="status"
-    aria-label="Loading"
-    :class="cn('size-4 animate-spin', props.class)"
-  />
-</template>

ui/src/components/ui/spinner/index.js

@@ -1 +0,0 @@
-export { default as Spinner } from "./Spinner.vue";

ui/src/composables/useAuth.ts

@@ -6,11 +6,11 @@ export function useAuth() {
     const userStore = useUserStore();
 
     // Account status control
-    const accountStatus = computed(() => userStore.user?.state);
+    const accountStatus = computed(() => userStore.state);
 
     // RBAC
     const roles = computed<string[]>(() => {
-        return userStore.user?.roles?.map((r: Role) => r.name) ?? [];
+        return userStore.user?.roleData?.map((r: Role) => r.name) ?? [];
     });
 
     function isDev() {

ui/src/main.js

@@ -20,12 +20,10 @@ const app = createApp(App)
 app.use(createPinia())
 app.use(router)
 
-if (import.meta.env.VITE_DISABLE_GLITCHTIP === "true") {
-    console.log("Glitchtip disabled");
-} else {
+if (!!import.meta.env.VITE_DISABLE_GLITCHTIP) {
     let dsn = import.meta.env.VITE_GLITCHTIP_DSN;
     let environment = import.meta.env.VITE_ENVIRONMENT;
-    let release = import.meta.env.VITE_APPLICATION_VERSION;
+
     Sentry.init({
         app,
         dsn: dsn,
@@ -34,7 +32,7 @@ if (import.meta.env.VITE_DISABLE_GLITCHTIP === "true") {
         ],
         tracesSampleRate: 0.01,
         environment: environment,
-        release: release
+        release: 'release tag'
     });
 }
 

ui/src/pages/Application.vue

@@ -2,17 +2,14 @@
 import ApplicationChat from '@/components/application/ApplicationChat.vue';
 import ApplicationForm from '@/components/application/ApplicationForm.vue';
 import { onMounted, ref } from 'vue';
-import { approveApplication, denyApplication, loadApplication, postApplication, postChatMessage, getMyApplication, postAdminChatMessage } from '@/api/application';
+import { ApplicationData, approveApplication, denyApplication, loadApplication, postApplication, postChatMessage, ApplicationStatus } from '@/api/application';
 import { useRoute } from 'vue-router';
 import Button from '@/components/ui/button/Button.vue';
 import { CheckIcon, XIcon } from 'lucide-vue-next';
-import Unauthorized from './Unauthorized.vue';
-import { ApplicationData, ApplicationFull, ApplicationStatus, CommentRow } from '@shared/types/application';
-import Spinner from '@/components/ui/spinner/Spinner.vue';
 
 const appData = ref<ApplicationData>(null);
 const appID = ref<number | null>(null);
-const chatData = ref<CommentRow[]>([])
+const chatData = ref<object[]>([])
 const readOnly = ref<boolean>(false);
 const newApp = ref<boolean>(null);
 const status = ref<ApplicationStatus>(null);
@@ -22,12 +19,13 @@ const loading = ref<boolean>(true);
 const member_name = ref<string>();
 
 const props = defineProps<{
-    mode?: "create" | "view-self" | "view-recruiter" | "view-self-id"
+    mode?: "create" | "view-self" | "view-recruiter"
 }>()
 
-const finalMode = ref<"create" | "view-self" | "view-recruiter" | "view-self-id">("create");
+const finalMode = ref<"create" | "view-self" | "view-recruiter">("create");
 
-function loadData(raw: ApplicationFull) {
+async function loadByID(id: number | string) {
+    const raw = await loadApplication(id);
 
     const data = raw.application;
 
@@ -42,20 +40,20 @@ function loadData(raw: ApplicationFull) {
     readOnly.value = true;
 }
 
-const route = useRoute();
-const unauthorized = ref(false);
+const router = useRoute();
 
 onMounted(async () => {
+
     //recruiter mode
     if (props.mode === 'view-recruiter') {
         finalMode.value = 'view-recruiter';
-        loadData(await loadApplication(Number(route.params.id), true))
+        await loadByID(Number(router.params.id));
     }
 
     //viewer mode
     if (props.mode === 'view-self') {
         finalMode.value = 'view-self';
-        loadData(await loadApplication("me"))
+        await loadByID('me');
     }
 
     //creator mode
@@ -66,33 +64,40 @@ onMounted(async () => {
         newApp.value = true;
     }
 
-    if (props.mode === 'view-self-id') {
-        finalMode.value = 'view-self-id';
-        try {
-            let raw = await getMyApplication(Number(route.params.id))
-            loadData(raw);
-            unauthorized.value = false;
-
-        } catch (error) {
-            if (error.message === "Unauthorized") {
-                unauthorized.value = true;
-            } else {
-                console.error(error);
-            }
-        }
-    }
-
     loading.value = false;
+
+    // try {
+    //     //get app ID from URL param
+    //     if (appIDRaw === undefined) {
+    //         //new app
+    //         appData.value = null
+    //         readOnly.value = false;
+    //         newApp.value = true;
+    //     } else {
+    //         //load app
+    //         const raw = await loadApplication(appIDRaw.toString());
+
+    //         const data = raw.application;
+
+    //         appID.value = data.id;
+    //         appData.value = data.app_data;
+    //         chatData.value = raw.comments;
+    //         status.value = data.app_status;
+    //         decisionDate.value = new Date(data.decision_at);
+    //         submitDate.value = data.submitted_at ? new Date(data.submitted_at) : null;
+    //         member_name.value = data.member_name;
+    //         newApp.value = false;
+    //         readOnly.value = true;
+    //     }
+    // } catch (e) {
+    //     console.error(e);
+    // }
 })
 
 async function postComment(comment) {
     chatData.value.push(await postChatMessage(comment, appID.value));
 }
 
-async function postCommentInternal(comment) {
-    chatData.value.push(await postAdminChatMessage(comment, appID.value));
-}
-
 const emit = defineEmits(['submit']);
 
 async function postApp(appData) {
@@ -102,87 +107,68 @@ async function postApp(appData) {
         newApp.value = false;
         emit('submit');
     }
-    // TODO: Handle fail to post    
+    // TODO: Handle fail to post
 }
 
 async function handleApprove(id) {
-    try {
-        await approveApplication(id);
-        loadData(await loadApplication(Number(route.params.id), true))
-    } catch (error) {
-        console.error(error);
-    }
+    console.log("hi");
+    await approveApplication(id);
 }
 
 async function handleDeny(id) {
-    try {
-        await denyApplication(id);
-        loadData(await loadApplication(Number(route.params.id), true))
-    } catch (error) {
-        console.error(error);
-    }
+    await denyApplication(id);
 }
 </script>
 
 <template>
-    <div v-if="!loading" class="w-full">
-        <div v-if="unauthorized" class="flex justify-center w-full my-10">
-            You do not have permission to view this application.
-        </div>
-        <div v-else>
-            <div v-if="!newApp" class="flex flex-row justify-between items-center py-2 mb-8">
-                <!-- Application header -->
-                <div>
-                    <h3 class="scroll-m-20 text-2xl font-semibold tracking-tight">{{ member_name }}</h3>
-                    <p class="text-muted-foreground">Submitted: {{ submitDate?.toLocaleString("en-US", {
+    <div v-if="!loading" class="w-full h-20">
+        <div v-if="!newApp" class="flex flex-row justify-between items-center py-2 mb-8">
+            <!-- Application header -->
+            <div>
+                <h3 class="scroll-m-20 text-2xl font-semibold tracking-tight">{{ member_name }}</h3>
+                <p class="text-muted-foreground">Submitted: {{ submitDate.toLocaleString("en-US", {
+                    year: "numeric",
+                    month: "long",
+                    day: "numeric",
+                    hour: "2-digit",
+                    minute: "2-digit"
+                }) }}</p>
+            </div>
+            <div>
+                <h3 class="text-right" :class="[
+                    'font-semibold',
+                    status === ApplicationStatus.Pending && 'text-yellow-500',
+                    status === ApplicationStatus.Accepted && 'text-green-500',
+                    status === ApplicationStatus.Denied && 'text-red-500'
+                ]">{{ status }}</h3>
+                <p v-if="status != ApplicationStatus.Pending" class="text-muted-foreground">{{ status }}: {{
+                    decisionDate.toLocaleString("en-US", {
                         year: "numeric",
                         month: "long",
                         day: "numeric",
                         hour: "2-digit",
                         minute: "2-digit"
                     }) }}</p>
+                <div class="mt-2" v-else-if="finalMode === 'view-recruiter'">
+                    <Button variant="success" class="mr-2" :onclick="() => { handleApprove(appID) }">
+                        <CheckIcon></CheckIcon>
+                    </Button>
+                    <Button variant="destructive" :onClick="() => { handleDeny(appID) }">
+                        <XIcon></XIcon>
+                    </Button>
                 </div>
-                <div>
-                    <h3 class="text-right" :class="[
-                        'font-semibold',
-                        status === ApplicationStatus.Pending && 'text-yellow-500',
-                        status === ApplicationStatus.Accepted && 'text-green-500',
-                        status === ApplicationStatus.Denied && 'text-red-500'
-                    ]">{{ status }}</h3>
-                    <p v-if="status != ApplicationStatus.Pending" class="text-muted-foreground">{{ status }}: {{
-                        decisionDate.toLocaleString("en-US", {
-                            year: "numeric",
-                            month: "long",
-                            day: "numeric",
-                            hour: "2-digit",
-                            minute: "2-digit"
-                        }) }}</p>
-                    <div class="mt-2" v-else-if="finalMode === 'view-recruiter'">
-                        <Button variant="success" class="mr-2" :onclick="() => { handleApprove(appID) }">
-                            <CheckIcon></CheckIcon>
-                        </Button>
-                        <Button variant="destructive" :onClick="() => { handleDeny(appID) }">
-                            <XIcon></XIcon>
-                        </Button>
-                    </div>
-                </div>
-            </div>
-            <div v-else class="flex flex-row justify-between items-center py-2 mb-8">
-                <h3 class="scroll-m-20 text-2xl font-semibold tracking-tight">Apply to join the 17th Rangers</h3>
-            </div>
-            <ApplicationForm :read-only="readOnly" :data="appData" @submit="(e) => { postApp(e) }" class="mb-7">
-            </ApplicationForm>
-            <div v-if="!newApp" class="pb-15">
-                <h3 class="scroll-m-20 text-2xl font-semibold tracking-tight mb-4">Discussion</h3>
-                <ApplicationChat :messages="chatData" @post="postComment" @post-internal="postCommentInternal"
-                    :admin-mode="finalMode === 'view-recruiter'">
-                </ApplicationChat>
             </div>
         </div>
-
+        <div v-else class="flex flex-row justify-between items-center py-2 mb-8">
+            <h3 class="scroll-m-20 text-2xl font-semibold tracking-tight">Apply to join the 17th Rangers</h3>
+        </div>
+        <ApplicationForm :read-only="readOnly" :data="appData" @submit="(e) => { postApp(e) }" class="mb-7">
+        </ApplicationForm>
+        <div v-if="!newApp">
+            <h3 class="scroll-m-20 text-2xl font-semibold tracking-tight mb-4">Discussion</h3>
+            <ApplicationChat :messages="chatData" @post="postComment"></ApplicationChat>
+        </div>
     </div>
     <!-- TODO: Implement some kinda loading screen -->
-    <div v-else class="flex items-center justify-center h-full">
-        <Spinner class="size-8"/>
-    </div>
+    <div v-else class="flex items-center justify-center h-full">Loading</div>
 </template>

ui/src/pages/Calendar.vue

@@ -3,14 +3,15 @@ import { ref, watch, nextTick, computed, onMounted } from 'vue'
 import FullCalendar from '@fullcalendar/vue3'
 import dayGridPlugin from '@fullcalendar/daygrid'
 import interactionPlugin from '@fullcalendar/interaction'
-import { ChevronLeft, ChevronRight, Plus } from 'lucide-vue-next'
+import { X, Clock, MapPin, User, ListTodo, ChevronLeft, ChevronRight, Plus } from 'lucide-vue-next'
 import CreateCalendarEvent from '@/components/calendar/CreateCalendarEvent.vue'
-import { CalendarEvent } from '@shared/types/calendar'
+import { getCalendarEvent, getMonthCalendarEvents } from '@/api/calendar'
+import { CalendarEvent, CalendarEventShort } from '@shared/types/calendar'
+import { Calendar } from '@fullcalendar/core'
 import ViewCalendarEvent from '@/components/calendar/ViewCalendarEvent.vue'
 import { useRouter, useRoute } from 'vue-router'
 import { useCalendarEvents } from '@/composables/useCalendarEvents'
 import { useCalendarNavigation } from '@/composables/useCalendarNavigation'
-import { useUserStore } from '@/stores/user'
 
 const monthLabels = [
     'January', 'February', 'March', 'April', 'May', 'June',
@@ -23,14 +24,13 @@ function api() {
 
 const router = useRouter();
 const route = useRoute();
-const userStore = useUserStore();
 
 function buildFullDate(month: number, year: number): Date {
     return new Date(year, month, 1); //default to first of month
 }
 
 const { selectedMonth, selectedYear, years, goPrev, goNext, goToday, onDatesSet, goToSelectedDate } = useCalendarNavigation(api)
-const { events, loadEvents } = useCalendarEvents(selectedMonth, selectedYear);
+const { events, loadEvents} = useCalendarEvents(selectedMonth, selectedYear);
 
 const panelOpen = ref(false)
 const activeEvent = ref<CalendarEvent | null>(null)
@@ -48,7 +48,6 @@ const dialogRef = ref<any>(null)
 
 // NEW: handle day/time slot clicks to start creating an event
 function onDateClick(arg: { dateStr: string }) {
-    if (!userStore.isLoggedIn) return;
     dialogRef.value?.openDialog(arg.dateStr);
     // For now, just open the panel with a draft payload.
     // activeEvent.value = {
@@ -203,7 +202,7 @@ onMounted(() => {
                                 @click="goToday">
                                 Today
                             </button>
-                            <button v-if="userStore.isLoggedIn"
+                            <button
                                 class="cursor-pointer ml-1 inline-flex items-center gap-1.5 rounded-md bg-primary px-3 py-1.5 text-sm text-primary-foreground hover:opacity-90"
                                 @click="onCreateEvent">
                                 <Plus class="h-4 w-4" />
@@ -217,8 +216,7 @@ onMounted(() => {
             <aside v-if="panelOpen"
                 class="3xl:w-lg 2xl:w-md border-l bg-card text-foreground flex flex-col overflow-auto scrollbar-themed"
                 :style="{ height: 'calc(100vh - 61px)', position: 'sticky', top: '64px' }">
-                <ViewCalendarEvent ref="eventViewRef" :key="currentEventID" @close="() => { router.push('/calendar'); }"
-                    @reload="loadEvents()" @edit="(val) => { dialogRef.openDialog(null, 'edit', val) }">
+                <ViewCalendarEvent ref="eventViewRef" @close="() => { router.push('/calendar'); }" @reload="loadEvents()" @edit="(val) => {dialogRef.openDialog(null, 'edit', val)}">
                 </ViewCalendarEvent>
             </aside>
         </div>

ui/src/pages/Documentation.vue

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

ui/src/pages/Dossier.vue

@@ -0,0 +1,110 @@
+<script setup lang="ts">
+
+</script>
+
+
+
+<template>
+  <div class="px-10 py-6 max-w-7xl mx-auto w-full">
+    <!-- Header -->
+    <div class="flex justify-between items-center mb-6">
+      <h1 class="text-3xl font-semibold tracking-tight">Member Deployments</h1>
+      <div class="text-muted-foreground">Unit / Dossier / Deployments</div>
+    </div>
+
+
+    <!-- Summary Cards -->
+    <div class="grid grid-cols-1 md:grid-cols-3 gap-6 mb-8">
+      <div class="p-5 rounded-xl border bg-card shadow-sm">
+        <p class="text-muted-foreground text-sm">Total Deployments</p>
+        <p class="text-3xl font-bold mt-2">123</p>
+      </div>
+      <div class="p-5 rounded-xl border bg-card shadow-sm">
+        <p class="text-muted-foreground text-sm">Total Hours</p>
+        <p class="text-3xl font-bold mt-2">456h</p>
+      </div>
+      <div class="p-5 rounded-xl border bg-card shadow-sm">
+        <p class="text-muted-foreground text-sm">Avg. Attendance</p>
+        <p class="text-3xl font-bold mt-2">87%</p>
+      </div>
+    </div>
+
+
+    <!-- Filters & Search -->
+    <div class="flex justify-between items-end mb-4 flex-wrap gap-4">
+      <div class="flex gap-4 flex-wrap">
+        <div>
+          <label class="block text-sm text-muted-foreground mb-1">Operation Type</label>
+          <select class="border rounded-md px-3 py-2 w-48 bg-background">
+            <option>All</option>
+            <option>Deployment</option>
+            <option>Training</option>
+          </select>
+        </div>
+
+
+        <div>
+          <label class="block text-sm text-muted-foreground mb-1">Sort By</label>
+          <select class="border rounded-md px-3 py-2 w-48 bg-background">
+            <option>Date (Newest)</option>
+            <option>Date (Oldest)</option>
+            <option>Longest Duration</option>
+          </select>
+        </div>
+      </div>
+
+
+      <div>
+        <label class="block text-sm text-muted-foreground mb-1">Search</label>
+        <input type="text" placeholder="Search deployments..." class="border rounded-md px-3 py-2 w-56 bg-background" />
+      </div>
+    </div>
+
+
+    <!-- Deployment List -->
+    <div class="rounded-xl border divide-y bg-card shadow-sm">
+      <!-- Row -->
+      <div class="p-5 hover:bg-accent cursor-pointer flex justify-between items-center">
+        <div>
+          <p class="font-semibold text-lg">Operation Dawn Strike</p>
+          <div class="text-sm text-muted-foreground flex gap-6 mt-1">
+            <span>Date: 2024-08-14</span>
+            <span>Duration: 3.4h</span>
+            <span>Role: Rifleman</span>
+          </div>
+        </div>
+        <div class="text-right">
+          <p class="font-medium">Status: <span class="text-green-500 font-semibold">Completed</span></p>
+        </div>
+      </div>
+      <div class="p-5 hover:bg-accent cursor-pointer flex justify-between items-center">
+        <div>
+          <p class="font-semibold text-lg">Operation Iron Resolve</p>
+          <div class="text-sm text-muted-foreground flex gap-6 mt-1">
+            <span>Date: 2024-08-02</span>
+            <span>Duration: 2.1h</span>
+            <span>Role: Machine Gunner</span>
+          </div>
+        </div>
+        <div class="text-right">
+          <p class="font-medium">Status: <span class="text-yellow-500 font-semibold">Partial</span></p>
+        </div>
+      </div>
+
+
+      <div class="p-5 hover:bg-accent cursor-pointer flex justify-between items-center">
+        <div>
+          <p class="font-semibold text-lg">Operation Midnight Gale</p>
+          <div class="text-sm text-muted-foreground flex gap-6 mt-1">
+            <span>Date: 2024-07-22</span>
+            <span>Duration: 4.8h</span>
+            <span>Role: Squad Leader</span>
+          </div>
+        </div>
+        <div class="text-right">
+          <p class="font-medium">Status: <span class="text-red-500 font-semibold">No‑Show</span></p>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>

ui/src/pages/Join.vue

@@ -14,13 +14,10 @@ import { useUserStore } from '@/stores/user';
 import { Check, Circle, Dot, Users, X } from 'lucide-vue-next'
 import { computed, ref } from 'vue';
 import Application from './Application.vue';
-import { restartApplication } from '@/api/application';
 
 function goToLogin() {
     const redirectUrl = encodeURIComponent(window.location.origin + '/join')
-    //@ts-ignore
-    const addr = import.meta.env.VITE_APIHOST;
-    window.location.href = `${addr}/login?redirect=${redirectUrl}`;
+    window.location.href = `https://aj17thdevapi.nexuszone.net/login?redirect=${redirectUrl}`;
 }
 
 let userStore = useUserStore();
@@ -70,25 +67,14 @@ const currentStep = computed<number>(() => {
         case "denied":
             return 5;
             break;
-        case "retired":
-            return 5;
-            break;
     }
 })
 
 const finalPanel = ref<'app' | 'message'>('message');
-
-const reloadKey = ref(0);
-
-async function restartApp() {
-    await restartApplication();
-    await userStore.loadUser();
-    reloadKey.value++;
-}
 </script>
 
 <template>
-    <div class="flex flex-col items-center mt-10 w-full" :key="reloadKey">
+    <div class="flex flex-col items-center mt-10 w-full">
 
         <!-- Stepper Container -->
         <div class="w-full flex justify-center">
@@ -185,9 +171,9 @@ async function restartApp() {
                                 <li>When prompted, choose <em>“Yes”</em> to download all associated mods.</li>
                             </ul>
                             <p>
-                                <a href="https://docs.iceberg-gaming.com/books/member-guides/page/new-member-setup-onboarding"
+                                <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 (Requires Sign-in)
+                                    Click here for the full installation guide
                                 </a>
                             </p>
                             <!-- CONTACT SECTION -->
@@ -225,7 +211,7 @@ async function restartApp() {
                                 our forums and introduce yourself.
                             </p>
                             <p>
-                                If you have any questions, feel free to reach out on TeamSpeak or Discord
+                                If you have any questions, feel free to reach out on TeamSpeak, Discord, or Guilded,
                                 someone
                                 will always be around to help.
                             </p>
@@ -233,8 +219,8 @@ async function restartApp() {
                     </div>
                     <!-- Denied message -->
                     <div v-else-if="userStore.state === 'denied'">
-                        <div class="w-full max-w-2xl flex flex-col gap-8">
-                            <h1 class="text-3xl sm:text-4xl font-bold text-left">
+                        <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">
@@ -260,39 +246,6 @@ async function restartApp() {
                                         Team</span>
                                 </p>
                             </div>
-                            <Button class="w-min" @click="restartApp">New Application</Button>
-                        </div>
-                    </div>
-                    <div v-else-if="userStore.state === 'retired'">
-                        <div class="w-full max-w-2xl flex flex-col gap-8">
-                            <h1 class="text-3xl sm:text-4xl font-bold text-left">
-                                You have retired from the 17th Ranger Battalion
-                            </h1>
-                            <div class="space-y-4 text-muted-foreground text-left leading-relaxed">
-                                <p>
-                                    Thank you for your service and participation in the <strong>17th Ranger
-                                        Battalion</strong>.
-                                    Your time with us has been sincerely appreciated.
-                                </p>
-                                <p>
-                                    Should you ever wish to return, you are welcome to <strong>reach out to our
-                                        leadership
-                                        team</strong>
-                                    for guidance on the reinstatement process or to stay connected with the community.
-                                </p>
-                                <p>
-                                    We recognize that circumstances change, and you will always have a place to
-                                    reconnect with
-                                    us
-                                    should the opportunity arise in the future.
-                                </p>
-                                <p>
-                                    All the best,<br />
-                                    <span class="text-foreground font-medium">The 17th Ranger Battalion Leadership
-                                        Team</span>
-                                </p>
-                            </div>
-                            <Button class="w-min" @click="restartApp">New Application</Button>
                         </div>
                     </div>
                 </div>

ui/src/pages/ManageApplications.vue

@@ -1,6 +1,5 @@
 <script setup>
-import { getAllApplications, approveApplication, denyApplication } from '@/api/application';
-import { ApplicationStatus } from '@shared/types/application'
+import { getAllApplications, approveApplication, denyApplication, ApplicationStatus } from '@/api/application';
 import {
     Table,
     TableBody,
@@ -11,11 +10,10 @@ import {
     TableRow,
 } from '@/components/ui/table'
 import Button from '@/components/ui/button/Button.vue';
-import { computed, onMounted, ref, watch } from 'vue';
+import { onMounted, ref, watch } from 'vue';
 import { useRoute, useRouter } from 'vue-router';
 import { CheckIcon, XIcon } from 'lucide-vue-next';
 import Application from './Application.vue';
-import MemberCard from '@/components/members/MemberCard.vue';
 
 const appList = ref([]);
 const now = Date.now();
@@ -52,26 +50,36 @@ function formatExact(iso) {
     return isNaN(d) ? '' : exactFmt.format(d)
 }
 
+async function handleApprove(id) {
+    await approveApplication(id);
+    appList.value = await getAllApplications();
+}
+
+async function handleDeny(id) {
+    await denyApplication(id);
+    appList.value = await getAllApplications();
+}
+
 const router = useRouter();
 function openApplication(id) {
-    if (!id) return;
     router.push(`/administration/applications/${id}`)
+    openPanel.value = true;
 }
 
 function closeApplication() {
     router.push('/administration/applications')
+    openPanel.value = false;
 }
 
 const route = useRoute();
 
 watch(() => route.params.id, (newId) => {
     if (newId === undefined) {
+        openPanel.value = false;
     }
 })
 
-// const openPanel = ref(false);
-const openPanel = computed(() => route.params.id !== undefined)
-
+const openPanel = ref(false);
 
 onMounted(async () => {
     appList.value = await getAllApplications();
@@ -87,42 +95,39 @@ onMounted(async () => {
         <!-- application list -->
         <div :class="openPanel == false ? 'w-full' : 'w-2/5'" class="pr-9">
             <h1 class="scroll-m-20 text-2xl font-semibold tracking-tight">Manage Applications</h1>
-            <div class="max-h-[80vh] overflow-hidden">
-                <Table class="w-full">
-                    <TableHeader>
-                        <TableRow>
-                            <TableHead>User</TableHead>
-                            <TableHead class="text-right">Date Submitted</TableHead>
-                            <TableHead class="text-right">Status</TableHead>
-                        </TableRow>
-                    </TableHeader>
-                </Table>
-
-                <!-- Scrollable body container -->
-                <div class="overflow-y-auto max-h-[70vh] scrollbar-themed">
-                    <Table class="w-full">
-                        <TableBody>
-                            <TableRow v-for="app in appList" :key="app.id" class="cursor-pointer"
-                                @click="openApplication(app.id)">
-                                <TableCell class="font-medium">
-                                    <MemberCard :memberId="app.member_id"></MemberCard>
-                                </TableCell>
-                                <TableCell class="text-right" :title="formatExact(app.submitted_at)">
-                                    {{ formatAgo(app.submitted_at) }}
-                                </TableCell>
-
-                                <TableCell class="text-right font-semibold" :class="[
-                                    app.app_status === ApplicationStatus.Pending && 'text-yellow-500',
-                                    app.app_status === ApplicationStatus.Accepted && 'text-green-500',
-                                    app.app_status === ApplicationStatus.Denied && 'text-destructive'
-                                ]">
-                                    {{ app.app_status }}
-                                </TableCell>
-                            </TableRow>
-                        </TableBody>
-                    </Table>
-                </div>
-            </div>
+            <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">
@@ -138,4 +143,32 @@ onMounted(async () => {
     </div>
 </template>
 
-<style scoped></style>
+<style scoped>
+/* Firefox */
+.scrollbar-themed {
+    scrollbar-width: thin;
+    scrollbar-color: #555 #1f1f1f;
+    padding-right: 6px;
+}
+
+/* Chrome, Edge, Safari */
+.scrollbar-themed::-webkit-scrollbar {
+    width: 10px;
+    /* slightly wider to allow padding look */
+}
+
+.scrollbar-themed::-webkit-scrollbar-track {
+    background: #1f1f1f;
+    margin-left: 6px;
+    /* ❗ adds space between content + scrollbar */
+}
+
+.scrollbar-themed::-webkit-scrollbar-thumb {
+    background: #555;
+    border-radius: 9999px;
+}
+
+.scrollbar-themed::-webkit-scrollbar-thumb:hover {
+    background: #777;
+}
+</style>

ui/src/pages/ManageLOA.vue

@@ -17,26 +17,27 @@ const showLOADialog = ref(false);
 </script>
 
 <template>
-    <div>
-        <Dialog v-model:open="showLOADialog" v-on:update:open="showLOADialog = false">
-            <DialogContent class="sm:max-w-fit">
-                <DialogHeader>
-                    <DialogTitle>Post LOA</DialogTitle>
-                    <DialogDescription>
-                        Post an LOA on behalf of a member.
-                    </DialogDescription>
-                </DialogHeader>
-                <LoaForm :admin-mode="true" class="my-3"></LoaForm>
-            </DialogContent>
-        </Dialog>
-        <div class="max-w-5xl mx-auto pt-10">
-            <div class="flex justify-between mb-4">
-                <h1 class="scroll-m-20 text-2xl font-semibold tracking-tight">LOA Log</h1>
-                <div>
-                    <Button @click="showLOADialog = true">Post LOA</Button>
-                </div>
-            </div>
-            <LoaList :admin-mode="true"></LoaList>
+    <Dialog v-model:open="showLOADialog" v-on:update:open="showLOADialog = false">
+        <DialogContent>
+            <DialogHeader>
+                <DialogTitle>Post LOA</DialogTitle>
+                <DialogDescription>
+                    Post an LOA on behalf of a member.
+                </DialogDescription>
+            </DialogHeader>
+            <LoaForm :admin-mode="true" class="my-5 w-full"></LoaForm>
+            <!-- <DialogFooter>
+                <Button variant="secondary" @click="showLOADialog = false">Cancel</Button>
+                <Button>Apply</Button>
+            </DialogFooter> -->
+        </DialogContent>
+    </Dialog>
+
+    <div class="max-w-5xl mx-auto pt-10">
+        <div class="flex justify-end mb-4">
+            <Button @click="showLOADialog = true">Post LOA</Button>
         </div>
+        <h1>LOA Log</h1>
+        <LoaList></LoaList>
     </div>
 </template>

ui/src/pages/MyApplications.vue

@@ -1,148 +0,0 @@
-<script setup>
-import { loadMyApplications } from '@/api/application';
-import { ApplicationStatus } from '@shared/types/application';
-import {
-    Table,
-    TableBody,
-    TableCaption,
-    TableCell,
-    TableHead,
-    TableHeader,
-    TableRow,
-} from '@/components/ui/table'
-import Button from '@/components/ui/button/Button.vue';
-import { onMounted, ref, watch } from 'vue';
-import { useRoute, useRouter } from 'vue-router';
-import { CheckIcon, XIcon } from 'lucide-vue-next';
-import Application from './Application.vue';
-
-const appList = ref([]);
-const now = Date.now();
-// relative time formatter (uses user locale)
-const rtf = new Intl.RelativeTimeFormat(undefined, { numeric: 'auto' })
-// exact date/time for tooltip
-const exactFmt = new Intl.DateTimeFormat(undefined, {
-    dateStyle: 'medium', timeStyle: 'short', timeZone: 'America/Toronto'
-})
-
-function formatAgo(iso) {
-    const d = new Date(iso)
-    if (isNaN(d)) return ''
-    let diff = (d.getTime() - now) / 1000 // seconds relative to page load
-    const divisions = [
-        { amount: 60, name: 'second' },
-        { amount: 60, name: 'minute' },
-        { amount: 24, name: 'hour' },
-        { amount: 7, name: 'day' },
-        { amount: 4.34524, name: 'week' }, // avg weeks per month
-        { amount: 12, name: 'month' },
-        { amount: Infinity, name: 'year' },
-    ]
-    for (const div of divisions) {
-        if (Math.abs(diff) < div.amount) {
-            return rtf.format(Math.round(diff), div.name)
-        }
-        diff /= div.amount
-    }
-}
-
-function formatExact(iso) {
-    const d = new Date(iso)
-    return isNaN(d) ? '' : exactFmt.format(d)
-}
-
-const router = useRouter();
-function openApplication(id) {
-    router.push(`/applications/${id}`)
-    openPanel.value = true;
-}
-
-const route = useRoute();
-
-watch(() => route.params.id, (newId) => {
-    if (newId === undefined) {
-        openPanel.value = false;
-    }
-})
-
-const openPanel = ref(false);
-
-onMounted(async () => {
-    appList.value = await loadMyApplications();
-
-    //preload application
-    if (route.params.id != undefined) {
-        openApplication(route.params.id)
-    } else {
-
-    }
-})
-</script>
-<template>
-    <div class="px-20 mx-auto max-w-[100rem] w-full flex mt-5 h-52 min-h-0 overflow-hidden">
-        <!-- application list -->
-        <div :class="openPanel == false ? 'w-full' : 'w-2/5'" class="pr-9">
-            <h1 class="scroll-m-20 text-2xl font-semibold tracking-tight mb-5">My Applications</h1>
-            <Table>
-                <TableHeader>
-                    <TableRow>
-                        <TableHead>Date Submitted</TableHead>
-                        <TableHead class="text-right">Status</TableHead>
-                    </TableRow>
-                </TableHeader>
-                <TableBody class="overflow-y-auto scrollbar-themed">
-                    <TableRow v-for="app in appList" :key="app.id" class="cursor-pointer"
-                        :onClick="() => { openApplication(app.id) }">
-                        <TableCell :title="formatExact(app.submitted_at)">
-                            {{ formatAgo(app.submitted_at) }}
-                        </TableCell>
-                        <TableCell class="text-right font-semibold" :class="[
-                            ,
-                            app.app_status === ApplicationStatus.Pending && 'text-yellow-500',
-                            app.app_status === ApplicationStatus.Accepted && 'text-green-500',
-                            app.app_status === ApplicationStatus.Denied && 'text-destructive'
-                        ]">{{ app.app_status }}</TableCell>
-                    </TableRow>
-                </TableBody>
-            </Table>
-        </div>
-        <div v-if="openPanel" class="pl-9 border-l w-3/5" :key="$route.params.id">
-            <div class="mb-5 flex justify-between">
-                <p class="scroll-m-20 text-2xl font-semibold tracking-tight"> Application</p>
-            </div>
-            <div class="overflow-y-auto max-h-[80vh] h-full mt-5 scrollbar-themed">
-                <Application :mode="'view-self-id'"></Application>
-            </div>
-        </div>
-    </div>
-</template>
-
-<style scoped>
-/* Firefox */
-.scrollbar-themed {
-    scrollbar-width: thin;
-    scrollbar-color: #555 #1f1f1f;
-    padding-right: 6px;
-}
-
-/* Chrome, Edge, Safari */
-.scrollbar-themed::-webkit-scrollbar {
-    width: 10px;
-    /* slightly wider to allow padding look */
-}
-
-.scrollbar-themed::-webkit-scrollbar-track {
-    background: #1f1f1f;
-    margin-left: 6px;
-    /* ❗ adds space between content + scrollbar */
-}
-
-.scrollbar-themed::-webkit-scrollbar-thumb {
-    background: #555;
-    border-radius: 9999px;
-}
-
-.scrollbar-themed::-webkit-scrollbar-thumb:hover {
-    background: #777;
-}
-</style>

ui/src/pages/MyProfile.vue

@@ -1,97 +0,0 @@
-<script setup lang="ts">
-import { onMounted, ref } from "vue";
-import { Card, CardHeader, CardTitle, CardDescription, CardContent, CardFooter } from "@/components/ui/card";
-import { Label } from "@/components/ui/label";
-import { Input } from "@/components/ui/input";
-import { Button } from "@/components/ui/button";
-import { memberSettings } from '@shared/types/member'
-import { getMemberSettings, setMemberSettings } from "@/api/member";
-import Spinner from "@/components/ui/spinner/Spinner.vue";
-import { useMemberDirectory } from "@/stores/memberDirectory";
-import { useUserStore } from "@/stores/user";
-
-const saving = ref(false);
-const loading = ref(true);
-const showLoading = ref(false);
-const form = ref<memberSettings>();
-
-const memberDictionary = useMemberDirectory()
-const userStore = useUserStore()
-
-function saveSettings() {
-    saving.value = true;
-
-    setTimeout(async () => {
-        // Replace with your API save call
-        setMemberSettings(form.value);
-        saving.value = false;
-        console.log(userStore.user.id)
-        memberDictionary.invalidateMember(userStore.user.id)
-    }, 800);
-}
-
-onMounted(async () => {
-    // Start a brief timer before showing the spinner
-    const timer = setTimeout(() => {
-        showLoading.value = true;
-    }, 200); // 150–250ms is ideal
-
-    form.value = await getMemberSettings();
-
-    clearTimeout(timer);
-    loading.value = false;
-    showLoading.value = false; // ensure spinner hides if it was shown
-});
-</script>
-
-
-<template>
-    <div class="mx-auto max-w-3xl w-full py-10 px-6 space-y-10">
-        <!-- Page Header -->
-        <div>
-            <h1 class="scroll-m-20 text-2xl font-semibold tracking-tight">Profile Settings</h1>
-            <p class="text-muted-foreground mt-1">
-                Manage your account information and display preferences.
-            </p>
-        </div>
-
-        <Card>
-            <CardHeader>
-                <CardTitle>Account Info</CardTitle>
-                <CardDescription>Your identity across the platform.</CardDescription>
-            </CardHeader>
-            <Transition name="fade" mode="out-in">
-
-                <CardContent class="space-y-6 min-h-40" v-if="!loading">
-                    <!-- Display Name -->
-                    <div class="grid gap-2">
-                        <Label for="displayName">Display Name</Label>
-                        <Input id="displayName" v-model="form.displayName" placeholder="Your display name" />
-                    </div>
-
-                </CardContent>
-                <CardContent v-else class="min-h-40 space-y-6 flex items-center">
-                    <Spinner v-if="showLoading" class="size-7 flex mx-auto -my-10"></Spinner>
-                </CardContent>
-            </Transition>
-
-            <CardFooter class="flex justify-end">
-                <Button @click="saveSettings" :disabled="saving">
-                    {{ saving ? "Saving..." : "Save Changes" }}
-                </Button>
-            </CardFooter>
-        </Card>
-    </div>
-</template>
-
-<style scoped>
-.fade-enter-active,
-.fade-leave-active {
-    transition: opacity 0.05s ease;
-}
-
-.fade-enter-from,
-.fade-leave-to {
-    opacity: 0;
-}
-</style>

ui/src/pages/RankChange.vue

@@ -1,24 +1,115 @@
 <script setup lang="ts">
-import PromotionForm from "@/components/promotions/promotionForm.vue";
-import PromotionList from "@/components/promotions/promotionList.vue";
+import { Check, Search } from "lucide-vue-next"
+import { Combobox, ComboboxAnchor, ComboboxEmpty, ComboboxGroup, ComboboxInput, ComboboxItem, ComboboxItemIndicator, ComboboxList } from "@/components/ui/combobox"
+import { Popover, PopoverContent, PopoverTrigger } from "@/components/ui/popover"
+import { getRanks, Rank, submitRankChange } from "@/api/rank"
+import { onMounted, ref } from "vue";
+import { Member, getMembers } from "@/api/member";
+import { cn } from "@/lib/utils"
+import { CalendarIcon } from "lucide-vue-next"
+
+import {
+    DateFormatter,
+
+    DateValue,
+
+    getLocalTimeZone,
+    today,
+} from "@internationalized/date"
+
+import Button from "@/components/ui/button/Button.vue";
+import Calendar from "@/components/ui/calendar/Calendar.vue";
+
+const members = ref<Member[]>([])
+const ranks = ref<Rank[]>([])
+const date = ref<DateValue>(today(getLocalTimeZone()))
+
+
+const currentMember = ref<Member | null>(null);
+const currentRank = ref<Rank | null>(null);
+onMounted(async () => {
+    members.value = await getMembers();
+    ranks.value = await getRanks();
+});
+
+const df = new DateFormatter("en-US", {
+    dateStyle: "long",
+})
+
+function submit() {
+    submitRankChange(currentMember.value.member_id, currentRank.value?.id, date.value.toString())
+        .then(() => {
+            alert("Rank change submitted!");
+            currentMember.value = null;
+            currentRank.value = null;
+            date.value = today(getLocalTimeZone());
+        })
+        .catch((err) => {
+            console.error(err);
+            alert("Failed to submit rank change.");
+        });
+}
+
 </script>
 
 <template>
-    <div class="mx-auto mt-10 max-w-7xl px-8">
-        <div class="flex max-h-[70vh] gap-8">
+    <div class="flex max-w-5xl justify-center gap-5 mx-auto mt-10">
+        <Combobox v-model="currentMember">
+            <ComboboxAnchor class="w-[300px]">
+                <ComboboxInput placeholder="Search members..." class="w-full pl-9"
+                    :display-value="(v) => v ? v.member_name : ''" />
+            </ComboboxAnchor>
+            <ComboboxList class="w-[300px]">
+                <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>
 
-            <!-- LEFT COLUMN -->
-            <div class="flex-1 border-r pr-8">
-                <!-- <PromotionList></PromotionList> -->
-            </div>
-
-            <!-- RIGHT COLUMN -->
-            <div class="flex-1 flex justify-center pl-8">
-                <div class="w-full max-w-3xl">
-                    <PromotionForm />
-                </div>
-            </div>
-
-        </div>
+        <!-- Rank Combobox -->
+        <Combobox v-model="currentRank">
+            <ComboboxAnchor class="w-[300px]">
+                <ComboboxInput placeholder="Search ranks..." class="w-full pl-9"
+                    :display-value="(v) => v ? v.short_name : ''" />
+            </ComboboxAnchor>
+            <ComboboxList class="w-[300px]">
+                <ComboboxEmpty class="text-muted-foreground">No results</ComboboxEmpty>
+                <ComboboxGroup>
+                    <template v-for="rank in ranks" :key="rank.id">
+                        <ComboboxItem :value="rank"
+                            class="data-[highlighted]:bg-accent data-[highlighted]:text-accent-foreground relative cursor-pointer select-none px-2 py-1.5">
+                            {{ rank.short_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-[280px] justify-start text-left font-normal',
+                    !date && 'text-muted-foreground',
+                )">
+                    <CalendarIcon class="mr-2 h-4 w-4" />
+                    {{ date ? df.format(date.toDate(getLocalTimeZone())) : "Pick a date" }}
+                </Button>
+            </PopoverTrigger>
+            <PopoverContent class="w-auto p-0">
+                <Calendar v-model="date" initial-focus />
+            </PopoverContent>
+        </Popover>
+        <Button @click="submit">Submit</Button>
     </div>
-</template>
+</template>

ui/src/pages/SubmitLOA.vue

@@ -1,29 +1,20 @@
 <script setup lang="ts">
 import LoaForm from '@/components/loa/loaForm.vue';
 import { useUserStore } from '@/stores/user';
-import { Member } from '@shared/types/member';
-import LoaList from '@/components/loa/loaList.vue';
-import { ref } from 'vue';
+import { Member } from '@/api/member';
 
 const userStore = useUserStore();
-
-const mode = ref<'submit' | 'view'>('submit')
+const user = userStore.user;
+const memberFull: Member = {
+    member_id: user.id,
+    member_name: user.name,
+    rank: null,
+    rank_date: null,
+    status: null,
+    status_date: null,
+};
 </script>
 
 <template>
-    <div class="max-w-5xl mx-auto flex w-full flex-col mt-4 mb-10">
-        <div class="mb-8">
-            <p class="scroll-m-20 text-2xl font-semibold tracking-tight">Leave of Absence</p>
-            <div class="pt-3">
-                <div class="flex w-min *:px-10 pt-2 border-b *:w-full *:text-center *:pb-1 *:cursor-pointer">
-                    <label :class="mode === 'submit' ? 'border-b-3 border-foreground' : 'mb-[2px]'"
-                        @click="mode = 'submit'">Submit</label>
-                    <label :class="mode === 'view' ? 'border-b-3 border-foreground' : 'mb-[2px]'"
-                        @click="mode = 'view'">History</label>
-                </div>
-            </div>
-        </div>
-        <LoaForm v-if="mode === 'submit'" :member="userStore.user.member"></LoaForm>
-        <LoaList v-if="mode === 'view'" :admin-mode="false"></LoaList>
-    </div>
+    <LoaForm class="m-10" :member="memberFull"></LoaForm>
 </template>

ui/src/pages/TrainingReport.vue

@@ -21,17 +21,6 @@ import SelectValue from '@/components/ui/select/SelectValue.vue';
 import SelectContent from '@/components/ui/select/SelectContent.vue';
 import SelectItem from '@/components/ui/select/SelectItem.vue';
 import Input from '@/components/ui/input/Input.vue';
-import MemberCard from '@/components/members/MemberCard.vue';
-import Spinner from '@/components/ui/spinner/Spinner.vue';
-import { pagination } from '@shared/types/pagination';
-import {
-    Pagination,
-    PaginationContent,
-    PaginationEllipsis,
-    PaginationItem,
-    PaginationNext,
-    PaginationPrevious,
-} from '@/components/ui/pagination'
 
 enum sidePanelState { view, create, closed };
 
@@ -52,7 +41,6 @@ watch(() => route.params.id, async (newID) => {
         focusedTrainingReport.value = null;
         return;
     }
-    TRLoaded.value = false;
     viewTrainingReport(Number(route.params.id));
 })
 
@@ -71,7 +59,6 @@ const focusedTrainingTrainers = computed<CourseAttendee[] | null>(() => {
 })
 async function viewTrainingReport(id: number) {
     focusedTrainingReport.value = await getTrainingReport(id);
-    TRLoaded.value = true;
 }
 
 async function closeTrainingReport() {
@@ -96,36 +83,15 @@ watch(() => sortMode.value, async (newSortMode) => {
 })
 
 async function loadTrainingReports() {
-    let data = await getTrainingReports(sortMode.value, searchString.value, pageNum.value, pageSize.value);
-    trainingReports.value = data.data;
-    pageData.value = data.pagination;
+    trainingReports.value = await getTrainingReports(sortMode.value, searchString.value);
 }
 
 onMounted(async () => {
-    await loadTrainingReports();
+    loadTrainingReports();
     if (route.params.id)
         viewTrainingReport(Number(route.params.id))
     loaded.value = true;
 })
-
-const TRLoaded = ref(false);
-
-const pageNum = ref<number>(1);
-const pageData = ref<pagination>();
-
-const pageSize = ref<number>(15)
-const pageSizeOptions = [10, 15, 30]
-
-function setPageSize(size: number) {
-    pageSize.value = size
-    pageNum.value = 1;
-    loadTrainingReports();
-}
-
-function setPage(pagenum: number) {
-    pageNum.value = pagenum;
-    loadTrainingReports();
-}
 </script>
 
 <template>
@@ -146,7 +112,7 @@ function setPage(pagenum: number) {
                 <div class="flex flex-row gap-5">
                     <div>
                         <label class="text-muted-foreground">Search</label>
-                        <Input v-model="searchString" placeholder="Search..."></Input>
+                        <Input v-model="searchString"></Input>
                     </div>
                     <div class="flex flex-col">
                         <label class="text-muted-foreground">Sort By</label>
@@ -186,68 +152,31 @@ function setPage(pagenum: number) {
                             <TableCell class="font-medium">{{ report.course_name.length > 30 ? report.course_shortname :
                                 report.course_name }}</TableCell>
                             <TableCell>{{ report.date.split('T')[0] }}</TableCell>
-                            <TableCell class="text-right">
-                                <MemberCard v-if="report.created_by_name" :member-id="report.created_by"></MemberCard>
-                                <span v-else>Unknown User</span>
-                            </TableCell>
-                            <!-- <TableCell class="text-right">{{ report.created_by_name === null ? "Unknown User" :
+                            <TableCell class="text-right">{{ report.created_by_name === null ? "Unknown User" :
                                 report.created_by_name
-                            }}</TableCell> -->
+                                }}</TableCell>
                         </TableRow>
                     </TableBody>
                 </Table>
             </div>
-            <div class="mt-5 flex justify-between" :class="sidePanel !== sidePanelState.closed ? 'flex-col items-center' : 'items-center justify-between'"
->
-                <div></div>
-                <Pagination v-slot="{ page }" :items-per-page="pageData?.pageSize || 10" :total="pageData?.total || 10"
-                    :default-page="2" :page="pageNum" @update:page="setPage">
-                    <PaginationContent v-slot="{ items }">
-                        <PaginationPrevious />
-                        <template v-for="(item, index) in items" :key="index">
-                            <PaginationItem v-if="item.type === 'page'" :value="item.value"
-                                :is-active="item.value === page">
-                                {{ item.value }}
-                            </PaginationItem>
-                        </template>
-                        <PaginationEllipsis :index="4" />
-                        <PaginationNext />
-                    </PaginationContent>
-                </Pagination>
-                <div class="flex items-center gap-3 text-sm" :class="sidePanel !== sidePanelState.closed ? 'mt-3' : ''" >
-                    <p class="text-muted-foreground text-nowrap">Per page:</p>
-
-                    <button v-for="size in pageSizeOptions" :key="size" @click="setPageSize(size)"
-                        class="px-2 py-1 rounded transition-colors" :class="{
-                            'bg-muted font-semibold': pageSize === size,
-                            'hover:bg-muted/50': pageSize !== size
-                        }">
-                        {{ size }}
-                    </button>
-                </div>
-            </div>
-
         </div>
         <!-- view training report section -->
         <div v-if="focusedTrainingReport != null && sidePanel == sidePanelState.view" class="pl-9 my-3 border-l w-3/5">
-            <div class="flex justify-between items-center">
+            <div class="flex justify-between">
                 <p class="scroll-m-20 text-2xl font-semibold tracking-tight">Training Report Details</p>
-                <Button @click="closeTrainingReport" class="cursor-pointer" variant="ghost" size="icon">
-                    <X class="size-6"></X>
-                </Button>
+                <button @click="closeTrainingReport" class="cursor-pointer">
+                    <X></X>
+                </button>
             </div>
-            <div v-if="TRLoaded" class="max-h-[70vh] overflow-auto scrollbar-themed my-5">
+            <div class="max-h-[70vh] overflow-auto scrollbar-themed my-5">
                 <div class="flex flex-col mb-5 border rounded-lg bg-muted/70 p-2 py-3 px-4">
                     <p class="scroll-m-20 text-xl font-semibold tracking-tight">{{ focusedTrainingReport.course_name }}
                     </p>
-                    <div class="flex gap-10 items-center">
+                    <div class="flex gap-10">
                         <p class="text-muted-foreground">{{ focusedTrainingReport.event_date.split('T')[0] }}</p>
-                        <p class="flex gap-2 items-center">Created by:
-                            <MemberCard v-if="focusedTrainingReport.created_by"
-                                :member-id="focusedTrainingReport.created_by" />
-                        <p v-else>{{ focusedTrainingReport.created_by_name === null ? "Unknown User" :
+                        <p class="">Created by {{ focusedTrainingReport.created_by_name === null ? "Unknown User" :
                             focusedTrainingReport.created_by_name
-                        }}</p>
+                        }}
                         </p>
                     </div>
                 </div>
@@ -262,11 +191,7 @@ function setPage(pagenum: number) {
                         </div>
                         <div v-for="person in focusedTrainingTrainers"
                             class="grid grid-cols-4 py-2 items-center border-b last:border-none">
-                            <div>
-                                <MemberCard v-if="person.attendee_id" :member-id="person.attendee_id"
-                                    class="justify-self-start"></MemberCard>
-                                <p v-else>{{ person.attendee_name }}</p>
-                            </div>
+                            <p>{{ person.attendee_name }}</p>
                             <p class="">{{ person.role.name }}</p>
                             <p class="col-span-2 text-right px-2"
                                 :class="person.remarks == '' ? 'text-muted-foreground' : ''">
@@ -288,11 +213,7 @@ function setPage(pagenum: number) {
                         </div>
                         <div v-for="person in focusedTrainingTrainees"
                             class="grid grid-cols-5 py-2 items-center border-b last:border-none">
-                            <div>
-                                <MemberCard v-if="person.attendee_id" :member-id="person.attendee_id"
-                                    class="justify-self-start"></MemberCard>
-                                <p v-else>{{ person.attendee_name }}</p>
-                            </div>
+                            <p>{{ person.attendee_name }}</p>
                             <Checkbox :disabled="!focusedTrainingReport.course.hasQual"
                                 :model-value="person.passed_bookwork" class="pointer-events-none ml-5">
                             </Checkbox>
@@ -321,11 +242,7 @@ function setPage(pagenum: number) {
                         </div>
                         <div v-for="person in focusedNoShows"
                             class="grid grid-cols-5 py-2 items-center border-b last:border-none">
-                            <div>
-                                <MemberCard v-if="person.attendee_id" :member-id="person.attendee_id"
-                                    class="justify-self-start"></MemberCard>
-                                <p v-else>{{ person.attendee_name }}</p>
-                            </div>
+                            <p>{{ person.attendee_name }}</p>
                             <!-- <Checkbox :default-value="person.passed_bookwork ? true : false" class="pointer-events-none">
                             </Checkbox>
                             <Checkbox :default-value="person.passed_qual ? true : false" class="pointer-events-none">
@@ -347,18 +264,15 @@ function setPage(pagenum: number) {
                     </div>
                 </div>
             </div>
-            <div v-else class="flex w-full items-center justify-center h-[80%]">
-                <Spinner class="size-8"></Spinner>
-            </div>
         </div>
         <div v-if="sidePanel == sidePanelState.create" class="pl-7 border-l w-3/5 max-w-5xl">
-            <div class="flex justify-between items-center my-3">
+            <div class="flex justify-between my-3">
                 <div class="flex pl-2 gap-5">
                     <p class="scroll-m-20 text-2xl font-semibold tracking-tight">New Training Report</p>
                 </div>
-                <Button @click="closeTrainingReport" class="cursor-pointer" variant="ghost" size="icon">
-                    <X class="size-6"></X>
-                </Button>
+                <button @click="closeTrainingReport" class="cursor-pointer">
+                    <X></X>
+                </button>
             </div>
             <div class="overflow-y-auto max-h-[70vh] mt-5 scrollbar-themed">
                 <TrainingReportForm class="w-full pl-2"

ui/src/pages/memberList.vue

@@ -65,7 +65,6 @@ const searchedMembers = computed(() => {
                         Member
                     </TableHead>
                     <TableHead>Rank</TableHead>
-                    <TableHead>Unit</TableHead>
                     <TableHead>Status</TableHead>
                 </TableRow>
             </TableHeader>
@@ -76,7 +75,6 @@ const searchedMembers = computed(() => {
                         {{ member.member_name }}
                     </TableCell>
                     <TableCell>{{ member.rank }}</TableCell>
-                    <TableCell>{{ member.unit }}</TableCell>
                     <TableCell>{{ member.status }}</TableCell>
                     <TableCell><Badge v-if="member.on_loa">On LOA</Badge></TableCell>
                     <TableCell @click.stop="" class="text-right">

ui/src/router/index.js

@@ -6,33 +6,30 @@ const router = createRouter({
   routes: [
     // PUBLIC
     { path: '/join', component: () => import('@/pages/Join.vue') },
-    { path: '/applications', component: () => import('@/pages/MyApplications.vue'), meta: { requiresAuth: true } },
-    { path: '/applications/:id', component: () => import('@/pages/MyApplications.vue'), meta: { requiresAuth: true } },
 
     // AUTH REQUIRED
+    { path: '/apply', component: () => import('@/pages/Application.vue'), meta: { requiresAuth: true } },
     { path: '/', component: () => import('@/pages/Homepage.vue') },
 
     // MEMBER ROUTES
     { path: '/members', component: () => import('@/pages/memberList.vue'), meta: { requiresAuth: true, memberOnly: true } },
     { path: '/loa', component: () => import('@/pages/SubmitLOA.vue'), meta: { requiresAuth: true, memberOnly: true } },
     { path: '/transfer', component: () => import('@/pages/Transfer.vue'), meta: { requiresAuth: true, memberOnly: true } },
-    { path: '/profile', component: () => import('@/pages/MyProfile.vue'), meta: { requiresAuth: true, memberOnly: true } },
-
-
-    { path: '/calendar', component: () => import('@/pages/Calendar.vue') },
-    { path: '/calendar/event/:id', component: () => import('@/pages/Calendar.vue') },
-
-    // disabled in favor of linking 
-    // { path: '/documents', component: () => import('@/pages/Documentation.vue'), meta: { requiresAuth: true, memberOnly: true }, },
-
+    
+    { path: '/calendar', component: () => import('@/pages/Calendar.vue'), meta: { requiresAuth: true, memberOnly: true }, },
+    { path: '/calendar/event/:id', component: () => import('@/pages/Calendar.vue'), meta: { requiresAuth: true, memberOnly: true }, },
+    
     { path: '/trainingReport', component: () => import('@/pages/TrainingReport.vue'), meta: { requiresAuth: true, memberOnly: true } },
     { path: '/trainingReport/new', component: () => import('@/pages/TrainingReport.vue'), meta: { requiresAuth: true, memberOnly: true } },
     { path: '/trainingReport/:id', component: () => import('@/pages/TrainingReport.vue'), meta: { requiresAuth: true, memberOnly: true } },
 
+    // Personnel File
+    { path: '/dossier', component: () => import('@/pages/Dossier.vue'), meta: { requiresAuth: false, memberOnly: false } },
+
     // ADMIN / STAFF ROUTES
     {
       path: '/administration',
-      meta: { requiresAuth: true, memberOnly: true, roles: ['17th Administrator', '17th HQ', '17th Command'] },
+      meta: { requiresAuth: true, memberOnly: true, roles: ['staff', 'admin'] },
       children: [
         { path: 'applications', component: () => import('@/pages/ManageApplications.vue') },
         { path: 'applications/:id', component: () => import('@/pages/ManageApplications.vue') },

ui/src/stores/memberDirectory.ts

@@ -1,140 +0,0 @@
-import { defineStore } from "pinia"
-import type { MemberLight, Member } from "@shared/types/member"
-import { getLightMembers, getFullMembers } from "@/api/member"
-import { reactive, ref } from "vue"
-import { resolve } from "path"
-import { rejects } from "assert"
-
-export const useMemberDirectory = defineStore('memberDirectory', () => {
-    const light = reactive<Record<number, MemberLight>>({});
-    const full = reactive<Record<number, Member>>({})
-
-    function getLight(id: number): Promise<MemberLight> {
-        if (light[id]) return Promise.resolve(light[id]);
-
-        if (!lightWaiters.has(id)) {
-            pendingLight.add(id);
-            lightWaiters.set(id, []);
-        }
-
-        scheduleBatch();
-
-        return new Promise<MemberLight>((resolve, reject) => {
-            lightWaiters.get(id)!.push({ resolve, reject })
-        })
-    }
-
-    function getFull(id: number): Promise<Member> {
-        if (full[id]) return Promise.resolve(full[id])
-
-        if (!fullWaiters.has(id)) {
-            pendingFull.add(id)
-            fullWaiters.set(id, [])
-        }
-
-        scheduleBatch()
-
-        return new Promise<Member>((resolve, reject) => {
-            fullWaiters.get(id)!.push({ resolve, reject })
-        })
-    }
-
-    function invalidateMember(id: number) {
-        delete light[id]
-        delete full[id]
-    }
-
-    //batching system
-    const pendingLight = new Set<number>()
-    const pendingFull = new Set<number>()
-
-    // promises
-    const lightWaiters = new Map<number, Array<{ resolve: (m: MemberLight) => void; reject: (e: any) => void }>>()
-    const fullWaiters = new Map<number, Array<{ resolve: (m: Member) => void; reject: (e: any) => void }>>()
-
-    let batchTimer: ReturnType<typeof setTimeout> | null = null;
-
-    function scheduleBatch() {
-        if (batchTimer) return
-
-        batchTimer = setTimeout(async () => {
-            batchTimer = null;
-
-            //Batch light
-            if (pendingLight.size > 0) {
-                const ids = Array.from(pendingLight);
-                pendingLight.clear();
-
-                try {
-                    const res = await getLightMembers(ids);
-                    for (const m of res) {
-                        light[m.id] = m;
-
-                        const waiters = lightWaiters.get(m.id);
-                        if (waiters) {
-                            for (const w of waiters) w.resolve(m)
-                            lightWaiters.delete(m.id)
-                        }
-                    }
-
-                    for (const id of ids) {
-                        if (!light[id]) {
-                            const waiters = lightWaiters.get(id);
-                            if (waiters) {
-                                for (const w of waiters) w.reject("Not found");
-                                lightWaiters.delete(id);
-                            }
-                        }
-                    }
-                } catch (error) {
-                    for (const id of ids) {
-                        const waiters = lightWaiters.get(id);
-                        if (waiters) {
-                            for (const w of waiters) w.reject(error);
-                            lightWaiters.delete(id);
-                        }
-                    }
-                }
-            }
-
-            //batch full
-            if (pendingFull.size > 0) {
-                const ids = Array.from(pendingFull);
-                pendingFull.clear();
-
-                try {
-                    const res = await getFullMembers(ids);
-                    for (const m of res) {
-                        full[m.member_id] = m;
-
-                        const waiters = fullWaiters.get(m.member_id);
-                        if (waiters) {
-                            for (const w of waiters) w.resolve(m)
-                            fullWaiters.delete(m.member_id);
-                        }
-                    }
-
-                    for (const id of ids) {
-                        if (!light[id]) {
-                            const waiters = fullWaiters.get(id);
-                            if (waiters) {
-                                for (const w of waiters) w.reject("Not found");
-                                fullWaiters.delete(id);
-                            }
-                        }
-                    }
-                } catch (error) {
-                    for (const id of ids) {
-                        const waiters = fullWaiters.get(id);
-                        if (waiters) {
-                            for (const w of waiters) w.reject(error);
-                            fullWaiters.delete(id);
-                        }
-                    }
-                }
-            }
-        })
-    }
-
-    return { light, full, getLight, getFull, invalidateMember }
-})