Merge branch 'main' into devcontainers

Reviewed-on: #176

.gitea/workflows/cd-deploy.yaml

@@ -48,12 +48,12 @@ jobs:
           cd /var/www/html/milsim-site-v4
           version=`git log -1 --format=%H`
           echo "Current Revision: $version"
-          echo "Updating to: ${{ github.sha }}
+          echo "Updating to: ${{ github.sha }}"
           sudo -u nginx git reset --hard
-          sudo -u nginx git pull origin main
+          sudo -u nginx git fetch --tags
           sudo -u nginx git pull origin main
           new_version=`git log -1 --format=%H`
-          echo "Sucessfully updated to: $new_version
+          echo "Successfully updated to: $new_version"
 
       - name: Update Shared Dependencies and Fix Permissions
         run: |

.gitignore

@@ -32,3 +32,5 @@ coverage
 *.sql
 .env
 *.db
+
+db_data

api/.env.example

@@ -21,7 +21,19 @@ 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= # config version 
+
+# webhooks/integrations
+DISCORD_APPLICATIONS_WEBHOOK=
+
+# Logger
+LOG_DEPTH= # normal / verbose / profiling
 
 # Glitchtip
 GLITCHTIP_DSN=
 DISABLE_GLITCHTIP= # true/false
+
+# Bookstack
+DOC_HOST=  # https://bookstack.whatever.com/
+DOC_TOKEN_SECRET=
+DOC_TOKEN_ID=

api/.gitignore

@@ -1 +1,3 @@
 built
+
+!migrations/*/*.sql

api/database.json

@@ -0,0 +1,20 @@
+{
+    "dev": {
+        "driver": "mysql",
+        "user": "root",
+        "password": "root",
+        "host": "localhost",
+        "database": "ranger_unit_tracker",
+        "port": "3306",
+        "multipleStatements": true
+    },
+    "prod": {
+        "driver": "mysql",
+        "user": {"ENV" : "DB_USERNAME"},
+        "password": {"ENV" : "DB_PASSWORD"},
+        "host": {"ENV" : "DB_HOST"},
+        "database": {"ENV" : "DB_DATABASE"},
+        "port": {"ENV" : "DB_PORT"},
+        "multipleStatements": true
+    }
+}

api/migrations/20260201154439-initial.js

@@ -0,0 +1,53 @@
+'use strict';
+
+var dbm;
+var type;
+var seed;
+var fs = require('fs');
+var path = require('path');
+var Promise;
+
+/**
+  * We receive the dbmigrate dependency from dbmigrate initially.
+  * This enables us to not have to rely on NODE_PATH.
+  */
+exports.setup = function(options, seedLink) {
+  dbm = options.dbmigrate;
+  type = dbm.dataType;
+  seed = seedLink;
+  Promise = options.Promise;
+};
+
+exports.up = function(db) {
+  var filePath = path.join(__dirname, 'sqls', '20260201154439-initial-up.sql');
+  return new Promise( function( resolve, reject ) {
+    fs.readFile(filePath, {encoding: 'utf-8'}, function(err,data){
+      if (err) return reject(err);
+      console.log('received data: ' + data);
+
+      resolve(data);
+    });
+  })
+  .then(function(data) {
+    return db.runSql(data);
+  });
+};
+
+exports.down = function(db) {
+  var filePath = path.join(__dirname, 'sqls', '20260201154439-initial-down.sql');
+  return new Promise( function( resolve, reject ) {
+    fs.readFile(filePath, {encoding: 'utf-8'}, function(err,data){
+      if (err) return reject(err);
+      console.log('received data: ' + data);
+
+      resolve(data);
+    });
+  })
+  .then(function(data) {
+    return db.runSql(data);
+  });
+};
+
+exports._meta = {
+  "version": 1
+};

api/migrations/sqls/20260201154439-initial-down.sql

@@ -0,0 +1 @@
+/* Replace with your SQL commands */

api/package.json

@@ -9,25 +9,33 @@
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
     "dev": "tsc && tsc-alias && node ./built/api/src/index.js",
-    "build": "tsc && tsc-alias"
+    "prod": "tsc && tsc-alias && node ./built/api/src/index.js",
+    "build": "tsc && tsc-alias",
+    "seed": "node ./scripts/seed.js"
   },
   "dependencies": {
+    "@rsol/hashmig": "^1.0.7",
     "@sentry/node": "^10.27.0",
+    "@types/express-session": "^1.18.2",
     "connect-sqlite3": "^0.9.16",
     "cors": "^2.8.5",
-    "dotenv": "^17.2.1",
+    "db-migrate": "^0.11.14",
+    "db-migrate-mysql": "^3.0.0",
+    "dotenv": "16.6.1",
     "express": "^5.1.0",
     "express-session": "^1.18.2",
     "mariadb": "^3.4.5",
     "morgan": "^1.10.1",
     "mysql2": "^3.14.3",
     "passport": "^0.7.0",
+    "passport-custom": "^1.1.1",
     "passport-openidconnect": "^0.1.2"
   },
   "devDependencies": {
     "@types/express": "^5.0.3",
     "@types/morgan": "^1.9.10",
     "@types/node": "^24.8.1",
+    "cross-env": "^10.1.0",
     "tsc-alias": "^1.8.16",
     "typescript": "^5.9.3"
   }

api/scripts/migrate.js

@@ -0,0 +1,29 @@
+const dotenv = require('dotenv');
+const path = require('path');
+const { execSync } = require('child_process');
+
+dotenv.config({ path: path.resolve(process.cwd(), `.env`) });
+
+const db = {
+    user: process.env.DB_USERNAME,
+    pass: process.env.DB_PASSWORD,
+    host: process.env.DB_MIGRATION_HOST,
+    port: process.env.DB_PORT,
+    name: process.env.DB_DATABASE,
+};
+const dbUrl = `mysql://${db.user}:${db.pass}@tcp(${db.host}:${db.port})/${db.name}`;
+
+const args = process.argv.slice(2).join(" ");
+const migrations = path.join(process.cwd(), "migrations");
+
+const cmd = [
+    "docker run --rm",
+    `-v "${migrations}:/migrations"`,
+    "migrate/migrate",
+    "-path=/migrations",
+    `-database "mysql://${db.user}:${db.pass}@tcp(${db.host}:${db.port})/${db.name}"`, // Use double quotes
+    args,
+].join(" ");
+
+console.log(cmd);
+execSync(cmd, { stdio: "inherit" });

api/scripts/seed.js

@@ -0,0 +1,33 @@
+const dotenv = require("dotenv");
+const path = require("path");
+const mariadb = require("mariadb");
+const fs = require("fs");
+
+dotenv.config({ path: path.resolve(process.cwd(), `.env`) });
+
+const { DB_HOST, DB_PORT, DB_USERNAME, DB_PASSWORD, DB_DATABASE, APPLICATION_ENVIRONMENT } = process.env;
+
+//do not accidentally seed prod pls
+if (APPLICATION_ENVIRONMENT !== "dev") {
+    console.log("PLEASE DO NOT SEED PROD!!!!");
+    process.exit(0);
+}
+
+(async () => {
+    const conn = await mariadb.createConnection({
+        host: DB_HOST,
+        port: DB_PORT,
+        user: DB_USERNAME,
+        password: DB_PASSWORD,
+        database: DB_DATABASE,
+        multipleStatements: true,
+    });
+
+    const seedFile = path.join(process.cwd(), "migrations", "seed.sql");
+    const sql = fs.readFileSync(seedFile, "utf8");
+
+    await conn.query(sql);
+    await conn.end();
+
+    console.log("Seeded");
+})();

api/src/db.ts

@@ -1,8 +1,5 @@
 // const mariadb = require('mariadb')
 import * as mariadb from 'mariadb';
-const dotenv = require('dotenv')
-dotenv.config();
-
 
 const pool = mariadb.createPool({
     host: process.env.DB_HOST,
@@ -12,7 +9,7 @@ const pool = mariadb.createPool({
     connectionLimit: 5,
     connectTimeout: 10000,        // give it more breathing room
     acquireTimeout: 15000,
-    database: 'ranger_unit_tracker',
+    database: process.env.DB_DATABASE,
     ssl: false,
 });
 

api/src/index.js

@@ -1,86 +0,0 @@
-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 === "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 });
-  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');
-const { env } = require('process');
-
-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

@@ -0,0 +1,129 @@
+import dotenv = require('dotenv');
+dotenv.config({ quiet: true });
+
+import express = require('express');
+import cors = require('cors');
+import morgan = require('morgan');
+import { logger, LogHeader, LogPayload } from './services/logging/logger';
+
+const app = express()
+
+app.use(morgan((tokens: morgan.TokenIndexer, req: express.Request, res: express.Response) => {
+
+  const head: LogHeader = {
+    type: 'http',
+    level: 'info',
+    depth: 'normal',
+    timestamp: new Date().toISOString(),
+  }
+
+  const payload: LogPayload = {
+    message: 'HTTP request completed',
+    data: {
+      method: tokens.method(req, res),
+      path: tokens.url(req, res),
+      status: Number(tokens.status(req, res)),
+      response_time_ms: Number(tokens['response-time'](req, res)),
+      user_id: req.user?.id,
+      user_name: req.user?.name,
+      user_agent: req.headers['user-agent'],
+    },
+  }
+
+  logger.log(head.level, head.type, payload.message, payload.data, head.depth)
+  return '';
+}, {
+  skip: (req: express.Request) => {
+    return req.originalUrl === '/members/me' || req.originalUrl === '/ping';
+  }
+}))
+
+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") {
+  logger.info('app', 'Glitchtip disabled', null, 'normal')
+} else {
+  let dsn = process.env.GLITCHTIP_DSN;
+  let release = process.env.APPLICATION_VERSION;
+  let environment = process.env.APPLICATION_ENVIRONMENT;
+  sentry.init({ dsn: dsn, release: release, environment: environment, integrations: [sentry.captureConsoleIntegration({ levels: ['error'] })] });
+  logger.info('app', 'Glitchtip initialized', null, 'normal')
+}
+
+//session setup
+import path = require('path');
+// import session = require('express-session');
+import session = require('express-session');
+import passport = require('passport');
+const SQLiteStore = require('connect-sqlite3')(session);
+
+const cookieOptions: session.CookieOptions = {
+  httpOnly: true,
+  sameSite: 'lax',
+  domain: process.env.CLIENT_DOMAIN,
+  maxAge: 1000 * 60 * 60 * 24 * 30, //30 days
+}
+const sessionOptions: session.SessionOptions = {
+  secret: 'whatever',
+  resave: false,
+  saveUninitialized: false,
+  store: new SQLiteStore({ db: 'sessions.db', dir: './' }),
+  rolling: true,
+  cookie: cookieOptions
+}
+
+import { initializeDiscordIntegrations } from './services/integrations/discord';
+
+//event bus setup
+initializeDiscordIntegrations();
+
+app.use(session(sessionOptions));
+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';
+import { docsRouter } from './routes/docs';
+import { units } from './routes/units';
+
+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('/units', units)
+app.use('/docs', docsRouter)
+app.use('/', authRouter)
+
+app.get('/ping', (req, res) => {
+  res.status(200).json({ message: 'pong' });
+});
+
+app.listen(port, () => {
+  logger.info('app', `Example app listening on port ${port} `)
+})

api/src/middleware/auth.ts

@@ -0,0 +1,49 @@
+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,50 +2,134 @@ const express = require('express');
 const router = express.Router();
 
 import pool from '../db';
-import { approveApplication, createApplication, getApplicationByID, getApplicationComments, getApplicationList, getMemberApplication } from '../services/applicationService';
+import { approveApplication, createApplication, denyApplication, getAllMemberApplications, getApplicationByID, getApplicationComments, getApplicationList, getMemberApplication } from '../services/db/applicationService';
-import { MemberState, setUserState } from '../services/memberService';
+import { setUserState } from '../services/db/memberService';
-import { getRankByName, insertMemberRank } from '../services/rankService';
+import { MemberState } from '@app/shared/types/member';
+import { getRankByName, insertMemberRank } from '../services/db/rankService';
 import { ApplicationFull, CommentRow } from "@app/shared/types/application"
-import { assignUserToStatus } from '../services/statusService';
+import { assignUserToStatus } from '../services/db/statusService';
+import { Request, response, Response } from 'express';
+import { getUserRoles } from '../services/db/rolesService';
+import { requireLogin, requireRole } from '../middleware/auth';
+import { logger } from '../services/logging/logger';
+import { bus } from '../services/events/eventBus';
 
-// POST /application
+//get CoC
-router.post('/', async (req, res) => {
+router.get('/coc', async (req: Request, res: Response) => {
   try {
-    const App = req.body?.App || {};
+    const response = await fetch(`${process.env.DOC_HOST}/api/pages/714`, {
-    const memberID = req.user.id;
+      headers: {
+        Authorization: `Token ${process.env.DOC_TOKEN_ID}:${process.env.DOC_TOKEN_SECRET}`,
+      },
+    });
 
-    const appVersion = 1;
+    if (!response.ok) {
+      const text = await response.text();
+      logger.error('app', 'Failed to fetch LOA policy from Bookstack', {
+        status: response.status,
+        statusText: response.statusText,
+        body: text,
+      });
+      return res.sendStatus(500);
+    }
 
-    createApplication(memberID, appVersion, JSON.stringify(App))
+    const out = await response.json();
-    setUserState(memberID, MemberState.Applicant);
+    res.status(200).json(out.html);
 
-    res.sendStatus(201);
+  } catch (error) {
-  } catch (err) {
+    logger.error('app', 'Error fetching LOA policy from Bookstack', {
-    console.error('Insert failed:', err);
+      error: error instanceof Error ? error.message : String(error),
-    res.status(500).json({ error: 'Failed to save application' });
+    });
+    res.sendStatus(500);
   }
 });
 
+
+// POST /application
+router.post('/', [requireLogin], async (req: Request, res: Response) => {
+  const memberID = req.user.id;
+  const App = req.body?.App || {};
+  const appVersion = 1;
+
+  try {
+    let appID = await createApplication(memberID, appVersion, JSON.stringify(App));
+
+    await setUserState(memberID, MemberState.Applicant);
+
+    res.sendStatus(201);
+
+    bus.emit("application.create", { application: appID, member_name: req.user.name, member_discord_id: req.user.discord_id || null })
+
+    logger.info('app', 'Application Posted', {
+      user: memberID,
+      app: appID
+    })
+  } catch (err) {
+    logger.error(
+      'app',
+      'Failed to create application',
+      {
+        memberID,
+        error: err instanceof Error ? err.message : String(err),
+        stack: err instanceof Error ? err.stack : undefined,
+      }
+    );
+    res.status(500).json({ error: 'Failed to create application' });
+  }
+});
+
+
 // GET /application/all
-router.get('/all', async (req, res) => {
+router.get('/all', [requireLogin, requireRole("Recruiter")], async (req, res) => {
   try {
     const rows = await getApplicationList();
     res.status(200).json(rows);
   } catch (err) {
-    console.error(err);
+    logger.error(
+      'app',
+      'Failed to get applications',
+      {
+        error: err instanceof Error ? err.message : String(err),
+        stack: err instanceof Error ? err.stack : undefined,
+      }
+    );
     res.status(500);
   }
 });
 
-router.get('/me', 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) {
+    logger.error(
+      'app',
+      'Failed to get applications for user',
+      {
+        user: userID,
+        error: error instanceof Error ? error.message : String(error),
+        stack: error instanceof Error ? error.stack : undefined,
+      }
+    );
+    return res.status(500);
+  }
+})
+
+router.get('/me', [requireLogin], async (req, res) => {
 
   let userID = req.user.id;
 
   try {
     let application = await getMemberApplication(userID);
 
-    if (application === undefined)
+    if (application === undefined) {
       res.sendStatus(204);
+      return;
+    }
 
     const comments: CommentRow[] = await getApplicationComments(application.id);
 
@@ -56,19 +140,30 @@ router.get('/me', async (req, res) => {
 
     return res.status(200).json(output);
   } catch (error) {
-    console.error('Failed to load application:', error);
+    logger.error(
+      'app',
+      'Failed to load application',
+      {
+        user: userID,
+        error: error instanceof Error ? error.message : String(error),
+        stack: error instanceof Error ? error.stack : undefined,
+      }
+    );
     return res.status(500).json(error);
   }
 })
 
-// GET /application/:id
+// GET /me/:id
-router.get('/:id', async (req, res) => {
+router.get('/me/:id', [requireLogin], async (req: Request, res: Response) => {
-  let appID = req.params.id;
+  let appID = Number(req.params.id);
-  console.log("HELLO")
+  let member = req.user.id;
   try {
     const application = await getApplicationByID(appID);
     if (application === undefined)
       return res.sendStatus(204);
+    if (application.member_id != member) {
+      return res.sendStatus(403);
+    }
 
     const comments: CommentRow[] = await getApplicationComments(appID);
 
@@ -78,78 +173,122 @@ router.get('/:id', async (req, res) => {
     }
     return res.status(200).json(output);
   }
-  catch (err) {
+  catch (error) {
-    console.error('Query failed:', err);
+    logger.error(
-    return res.status(500).json({ error: 'Failed to load application' });
+      'app',
+      'Failed to load application',
+      {
+        application: appID,
+        user: member,
+        error: error instanceof Error ? error.message : String(error),
+        stack: error instanceof Error ? error.stack : undefined,
+      }
+    );
+    return res.status(500);
+  }
+});
+
+// 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 (error) {
+    logger.error(
+      'app',
+      'Failed to load application',
+      {
+        application: appID,
+        error: error instanceof Error ? error.message : String(error),
+        stack: error instanceof Error ? error.stack : undefined,
+      }
+    );
+    return res.status(500);
   }
 });
 
 // POST /application/approve/:id
-router.post('/approve/:id', async (req, res) => {
+router.post('/approve/:id', [requireLogin, requireRole("Recruiter")], async (req: Request, res: Response) => {
-  const appID = req.params.id;
+  const appID = Number(req.params.id);
+  const approved_by = req.user.id;
 
   try {
     const app = await getApplicationByID(appID);
-    const result = await approveApplication(appID);
+    await approveApplication(appID, approved_by);
 
-    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);
 
-    let nextRank = await getRankByName('Recruit')
+    await pool.query('CALL sp_accept_new_recruit_validation(?, ?, ?, ?)', [Number(process.env.CONFIG_ID), app.member_id, approved_by, approved_by])
-    await insertMemberRank(app.member_id, nextRank.id);
+
-    //assign user to "pending basic"
+    logger.info('app', "Member application approved", {
-    await assignUserToStatus(app.member_id, 1);
+      application: app.id,
+      applicant: app.member_id,
+      approver: approved_by
+    })
     res.sendStatus(200);
-  } catch (err) {
+  } catch (error) {
-    console.error('Approve failed:', err);
+    logger.error(
+      'app',
+      'Failed to approve application',
+      {
+        application: appID,
+        error: error instanceof Error ? error.message : String(error),
+        stack: error instanceof Error ? error.stack : undefined,
+      }
+    );
     res.status(500).json({ error: 'Failed to approve application' });
   }
 });
 
 // POST /application/deny/:id
-router.post('/deny/:id', async (req, res) => {
+router.post('/deny/:id', [requireLogin, requireRole("Recruiter")], async (req: Request, res: Response) => {
-  const appID = req.params.id;
+  const appID = Number(req.params.id);
+  const approver = Number(req.user.id);
 
-  const sql = `
-      UPDATE applications
-         SET denied_at = NOW()
-       WHERE id = ?
-        AND approved_at IS NULL
-        AND denied_at IS NULL
-      `;
   try {
-    const result = await pool.execute(sql, appID);
+    const app = await getApplicationByID(appID);
+    await denyApplication(appID, approver);
+    await setUserState(app.member_id, MemberState.Denied);
 
-    console.log(result);
+    logger.info('app', "Member application approved", {
-
+      application: app.id,
-    if (result.affectedRows === 0) {
+      applicant: app.member_id,
-      res.status(400).json('Something went wrong denying the application');
+      approver: approver
-    }
+    })
-
+    res.sendStatus(200);
-    if (result.affectedRows == 1) {
+  } catch (error) {
-      res.sendStatus(200);
+    logger.error(
-    }
+      'app',
-
+      'Failed to deny application',
-  } catch (err) {
+      {
-    console.error('Approve failed:', err);
+        application: appID,
+        error: error instanceof Error ? error.message : String(error),
+        stack: error instanceof Error ? error.stack : undefined,
+      }
+    );
     res.status(500).json({ error: 'Failed to deny application' });
   }
 });
 
 // POST /application/:id/comment
-router.post('/:id/comment', async (req, res) => {
+router.post('/:id/comment', [requireLogin], async (req: Request, res: Response) => {
   const appID = req.params.id;
   const data = req.body.message;
-  const user = 1;
+  const user = req.user;
 
   const sql = `INSERT INTO application_comments(
     application_id,
@@ -158,11 +297,11 @@ router.post('/:id/comment', async (req, res) => {
   )
 VALUES(?, ?, ?);`
 
-  try {
-    const conn = await pool.getConnection();
 
-    const result = await conn.query(sql, [appID, user, data])
+  try {
-    console.log(result)
+    var conn = await pool.getConnection();
+
+    const result = await conn.query(sql, [appID, user.id, data])
     if (result.affectedRows !== 1) {
       conn.release();
       throw new Error("Insert Failure")
@@ -178,12 +317,111 @@ VALUES(?, ?, ?);`
           INNER JOIN members AS member ON member.id = app.poster_id
         WHERE app.id = ?; `;
     const comment = await conn.query(getSQL, [result.insertId])
+
+    logger.info('app', "Application comment posted", {
+      application: appID,
+      poster: user.id,
+      comment: result.insertId,
+    })
+
     res.status(201).json(comment[0]);
 
-  } catch (err) {
+  } catch (error) {
-    console.error('Comment failed:', err);
+    logger.error(
+      'app',
+      'Failed to post comment',
+      {
+        application: appID,
+        error: error instanceof Error ? error.message : String(error),
+        stack: error instanceof Error ? error.stack : undefined,
+      }
+    );
     res.status(500).json({ error: 'Could not post comment' });
+  } finally {
+    conn.release();
   }
 });
 
-module.exports = router;
+// 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;
+
+  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])
+    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])
+
+    logger.info('app', "Admin application comment posted", {
+      application: appID,
+      poster: user.id,
+      comment: result.insertId,
+    })
+
+    res.status(201).json(comment[0]);
+  } catch (error) {
+    logger.error(
+      'app',
+      'Failed to post comment',
+      {
+        application: appID,
+        error: error instanceof Error ? error.message : String(error),
+        stack: error instanceof Error ? error.stack : undefined,
+      }
+    );
+    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);
+
+    logger.info('app', "Member restarted application", {
+      user: user
+    })
+
+    res.sendStatus(200);
+  } catch (error) {
+    logger.error(
+      'app',
+      'Failed to restart application',
+      {
+        user: user,
+        error: error instanceof Error ? error.message : String(error),
+        stack: error instanceof Error ? error.stack : undefined,
+      }
+    );
+    res.status(500).json({ error: 'Could not rester application' });
+  }
+})
+
+export const applicationRouter = router;

api/src/routes/auth.js

@@ -1,132 +0,0 @@
-const passport = require('passport');
-const OpenIDConnectStrategy = require('passport-openidconnect');
-const dotenv = require('dotenv');
-dotenv.config();
-
-const express = require('express');
-const { param } = require('./applications');
-const router = express.Router();
-import pool from '../db';
-const querystring = require('querystring');
-
-
-passport.use(new OpenIDConnectStrategy({
-    issuer: process.env.AUTH_ISSUER,
-    authorizationURL: process.env.AUTH_DOMAIN + '/authorize/',
-    tokenURL: process.env.AUTH_DOMAIN + '/token/',
-    userInfoURL: process.env.AUTH_DOMAIN + '/userinfo/',
-    clientID: process.env.AUTH_CLIENT_ID,
-    clientSecret: process.env.AUTH_CLIENT_SECRET,
-    callbackURL: process.env.AUTH_REDIRECT_URI,
-    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('profile:', JSON.stringify(profile, null, 2));
-    console.log('profile:', profile);
-    console.log('id_token claims:', JSON.stringify(jwtClaims, null, 2));
-    console.log('preferred_username:', jwtClaims?.preferred_username);
-
-    const con = await pool.getConnection();
-    try {
-        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;
-        //if member exists
-        if (existing.length > 0) {
-            memberId = existing[0].id;
-        } else {
-            //otherwise: create 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);
-        }
-        await con.commit();
-        return cb(null, { memberId });
-    } catch (error) {
-        await con.rollback();
-        return cb(error);
-    } finally {
-        con.release();
-    }
-}));
-
-router.get('/login', (req, res, next) => {
-    // Store redirect target in session if provided
-    req.session.redirectTo = req.query.redirect;
-
-    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;
-    passport.authenticate('openidconnect', (err, user) => {
-        if (err) return next(err);
-        if (!user) return res.redirect(process.env.CLIENT_URL);
-
-        req.logIn(user, err => {
-            if (err) return next(err);
-
-            // Use redirect saved from session
-            const redirectTo = redirectURI || process.env.CLIENT_URL;
-            delete req.session.redirectTo;
-            return res.redirect(redirectTo);
-        });
-    })(req, res, next);
-});
-
-router.get('/logout', function (req, res, next) {
-    req.logout(function (err) {
-        if (err) { return next(err); }
-        var params = {
-            client_id: process.env.AUTH_CLIENT_ID,
-            returnTo: process.env.CLIENT_URL
-        };
-        res.redirect(process.env.AUTH_END_SESSION_URI + '?' + querystring.stringify(params));
-    });
-});
-
-passport.serializeUser(function (user, cb) {
-    process.nextTick(function () {
-        cb(null, user);
-    });
-});
-
-passport.deserializeUser(function (user, cb) {
-    process.nextTick(async function () {
-
-        const memberID = user.memberId;
-
-        const con = await pool.getConnection();
-
-        var userData;
-        try {
-            let userResults = await con.query(`SELECT id, name FROM members WHERE id = ?;`, [memberID])
-            userData = userResults[0];
-
-        } catch (error) {
-            console.error(error)
-        } finally {
-            con.release();
-        }
-        return cb(null, userData);
-    });
-});
-
-
-module.exports = router;

api/src/routes/auth.ts

@@ -0,0 +1,339 @@
+const passport = require('passport');
+const OpenIDConnectStrategy = require('passport-openidconnect');
+
+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/db/rolesService';
+import { getUserState, mapDiscordtoID } from '../services/db/memberService';
+import { MemberState } from '@app/shared/types/member';
+import { toDateTime } from '@app/shared/utils/time';
+import { logger } from '../services/logging/logger';
+const querystring = require('querystring');
+import { performance } from 'perf_hooks';
+import { CacheService } from '../services/cache/cache';
+import { Strategy as CustomStrategy } from 'passport-custom';
+
+
+function parseJwt(token) {
+    return JSON.parse(Buffer.from(token.split('.')[1], 'base64').toString());
+}
+
+const devLogin = (req: any, res: any, next: any) => {
+    // The object here must match what your 'verify' function returns: { memberId }
+    const devUser = { memberId: 1 }; // Hardcoded ID
+
+    req.logIn(devUser, (err: any) => {
+        if (err) return next(err);
+        const redirectTo = req.session.redirectTo || process.env.CLIENT_URL;
+        delete req.session.redirectTo;
+        return res.redirect(redirectTo);
+    });
+};
+
+if (process.env.AUTH_MODE === "mock") {
+    passport.use('mock', new CustomStrategy(async (req, done) => {
+        const mockUser = { memberId: 1 };
+        return done(null, mockUser);
+    }))
+} else {
+    passport.use('oidc', new OpenIDConnectStrategy({
+        issuer: process.env.AUTH_ISSUER,
+        authorizationURL: process.env.AUTH_DOMAIN + '/authorize/',
+        tokenURL: process.env.AUTH_DOMAIN + '/token/',
+        userInfoURL: process.env.AUTH_DOMAIN + '/userinfo/',
+        clientID: process.env.AUTH_CLIENT_ID,
+        clientSecret: process.env.AUTH_CLIENT_SECRET,
+        callbackURL: process.env.AUTH_REDIRECT_URI,
+        scope: ['openid', 'profile', 'discord']
+    }, 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);
+        let con;
+
+        try {
+            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 | null = null;
+            //if member exists
+            if (existing.length > 0) {
+                //login
+                memberId = existing[0].id;
+                logger.info('auth', `Existing member login`, {
+                    memberId,
+                    issuer,
+                });
+
+            } else {
+                //otherwise: create account mode
+                const jwt = parseJwt(jwtClaims);
+                const discordID = jwt.discord?.id as number;
+
+                //check if account is available to claim
+                if (discordID)
+                    memberId = await mapDiscordtoID(discordID);
+
+                if (discordID && memberId) {
+                    // claim account
+                    const result = await con.query(
+                        `UPDATE members SET authentik_sub = ?, authentik_issuer = ? WHERE id = ?;`,
+                        [sub, issuer, memberId]
+                    )
+                    logger.info('auth', `Existing member claimed via Discord`, {
+                        memberId,
+                        discordID,
+                        issuer,
+                    });
+
+                } else {
+                    // 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);
+
+                    logger.info('auth', `New member account created`, {
+                        memberId,
+                        username,
+                        issuer,
+                    });
+
+                }
+            }
+
+            await con.query(`UPDATE members SET last_login = ? WHERE id = ?`, [toDateTime(new Date()), memberId])
+
+            await con.commit();
+            return cb(null, { memberId });
+        } catch (error) {
+            logger.error('auth', `Authentication transaction failed`, {
+                issuer,
+                error: error instanceof Error ? error.message : String(error),
+                stack: error instanceof Error ? error.stack : undefined,
+            });
+
+            if (con) {
+                try {
+                    await con.rollback();
+                } catch (rollbackError) {
+                    logger.error('auth', `Rollback failed`, {
+                        error: rollbackError instanceof Error
+                            ? rollbackError.message
+                            : String(rollbackError),
+                    });
+                }
+            }
+            return cb(error);
+        } finally {
+            if (con) con.release();
+        }
+    }));
+}
+
+router.get('/login', (req, res, next) => {
+    req.session.redirectTo = req.query.redirect as string;
+
+    const strategy = process.env.AUTH_MODE === 'mock' ? 'mock' : 'oidc';
+
+    passport.authenticate(strategy, {
+        successRedirect: (req.session.redirectTo || process.env.CLIENT_URL),
+        failureRedirect: '/login'
+    })(req, res, next);
+});
+
+router.get('/callback', (req, res, next) => {
+
+    //escape if mocked
+    if (process.env.AUTH_MODE === 'mock') {
+        return res.redirect(process.env.CLIENT_URL || '/');
+    }
+
+    const redirectURI = req.session.redirectTo;
+    passport.authenticate('oidc', (err, user) => {
+        if (err) return next(err);
+        if (!user) return res.redirect(process.env.CLIENT_URL);
+
+        req.logIn(user, err => {
+            if (err) return next(err);
+
+            // Use redirect saved from session
+            const redirectTo = redirectURI || process.env.CLIENT_URL;
+            delete req.session.redirectTo;
+            return res.redirect(redirectTo);
+        });
+    })(req, res, next);
+});
+
+router.get('/logout', [requireLogin], function (req, res, next) {
+    req.logout(function (err) {
+
+        if (err) { return next(err); }
+
+        req.session.destroy((err) => {
+            if (err) { return next(err); }
+
+            res.clearCookie('connect.sid', {
+                path: '/',
+                domain: process.env.CLIENT_DOMAIN,
+                httpOnly: true,
+                sameSite: 'lax'
+            });
+
+            if (process.env.AUTH_MODE === 'mock') {
+                return res.redirect(process.env.CLIENT_URL || '/');
+            }
+
+            var params = {
+                client_id: process.env.AUTH_CLIENT_ID,
+                returnTo: process.env.CLIENT_URL
+            };
+
+            const endSessionUri = process.env.AUTH_END_SESSION_URI;
+            if (endSessionUri) {
+                return res.redirect(endSessionUri + '?' + querystring.stringify(params));
+            } else {
+                return res.redirect(process.env.CLIENT_URL || '/');
+            }
+        })
+    });
+});
+
+passport.serializeUser(function (user, cb) {
+    process.nextTick(function () {
+        cb(null, user);
+    });
+});
+
+passport.deserializeUser(function (user, cb) {
+    const start = performance.now();
+    const timings: Record<string, number> = {};
+
+    process.nextTick(async function () {
+        const memberID = user.memberId as number;
+        let con;
+
+        try {
+            //cache lookup
+            let t = performance.now();
+            const cachedData: UserData | undefined = userCache.Get(memberID);
+            timings.cache_lookup = performance.now() - t;
+
+            if (cachedData) {
+                timings.total = performance.now() - start;
+
+                logger.info(
+                    'profiling',
+                    'passport.deserializeUser (cache hit)',
+                    {
+                        memberId: memberID,
+                        cache_hit: true,
+                        source: 'cache',
+                        total_ms: timings.total,
+                        breakdown_ms: timings,
+                    },
+                    'profiling'
+                );
+
+                return cb(null, cachedData);
+            }
+
+            //cache miss, db load
+            t = performance.now();
+            con = await pool.getConnection();
+            timings.getConnection = performance.now() - t;
+
+            t = performance.now();
+            const userResults = await con.query(
+                `SELECT id, name, discord_id FROM members WHERE id = ?;`,
+                [memberID]
+            );
+            timings.memberQuery = performance.now() - t;
+
+            const userData: UserData = userResults[0];
+
+            t = performance.now();
+            userData.roles = await getUserRoles(memberID) || [];
+            timings.roles = performance.now() - t;
+
+            t = performance.now();
+            userData.state = await getUserState(memberID);
+            timings.state = performance.now() - t;
+
+            t = performance.now();
+            userCache.Set(userData.id, userData);
+            timings.cache_set = performance.now() - t;
+
+            timings.total = performance.now() - start;
+
+            logger.info(
+                'profiling',
+                'passport.deserializeUser (db load)',
+                {
+                    memberId: memberID,
+                    cache_hit: false,
+                    source: 'db',
+                    total_ms: timings.total,
+                    breakdown_ms: timings,
+                },
+                'profiling'
+            );
+
+            return cb(null, userData);
+
+        } catch (error) {
+            logger.error(
+                'profiling',
+                'passport.deserializeUser failed',
+                {
+                    memberId: memberID,
+                    error: error instanceof Error ? error.message : String(error),
+                }
+            );
+            return cb(error);
+        } finally {
+            if (con) con.release();
+        }
+    });
+});
+
+declare global {
+    namespace Express {
+        interface Request {
+            user: {
+                id: number;
+                name: string;
+                discord_id: string;
+                roles: Role[];
+                state: MemberState;
+            };
+        }
+    }
+}
+
+export interface UserData {
+    id: number;
+    name: string;
+    roles: Role[];
+    state: MemberState;
+    discord_id?: string;
+}
+
+const userCache = new CacheService<number, UserData>();
+
+export const authRouter = router;
+export const memberCache = userCache;

api/src/routes/calendar.ts

@@ -1,6 +1,9 @@
 import { Request, Response } from "express";
-import { createEvent, getEventAttendance, getEventDetails, getShortEventsInRange, setAttendanceStatus, setEventCancelled, updateEvent } from "../services/calendarService";
+import { createEvent, getEventAttendance, getEventDetails, getShortEventsInRange, setAttendanceStatus, setEventCancelled, updateEvent } from "../services/db/calendarService";
 import { CalendarAttendance, CalendarEvent } from "@app/shared/types/calendar";
+import { requireLogin, requireMemberState, requireRole } from "../middleware/auth";
+import { MemberState } from "@app/shared/types/member";
+import { logger } from "../services/logging/logger";
 
 const express = require('express');
 const r = express.Router();
@@ -26,7 +29,14 @@ r.get('/', async (req, res) => {
 
         res.status(200).json(events);
     } catch (error) {
-        console.error('Error fetching calendar events:', error);
+        logger.error(
+            'app',
+            'Failed to get calendar events',
+            {
+                error: error instanceof Error ? error.message : String(error),
+                stack: error instanceof Error ? error.stack : undefined,
+            }
+        );
         res.status(500).send('Error fetching calendar events');
     }
 });
@@ -35,40 +45,79 @@ r.get('/upcoming', async (req, res) => {
     res.sendStatus(501);
 })
 
-r.post('/:id/cancel', async (req: Request, res: Response) => {
+r.post('/:id/cancel', [requireLogin, requireMemberState(MemberState.Member)], async (req: Request, res: Response) => {
     try {
         const eventID = Number(req.params.id);
         setEventCancelled(eventID, true);
+
+        logger.info('app', 'Calendar event cancelled', {
+            event: eventID,
+            user: req.user.id
+        })
         res.sendStatus(200);
     } catch (error) {
-        console.error('Error setting cancel status:', error);
+        logger.error(
+            'app',
+            'Failed to get cancel calendar event',
+            {
+                error: error instanceof Error ? error.message : String(error),
+                stack: error instanceof Error ? error.stack : undefined,
+            }
+        );
         res.status(500).send('Error setting cancel status');
     }
 })
-r.post('/:id/uncancel', async (req: Request, res: Response) => {
+r.post('/:id/uncancel', [requireLogin, requireMemberState(MemberState.Member)], async (req: Request, res: Response) => {
     try {
         const eventID = Number(req.params.id);
         setEventCancelled(eventID, false);
+
+        logger.info('app', 'Calendar event un-cancelled', {
+            event: eventID,
+            user: req.user.id
+        })
         res.sendStatus(200);
     } catch (error) {
-        console.error('Error setting cancel status:', error);
+        logger.error(
+            'app',
+            'Failed to uncancel calendar event',
+            {
+                error: error instanceof Error ? error.message : String(error),
+                stack: error instanceof Error ? error.stack : undefined,
+            }
+        );
         res.status(500).send('Error setting cancel status');
     }
 })
 
 
-r.post('/:id/attendance', async (req: Request, res: Response) => {
+r.post('/:id/attendance', [requireLogin, requireMemberState(MemberState.Member)], async (req: Request, res: Response) => {
     try {
         let member = req.user.id;
         let event = Number(req.params.id);
         let state = req.query.state as CalendarAttendance;
         setAttendanceStatus(member, event, state);
+
+        logger.info('app', 'Member set calendar event attendance', {
+            event: event,
+            user: req.user.id,
+            state: state
+        })
+
         res.sendStatus(200);
     } catch (error) {
-        console.error('Failed to set attendance:', error);
+        logger.error(
+            'app',
+            'Failed to set attendance',
+            {
+                error: error instanceof Error ? error.message : String(error),
+                stack: error instanceof Error ? error.stack : undefined,
+            }
+        );
         res.status(500).json(error);
     }
 })
+
 //get event details
 r.get('/:id', async (req: Request, res: Response) => {
     try {
@@ -77,15 +126,22 @@ r.get('/:id', async (req: Request, res: Response) => {
         let details: CalendarEvent = await getEventDetails(eventID);
         details.eventSignups = await getEventAttendance(eventID);
         res.status(200).json(details);
-    } catch (err) {
+    } catch (error) {
-        console.error('Insert failed:', err);
+        logger.error(
-        res.status(500).json(err);
+            'app',
+            'Failed to get calendar event details',
+            {
+                error: error instanceof Error ? error.message : String(error),
+                stack: error instanceof Error ? error.stack : undefined,
+            }
+        );
+        res.status(500);
     }
 })
 
 
 //post a new calendar event 
-r.post('/', async (req: Request, res: Response) => {
+r.post('/', [requireLogin, requireMemberState(MemberState.Member)], async (req: Request, res: Response) => {
     try {
         const member = req.user.id;
         let event: CalendarEvent = req.body;
@@ -93,26 +149,50 @@ r.post('/', async (req: Request, res: Response) => {
         event.start = new Date(event.start);
         event.end = new Date(event.end);
         createEvent(event);
+
+        logger.info('app', 'Calendar event posted', {
+            event: event.id,
+            user: req.user.id
+        })
+
         res.sendStatus(200);
     } catch (error) {
-        console.error('Failed to create event:', error);
+        logger.error(
+            'app',
+            'Failed to create calendar event',
+            {
+                error: error instanceof Error ? error.message : String(error),
+                stack: error instanceof Error ? error.stack : undefined,
+            }
+        );
         res.status(500).json(error);
     }
 })
 
-r.put('/', async (req: Request, res: Response) => {
+r.put('/', [requireLogin, requireMemberState(MemberState.Member)], async (req: Request, res: Response) => {
     try {
         let event: CalendarEvent = req.body;
         event.start = new Date(event.start);
         event.end = new Date(event.end);
-        console.log(event);
         updateEvent(event);
+
+        logger.info('app', 'Calendar event updated', {
+            event: event.id,
+            user: req.user.id
+        })
+
         res.sendStatus(200);
     } catch (error) {
-        console.error('Failed to update event:', error);
+        logger.error(
+            'app',
+            'Failed to update calendar event',
+            {
+                error: error instanceof Error ? error.message : String(error),
+                stack: error instanceof Error ? error.stack : undefined,
+            }
+        );
         res.status(500).json(error);
     }
 })
 
-
+export const calendarRouter = r;
-module.exports.calendarRouter = r;

api/src/routes/course.ts

@@ -1,89 +1,145 @@
 import { CourseAttendee, CourseEventDetails } from "@app/shared/types/course";
-import { getAllCourses, getCourseEventAttendees, getCourseEventDetails, getCourseEventRoles, getCourseEvents, insertCourseEvent } from "../services/CourseSerivce";
+import { getAllCourses, getCourseEventAttendees, getCourseEventDetails, getCourseEventRoles, getCourseEvents, insertCourseEvent } from "../services/db/CourseSerivce";
 import { Request, Response, Router } from "express";
+import { requireLogin, requireMemberState } from "../middleware/auth";
+import { MemberState } from "@app/shared/types/member";
+import { logger } from "../services/logging/logger";
 
-const courseRouter = Router();
+const cr = Router();
-const eventRouter = Router();
+const er = Router();
 
-courseRouter.get('/', async (req, res) => {
+cr.use(requireLogin)
+er.use(requireLogin)
+cr.use(requireMemberState(MemberState.Member))
+er.use(requireMemberState(MemberState.Member))
+
+cr.get('/', async (req, res) => {
     try {
         const courses = await getAllCourses();
         res.status(200).json(courses);
-    } catch (err) {
+    } catch (error) {
-        console.error('failed to fetch courses', err);
+        logger.error(
-        res.status(500).json('failed to fetch courses\n' + err);
+            'app',
+            'Failed to fetch courses',
+            {
+                error: error instanceof Error ? error.message : String(error),
+                stack: error instanceof Error ? error.stack : undefined,
+            }
+        );
+        res.status(500).json('failed to fetch courses');
     }
 })
 
-courseRouter.get('/roles', async (req, res) => {
+cr.get('/roles', async (req, res) => {
     try {
         const roles = await getCourseEventRoles();
         res.status(200).json(roles);
-    } catch (err) {
+    } catch (error) {
-        console.error('failed to fetch course roles', err);
+        logger.error(
-        res.status(500).json('failed to fetch course roles\n' + err);
+            'app',
+            'Failed to fetch course roles',
+            {
+                error: error instanceof Error ? error.message : String(error),
+                stack: error instanceof Error ? error.stack : undefined,
+            }
+        );
+        res.status(500).json('failed to fetch course roles');
     }
 })
 
-eventRouter.get('/', async (req: Request, res: Response) => {
+//get event list
-    const allowedSorts = new Map([
+er.get('/', async (req: Request, res: Response) => {
-        ["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 {
-        let events = await getCourseEvents(sortDir, search);
+        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);
         res.status(200).json(events);
     } catch (error) {
-        console.error('failed to fetch reports', error);
+        logger.error(
+            'app',
+            'Failed to fetch course events',
+            {
+                error: error instanceof Error ? error.message : String(error),
+                stack: error instanceof Error ? error.stack : undefined,
+            }
+        );
         res.status(500).json(error);
     }
 });
 
-eventRouter.get('/:id', async (req: Request, res: Response) => {
+er.get('/:id', async (req: Request, res: Response) => {
     try {
         let out = await getCourseEventDetails(Number(req.params.id));
         res.status(200).json(out);
     } catch (error) {
-        console.error('failed to fetch report', error);
+        logger.error(
+            'app',
+            'Failed to fetch course event',
+            {
+                error: error instanceof Error ? error.message : String(error),
+                stack: error instanceof Error ? error.stack : undefined,
+            }
+        );
         res.status(500).json(error);
     }
 });
 
-eventRouter.get('/attendees/:id', async (req: Request, res: Response) => {
+er.get('/attendees/:id', async (req: Request, res: Response) => {
     try {
         const attendees: CourseAttendee[] = await getCourseEventAttendees(Number(req.params.id));
         res.status(200).json(attendees);
-    } catch (err) {
+    } catch (error) {
-        console.error('failed to fetch attendees', err);
+        logger.error(
-        res.status(500).json("failed to fetch attendees\n" + err);
+            'app',
+            'Failed to fetch course event attendees',
+            {
+                error: error instanceof Error ? error.message : String(error),
+                stack: error instanceof Error ? error.stack : undefined,
+            }
+        );
+        res.status(500).json("failed to fetch attendees");
     }
 })
 
-eventRouter.post('/', async (req: Request, res: Response) => {
+er.post('/', async (req: Request, res: Response) => {
     const posterID: number = req.user.id;
     try {
-        console.log();
         let data: CourseEventDetails = req.body;
         data.created_by = posterID;
         data.event_date = new Date(data.event_date);
         const id = await insertCourseEvent(data);
+
+        logger.info('app', 'Training report posted', { user: posterID, report: id })
         res.status(201).json(id);
     } catch (error) {
-        console.error('failed to post training', error);
+        logger.error(
+            'app',
+            'Failed to post training report',
+            {
+                user: posterID,
+                error: error instanceof Error ? error.message : String(error),
+                stack: error instanceof Error ? error.stack : undefined,
+            }
+        );
         res.status(500).json("failed to post training\n" + error)
     }
 })
 
-module.exports.courseRouter = courseRouter;
+export const courseRouter = cr;
-module.exports.eventRouter = eventRouter;
+export const eventRouter = er;

api/src/routes/docs.ts

@@ -0,0 +1,57 @@
+const express = require('express');
+const router = express.Router();
+
+import { Request, Response } from 'express';
+import { requireLogin } from '../middleware/auth';
+import { logger } from '../services/logging/logger';
+
+// GET /welcome
+router.get('/welcome', [requireLogin], async (req: Request, res: Response) => {
+    const t0 = performance.now(); // optional profiling start
+
+    try {
+        const response = await fetch(`${process.env.DOC_HOST}/api/pages/717`, {
+            headers: {
+                Authorization: `Token ${process.env.DOC_TOKEN_ID}:${process.env.DOC_TOKEN_SECRET}`,
+            },
+        });
+
+        if (!response.ok) {
+            const text = await response.text();
+            logger.error('app', 'Failed to fetch welcome page from Bookstack', {
+                status: response.status,
+                statusText: response.statusText,
+                body: text,
+                userId: req.user?.id,
+            });
+            return res.sendStatus(500);
+        }
+
+        const out = await response.json();
+        res.status(200).json(out.html);
+
+        // optional profiling log
+        const duration = performance.now() - t0;
+        logger.info(
+            'profiling',
+            'GET /welcome completed',
+            {
+                userId: req.user?.id,
+                total_ms: duration,
+            },
+            'profiling'
+        );
+
+    } catch (error) {
+        logger.error('app', 'Error fetching welcome page from Bookstack', {
+            error: error instanceof Error ? error.message : String(error),
+            stack: error instanceof Error ? error.stack : undefined,
+            userId: req.user?.id,
+        });
+        res.sendStatus(500);
+    }
+});
+
+
+
+export const docsRouter = router;

api/src/routes/loa.js

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

@@ -0,0 +1,262 @@
+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/db/loaService';
+import { LOARequest } from '@app/shared/types/loa';
+import { requireLogin, requireRole } from '../middleware/auth';
+import { logger } from '../services/logging/logger';
+
+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);
+        logger.info('app', 'LOA Posted', { poster: req.user.id, user: LOARequest.member_id })
+        res.sendStatus(201);
+    } catch (error) {
+        logger.error(
+            'app',
+            'Failed to post LOA',
+            {
+                error: error instanceof Error ? error.message : String(error),
+                stack: error instanceof Error ? error.stack : undefined,
+            }
+        );
+        res.status(500).send(error);
+    }
+});
+
+//admin posts LOA
+router.post("/admin", [requireRole(['17th Administrator', '17th HQ', '17th Command'])], async (req: Request, res: Response) => {
+    let LOARequest = req.body as LOARequest;
+    LOARequest.created_by = req.user.id;
+    LOARequest.filed_date = new Date();
+    try {
+        await createNewLOA(LOARequest);
+        logger.info('app', 'LOA Posted', { poster: req.user.id, user: LOARequest.member_id })
+        res.sendStatus(201);
+    } catch (error) {
+        logger.error(
+            'app',
+            'Failed to post LOA',
+            {
+                error: error instanceof Error ? error.message : String(error),
+                stack: error instanceof Error ? error.stack : undefined,
+            }
+        ); 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) {
+        logger.error(
+            'app',
+            'Failed to get user current LOA',
+            {
+                error: error instanceof Error ? error.message : String(error),
+                stack: error instanceof Error ? error.stack : undefined,
+            }
+        );
+        res.status(500).send(error);
+    }
+})
+
+//get my LOA history
+router.get("/history", async (req: Request, res: Response) => {
+    try {
+        const user = req.user.id;
+
+        const page = Number(req.query.page) || undefined;
+        const pageSize = Number(req.query.pageSize) || undefined;
+
+        const result = await getUserLOA(user, page, pageSize);
+        res.status(200).json(result)
+    } catch (error) {
+        logger.error(
+            'app',
+            'Failed to get user LOA history',
+            {
+                error: error instanceof Error ? error.message : String(error),
+                stack: error instanceof Error ? error.stack : undefined,
+            }
+        );
+        res.status(500).send(error);
+    }
+})
+
+router.get('/all', [requireRole(['17th Administrator', '17th HQ', '17th Command'])], 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) {
+        logger.error(
+            'app',
+            'Failed to get full LOA history',
+            {
+                error: error instanceof Error ? error.message : String(error),
+                stack: error instanceof Error ? error.stack : undefined,
+            }
+        );
+        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) {
+        logger.error(
+            'app',
+            'Failed to get LOA types',
+            {
+                error: error instanceof Error ? error.message : String(error),
+                stack: error instanceof Error ? error.stack : undefined,
+            }
+        );
+        res.status(500).json(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);
+
+        logger.info('app', 'LOA Closed', { closed_by: closer, LOA: id })
+
+        res.sendStatus(200);
+    } catch (error) {
+        logger.error(
+            'app',
+            'Failed to cancel LOA',
+            {
+                error: error instanceof Error ? error.message : String(error),
+                stack: error instanceof Error ? error.stack : undefined,
+            }
+        );
+        res.status(500).json(error);
+    }
+})
+
+//TODO: enforce admin only
+router.post('/adminCancel/:id', [requireRole(['17th Administrator', '17th HQ', '17th Command'])], async (req: Request, res: Response) => {
+    let closer = req.user.id;
+    try {
+        await closeLOA(Number(req.params.id), closer);
+
+        logger.info('app', 'LOA Closed', { closed_by: closer, LOA: req.params.id })
+
+        res.sendStatus(200);
+    } catch (error) {
+        logger.error(
+            'app',
+            'Failed to cancel LOA',
+            {
+                error: error instanceof Error ? error.message : String(error),
+                stack: error instanceof Error ? error.stack : undefined,
+            }
+        );
+        res.status(500).json(error);
+    }
+})
+
+// extend LOA
+router.post('/extend/:id', [requireRole(['17th Administrator', '17th HQ', '17th Command'])], 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);
+        logger.info('app', 'LOA Extended', { extended_by: req.user.id, LOA: req.params.id })
+
+        res.sendStatus(200);
+    } catch (error) {
+        logger.error(
+            'app',
+            'Failed to extend LOA',
+            {
+                error: error instanceof Error ? error.message : String(error),
+                stack: error instanceof Error ? error.stack : undefined,
+            }
+        );
+        res.status(500).json(error);
+    }
+})
+
+// GET /policy
+router.get('/policy', async (req: Request, res: Response) => {
+    const t0 = performance.now();
+
+    try {
+        const response = await fetch(`${process.env.DOC_HOST}/api/pages/42`, {
+            headers: {
+                Authorization: `Token ${process.env.DOC_TOKEN_ID}:${process.env.DOC_TOKEN_SECRET}`,
+            },
+        });
+
+        if (!response.ok) {
+            const text = await response.text();
+
+            logger.error('app', 'Failed to fetch policy page from Bookstack', {
+                pageId: 42,
+                status: response.status,
+                statusText: response.statusText,
+                body: text,
+                userId: req.user?.id,
+            });
+
+            return res.sendStatus(500);
+        }
+
+        const out = await response.json();
+        res.status(200).json(out.html);
+
+        logger.info(
+            'profiling',
+            'GET /policy completed',
+            {
+                pageId: 42,
+                total_ms: performance.now() - t0,
+            },
+            'profiling'
+        );
+
+    } catch (error) {
+        logger.error('app', 'Error fetching policy page from Bookstack', {
+            pageId: 42,
+            error: error instanceof Error ? error.message : String(error),
+            stack: error instanceof Error ? error.stack : undefined,
+            userId: req.user?.id,
+        });
+
+        res.sendStatus(500);
+    }
+});
+
+
+export const loaRouter = router;

api/src/routes/members.js

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

@@ -0,0 +1,267 @@
+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/db/loaService';
+import { getAllMembersLite, getMemberSettings, getMembersFull, getMembersLite, getUserData, getUserState, setUserSettings, getFilteredMembers, setUserState } from '../services/db/memberService';
+import { getUserRoles } from '../services/db/rolesService';
+import { memberSettings, MemberState, myData } from '@app/shared/types/member';
+import { Discharge } from '@app/shared/schemas/dischargeSchema';
+
+import { Performance } from 'perf_hooks';
+import { logger } from '../services/logging/logger';
+import { memberCache } from './auth';
+import { cancelLatestRank } from '../services/db/rankService';
+import { cancelLatestUnit } from '../services/db/unitService';
+
+//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 (error) {
+        logger.error(
+            'app',
+            'Failed to get all users',
+            {
+                error: error instanceof Error ? error.message : String(error),
+                stack: error instanceof Error ? error.stack : undefined,
+            }
+        );
+        return res.status(500).json({ error: 'Failed to fetch users' });
+    }
+});
+
+router.get('/filtered', [requireLogin, requireMemberState(MemberState.Member)], async (req, res) => {
+    try {
+        // Extract Query Parameters
+        const page = parseInt(req.query.page as string) || 1;
+        const pageSize = parseInt(req.query.pageSize as string) || 15;
+        const search = req.query.search as string | undefined;
+        const status = req.query.status as string | undefined;
+        const unitId = req.query.unitId as string | undefined;
+
+        // Call the service function
+        const result = await getFilteredMembers(page, pageSize, search, status, unitId);
+
+        return res.status(200).json(result);
+    } catch (error) {
+        logger.error('app', 'Failed to get filtered users', {
+            error: error instanceof Error ? error.message : String(error),
+        });
+        return res.status(500).json({ error: 'Failed to fetch users' });
+    }
+});
+
+router.get('/me', [requireLogin], async (req: Request, res) => {
+    if (!req.user) return res.sendStatus(401);
+
+    const routeStart = performance.now();
+    const timings: Record<string, number> = {};
+
+    try {
+        let t;
+
+        t = performance.now();
+        const memData = await getUserData(req.user.id);
+        timings.member = performance.now() - t;
+
+        t = performance.now();
+        const LOAData = await getUserActiveLOA(req.user.id);
+        timings.loa = performance.now() - t;
+
+        t = performance.now();
+        const memState = await getUserState(req.user.id);
+        timings.state = performance.now() - t;
+
+        t = performance.now();
+        const roleData = await getUserRoles(req.user.id);
+        timings.roles = performance.now() - t;
+
+        const userDataFull: myData = {
+            member: memData,
+            LOAs: LOAData,
+            roles: roleData,
+            state: memState,
+        };
+
+        res.status(200).json(userDataFull);
+
+        logger.info('profiling', 'GET /members/me completed', {
+            userId: req.user.id,
+            total_ms: performance.now() - routeStart,
+            breakdown_ms: timings,
+        }, 'profiling');
+
+    } catch (error) {
+        logger.error('profiling', 'GET /members/me failed', {
+            userId: req.user?.id,
+            error: error instanceof Error ? error.message : String(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;
+        let output = await getMemberSettings(user);
+        res.status(200).json(output);
+    } catch (error) {
+        logger.error(
+            'app',
+            'Failed to get member settings',
+            {
+                error: error instanceof Error ? error.message : String(error),
+                stack: error instanceof Error ? error.stack : undefined,
+            }
+        );
+        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;
+        await setUserSettings(user, settings);
+        logger.info('app', 'User updated profile settings', { user: user })
+        res.sendStatus(200);
+    } catch (error) {
+        logger.error(
+            'app',
+            'Failed to update user settings',
+            {
+                error: error instanceof Error ? error.message : String(error),
+                stack: error instanceof Error ? error.stack : undefined,
+            }
+        ); 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) {
+        logger.error(
+            'app',
+            'Failed to get lite users',
+            {
+                error: error instanceof Error ? error.message : String(error),
+                stack: error instanceof Error ? error.stack : undefined,
+            }
+        );
+        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) {
+        logger.error(
+            'app',
+            'Failed to get batch lite users',
+            {
+                error: error instanceof Error ? error.message : String(error),
+                stack: error instanceof Error ? error.stack : undefined,
+            }
+        );
+        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) {
+        logger.error(
+            'app',
+            'Failed to get batch full users',
+            {
+                error: error instanceof Error ? error.message : String(error),
+                stack: error instanceof Error ? error.stack : undefined,
+            }
+        ); res.status(500).json(error);
+    }
+})
+
+router.get('/:id', [requireLogin], async (req, res) => {
+    const userId = req.params.id;
+
+    try {
+        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 (error) {
+        logger.error(
+            'app',
+            'Failed to get user',
+            {
+                user: userId,
+                error: error instanceof Error ? error.message : String(error),
+                stack: error instanceof Error ? error.stack : undefined,
+            }
+        ); 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);
+});
+
+//discharge member
+router.post('/discharge', [requireLogin, requireMemberState(MemberState.Member), requireRole("17th Administrator")], async (req: Request, res: Response) => {
+    try {
+        var con = await pool.getConnection();
+
+        con.beginTransaction();
+
+        var data: Discharge = req.body;
+        setUserState(data.userID, MemberState.Retired, con);
+        cancelLatestRank(data.userID, con);
+        cancelLatestUnit(data.userID, con);
+        con.commit();
+        memberCache.Invalidate(data.userID);
+
+        res.sendStatus(200);
+    } catch (error) {
+        logger.error('app', 'Failed to discharge user', {
+            data: data,
+            caller: req.user.id,
+            error: error instanceof Error ? error.message : String(error),
+            stack: error instanceof Error ? error.stack : undefined,
+        })
+    } finally {
+        if (con)
+            con.release();
+    }
+});
+
+export const memberRouter = router;

api/src/routes/ranks.js

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

@@ -0,0 +1,96 @@
+import { MemberState } from "@app/shared/types/member";
+import { requireLogin, requireMemberState, requireRole } from "../middleware/auth";
+import { batchInsertMemberRank, getAllRanks, getPromotionHistorySummary, getPromotionsOnDay, insertMemberRank } from "../services/db/rankService";
+import { BatchPromotion, BatchPromotionMember } from '@app/shared/schemas/promotionSchema'
+
+import express = require('express');
+import { logger } from "../services/logging/logger";
+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 approver = req.body.approver as number;
+        const author = req.user.id;
+        if (!change) res.sendStatus(400);
+
+        await batchInsertMemberRank(change, author, approver);
+        logger.info('app', 'Promotion batch submitted', { author: author })
+        res.sendStatus(201);
+    } catch (error) {
+        logger.error(
+            'app',
+            'Failed to post rank change',
+            {
+                error: error instanceof Error ? error.message : String(error),
+                stack: error instanceof Error ? error.stack : undefined,
+            }
+        );
+        res.status(500).json({ error: 'Failed to update ranks' });
+    }
+});
+
+ur.get('/', async (req: express.Request, res: express.Response) => {
+    try {
+        const promos = await getPromotionHistorySummary();
+        res.status(200).json(promos);
+    } catch (error) {
+        logger.error(
+            'app',
+            'Failed to get rank change history',
+            {
+                error: error instanceof Error ? error.message : String(error),
+                stack: error instanceof Error ? error.stack : undefined,
+            }
+        );
+        res.sendStatus(500);
+    }
+});
+
+ur.get('/:day', async (req: express.Request, res: express.Response) => {
+    try {
+        if (!req.params.day) res.sendStatus(400);
+
+        var day = new Date(req.params.day)
+        const promos = await getPromotionsOnDay(day);
+        res.status(200).json(promos);
+    } catch (error) {
+        logger.error(
+            'app',
+            'Failed to get rank change history on day',
+            {
+                day: day,
+                error: error instanceof Error ? error.message : String(error),
+                stack: error instanceof Error ? error.stack : undefined,
+            }
+        );
+        res.sendStatus(500);
+    }
+})
+
+//get all ranks
+r.get('/', async (req, res) => {
+    try {
+        const ranks = await getAllRanks();
+        res.json(ranks);
+    } catch (error) {
+        logger.error(
+            'app',
+            'Failed to get all ranks',
+            {
+                error: error instanceof Error ? error.message : String(error),
+                stack: error instanceof Error ? error.stack : undefined,
+            }
+        );
+        res.status(500).json({ error: 'Internal server error' });
+    }
+});
+
+export const ranks = r;
+export const memberRanks = ur;

api/src/routes/roles.js

@@ -1,116 +0,0 @@
-const express = require('express');
-const r = express.Router();
-const ur = express.Router();
-
-import pool from '../db';
-import { assignUserGroup, createGroup } from '../services/rolesService';
-
-//manually assign a member to a group
-ur.post('/', async (req, res) => {
-    try {
-        const body = req.body;
-
-        assignUserGroup(body.member_id, body.role_id);
-
-        res.sendStatus(201);
-    } catch (err) {
-        console.error('Insert failed:', err);
-        res.status(500).json({ error: 'Failed to add to group' });
-    }
-});
-
-//manually remove member from group
-ur.delete('/', async (req, res) => {
-    try {
-        const body = req.body;
-        console.log(body);
-
-        const sql = 'DELETE FROM members_roles WHERE member_id = ? AND role_id = ?'
-        await pool.query(sql, [body.member_id, body.role_id])
-
-        res.sendStatus(200);
-    }
-    catch (err) {
-        console.error("delete failed: ", err)
-        res.status(500).json({ error: 'Failed to remove from group' });
-
-    }
-})
-
-//get all roles
-r.get('/', async (req, res) => {
-    try {
-        const con = await pool.getConnection();
-
-        // Get all roles
-        const roles = await con.query('SELECT * FROM roles;');
-
-        // Get all members for each role
-        const membersRoles = await con.query(`
-            SELECT mr.role_id, v.*
-            FROM members_roles mr
-            JOIN view_member_rank_status_all v ON mr.member_id = v.member_id
-            `);
-
-
-        // Group members by role_id
-        const roleIdToMembers = {};
-        for (const row of membersRoles) {
-            if (!roleIdToMembers[row.role_id]) roleIdToMembers[row.role_id] = [];
-            // Remove role_id from member object
-            const { role_id, ...member } = row;
-            roleIdToMembers[role_id].push(member);
-        }
-
-        // Attach members to each role
-        const result = roles.map(role => ({
-            ...role,
-            members: roleIdToMembers[role.id] || []
-        }));
-
-        con.release();
-        res.json(result);
-    } catch (err) {
-        console.error(err);
-        res.status(500).json({ error: 'Internal server error' });
-    }
-});
-
-//create a new role
-r.post('/', async (req, res) => {
-    try {
-        const { name, color, description } = req.body;
-        console.log('Creating role:', { name, color, description });
-        if (!name || !color) {
-            return res.status(400).json({ error: 'Name and color are required' });
-        }
-
-        const hexColorRegex = /^#([0-9A-Fa-f]{6})$/;
-        if (!hexColorRegex.test(color)) {
-            return res.status(400).json({ error: 'Color must be a valid hex color (#ffffff)' });
-        }
-
-        await createGroup(name, color, description);
-
-        res.sendStatus(201);
-    } catch (err) {
-        console.error('Insert failed:', err);
-        res.status(500).json({ error: 'Failed to create role' });
-    }
-})
-
-r.delete('/:id', async (req, res) => {
-    try {
-        const id = req.params.id;
-
-        const sql = 'DELETE FROM roles WHERE id = ?';
-        const res = await pool.query(sql, [id]);
-        res.sendStatus(200);
-    } catch (error) {
-        console.log(error);
-        res.sendStatus(500);
-    }
-})
-
-module.exports.roles = r;
-module.exports.memberRoles = ur;

api/src/routes/roles.ts

@@ -0,0 +1,170 @@
+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, getAllRoles, getRole, getUsersWithRole } from '../services/db/rolesService';
+import { Request, Response } from 'express';
+import { logger } from '../services/logging/logger';
+
+r.use(requireLogin)
+ur.use(requireLogin)
+
+//manually assign a member to a group
+ur.post('/', [requireMemberState(MemberState.Member), requireRole("17th Administrator")], async (req: Request, res) => {
+    const body = req.body;
+
+    try {
+
+        await assignUserGroup(body.member_id, body.role_id);
+
+        logger.info('app', 'User assigned role', { user: body.member_id, role: body.role_id, assigner: req.user.id })
+        res.sendStatus(201);
+    } catch (error) {
+        if (error?.code === 'ER_DUP_ENTRY') {
+            return res.status(400).json({
+                error: 'Member already has this role',
+            });
+        }
+
+        logger.error(
+            'app',
+            'Failed to assign role',
+            {
+                user: body.member_id,
+                role: body.role_id,
+                assigner: req.user.id,
+                error: error instanceof Error ? error.message : String(error),
+                stack: error instanceof Error ? error.stack : undefined,
+            }
+        );
+        res.status(500).json({ error: 'Failed to add to group' });
+    }
+});
+
+//manually remove member from group
+ur.delete('/', [requireMemberState(MemberState.Member), requireRole("17th Administrator")], async (req: Request, res: Response) => {
+    const body = req.body;
+
+    try {
+
+        const sql = 'DELETE FROM members_roles WHERE member_id = ? AND role_id = ?'
+        await pool.query(sql, [body.member_id, body.role_id])
+
+        logger.info('app', 'User removed role', { user: body.member_id, role: body.role_id, assigner: req.user.id })
+
+        res.sendStatus(200);
+    }
+    catch (error) {
+        logger.error(
+            'app',
+            'Failed to remove role',
+            {
+                user: body.member_id,
+                role: body.role_id,
+                assigner: req.user.id,
+                error: error instanceof Error ? error.message : String(error),
+                stack: error instanceof Error ? error.stack : undefined,
+            }
+        );
+        res.status(500).json({ error: 'Failed to remove from group' });
+    }
+})
+
+//get all roles
+r.get('/', [requireMemberState(MemberState.Member)], async (req, res) => {
+    try {
+        const roles = await getAllRoles();
+        
+        res.status(200).json(roles);
+    } catch (error) {
+        logger.error(
+            'app',
+            'Failed to get all roles',
+            {
+                error: error instanceof Error ? error.message : String(error),
+                stack: error instanceof Error ? error.stack : undefined,
+            }
+        );
+        res.sendStatus(500);
+    }
+});
+
+r.get('/:id/members', [requireMemberState(MemberState.Member)], async (req: Request, res: Response) => {
+    try {
+        const members = await getUsersWithRole(Number(req.params.id));
+        res.status(200).json(members);
+    } catch (error) {
+        logger.error(
+            'app',
+            'Failed to get role members',
+            {
+                role: req.params.id,
+                error: error instanceof Error ? error.message : String(error),
+                stack: error instanceof Error ? error.stack : undefined,
+            }
+        );
+        res.sendStatus(500);
+    }
+})
+
+
+r.get('/:id', [requireMemberState(MemberState.Member)], async (req: Request, res: Response) => {
+    try {
+        const role = await getRole(Number(req.params.id));
+        res.status(200).json(role);
+    } catch (error) {
+        logger.error(
+            'app',
+            'Failed to get role members',
+            {
+                role: req.params.id,
+                error: error instanceof Error ? error.message : String(error),
+                stack: error instanceof Error ? error.stack : undefined,
+            }
+        );
+        res.sendStatus(500);
+    }
+})
+
+
+
+//create a new role
+r.post('/', [requireMemberState(MemberState.Member), requireRole("dev")], async (req, res) => {
+    try {
+        const { name, color, description } = req.body;
+        if (!name || !color) {
+            return res.status(400).json({ error: 'Name and color are required' });
+        }
+
+        const hexColorRegex = /^#([0-9A-Fa-f]{6})$/;
+        if (!hexColorRegex.test(color)) {
+            return res.status(400).json({ error: 'Color must be a valid hex color (#ffffff)' });
+        }
+
+        await createGroup(name, color, description);
+
+        res.sendStatus(201);
+    } catch (err) {
+        console.error('Insert failed:', err);
+        res.status(500).json({ error: 'Failed to create role' });
+    }
+})
+
+r.delete('/:id', [requireMemberState(MemberState.Member), requireRole("dev")], async (req, res) => {
+    try {
+        const id = req.params.id;
+
+        const sql = 'DELETE FROM roles WHERE id = ?';
+        const res = await pool.query(sql, [id]);
+        res.sendStatus(200);
+    } catch (error) {
+        console.error(error);
+        res.sendStatus(500);
+    }
+})
+
+export const roles = r;
+export const memberRoles = ur;

api/src/routes/statuses.ts

@@ -1,11 +1,16 @@
-const express = require('express');
+import express = require('express');
-const status = express.Router();
+const statusR = express.Router();
-const memberStatus = express.Router();
+const memberStatusR = express.Router();
 
 import pool from '../db';
+import { requireLogin } from '../middleware/auth';
+import { logger } from '../services/logging/logger';
+
+statusR.use(requireLogin);
+memberStatusR.use(requireLogin);
 
 //insert a new latest rank for a user
-memberStatus.post('/', async (req, res) => {
+memberStatusR.post('/', async (req, res) => {
     // try {
     //     const App = req.body?.App || {};
 
@@ -30,17 +35,25 @@ memberStatus.post('/', async (req, res) => {
 });
 
 //get all statuses
-status.get('/', async (req, res) => {
+statusR.get('/', async (req, res) => {
     try {
         const result = await pool.query('SELECT * FROM statuses;');
         res.json(result);
-    } catch (err) {
+    } catch (error) {
-        console.error(err);
+        logger.error(
-        res.status(500).json({ error: 'Internal server error' });
+            'app',
+            'Failed to get all statuses',
+            {
+                error: error instanceof Error ? error.message : String(error),
+                stack: error instanceof Error ? error.stack : undefined,
+            }
+        );
+        res.sendStatus(500);
     }
 });
 
-module.exports.status = status;
+export const status = statusR;
-module.exports.memberStatus = memberStatus;
+export const memberStatus = memberStatusR;
+
 
 // TODO, implement get all ranks route with SQL stirng SELECT id, name, short_name, category, sort_id FROM ranks;

api/src/routes/units.ts

@@ -0,0 +1,29 @@
+import express = require('express');
+const unitsRouter = express.Router();
+
+import pool from '../db';
+import { requireLogin } from '../middleware/auth';
+import { logger } from '../services/logging/logger';
+import { Unit } from '@app/shared/types/units';
+
+unitsRouter.use(requireLogin);
+
+//get all units
+unitsRouter.get('/', async (req, res) => {
+    try {
+        const result: Unit[] = await pool.query('SELECT * FROM units WHERE active = 1;');
+        res.json(result);
+    } catch (error) {
+        logger.error(
+            'app',
+            'Failed to get all units',
+            {
+                error: error instanceof Error ? error.message : String(error),
+                stack: error instanceof Error ? error.stack : undefined,
+            }
+        );
+        res.sendStatus(500);
+    }
+});
+
+export const units = unitsRouter;

api/src/services/applicationService.ts

@@ -1,71 +0,0 @@
-import { ApplicationListRow, ApplicationRow, CommentRow } from "@app/shared/types/application";
-import pool from "../db";
-
-export async function createApplication(memberID: number, appVersion: number, app: string) {
-  const sql = `INSERT INTO applications (member_id, app_version, app_data) VALUES (?, ?, ?);`;
-  const params = [memberID, appVersion, JSON.stringify(app)]
-  return await pool.query(sql, params);
-}
-
-export async function getMemberApplication(memberID: number): Promise<ApplicationRow> {
-  const sql = `SELECT app.*,
-          member.name AS member_name
-      FROM applications AS app
-          INNER JOIN members AS member ON member.id = app.member_id
-      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.*,
-          member.name AS member_name
-      FROM applications AS app
-          INNER JOIN members AS member ON member.id = app.member_id
-      WHERE app.id = ?;`;
-  let app: ApplicationRow[] = await pool.query(sql, [appID]);
-  return app[0];
-}
-
-export async function getApplicationList(): Promise<ApplicationListRow[]> {
-  const sql = `SELECT
-      member.name AS member_name,
-      app.id,
-      app.member_id,
-      app.submitted_at,
-      app.app_status
-    FROM applications AS app
-    LEFT JOIN members AS member
-      ON member.id = app.member_id;`
-
-  const rows: ApplicationListRow[] = await pool.query(sql);
-  return rows;
-}
-
-export async function approveApplication(id) {
-  const sql = `
-      UPDATE applications
-         SET approved_at = NOW()
-       WHERE id = ?
-        AND approved_at IS NULL
-        AND denied_at IS NULL
-      `;
-
-  const result = await pool.execute(sql, id);
-  return result;
-}
-
-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,
-          member.name AS poster_name
-        FROM application_comments AS app
-          INNER JOIN members AS member ON member.id = app.poster_id
-        WHERE app.application_id = ?;`,
-    [appID]);
-}

api/src/services/cache/cache.ts

@@ -0,0 +1,19 @@
+export class CacheService<Key, Value> {
+    private cacheMap: Map<Key, Value>
+
+    constructor() {
+        this.cacheMap = new Map<Key, Value>();
+    }
+
+    public Get(key: Key): Value {
+        return this.cacheMap.get(key)
+    }
+
+    public Set(key: Key, value: Value) {
+        this.cacheMap.set(key, value);
+    }
+
+    public Invalidate(key: Key): boolean {
+        return this.cacheMap.delete(key);
+    }
+}

api/src/services/db/CourseSerivce.ts

@@ -1,5 +1,6 @@
-import pool from "../db"
+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;"
@@ -79,11 +80,13 @@ 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();
+
+        let course: Course = await getCourseByID(event.course_id);
+
         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]);
+        const res = await con.query("INSERT INTO course_events (course_id, event_date, remarks, created_by, hasBookwork, hasQual) VALUES (?, ?, ?, ?, ?, ?);", [event.course_id, toDateTime(event.event_date), event.remarks, event.created_by, course.hasBookwork, course.hasQual]);
         var eventID: number = res.insertId;
 
         for (const attendee of event.attendees) {
@@ -98,16 +101,17 @@ 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) {
-        await con.rollback();
+        if (con) await con.rollback();
-        await con.release();
         throw error;
+    } finally {
+        if (con) await con.release();
     }
 }
 
-export async function getCourseEvents(sortDir: string, search: string = ""): Promise<CourseEventSummary[]> {
+export async function getCourseEvents(sortDir: string, search: string = "", page = 1, pageSize = 10): Promise<PagedData<CourseEventSummary>> {
+    const offset = (page - 1) * pageSize;
 
     let params = [];
     let searchString = "";
@@ -133,11 +137,23 @@ export async function getCourseEvents(sortDir: string, search: string = ""): Pro
                 LEFT JOIN members AS M
                     ON E.created_by = M.id
                 ${searchString}
-                ORDER BY E.event_date ${sortDir};`;
+                ORDER BY E.event_date ${sortDir}         
-    console.log(sql)
+                LIMIT ? OFFSET ?;`;
-    console.log(params)
+
-    let events: CourseEventSummary[] = await pool.query(sql, params);
+    let countSQL = `SELECT COUNT(*) AS count
-    return events;
+                    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;
 }
 
 export async function getCourseEventRoles(): Promise<CourseAttendeeRole[]> {

api/src/services/db/applicationService.ts

@@ -0,0 +1,125 @@
+import { ApplicationListRow, ApplicationRow, CommentRow } from "@app/shared/types/application";
+import pool from "../../db";
+import { error } from "console";
+
+/**
+ * Create an application in the db
+ * @param memberID 
+ * @param appVersion 
+ * @param app 
+ * @returns ID of the created application
+ */
+export async function createApplication(memberID: number, appVersion: number, app: string): Promise<number> {
+  const sql = `INSERT INTO applications (member_id, app_version, app_data) VALUES (?, ?, ?);`;
+  const params = [memberID, appVersion, JSON.stringify(app)]
+
+  let result = await pool.query(sql, params);
+  return Number(result.insertId);
+}
+
+export async function getMemberApplication(memberID: number): Promise<ApplicationRow> {
+  const sql = `SELECT app.*,
+          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;`;
+
+  let app: ApplicationRow[] = await pool.query(sql, [memberID]);
+  return app[0];
+}
+
+
+export async function getApplicationByID(appID: number): Promise<ApplicationRow> {
+  const sql =
+    `SELECT app.*,
+          member.name AS member_name
+      FROM applications AS app
+          INNER JOIN members AS member ON member.id = app.member_id
+      WHERE app.id = ?;`;
+  let app: ApplicationRow[] = await pool.query(sql, [appID]);
+  return app[0];
+}
+
+export async function getApplicationList(page: number = 1, pageSize: number = 25): Promise<ApplicationListRow[]> {
+  const offset = (page - 1) * pageSize;
+
+  const sql = `SELECT
+      member.name AS member_name,
+      app.id,
+      app.member_id,
+      app.submitted_at,
+      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 ?;`
+
+  const rows: ApplicationListRow[] = await pool.query(sql, [pageSize, offset]);
+  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) {
+  const sql = `
+      UPDATE applications
+         SET approved_at = NOW(), approved_by = ?
+       WHERE id = ?
+        AND approved_at IS NULL
+        AND denied_at IS NULL
+      `;
+
+  const result = await pool.execute(sql, [approver, id]);
+  if (result.affectedRows == 1) {
+    return
+  } else {
+    throw new Error(`"Something went wrong approving application with ID ${id}`);
+  }
+}
+
+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]);
+  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 : ''}`;
+
+  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}`,
+    [appID]);
+}

api/src/services/db/calendarService.ts

@@ -1,4 +1,4 @@
-import pool from '../db';
+import pool from '../../db';
 import { CalendarEventShort, CalendarSignup, CalendarEvent, CalendarAttendance } from "@app/shared/types/calendar"
 import { toDateTime } from "@app/shared/utils/time"
 
@@ -126,6 +126,5 @@ export async function getEventAttendance(eventID: number): Promise<CalendarSignu
 
     const sql = "CALL `sp_GetCalendarEventSignups`(?)"
     const res = await pool.query(sql, [eventID]);
-    console.log(res[0]);
     return res[0];
 }

api/src/services/db/loaService.ts

@@ -0,0 +1,109 @@
+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, page = 1, pageSize = 10): Promise<PagedData<LOARequest>> {
+
+    const offset = (page - 1) * pageSize;
+
+    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
+                LIMIT ? OFFSET ?;`, [userId, pageSize, offset])
+
+    let loaCount = Number((await pool.query(`SELECT COUNT(*) as count FROM leave_of_absences WHERE member_id = ?;`, [userId]))[0].count);
+    let pageCount = loaCount / pageSize;
+    let output: PagedData<LOARequest> = { data: result, pagination: { page: page, pageSize: pageSize, total: loaCount, totalPages: pageCount } }
+    return output;
+}
+
+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() > start_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]);
+    return out;
+}
+
+export async function getLOAbyID(id: number): Promise<LOARequest> {
+    let res = await pool.query(`SELECT * FROM leave_of_absences WHERE id = ?`, [id]);
+    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/db/memberService.ts

@@ -0,0 +1,210 @@
+import { Role } from "@app/shared/types/roles";
+import pool from "../../db";
+import { Member, MemberCardDetails, MemberLight, memberSettings, MemberState, PaginatedMembers } from '@app/shared/types/member'
+import { logger } from "../logging/logger";
+import { memberCache } from "../../routes/auth";
+import * as mariadb from 'mariadb';
+
+export async function getFilteredMembers(
+  page: number = 1,
+  pageSize: number = 15,
+  search?: string,
+  status?: string,
+  unitId?: string
+): Promise<PaginatedMembers> {
+  try {
+    const offset = (page - 1) * pageSize;
+    const whereClauses: string[] = [];
+    const params: any[] = [];
+
+    if (status && status !== 'all') {
+      whereClauses.push(`m.state = ?`);
+      params.push(status);
+    }
+
+    if (search) {
+      whereClauses.push(`v.member_name LIKE ?`);
+      params.push(`%${search}%`);
+    }
+
+    if (unitId && unitId !== 'all') {
+      whereClauses.push(`v.unit = ?`);
+      params.push(unitId);
+    }
+
+    const whereClause = whereClauses.length > 0
+      ? ` WHERE ${whereClauses.join(' AND ')}`
+      : '';
+
+    // COUNT QUERY
+    const countQuery = `SELECT COUNT(*) as total FROM view_member_rank_unit_status_latest v INNER JOIN members m ON v.member_id = m.id ${whereClause}`;
+    const [countResults]: any[] = await pool.query(countQuery, params);
+    const total = Number(countResults?.total) || 0;
+
+    // DATA QUERY
+    const dataQuery = `
+      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
+      INNER JOIN members m ON v.member_id = m.id
+      ${whereClause} -- Added back correctly
+      ORDER BY v.member_name ASC
+      LIMIT ? OFFSET ?
+    `;
+
+    const rows: any[] = await pool.query(dataQuery, [...params, pageSize, offset]);
+
+    // Map rows to Member type
+    const members: Member[] = rows.map(row => ({
+      member_id: Number(row.member_id),
+      member_name: row.member_name,
+      displayName: row.displayName,
+      rank: row.rank,
+      rank_date: row.rank_date,
+      unit: row.unit,
+      unit_date: row.unit_date,
+      status: row.status,
+      status_date: row.status_date,
+      loa_until: row.loa_until ? new Date(row.loa_until) : undefined,
+    }));
+
+    return {
+      data: members,
+      pagination: {
+        page,
+        pageSize,
+        total,
+        totalPages: Math.ceil(total / pageSize),
+      },
+    };
+  } catch (error) {
+    logger.error('app', 'Error fetching filtered members', {
+      error: error instanceof Error ? error.message : String(error),
+    });
+    throw error;
+  }
+}
+
+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 async function setUserState(userID: number, state: MemberState, con: mariadb.Pool | mariadb.Connection = pool) {
+  try {
+    const sql = `UPDATE members
+        SET state = ?
+        WHERE id = ?;`;
+    return await con.query(sql, [state, userID]);
+  } catch (error) {
+    logger.error('app', 'Error setting user state', error);
+  } finally {
+    memberCache.Invalidate(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);
+}
+
+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])
+}
+
+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<MemberCardDetails[]> {
+  const sql = `
+    SELECT m.*,
+      COALESCE(
+        JSON_ARRAYAGG(
+          CASE
+            WHEN r.id IS NOT NULL THEN JSON_OBJECT(
+              'id', r.id,
+              'name', r.name,
+              'color', r.color,
+              'description', r.description
+            )
+          END
+        ),
+        JSON_ARRAY()
+      ) AS roles
+    FROM view_member_rank_unit_status_latest m
+    LEFT JOIN members_roles mr ON m.member_id = mr.member_id
+    LEFT JOIN roles r ON mr.role_id = r.id
+    WHERE m.member_id IN (?)
+    GROUP BY m.member_id;
+  `;
+
+  const rows: any[] = await pool.query(sql, [ids]);
+
+  return rows.map(row => {
+    const member: Member = {
+      member_id: row.member_id,
+      member_name: row.member_name,
+      displayName: row.displayName,
+      rank: row.rank,
+      rank_date: row.rank_date,
+      unit: row.unit,
+      unit_date: row.unit_date,
+      status: row.status,
+      status_date: row.status_date,
+      loa_until: row.loa_until ? new Date(row.loa_until) : undefined,
+    };
+    // roles comes as array of strings; parse each one
+    const roles: Role[] = row.roles;
+
+    return { member, roles };
+  });
+}
+
+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/db/rankService.ts

@@ -0,0 +1,119 @@
+import { BatchPromotion, BatchPromotionMember } from "@app/shared/schemas/promotionSchema";
+import { PromotionDetails, PromotionSummary } from "@app/shared/types/rank"
+import pool from "../../db";
+import { PagedData } from "@app/shared/types/pagination";
+import { toDate, toDateIgnoreZone, toDateTime } from "@app/shared/utils/time";
+import * as mariadb from 'mariadb';
+
+export async function getAllRanks() {
+    const rows = await pool.query(
+        'SELECT id, name, short_name, sort_id FROM ranks;'
+    );
+    return rows;
+}
+
+export async function getRankByName(name: string) {
+    const rows = await pool.query(`SELECT id, name, short_name, sort_id FROM ranks WHERE name = ?`, [name]);
+
+    if (rows.length === 0)
+        throw new Error("Could not find rank: " + name);
+
+    return rows[0];
+}
+
+export async function insertMemberRank(member_id: number, rank_id: number, date: Date): Promise<void>;
+export async function insertMemberRank(member_id: number, rank_id: number): Promise<void>;
+
+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());`;
+
+    const params = date
+        ? [member_id, rank_id, date]
+        : [member_id, rank_id];
+
+    await pool.query(sql, params);
+}
+
+
+export async function batchInsertMemberRank(promos: BatchPromotionMember[], author: number, approver: number) {
+    try {
+        var con = await pool.getConnection();
+        promos.forEach(p => {
+            con.query(`CALL sp_update_member_rank(?, ?, ?, ?, ?, ?)`, [p.member_id, p.rank_id, approver, author, "Rank Change", toDateIgnoreZone(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
+                WHERE reason = 'Rank Change'
+                GROUP BY
+                    entry_day
+                ORDER BY
+                    entry_day DESC
+                LIMIT ? OFFSET ?;`
+
+    let promoList: PromotionSummary[] = await pool.query(sql, [pageSize, offset]) as PromotionSummary[];
+
+    let rowCount = Number((await pool.query(`SELECT
+                                                COUNT(*) AS total_grouped_days_count
+                                            FROM
+                                                (
+                                                    SELECT DISTINCT DATE(start_date)
+                                                    FROM members_ranks
+                                                    WHERE reason = 'Rank Change'
+                                                ) AS grouped_days;`))[0]);
+
+    let pageCount = rowCount / pageSize;
+
+    let output: PagedData<PromotionSummary> = { data: promoList, pagination: { page: page, pageSize: pageSize, total: rowCount, totalPages: pageCount } }
+    return output;
+}
+
+export async function getPromotionsOnDay(day: Date): Promise<PromotionDetails[]> {
+
+    const dayString = toDateTime(day);
+
+    // SQL query to fetch all records from members_unit for the specified day
+    let sql = `
+        SELECT 
+            mr.id AS promo_id,
+            mr.member_id,
+            mr.created_by_id,
+            mr.authorized_by_id,
+            r.short_name
+        FROM members_ranks AS mr
+            LEFT JOIN ranks AS r ON r.id = mr.rank_id
+        WHERE DATE(mr.start_date) = ? && mr.reason = 'Rank Change'
+        ORDER BY mr.start_date ASC;
+    `;
+
+    let batchPromotion = await pool.query(sql, [dayString]) as PromotionDetails[];
+
+    return batchPromotion;
+}
+
+export async function cancelLatestRank(userID: number, con: mariadb.Pool | mariadb.Connection = pool): Promise<boolean> {
+    try {
+        let sql = `CALL sp_end_member_rank(?,NOW())`;
+        con.query(sql, [userID]);
+        return true;
+    } catch (error) {
+        throw error;
+    }
+}

api/src/services/db/rolesService.ts

@@ -0,0 +1,65 @@
+import { MemberLight } from '@app/shared/types/member';
+import pool from '../../db';
+import { Role, RoleSummary } from '@app/shared/types/roles'
+import { logger } from '../logging/logger';
+import { memberCache } from '../../routes/auth';
+
+export async function assignUserGroup(userID: number, roleID: number) {
+    try {
+        const sql = `INSERT INTO members_roles (member_id, role_id) VALUES (?, ?);`;
+        const params = [userID, roleID];
+
+        return await pool.query(sql, params);
+    } catch (error) {
+        logger.error('app', 'Failed to assign user group', error);
+    } finally {
+        memberCache.Invalidate(userID);
+    }
+}
+
+export async function createGroup(name: string, color: string, description: string) {
+    const sql = `INSERT INTO roles (name, color, description) VALUES (?, ?, ?)`;
+    const params = [name, color, description];
+
+    const result = await pool.query(sql, params);
+    return { id: result.insertId, name, color, description };
+}
+
+export async function getUserRoles(userID: number): Promise<Role[]> {
+    const sql = `SELECT r.id, r.name
+        FROM members_roles mr
+        INNER JOIN roles r ON mr.role_id = r.id
+        WHERE mr.member_id = ?;`;
+
+    return await pool.query(sql, [userID]);
+}
+
+export async function getRole(id: number): Promise<Role> {
+    let res = await pool.query(`SELECT * FROM roles WHERE id = ?`, [id])
+    return res[0] as Role;
+}
+
+export async function getAllRoles(): Promise<RoleSummary> {
+    return await pool.query(`SELECT id, name, color FROM roles`);
+}
+
+export async function getUsersWithRole(roleId: number): Promise<MemberLight[]> {
+    const out = await pool.query(
+        `
+    SELECT
+      m.member_id   AS id,
+      m.member_name AS username,
+      m.displayName,
+      u.color
+    FROM members_roles mr
+    JOIN view_member_rank_unit_status_latest m
+      ON m.member_id = mr.member_id
+    LEFT JOIN units u
+      ON u.name = m.unit
+    WHERE mr.role_id = ?
+    `,
+        [roleId]
+    )
+
+    return out as MemberLight[]
+}

api/src/services/db/statusService.ts

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

api/src/services/db/unitService.ts

@@ -0,0 +1,13 @@
+import pool from "../../db";
+import * as mariadb from 'mariadb';
+
+
+export async function cancelLatestUnit(userID: number, con: mariadb.Pool | mariadb.Connection = pool): Promise<boolean> {
+    try {
+        let sql = `CALL sp_end_member_unit(?,NOW())`;
+        con.query(sql, [userID]);
+        return true;
+    } catch (error) {
+        throw error;
+    }
+}

api/src/services/events/eventBus.ts

@@ -0,0 +1,56 @@
+import { randomUUID } from "crypto";
+import { logger } from "../logging/logger";
+
+interface Event {
+    id: string
+    type: string
+    occurredAt: string
+    payload?: Record<string, any>
+}
+
+type EventHandler = (event: Event) => void | Promise<void>;
+
+class EventBus {
+    private handlers: Map<string, EventHandler[]> = new Map();
+
+    /**
+     * Register event listener
+     * @param type 
+     * @param handler 
+     */
+    on(type: string, handler: EventHandler) {
+        const handlers = this.handlers.get(type) ?? [];
+        handlers.push(handler);
+        this.handlers.set(type, handlers);
+    }
+
+    /**
+     * Emit event of given type
+     * @param type
+     * @param payload 
+     */
+    async emit(type: string, payload?: Record<string, any>) {
+        const event: Event = {
+            id: randomUUID(),
+            type,
+            occurredAt: new Date().toISOString(),
+            payload
+        }
+
+        const handlers = this.handlers.get(type) ?? []
+
+        for (const h of handlers) {
+            try {
+                await h(event)
+            } catch (error) {
+                logger.error('app', 'Event handler failed', {
+                    type: event.type,
+                    id: event.id,
+                    error: error instanceof Error ? error.message : String(error),
+                })
+            }
+        }
+    }
+}
+
+export const bus = new EventBus();

api/src/services/integrations/discord.ts

@@ -0,0 +1,39 @@
+import { bus } from "../events/eventBus";
+import { logger } from "../logging/logger";
+
+export function initializeDiscordIntegrations() {
+    bus.on('application.create', async (event) => {
+
+        if (!process.env.DISCORD_APPLICATIONS_WEBHOOK) {
+            logger.error("app", 'Discord Applications Webhook is not defined')
+            return;
+        }
+
+        let applicantName = event.payload.member_discord_id || event.payload.member_name;
+        if (event.payload.member_discord_id) {
+            applicantName = `<@${event.payload.member_discord_id}>`;
+        }
+        const link = `${process.env.CLIENT_URL}/administration/applications/${event.payload.application}`;
+
+        const embed = {
+            title: "Application Posted",
+            description: `[View Application](${link})`,
+            color: 0x00ff00, // optional: green color
+            timestamp: new Date().toISOString(), // <-- Discord expects ISO8601
+            fields: [
+                {
+                    name: "Submitted By",
+                    value: applicantName,
+                    inline: false,
+                },
+            ],
+        };
+
+        // send to Discord webhook
+        await fetch(process.env.DISCORD_APPLICATIONS_WEBHOOK!, {
+            method: 'POST',
+            headers: { 'Content-Type': 'application/json' },
+            body: JSON.stringify({ embeds: [embed] }),
+        });
+    });
+}

api/src/services/logging/logger.ts

@@ -0,0 +1,72 @@
+export type LogLevel = 'debug' | 'info' | 'warn' | 'error';
+export type LogDepth = 'normal' | 'verbose' | 'profiling';
+export type LogType = 'http' | 'app' | 'auth' | 'profiling';
+
+export interface LogHeader {
+    timestamp: string;
+    level: LogLevel;
+    depth: LogDepth;
+    type: LogType; // 'http', 'app', 'db', etc.
+    user_id?: number;
+}
+
+export interface LogPayload {
+    message?: string;              // short human-friendly description
+    data?: Record<string, any>;    // type-specific rich data
+}
+
+// Environment defaults
+const CURRENT_DEPTH: LogDepth = (process.env.LOG_DEPTH as LogDepth) || 'normal';
+
+const DEPTH_ORDER: Record<LogDepth, number> = { normal: 0, verbose: 1, profiling: 2 };
+
+function shouldLog(depth: LogDepth) {
+    let should = DEPTH_ORDER[depth] <= DEPTH_ORDER[CURRENT_DEPTH]
+    return should;
+}
+
+function emitLog(header: LogHeader, payload: LogPayload = {}) {
+    if (!shouldLog(header.depth)) return;
+
+    const logLine = { ...header, ...payload };
+
+    if (header.level === 'error')
+        console.error(JSON.stringify(logLine))
+    else
+        console.log(JSON.stringify(logLine));
+}
+
+export const logger = {
+    log(level: LogLevel, type: LogType, message: string, data?: Record<string, any>, depth: LogDepth = 'normal', context?: Partial<LogHeader>) {
+        const header: LogHeader = {
+            timestamp: new Date().toISOString(),
+            level,
+            depth,
+            type,
+            ...context,
+        };
+
+        const payload: LogPayload = {
+            message,
+            data,
+        };
+
+        emitLog(header, payload);
+    },
+
+    info(type: LogType, message: string, data?: Record<string, any>, depth: LogDepth = 'normal', context?: Partial<LogHeader>) {
+        this.log('info', type, message, data, depth, context);
+    },
+
+    debug(type: LogType, message: string, data?: Record<string, any>, depth: LogDepth = 'normal', context?: Partial<LogHeader>) {
+        this.log('debug', type, message, data, depth, context);
+    },
+
+    warn(type: LogType, message: string, data?: Record<string, any>, depth: LogDepth = 'normal', context?: Partial<LogHeader>) {
+        this.log('warn', type, message, data, depth, context);
+    },
+
+    error(type: LogType, message: string, data?: Record<string, any>, depth: LogDepth = 'normal', context?: Partial<LogHeader>) {
+        this.log('error', type, message, data, depth, context);
+    },
+}

api/src/services/memberService.ts

@@ -1,34 +0,0 @@
-import pool from "../db";
-
-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
-        SET state = ?
-        WHERE id = ?;`;
-    return await pool.query(sql, [state, userID]);
-}
-
-declare global {
-  namespace Express {
-    interface Request {
-      user: {
-        id: number;
-        name: string;
-      };
-    }
-  }
-}

api/src/services/rankService.ts

@@ -1,32 +0,0 @@
-import pool from "../db";
-
-export async function getAllRanks() {
-    const rows = await pool.query(
-        'SELECT id, name, short_name, sort_id FROM ranks;'
-    );
-    return rows;
-}
-
-export async function getRankByName(name: string) {
-    const rows = await pool.query(`SELECT id, name, short_name, sort_id FROM ranks WHERE name = ?`, [name]);
-
-    if (rows.length === 0)
-        throw new Error("Could not find rank: " + name);
-
-    return rows[0];
-}
-
-export async function insertMemberRank(member_id: number, rank_id: number, date: Date): Promise<void>;
-export async function insertMemberRank(member_id: number, rank_id: number): Promise<void>;
-
-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, event_date) VALUES (?, ?, ?);`
-        : `INSERT INTO members_ranks (member_id, rank_id, event_date) VALUES (?, ?, NOW());`;
-
-    const params = date
-        ? [member_id, rank_id, date]
-        : [member_id, rank_id];
-
-    await pool.query(sql, params);
-}

api/src/services/rolesService.ts

@@ -1,27 +0,0 @@
-import pool from '../db';
-import { Role } from '@app/shared/types/roles'
-
-export async function assignUserGroup(userID: number, roleID: number) {
-
-    const sql = `INSERT INTO members_roles (member_id, role_id) VALUES (?, ?);`;
-    const params = [userID, roleID];
-
-    return await pool.query(sql, params);
-}
-
-export async function createGroup(name: string, color: string, description: string) {
-    const sql = `INSERT INTO roles (name, color, description) VALUES (?, ?, ?)`;
-    const params = [name, color, description];
-
-    const result = await pool.query(sql, params);
-    return { id: result.insertId, name, color, description };
-}
-
-export async function getUserRoles(userID: number): Promise<Role[]> {
-    const sql = `SELECT r.id, r.name
-        FROM members_roles mr
-        INNER JOIN roles r ON mr.role_id = r.id
-        WHERE mr.member_id = 190;`;
-
-    return await pool.query(sql, [userID]);
-}

api/tsconfig.json

@@ -7,6 +7,7 @@
       "node",
       "express"
     ],
+    "sourceMap": true,
     "paths": {
       "@app/shared/*": ["../shared/*"]
     }

docker-compose.dev.yml

@@ -0,0 +1,13 @@
+version: "3.9"
+services:
+  db:
+    image: mariadb:10.6.23-ubi9
+    environment:
+      MARIADB_ROOT_PASSWORD: root
+      MARIADB_DATABASE: ranger_unit_tracker
+      MARIADB_USER: dev
+      MARIADB_PASSWORD: dev
+    ports:
+      - "3306:3306"
+    volumes:
+      - ./db_data:/var/lib/mysql

readme.md

@@ -0,0 +1,54 @@
+## Prerequs
+
+* Node.js
+* npm
+* Docker + Docker Compose
+
+## Installation
+
+Install dependencies in each workspace:
+
+```
+cd ui && npm install
+cd ../api && npm install
+cd ../shared && npm install
+```
+
+## Local Development Setup
+
+From the project root, start required services:
+
+```
+docker compose -f docker-compose.dev.yml up
+```
+
+Run database setup from `/api`:
+
+```
+npm run migrate:up
+npm run migrate:seed
+```
+
+## Running the App
+
+Start the frontend:
+
+```
+cd ui
+npm run dev
+```
+
+Start the API:
+
+```
+cd api
+npm run dev
+```
+
+* UI runs via Vite
+* API runs on Node after TypeScript build
+
+## Notes
+
+* `shared` must have its dependencies installed for both UI and API to work
+* `docker-compose.dev.yml` is required for local dev dependencies (e.g. database)

shared/schemas/dischargeSchema.ts

@@ -0,0 +1,10 @@
+import z from "zod";
+
+export const dischargeSchema = z.object({
+    reason: z.string().min(1, "Please provide a valid reason for discharge").max(200),
+    // effectiveDate: z.string().min(1, "Date is required"),
+})
+
+export type Discharge = z.infer<typeof dischargeSchema> & {
+    userID: number;
+};

shared/schemas/loaSchema.ts

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

@@ -0,0 +1,32 @@
+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" }),
+    approver: z.number({ invalid_type_error: "Must select a member" }).int().positive()
+})
+    .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,6 +40,7 @@ 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,7 @@ export interface CalendarSignup {
     eventID: number;
     status: CalendarAttendance;
     member_name?: string;
-    member_unit?: string;
+    unit_name?: string;
 }    
 
 export interface CalendarEventShort {

shared/types/loa.ts

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

@@ -0,0 +1,50 @@
+import { LOARequest } from "./loa";
+import { Role } from "./roles";
+import { PagedData } from "./pagination";
+
+export interface memberSettings {
+    displayName: string;
+}
+
+export type PaginatedMembers = PagedData<Member>;
+
+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 MemberCardDetails {
+    member: Member;
+    roles: Role[];
+}
+
+export interface myData {
+    member: Member;
+    LOAs: LOARequest[];
+    roles: Role[];
+    state: MemberState;
+}

shared/types/pagination.ts

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

shared/types/rank.ts

@@ -0,0 +1,19 @@
+export type Rank = {
+  id: number
+  name: string
+  short_name: string
+  category: string
+  sortOrder: number
+}
+
+export interface PromotionSummary {
+  entry_day: Date;
+}
+
+export interface PromotionDetails {
+  promo_id: number;
+  member_id: number;
+  short_name: string;
+  created_by_id: number;
+  authorized_by_id: number;
+}

shared/types/roles.ts

@@ -1,6 +1,14 @@
+import { MemberLight } from "./member";
+
 export interface Role {
     id: number;
     name: string;
     color?: string;
     description?: string;
 }
+
+export interface RoleSummary {
+    id: number;
+    name: string;
+    color?: string;
+}

shared/types/units.ts

@@ -0,0 +1,7 @@
+export interface Unit {
+    id: number;
+    name: string;
+    description?: string;
+    active: boolean;
+    color?: string;
+}

shared/utils/time.ts

@@ -1,12 +1,36 @@
 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 year = date.getFullYear();
-    const month  = (date.getMonth() + 1).toString().padStart(2, "0");
+    const month = (date.getMonth() + 1).toString().padStart(2, "0");
-    const day    = date.getDate().toString().padStart(2, "0");
+    const day = date.getDate().toString().padStart(2, "0");
-    const hour   = date.getHours().toString().padStart(2, "0");
+    const hour = date.getHours().toString().padStart(2, "0");
     const minute = date.getMinutes().toString().padStart(2, "0");
     const second = date.getSeconds().toString().padStart(2, "0");
 
     return `${year}-${month}-${day} ${hour}:${minute}:${second}`;
 }
+
+export function toDateIgnoreZone(date: Date): string {
+    if (typeof date === 'string') {
+        date = new Date(date);
+    }
+    return date.toISOString().split('T')[0];
+}
+
+export function toDate(date: Date): string {
+    if (typeof date === 'string') {
+        date = new Date(date);
+    }
+    console.log(date);
+    // This produces a CST-local date because server runs in CST
+    const year = date.getFullYear();
+    const month = (date.getMonth() + 1).toString().padStart(2, "0");
+    const day = date.getDate().toString().padStart(2, "0");
+    let out = `${year}-${month}-${day}`;
+
+    console.log(out);
+    return out;
+}

ui/.env.example

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

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>Vite App</title>
+    <title>17th Ranger Battalion</title>
   </head>
   <body>
     <div id="app"></div>

ui/src/App.vue

@@ -5,6 +5,7 @@ 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();
 
@@ -18,21 +19,32 @@ function formatDate(dateStr) {
 }
 
 const environment = import.meta.env.VITE_ENVIRONMENT;
+const version = import.meta.env.VITE_APPLICATION_VERSION;
 </script>
 
 <template>
-  <div class="flex flex-col min-h-screen">
+  <div class="flex flex-col min-h-screen" style="background-image: linear-gradient(rgba(0, 0, 0, 0.25), rgba(0, 0, 0, 0.25)), url('/bg.jpg'); 
+      background-size: contain; 
+      background-attachment: fixed;
+      background-position: center;">
     <div class="sticky top-0 bg-background z-50">
       <Navbar class="flex"></Navbar>
-      <Alert v-if="environment == 'dev'" class="m-2 mx-auto w-5xl" variant="info">
+      <Alert v-if="environment == 'dev'" class="m-2 mx-auto max-w-5xl" variant="info">
-        <AlertDescription class="flex flex-row items-center text-nowrap gap-5 mx-auto">
+        <AlertDescription class="flex flex-row items-center text-wrap gap-5 mx-auto">
-          <p>This is a development build of the application. Some features will be unavailable or unstable.</p>
+          <p>Development environment (v{{ version }}). Features may be incomplete or unavailable.</p>
         </AlertDescription>
       </Alert>
-      <Alert v-if="userStore.user?.loa?.[0]" class="m-2 mx-auto w-5xl" variant="info">
+      <Alert v-if="userStore.user?.LOAs?.[0]" class="m-2 mx-auto max-w-5xl" variant="info">
         <AlertDescription class="flex flex-row items-center text-nowrap gap-5 mx-auto">
-          <p>You are on LOA until <strong>{{ formatDate(userStore.user?.loa?.[0].end_date) }}</strong></p>
+            <p v-if="new Date(userStore.user?.LOAs?.[0].extended_till || userStore.user?.LOAs?.[0].end_date) > new Date()">
-          <Button variant="secondary">End LOA</Button>
+            LOA until <strong>{{ formatDate(userStore.user?.LOAs?.[0].extended_till || userStore.user?.LOAs?.[0].end_date) }}</strong>
+            </p>
+            <p v-else>
+            LOA expired on <strong>{{ formatDate(userStore.user?.LOAs?.[0].extended_till || userStore.user?.LOAs?.[0].end_date) }}</strong>
+            </p>
+          <Button variant="secondary"
+            @click="async () => { await cancelLOA(userStore.user.LOAs?.[0].id); userStore.loadUser(); }">End
+            LOA</Button>
         </AlertDescription>
       </Alert>
     </div>

ui/src/api/application.ts

@@ -1,80 +1,11 @@
-export type ApplicationDto = Partial<{
+import { ApplicationFull } from "@shared/types/application";
-  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): Promise<ApplicationFull | null> {
+export async function loadApplication(id: number | string, asAdmin: boolean = false): Promise<ApplicationFull | null> {
-  const res = await fetch(`${addr}/application/${id}`, { credentials: 'include' })
+  const res = await fetch(`${addr}/application/${id}?admin=${asAdmin}`, { credentials: 'include' })
   if (res.status === 204) return null
   if (!res.ok) throw new Error('Failed to load application')
   const json = await res.json()
@@ -104,6 +35,22 @@ 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),
   })
@@ -112,7 +59,9 @@ export async function postChatMessage(message: any, post_id: number) {
 }
 
 export async function getAllApplications(): Promise<ApplicationFull> {
-  const res = await fetch(`${addr}/application/all`)
+  const res = await fetch(`${addr}/application/all`, {
+    credentials: 'include',
+  })
 
   if (res.ok) {
     return res.json()
@@ -121,18 +70,67 @@ export async function getAllApplications(): Promise<ApplicationFull> {
   }
 }
 
-export async function approveApplication(id: Number) {
+export async function loadMyApplications(): Promise<ApplicationFull> {
-  const res = await fetch(`${addr}/application/approve/${id}`, { method: 'POST' })
+  const res = await fetch(`${addr}/application/meList`, { credentials: 'include' })
 
-  if (!res.ok) {
+  if (res.ok) {
+    return res.json()
+  } else {
     console.error("Something went wrong approving the application")
   }
 }
 
-export async function denyApplication(id: Number) {
+export async function getMyApplication(id: number): Promise<ApplicationFull> {
-  const res = await fetch(`${addr}/application/deny/${id}`, { method: 'POST' })
+  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' })
 
   if (!res.ok) {
-    console.error("Something went wrong denying the application")
+    throw new 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' })
+
+  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;
   }
 }

ui/src/api/calendar.ts

@@ -100,7 +100,6 @@ 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/docs.ts

@@ -0,0 +1,18 @@
+//  @ts-ignore
+const addr = import.meta.env.VITE_APIHOST;
+
+export async function getWelcomeMessage(): Promise<string> {
+    const res = await fetch(`${addr}/docs/welcome`, {
+        method: "GET",
+        credentials: 'include',
+    });
+    if (res.ok) {
+        const out = res.json();
+        if (!out) {
+            return null;
+        }
+        return out;
+    } else {
+        return null;
+    }
+}

ui/src/api/loa.ts

@@ -1,12 +1,5 @@
-export type LOARequest = {
+import { LOARequest, LOAType } from '@shared/types/loa'
-    id?: number;
+import { PagedData } from '@shared/types/pagination'
-    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;
 
@@ -17,21 +10,41 @@ export async function submitLOA(request: LOARequest): Promise<{ id?: number; err
             "Content-Type": "application/json",
         },
         body: JSON.stringify(request),
+        credentials: 'include',
     });
 
     if (res.ok) {
-        return res.json();
+        return;
     } else {
-        return { error: "Failed to submit LOA" };
+        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) {
+        return
+    } else {
+        throw new Error("Failed to submit LOA");
+    }
+}
+
+
 export async function getMyLOA(): Promise<LOARequest | null> {
     const res = await fetch(`${addr}/loa/me`, {
         method: "GET",
         headers: {
             "Content-Type": "application/json",
         },
+        credentials: 'include',
     });
 
 
@@ -46,12 +59,49 @@ export async function getMyLOA(): Promise<LOARequest | null> {
     }
 }
 
-export function getAllLOAs(): Promise<LOARequest[]> {
+export async function getAllLOAs(page?: number, pageSize?: number): Promise<PagedData<LOARequest>> {
-    return fetch(`${addr}/loa/all`, {
+    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}`, {
         method: "GET",
         headers: {
             "Content-Type": "application/json",
         },
+        credentials: 'include',
+    }).then((res) => {
+        if (res.ok) {
+            return res.json();
+        } else {
+            return [];
+        }
+    });
+}
+
+export function getMyLOAs(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/history?${params}`, {
+        method: "GET",
+        credentials: 'include',
+        headers: {
+            "Content-Type": "application/json",
+        },
     }).then((res) => {
         if (res.ok) {
             return res.json();
@@ -59,4 +109,69 @@ export function getAllLOAs(): 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,12 +1,5 @@
-export type Member = {
+import { Discharge } from "@shared/schemas/dischargeSchema";
-    member_id: number;
+import { memberSettings, Member, MemberLight, MemberCardDetails, PaginatedMembers } from "@shared/types/member";
-    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;
@@ -20,3 +13,126 @@ export async function getMembers(): Promise<Member[]> {
     }
     return response.json();
 }
+
+export async function getMembersFiltered(params: {
+    page?: number;
+    pageSize?: number;
+    search?: string;
+    status?: string;
+    unitId?: string;
+} = {}): Promise<PaginatedMembers> {
+
+    // Construct the query string dynamically
+    const query = new URLSearchParams();
+    if (params.page) query.append('page', params.page.toString());
+    if (params.pageSize) query.append('pageSize', params.pageSize.toString());
+    if (params.search) query.append('search', params.search);
+    if (params.status && params.status !== 'all') query.append('status', params.status);
+    if (params.unitId && params.unitId !== 'all') query.append('unitId', params.unitId);
+
+    const response = await fetch(`${addr}/members/filtered?${query.toString()}`, {
+        credentials: 'include'
+    });
+
+    if (!response.ok) {
+        throw new Error("Failed to fetch members");
+    }
+
+    return response.json();
+}
+
+export async function getMemberSettings(): Promise<memberSettings> {
+    const response = await fetch(`${addr}/members/settings`, {
+        credentials: 'include'
+    });
+    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<MemberCardDetails[]> {
+
+    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();
+}
+
+/**
+ * Requests for the given member to be discharged
+ * @param data discharge packet
+ * @returns true on success
+ */
+export async function dischargeMember(data: Discharge): Promise<boolean> {
+    const response = await fetch(`${addr}/members/discharge`, {
+        credentials: 'include',
+        method: 'POST',
+        headers: {
+            "Content-Type": "application/json",
+        },
+        body: JSON.stringify(data)
+    });
+    if (!response.ok) {
+        throw new Error("Failed to discharge member");
+    }
+    return true;
+}

ui/src/api/rank.ts

@@ -1,38 +1,73 @@
-export type Rank = {
+import { BatchPromotion, BatchPromotionMember } from '@shared/schemas/promotionSchema';
-  id: number
+import { PagedData } from '@shared/types/pagination';
-  name: string
+import { PromotionDetails, PromotionSummary, Rank } from '@shared/types/rank'
-  short_name: string
-  sortOrder: number
-}
 
 //  @ts-ignore
 const addr = import.meta.env.VITE_APIHOST;
 
-export async function getRanks(): Promise<Rank[]> {
+export async function getAllRanks(): Promise<Rank[]> {
-  const res = await fetch(`${addr}/ranks`)
+    const res = await fetch(`${addr}/ranks`, {
-
+        credentials: 'include'
-  if (res.ok) {
+    })
-    return res.json()
-  } else {
-    console.error("Something went wrong approving the application")
-  }
 
+    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`, {
-  const res = await fetch(`${addr}/memberRanks`, {
+        method: "POST",
-    method: "POST",
+        headers: {
-    headers: {
+            "Content-Type": "application/json",
-      "Content-Type": "application/json",
+        },
-    },
+        credentials: 'include',
-    body: JSON.stringify({ change: { member_id, rank_id, date } }),
+        body: JSON.stringify(promo),
-  })
+    })
 
-  if (res.ok) {
+    if (res.ok) {
-    return { ok: true }
+        return
-  } else {
+    } else {
-    console.error("Failed to submit rank change")
+        throw new Error("Failed to submit rank change: Server error");
-    return { ok: false }
+    }
-  }
+}
+
+export async function getPromoHistory(page?: number, pageSize?: number): Promise<PagedData<PromotionSummary>> {
+    const params = new URLSearchParams();
+
+    if (page !== undefined) {
+        params.set("page", page.toString());
+    }
+
+    if (pageSize !== undefined) {
+        params.set("pageSize", pageSize.toString());
+    }
+
+    return fetch(`${addr}/memberRanks?${params}`, {
+        method: "GET",
+        headers: {
+            "Content-Type": "application/json",
+        },
+        credentials: 'include',
+    }).then((res) => {
+        if (res.ok) {
+            return res.json();
+        } else {
+            return [];
+        }
+    });
+}
+
+export async function getPromotionsOnDay(day: Date): Promise<PromotionDetails[]> {
+    const res = await fetch(`${addr}/memberRanks/${day.toISOString()}`, {
+        credentials: 'include',
+    })
+
+    if (res.ok) {
+        return await res.json();
+    } else {
+        throw new Error("Failed to submit rank change: Server error");
+    }
 }

ui/src/api/roles.ts

@@ -1,16 +1,13 @@
-export type Role = {
+import { Member, MemberLight } from "@shared/types/member";
-    id: number;
+import { Role } from "@shared/types/roles";
-    name: string;
-    color: string;
-    description: string | null;
-    members: any[];
-};
 
 //  @ts-ignore
 const addr = import.meta.env.VITE_APIHOST;
 
 export async function getRoles(): Promise<Role[]> {
-    const res = await fetch(`${addr}/roles`)
+    const res = await fetch(`${addr}/roles`, {
+        credentials: 'include',
+    })
 
     if (res.ok) {
         return res.json() as Promise<Role[]>;
@@ -20,17 +17,42 @@ export async function getRoles(): Promise<Role[]> {
     }
 }
 
+export async function getRoleDetails(id: number): Promise<Role> {
+    const res = await fetch(`${addr}/roles/${id}`, {
+        credentials: 'include',
+    })
+
+    if (res.ok) {
+        return res.json() as Promise<Role>;
+    } else {
+        throw new Error("Could not load role");
+    }
+}
+
+export async function getRoleMembers(id: number): Promise<MemberLight[]> {
+    const res = await fetch(`${addr}/roles/${id}/members`, {
+        credentials: 'include',
+    })
+
+    if (res.ok) {
+        return res.json();
+    } else {
+        throw new Error("Could not load members");
+    }
+}
+
 export async function createRole(name: string, color: string, description: string | null): Promise<Role | null> {
     const res = await fetch(`${addr}/roles`, {
         method: "POST",
         headers: {
             "Content-Type": "application/json"
         },
+        credentials: 'include',
         body: JSON.stringify({
             name,
             color,
             description
-        })
+        }),
     });
 
     if (res.ok) {
@@ -47,6 +69,7 @@ export async function addMemberToRole(member_id: number, role_id: number): Promi
         headers: {
             "Content-Type": "application/json"
         },
+        credentials: 'include',
         body: JSON.stringify({
             member_id,
             role_id
@@ -64,6 +87,7 @@ export async function addMemberToRole(member_id: number, role_id: number): Promi
 export async function removeMemberFromRole(member_id: number, role_id: number): Promise<boolean> {
     const res = await fetch(`${addr}/memberRoles`, {
         method: "DELETE",
+        credentials: 'include',
         headers: {
             "Content-Type": "application/json"
         },
@@ -83,7 +107,8 @@ export async function removeMemberFromRole(member_id: number, role_id: number):
 
 export async function deleteRole(role_id: number): Promise<boolean> {
     const res = await fetch(`${addr}/roles/${role_id}`, {
-        method: "DELETE"
+        method: "DELETE",
+        credentials: 'include',
     });
 
     if (res.ok) {

ui/src/api/trainingReport.ts

@@ -1,13 +1,34 @@
 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): Promise<CourseEventSummary[]> {
+export async function getTrainingReports(sortMode?: string, search?: string, page?: number, pageSize?: number): Promise<PagedData<CourseEventSummary>> {
-    const res = await fetch(`${addr}/courseEvent?sort=${sortMode}&search=${search}`);
+    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',
+    });
 
     if (res.ok) {
-        return await res.json() as Promise<CourseEventSummary[]>;
+        return await res.json() as Promise<PagedData<CourseEventSummary>>;
     } else {
         console.error("Something went wrong");
         throw new Error("Failed to load training reports");
@@ -15,7 +36,9 @@ export async function getTrainingReports(sortMode: string, search: string): Prom
 }
 
 export async function getTrainingReport(id: number): Promise<CourseEventDetails> {
-    const res = await fetch(`${addr}/courseEvent/${id}`);
+    const res = await fetch(`${addr}/courseEvent/${id}`, {
+        credentials: 'include',
+    });
 
     if (res.ok) {
         return await res.json() as Promise<CourseEventDetails>;
@@ -26,7 +49,9 @@ export async function getTrainingReport(id: number): Promise<CourseEventDetails>
 }
 
 export async function getAllTrainings(): Promise<Course[]> {
-    const res = await fetch(`${addr}/course`);
+    const res = await fetch(`${addr}/course`, {
+        credentials: 'include',
+    });
 
     if (res.ok) {
         return await res.json() as Promise<Course[]>;
@@ -37,7 +62,9 @@ export async function getAllTrainings(): Promise<Course[]> {
 }
 
 export async function getAllAttendeeRoles(): Promise<CourseAttendeeRole[]> {
-    const res = await fetch(`${addr}/course/roles`);
+    const res = await fetch(`${addr}/course/roles`, {
+        credentials: 'include',
+    });
 
     if (res.ok) {
         return await res.json() as Promise<CourseAttendeeRole[]>;

ui/src/api/units.ts

@@ -0,0 +1,15 @@
+import { memberSettings, Member, MemberLight, MemberCardDetails } from "@shared/types/member";
+import { Unit } from "@shared/types/units";
+
+//  @ts-ignore
+const addr = import.meta.env.VITE_APIHOST;
+
+export async function getUnits(): Promise<Unit[]> {
+    const response = await fetch(`${addr}/units`, {
+        credentials: 'include'
+    });
+    if (!response.ok) {
+        throw new Error("Failed to fetch units");
+    }
+    return response.json();
+}

ui/src/assets/base.css

@@ -4,7 +4,7 @@
 @custom-variant dark (&:is(.dark *));
 
 :root {
-  --background: oklch(0.2046 0 0);
+  --background: oklch(19.125% 0.00002 271.152);
   --foreground: oklch(0.9219 0 0);
   --card: oklch(23.075% 0.00003 271.152);
   --card-foreground: oklch(0.9219 0 0);
@@ -166,3 +166,111 @@
     @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,13 +18,17 @@ 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 { CircleArrowOutUpRight } from 'lucide-vue-next';
+import { ArrowUpRight, CircleArrowOutUpRight } from 'lucide-vue-next';
+import DropdownMenuGroup from '../ui/dropdown-menu/DropdownMenuGroup.vue';
+import DropdownMenuSeparator from '../ui/dropdown-menu/DropdownMenuSeparator.vue';
 
 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;
@@ -58,10 +62,15 @@ function blurAfter() {
                                 </NavigationMenuLink>
                             </NavigationMenuItem>
 
-                            <!-- Members -->
+                            <!-- Docs -->
                             <NavigationMenuItem>
                                 <NavigationMenuLink as-child :class="navigationMenuTriggerStyle()">
-                                    <RouterLink to="/" @click="blurAfter">Documents</RouterLink>
+                                    <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>
                                 </NavigationMenuLink>
                             </NavigationMenuItem>
 
@@ -76,11 +85,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">
@@ -98,13 +107,13 @@ function blurAfter() {
                                 <NavigationMenuContent
                                     class="grid gap-1 p-2 text-left [&_a]:w-full [&_a]:block [&_a]:whitespace-nowrap *:bg-transparent">
 
-                                    <NavigationMenuLink
+                                    <!-- <NavigationMenuLink
                                         v-if="auth.hasAnyRole(['17th Administrator', '17th HQ', '17th Command'])"
                                         as-child :class="navigationMenuTriggerStyle()">
                                         <RouterLink to="/administration/rankChange" @click="blurAfter">
                                             Promotions
                                         </RouterLink>
-                                    </NavigationMenuLink>
+                                    </NavigationMenuLink> -->
 
                                     <NavigationMenuLink
                                         v-if="auth.hasAnyRole(['17th Administrator', '17th HQ', '17th Command'])"
@@ -117,8 +126,8 @@ function blurAfter() {
                                     <NavigationMenuLink
                                         v-if="auth.hasAnyRole(['17th Administrator', '17th HQ', '17th Command'])"
                                         as-child :class="navigationMenuTriggerStyle()">
-                                        <RouterLink to="/administration/transfer" @click="blurAfter">
+                                        <RouterLink to="/administration/rankChange" @click="blurAfter">
-                                            Transfer Requests
+                                            Promotions
                                         </RouterLink>
                                     </NavigationMenuLink>
 
@@ -129,6 +138,12 @@ function blurAfter() {
                                         </RouterLink>
                                     </NavigationMenuLink>
 
+                                    <NavigationMenuItem as-child :class="navigationMenuTriggerStyle()">
+                                        <RouterLink to="/administration/members" @click="blurAfter">
+                                            Member Management
+                                        </RouterLink>
+                                    </NavigationMenuItem>
+
                                     <NavigationMenuLink v-if="auth.hasRole('17th Administrator')" as-child
                                         :class="navigationMenuTriggerStyle()">
                                         <RouterLink to="/administration/roles" @click="blurAfter">
@@ -137,13 +152,6 @@ function blurAfter() {
                                     </NavigationMenuLink>
                                 </NavigationMenuContent>
                             </NavigationMenuItem>
-
-                            <NavigationMenuItem as-child :class="navigationMenuTriggerStyle()">
-                                <RouterLink to="/members" @click="blurAfter">
-                                    Members (debug)
-                                </RouterLink>
-                            </NavigationMenuItem>
-
                         </NavigationMenuList>
                     </NavigationMenu>
                 </div>
@@ -170,12 +178,17 @@ function blurAfter() {
             <div>
                 <DropdownMenu v-if="userStore.isLoggedIn">
                     <DropdownMenuTrigger class="cursor-pointer">
-                        <p>{{ userStore.user.name }}</p>
+                        <Button variant="ghost" class="px-4">
+                            {{ userStore.displayName }}
+                        </Button>
                     </DropdownMenuTrigger>
                     <DropdownMenuContent>
-                        <!-- <DropdownMenuItem>My Profile</DropdownMenuItem> -->
+                        <DropdownMenuItem @click="$router.push('/profile')">My Profile</DropdownMenuItem>
+                        <DropdownMenuSeparator></DropdownMenuSeparator>
                         <!-- <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,13 +11,22 @@ 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 = defineProps<{
+const props = withDefaults(defineProps<{
-  messages: Array<Record<string, any>>
+  messages: CommentRow[]
-}>()
+  adminMode?: boolean
+}>(), {
+  adminMode: false,
+})
 
 const emit = defineEmits<{
   (e: 'post', text: string): void
+  (e: 'postInternal', text: string): void
 }>()
 
 const commentSchema = toTypedSchema(
@@ -26,9 +35,14 @@ const commentSchema = toTypedSchema(
   })
 )
 
+const submitMode = ref("public");
+
 // vee-validate passes (values, actions) to @submit
 function onSubmit(values: { text: string }, { resetForm }: { resetForm: () => void }) {
-  emit('post', values.text.trim())
+  if (submitMode.value === "internal")
+    emit('postInternal', values.text.trim())
+  else
+    emit('post', values.text.trim())
   resetForm()
 }
 </script>
@@ -48,25 +62,31 @@ function onSubmit(values: { text: string }, { resetForm }: { resetForm: () => vo
       </FormField>
 
       <!-- Button below, right-aligned -->
-      <div class="mt-2 flex justify-end">
+      <div class="mt-2 flex justify-end gap-2">
-        <Button type="submit">Post</Button>
+        <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>
     </Form>
 
     <!-- Existing posts -->
     <div class="space-y-3">
-      <div v-for="(message, i) in props.messages" :key="message.id ?? i"
+      <div v-for="(message, i) in props.messages" :key="message.comment_id ?? i" class="rounded-md border p-3 space-y-5"
-        class="rounded-md border border-neutral-800 p-3 space-y-5">
+        :class="message.admin_only ? 'border-amber-300/70' : 'border-neutral-800'">
         <!-- Comment header -->
         <div class="flex justify-between">
-          <p>{{ message.poster_name }}</p>
+          <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 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,26 +13,38 @@ 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 { onMounted, ref } from 'vue';
+import { nextTick, onMounted, ref, watch } from 'vue';
 import * as z from 'zod';
 import DateInput from '../form/DateInput.vue';
-import { ApplicationData } from '@/api/application';
+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+\/?$/;
+
 
 const formSchema = toTypedSchema(z.object({
   dob: z.string().refine(v => v, { message: "A date of birth is required." }),
-  name: z.string(),
+  name: z.string().nonempty(),
-  playtime: z.coerce.number({ invalid_type_error: "Must be a number", }).min(0, "Cannot be less than 0"),
+  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(),
+  hobbies: z.string().nonempty(),
   military: z.boolean(),
-  communities: z.string(),
+  communities: z.string().nonempty(),
-  joinReason: z.string(),
+  joinReason: z.string().nonempty(),
-  milsimAttraction: z.string(),
+  milsimAttraction: z.string().nonempty(),
-  referral: z.string(),
+  referral: z.string().nonempty(),
-  steamProfile: z.string(),
+  steamProfile: z.string().nonempty().refine((val) => regexA.test(val) || regexB.test(val), { message: "Invalid Steam profile URL." }),
-  timezone: z.string(),
+  timezone: z.string().nonempty(),
   canAttendSaturday: z.boolean(),
-  interests: z.string(),
+  interests: z.string().nonempty(),
-  aknowledgeRules: z.literal(true, {
+  acknowledgeRules: z.literal(true, {
     errorMap: () => ({ message: "Required" })
   }),
 }))
@@ -41,7 +53,7 @@ const formSchema = toTypedSchema(z.object({
 const fallbackInitials = {
   military: false,
   canAttendSaturday: false,
-  aknowledgeRules: false,
+  acknowledgeRules: false,
 }
 
 const props = defineProps<{
@@ -57,7 +69,7 @@ async function onSubmit(val: any) {
   emit('submit', val);
 }
 
-onMounted(() => {
+onMounted(async () => {
   if (props.data !== null) {
     const parsed = typeof props.data === "string"
       ? JSON.parse(props.data)
@@ -67,8 +79,46 @@ onMounted(() => {
   } 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();
+  }
+});
+
+function convertToAge(dob: string) {
+  const [month, day, year] = dob.split('/').map(Number);
+
+  let dobDate = new Date(year, month - 1, day);
+
+  return Math.floor(
+    (Date.now() - dobDate.getTime()) / (1000 * 60 * 60 * 24 * 365.2425)
+  );
+
+}
 
 </script>
 
@@ -80,9 +130,14 @@ onMounted(() => {
       <FormItem>
         <FormLabel>What is your date of birth?</FormLabel>
         <FormControl>
-          <DateInput :model-value="(value as string) ?? ''" :disabled="readOnly" @update:model-value="handleChange" />
+          <template class="flex items-center gap-10">
+            <DateInput :model-value="(value as string) ?? ''" :disabled="readOnly" @update:model-value="handleChange" />
+            <p class="text-muted-foreground">Age: {{ convertToAge(value) }}</p>
+          </template>
         </FormControl>
-        <FormMessage />
+        <div class="h-4">
+          <FormMessage class="text-destructive" />
+        </div>
       </FormItem>
     </FormField>
 
@@ -94,7 +149,9 @@ onMounted(() => {
         <FormControl>
           <Input :model-value="value" @update:model-value="handleChange" :disabled="readOnly" />
         </FormControl>
-        <FormMessage />
+        <div class="h-4">
+          <FormMessage class="text-destructive" />
+        </div>
       </FormItem>
     </FormField>
 
@@ -105,7 +162,9 @@ onMounted(() => {
         <FormControl>
           <Input type="number" :model-value="value" @update:model-value="handleChange" :disabled="readOnly" />
         </FormControl>
-        <FormMessage />
+        <div class="h-4">
+          <FormMessage class="text-destructive" />
+        </div>
       </FormItem>
     </FormField>
 
@@ -117,7 +176,9 @@ onMounted(() => {
           <Textarea rows="4" class="resize-none" :model-value="value" @update:model-value="handleChange"
             :disabled="readOnly" />
         </FormControl>
-        <FormMessage />
+        <div class="h-4">
+          <FormMessage class="text-destructive" />
+        </div>
       </FormItem>
     </FormField>
 
@@ -127,11 +188,13 @@ onMounted(() => {
         <FormLabel>Have you ever served in the military?</FormLabel>
         <FormControl>
           <div class="flex items-center gap-2">
-            <Checkbox :checked="value ?? false" @update:checked="handleChange" :disabled="readOnly" />
+            <Checkbox :model-value="value" @update:model-value="handleChange" :disabled="readOnly" />
             <span>Yes (checked) / No (unchecked)</span>
           </div>
         </FormControl>
-        <FormMessage />
+        <div class="h-4">
+          <FormMessage class="text-destructive" />
+        </div>
       </FormItem>
     </FormField>
 
@@ -142,7 +205,9 @@ onMounted(() => {
         <FormControl>
           <Input :model-value="value" @update:model-value="handleChange" :disabled="readOnly" />
         </FormControl>
-        <FormMessage />
+        <div class="h-4">
+          <FormMessage class="text-destructive" />
+        </div>
       </FormItem>
     </FormField>
 
@@ -154,7 +219,9 @@ onMounted(() => {
           <Textarea rows="4" class="resize-none" :model-value="value" @update:model-value="handleChange"
             :disabled="readOnly" />
         </FormControl>
-        <FormMessage />
+        <div class="h-4">
+          <FormMessage class="text-destructive" />
+        </div>
       </FormItem>
     </FormField>
 
@@ -166,7 +233,9 @@ onMounted(() => {
           <Textarea rows="4" class="resize-none" :model-value="value" @update:model-value="handleChange"
             :disabled="readOnly" />
         </FormControl>
-        <FormMessage />
+        <div class="h-4">
+          <FormMessage class="text-destructive" />
+        </div>
       </FormItem>
     </FormField>
 
@@ -178,7 +247,9 @@ onMounted(() => {
           <Input placeholder="e.g., Reddit / Member: Alice" :model-value="value" @update:model-value="handleChange"
             :disabled="readOnly" />
         </FormControl>
-        <FormMessage />
+        <div class="h-4">
+          <FormMessage class="text-destructive" />
+        </div>
       </FormItem>
     </FormField>
 
@@ -194,7 +265,9 @@ onMounted(() => {
           <Input type="url" placeholder="https://steamcommunity.com/profiles/7656119..." :model-value="value"
             @update:model-value="handleChange" :disabled="readOnly" />
         </FormControl>
-        <FormMessage />
+        <div class="h-4">
+          <FormMessage class="text-destructive" />
+        </div>
       </FormItem>
     </FormField>
 
@@ -206,7 +279,9 @@ onMounted(() => {
           <Input placeholder="e.g., AEST, EST, UTC+10" :model-value="value" @update:model-value="handleChange"
             :disabled="readOnly" />
         </FormControl>
-        <FormMessage />
+        <div class="h-4">
+          <FormMessage class="text-destructive" />
+        </div>
       </FormItem>
     </FormField>
 
@@ -220,7 +295,9 @@ onMounted(() => {
             <span>Yes (checked) / No (unchecked)</span>
           </div>
         </FormControl>
-        <FormMessage />
+        <div class="h-4">
+          <FormMessage class="text-destructive" />
+        </div>
       </FormItem>
     </FormField>
 
@@ -232,27 +309,44 @@ onMounted(() => {
           <Input placeholder="e.g., Rifleman; Medic; Pilot" :model-value="value" @update:model-value="handleChange"
             :disabled="readOnly" />
         </FormControl>
-        <FormMessage />
+        <div class="h-4">
+          <FormMessage class="text-destructive" />
+        </div>
       </FormItem>
     </FormField>
 
     <!-- Code of Conduct (boolean, field name kept as-is) -->
-    <FormField name="aknowledgeRules" v-slot="{ value, handleChange }">
+    <FormField name="acknowledgeRules" 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">Code of
+            <span>By checking this box, you accept the <Button variant="link" class="p-0 h-min"
+                @click.prevent.stop="showCoC = true">Code of
                 Conduct</Button>.</span>
           </div>
         </FormControl>
-        <FormMessage />
+        <div class="h-4">
+          <FormMessage class="text-destructive" />
+        </div>
       </FormItem>
     </FormField>
 
     <div class="pt-2" v-if="!readOnly">
-      <Button type="submit" :onClick="() => console.log('hi')" :disabled="readOnly">Submit Application</Button>
+      <Button type="submit" :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,6 +1,6 @@
 <script setup lang="ts">
 import type { CalendarEvent, CalendarSignup } from '@shared/types/calendar'
-import { CircleAlert, Clock4, EllipsisVertical, MapPin, User, X } from 'lucide-vue-next';
+import { CircleAlert, Clock4, EllipsisVertical, Link, MapPin, User, X } from 'lucide-vue-next';
 import { computed, ref, watch } from 'vue';
 import ButtonGroup from '../ui/button-group/ButtonGroup.vue';
 import Button from '../ui/button/Button.vue';
@@ -12,6 +12,9 @@ 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';
+import { CopyLink } from '@/lib/copyLink';
 
 const route = useRoute();
 
@@ -28,9 +31,14 @@ watch(
     { immediate: true }
 );
 
+watch(loaded, (value) => {
+    if (value) emit('load');
+});
+
 const emit = defineEmits<{
     (e: 'close'): void
     (e: 'reload'): void
+    (e: 'load'): void
     (e: 'edit', event: CalendarEvent): void
 }>()
 
@@ -62,11 +70,11 @@ 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 user = useUserStore();
+let userStore = useUserStore();
 const myAttendance = computed<CalendarSignup | null>(() => {
-    if (!user.isLoggedIn) return null;
+    if (!userStore.isLoggedIn) return null;
     return activeEvent.value.eventSignups.find(
-        (s) => s.member_id === user.user.id
+        (s) => s.member_id === userStore.user.member.member_id
     ) || null;
 });
 
@@ -77,8 +85,9 @@ async function setAttendance(state: CalendarAttendance) {
 }
 
 const canEditEvent = computed(() => {
-    if (!user.isLoggedIn) return false;
+    if (!userStore.isLoggedIn) return false;
-    if (user.user.id == activeEvent.value.creator_id)
+    if (userStore.state !== 'member') return false;
+    if (userStore.user.member.member_id == activeEvent.value.creator_id)
         return true;
 });
 
@@ -102,11 +111,11 @@ 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.member_unit === 'Alpha Company');
+        out = activeEvent.value.eventSignups?.filter((s) => s.unit_name === 'Alpha Company');
     } else if (attendanceTab.value === 'Echo') {
-        out = activeEvent.value.eventSignups?.filter((s) => s.member_unit === 'Echo Company')
+        out = activeEvent.value.eventSignups?.filter((s) => s.unit_name === 'Echo Company')
     } else {
-        out = activeEvent.value.eventSignups?.filter((s) => s.member_unit != 'Alpha Company' && s.member_unit != 'Echo Company')
+        out = activeEvent.value.eventSignups?.filter((s) => s.unit_name != 'Alpha Company' && s.unit_name != 'Echo Company')
     }
 
     const statusOrder: Record<CalendarAttendance, number> = {
@@ -124,11 +133,11 @@ const attendanceCountsByGroup = computed(() => {
     const signups = activeEvent.value.eventSignups ?? [];
 
     return {
-        Alpha: signups.filter(s => s.member_unit === "Alpha Company").length,
+        Alpha: signups.filter(s => s.unit_name === "Alpha Company").length,
-        Echo: signups.filter(s => s.member_unit === "Echo Company").length,
+        Echo: signups.filter(s => s.unit_name === "Echo Company").length,
         Other: signups.filter(s =>
-            s.member_unit !== "Alpha Company" &&
+            s.unit_name !== "Alpha Company" &&
-            s.member_unit !== "Echo Company"
+            s.unit_name !== "Echo Company"
         ).length,
     };
 });
@@ -175,17 +184,20 @@ defineExpose({ forceReload })
 <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 border-border px-4 py-3 ">
-            <h2 class="text-lg font-semibold break-all">
+            <h2 class="text-lg font-semibold break-after-all">
                 {{ activeEvent?.name || 'Event' }}
             </h2>
-            <div class="flex gap-4 items-center">
+            <div class="flex gap-2 items-center">
                 <DropdownMenu v-if="canEditEvent">
                     <DropdownMenuTrigger>
-                        <button
+                        <Button variant="ghost" size="icon">
+                            <EllipsisVertical class="size-5" />
+                        </Button>
+                        <!-- <button
                             class="inline-flex flex-none size-8 items-center justify-center cursor-pointer rounded-md hover:bg-muted/40 transition">
                             <EllipsisVertical class="size-6" />
-                        </button>
+                        </button> -->
                     </DropdownMenuTrigger>
                     <DropdownMenuContent>
                         <DropdownMenuItem @click="emit('edit', activeEvent)">
@@ -194,16 +206,22 @@ defineExpose({ forceReload })
                         <DropdownMenuItem v-if="activeEvent.cancelled" @click="setCancel(false)">
                             Un-Cancel
                         </DropdownMenuItem>
-                        <DropdownMenuItem v-else @click="setCancel(true)">
+                        <DropdownMenuItem v-else @click="setCancel(true)" class="text-destructive">
                             Cancel
                         </DropdownMenuItem>
                     </DropdownMenuContent>
                 </DropdownMenu>
-                <button
+                <Button variant="ghost" size="icon" @click="CopyLink()">
-                    class="inline-flex flex-none size-8 items-center justify-center rounded-md border hover:bg-muted/40 transition cursor-pointer"
+                    <Link class="size-4" />
+                </Button>
+                <Button variant="ghost" size="icon" @click="emit('close')">
+                    <X class="size-5" />
+                </Button>
+                <!-- <button
+                    class="inline-flex flex-none size-8 items-center justify-center rounded-md border hover:bg-muted transition cursor-pointer"
                     aria-label="Close" @click="emit('close')">
                     <X class="size-4" />
-                </button>
+                </button> -->
             </div>
         </div>
         <!-- Body -->
@@ -213,15 +231,15 @@ defineExpose({ forceReload })
                     <CircleAlert></CircleAlert> This event has been cancelled
                 </div>
             </section>
-            <section v-if="isPast && user.isLoggedIn" class="w-full">
+            <section v-if="isPast && userStore.state === 'member'" class="w-full">
-                <ButtonGroup class="flex w-full">
+                <ButtonGroup class="flex w-full justify-center">
-                    <Button variant="outline"
+                    <Button variant="outline" class="flex-1"
                         :class="myAttendance?.status === CalendarAttendance.Attending ? 'border-2 border-primary text-primary' : ''"
                         @click="setAttendance(CalendarAttendance.Attending)">Going</Button>
-                    <Button variant="outline"
+                    <Button variant="outline" class="flex-1"
                         :class="myAttendance?.status === CalendarAttendance.Maybe ? 'border-2 !border-l-2 border-primary text-primary' : ''"
                         @click="setAttendance(CalendarAttendance.Maybe)">Maybe</Button>
-                    <Button variant="outline"
+                    <Button variant="outline" class="flex-1"
                         :class="myAttendance?.status === CalendarAttendance.NotAttending ? 'border-2 !border-l-2 border-primary text-primary' : ''"
                         @click="setAttendance(CalendarAttendance.NotAttending)">Declined</Button>
                 </ButtonGroup>
@@ -239,13 +257,14 @@ defineExpose({ forceReload })
                     <MapPin :size="20"></MapPin> {{ activeEvent.location || "Unknown" }}
                 </div>
                 <div class="text-foreground/80 flex gap-3 items-center">
-                    <User :size="20"></User> {{ activeEvent.creator_name || "Unknown User" }}
+                    <User :size="20"></User>
+                    <MemberCard :member-id="activeEvent.creator_id"></MemberCard>
                 </div>
             </section>
             <!-- Description -->
             <section class="space-y-2 w-full">
                 <p class="text-lg font-semibold">Description</p>
-                <p class="border bg-muted/50 px-3 py-2 rounded-lg min-h-24 my-2 whitespace-pre-line">
+                <p class="border border-border bg-muted/50 px-3 py-2 rounded-lg min-h-24 my-2 whitespace-pre-line">
                     {{ activeEvent.description }}
                 </p>
             </section>
@@ -259,8 +278,8 @@ defineExpose({ forceReload })
                         <p>Declined <span class="ml-1">{{ attendanceStatusSummary.notAttending }}</span></p>
                     </div> -->
                 </div>
-                <div class="flex flex-col border bg-muted/50 rounded-lg min-h-24 my-2">
+                <div class="flex flex-col border border-border bg-muted/50 rounded-lg min-h-24 my-2">
-                    <div class="flex w-full pt-2 border-b *:w-full *:text-center *:pb-1 *:cursor-pointer">
+                    <div class="flex w-full pt-2 border-b border-border *:w-full *:text-center *:pb-1 *:cursor-pointer">
                         <label :class="attendanceTab === 'Alpha' ? 'border-b-3 border-foreground' : 'mb-[2px]'"
                             @click="attendanceTab = 'Alpha'">Alpha {{ attendanceCountsByGroup.Alpha }}</label>
                         <label :class="attendanceTab === 'Echo' ? 'border-b-3 border-foreground' : 'mb-[2px]'"
@@ -269,14 +288,16 @@ defineExpose({ forceReload })
                             @click="attendanceTab = 'Other'">Other {{ attendanceCountsByGroup.Other }}</label>
                     </div>
                     <div class="pb-1 min-h-48">
-                        <div class="grid grid-cols-2 font-semibold text-muted-foreground border-b py-1 px-3 mb-2">
+                        <div class="grid grid-cols-2 font-semibold text-muted-foreground border-b border-border py-1 px-3 mb-2">
                             <p>Name</p>
                             <p class="text-right">Status</p>
                         </div>
 
                         <div v-for="person in attendanceList" :key="person.member_id"
-                            class="grid grid-cols-2 py-1 *:px-3 hover:bg-muted">
+                            class="grid grid-cols-3 py-1 *:px-3 hover:bg-muted">
-                            <p>{{ person.member_name }}</p>
+                            <div class="col-span-2">
+                                <MemberCard :member-id="person.member_id"></MemberCard>
+                            </div>
                             <p :class="statusColor(person.status)" class="text-right">
                                 {{ displayStatus(person.status) }}
                             </p>
@@ -286,4 +307,14 @@ defineExpose({ forceReload })
             </section>
         </div>
     </div>
+    <div v-else class="relative flex justify-center items-center h-full">
+        <!-- Close button (top-right) -->
+        <Button variant="ghost" size="icon" class="absolute top-2 right-2" @click="emit('close')">
+            <X class="size-5" />
+        </Button>
+
+        <!-- Spinner (centered) -->
+        <Spinner class="size-8" />
+    </div>
+
 </template>

ui/src/components/loa/loaForm.vue

@@ -1,26 +1,48 @@
 <script setup lang="ts">
 import { Check, Search } from "lucide-vue-next"
-import { Combobox, ComboboxAnchor, ComboboxEmpty, ComboboxGroup, ComboboxInput, ComboboxItem, ComboboxItemIndicator, ComboboxList } from "@/components/ui/combobox"
+import { ComboboxAnchor, ComboboxEmpty, ComboboxGroup, ComboboxInput, ComboboxItem, ComboboxItemIndicator, ComboboxList } from "@/components/ui/combobox"
-import { onMounted, ref } from "vue";
+import { computed, onMounted, ref, watch } from "vue";
-import { Member, getMembers } from "@/api/member";
+import { getMembers } from "@/api/member";
+import { Member } from "@shared/types/member";
 import Button from "@/components/ui/button/Button.vue";
 import {
     CalendarDate,
     DateFormatter,
+    fromDate,
     getLocalTimeZone,
+    parseDate,
+    today,
 } from "@internationalized/date"
-import type { DateRange } from "reka-ui"
+import type { DateRange, DateValue } 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 { LOARequest, submitLOA } from "@/api/loa"; // <-- import the submit function
+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";
 
 const members = ref<Member[]>([])
+const loaTypes = ref<LOAType[]>();
+const policyString = ref<string | null>(null);
+
 const currentMember = ref<Member | null>(null);
 
 const props = withDefaults(defineProps<{
@@ -31,142 +53,312 @@ const props = withDefaults(defineProps<{
     member: null,
 });
 
+const df = new Intl.DateTimeFormat('en-US', {
+    year: 'numeric',
+    month: 'long',
+    day: 'numeric'
+});
 
-const df = new DateFormatter("en-US", {
+const userStore = useUserStore()
-    dateStyle: "medium",
+
+//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";
+import Spinner from "../ui/spinner/Spinner.vue";
+
+const { handleSubmit, values, resetForm } = useForm({
+    validationSchema: toTypedSchema(loaSchema),
 })
 
-const value = ref({
+const formSubmitted = ref(false);
-    // start: new CalendarDate(2022, 1, 20),
-    // end: new CalendarDate(2022, 1, 20).add({ days: 20 }),
-}) as Ref<DateRange>
-
-const reason = ref(""); // <-- reason for LOA
 const submitting = ref(false);
-const submitError = ref<string | null>(null);
+
-const submitSuccess = ref(false);
+const onSubmit = handleSubmit(async (values) => {
+    //catch double submit
+    if (submitting.value) return;
+    submitting.value = true;
+    const out: LOARequest = {
+        member_id: values.member_id,
+        start_date: values.start_date,
+        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;
+    submitting.value = 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);
     }
-    members.value = await getMembers();
+    loaTypes.value = await getLoaTypes();
+    resetForm({ values: { member_id: currentMember.value?.member_id } });
 });
 
-// Submit handler
+const policyRef = ref<HTMLElement>(null);
-async function handleSubmit() {
-    submitError.value = null;
-    submitSuccess.value = false;
-    submitting.value = true;
 
-    // Use currentMember if adminMode, otherwise use your own member id (stubbed as 89 here)
+const defaultPlaceholder = today(getLocalTimeZone())
-    const member_id = currentMember.value?.member_id ?? 89;
 
-    // Format dates as ISO strings
+const minEndDate = computed(() => {
-    const filed_date = toMariaDBDatetime(new Date());
+    if (values.start_date) {
-    const start_date = toMariaDBDatetime(value.value.start?.toDate(getLocalTimeZone()));
+        return new CalendarDate(values.start_date.getFullYear(), values.start_date.getMonth() + 1, values.start_date.getDate())
-    const end_date = toMariaDBDatetime(value.value.end?.toDate(getLocalTimeZone()));
-
-    if (!member_id || !filed_date || !start_date || !end_date) {
-        submitError.value = "Missing required fields";
-        submitting.value = false;
-        return;
-    }
-
-    const req: LOARequest = {
-        filed_date,
-        start_date,
-        end_date,
-        reason: reason.value,
-        member_id
-    };
-
-    const result = await submitLOA(req);
-    submitting.value = false;
-
-    if (result.id) {
-        submitSuccess.value = true;
-        reason.value = "";
     } else {
-        submitError.value = result.error || "Failed to submit LOA";
+        return today(getLocalTimeZone());
     }
-}
+})
 
-function toMariaDBDatetime(date: Date): string {
+const maxEndDate = computed(() => {
-    return date.toISOString().slice(0, 19).replace('T', ' ');
+    if (values.type && values.start_date) {
-}
+        let endDateObj = new Date(values.start_date.getTime() + values.type.max_length_days * 24 * 60 * 60 * 1000);
+        return new CalendarDate(endDateObj.getFullYear(), endDateObj.getMonth() + 1, endDateObj.getDate())
+    } else {
+        return null;
+    }
+})
+
+const minStartDate = computed(() => {
+    if (values.type && values.end_date) {
+        let endDateObj = new Date(values.end_date.getTime() - values.type.max_length_days * 24 * 60 * 60 * 1000);
+        let td = today(getLocalTimeZone());
+        let start = new CalendarDate(endDateObj.getFullYear(), endDateObj.getMonth() + 1, endDateObj.getDate())
+        return td.compare(start) > 0 ? td : start;
+    } else {
+        return today(getLocalTimeZone());
+    }
+})
+
+const memberFilter = ref('');
+
+const filteredMembers = computed(() => {
+    const q = memberFilter?.value?.toLowerCase() ?? ""
+    const results: Member[] = []
+
+    for (const m of members.value ?? []) {
+        if (!q || (m.displayName || m.member_name).toLowerCase().includes(q)) {
+            results.push(m)
+            if (results.length >= 50) break
+        }
+    }
+
+    return results
+})
 </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 space-x-4 rounded-md border p-4">
+        <div v-if="!adminMode" class="flex-1 flex flex-col space-x-4 rounded-md border p-4">
-            <div class="flex-2 space-y-1">
+            <p class="scroll-m-20 text-2xl font-semibold tracking-tight">LOA Policy</p>
-                <p class="text-sm font-medium leading-none">
+            <div ref="policyRef" class="bookstack-container">
-                    LOA Policy
+                <!-- LOA policy gets loaded here -->
-                </p>
-                <p class="text-sm text-muted-foreground">
-                    Policy goes here.
-                </p>
             </div>
         </div>
         <div class="flex-1 flex flex-col gap-5">
-            <div class="flex w-full gap-5 ">
+            <form v-if="!formSubmitted" @submit="onSubmit" class="flex flex-col gap-2">
-                <Combobox class="w-1/2" v-model="currentMember" :disabled="!adminMode">
+                <div class="flex w-full gap-5">
-                    <ComboboxAnchor class="w-full">
+                    <VeeField v-slot="{ field, errors }" name="member_id">
-                        <ComboboxInput placeholder="Search members..." class="w-full pl-9"
+                        <Field>
-                            :display-value="(v) => v ? v.member_name : ''" />
+                            <FieldContent>
-                    </ComboboxAnchor>
+                                <FieldLabel>Member</FieldLabel>
-                    <ComboboxList class="w-full">
+                                <Combobox :model-value="field.value" @update:model-value="field.onChange"
-                        <ComboboxEmpty class="text-muted-foreground">No results</ComboboxEmpty>
+                                    :disabled="!adminMode">
-                        <ComboboxGroup>
+                                    <ComboboxAnchor class="w-full">
-                            <template v-for="member in members" :key="member.member_id">
+                                        <ComboboxInput placeholder="Search members..." class="w-full pl-3"
-                                <ComboboxItem :value="member"
+                                            :display-value="(id) => {
-                                    class="data-[highlighted]:bg-accent data-[highlighted]:text-accent-foreground relative cursor-pointer select-none px-2 py-1.5">
+                                                const m = members.find(mem => mem.member_id === id)
-                                    {{ member.member_name }}
+                                                return m ? m.displayName || m.member_name : ''
-                                    <ComboboxItemIndicator class="absolute left-2 inline-flex items-center">
+                                            }" @input="memberFilter = $event.target.value" />
-                                        <Check class="h-4 w-4" />
+                                    </ComboboxAnchor>
-                                    </ComboboxItemIndicator>
+                                    <ComboboxList class="*:w-64">
-                                </ComboboxItem>
+                                        <ComboboxEmpty class="text-muted-foreground w-full">No results</ComboboxEmpty>
-                            </template>
+                                        <ComboboxGroup>
-                        </ComboboxGroup>
+                                            <div class="max-h-80 overflow-y-scroll scrollbar-themed min-w-3xs">
-                    </ComboboxList>
+                                                <template v-for="member in filteredMembers" :key="member.member_id">
-                </Combobox>
+                                                    <ComboboxItem :value="member.member_id"
-                <Popover>
+                                                        class="data-[highlighted]:bg-accent data-[highlighted]:text-accent-foreground relative cursor-pointer select-none px-2 py-1.5 w-full">
-                    <PopoverTrigger as-child>
+                                                        {{ member.displayName || member.member_name }}
-                        <Button variant="outline" :class="cn(
+                                                        <ComboboxItemIndicator
-                            'w-1/2 justify-start text-left font-normal',
+                                                            class="absolute left-2 inline-flex items-center">
-                            !value && 'text-muted-foreground',
+                                                            <Check class="h-4 w-4" />
-                        )">
+                                                        </ComboboxItemIndicator>
-                            <CalendarIcon class="mr-2 h-4 w-4" />
+                                                    </ComboboxItem>
-                            <template v-if="value.start">
+                                                </template>
-                                <template v-if="value.end">
+                                            </div>
-                                    {{ df.format(value.start.toDate(getLocalTimeZone())) }} - {{
+                                        </ComboboxGroup>
-                                        df.format(value.end.toDate(getLocalTimeZone())) }}
+                                    </ComboboxList>
-                                </template>
+                                </Combobox>
-                                <template v-else>
+                                <div class="h-4">
-                                    {{ df.format(value.start.toDate(getLocalTimeZone())) }}
+                                    <FieldError v-if="errors.length" :errors="errors"></FieldError>
-                                </template>
+                                </div>
-                            </template>
+                            </FieldContent>
-                            <template v-else>
+                        </Field>
-                                Pick a date
+                    </VeeField>
-                            </template>
+                    <VeeField v-slot="{ field, errors }" name="type">
-                        </Button>
+                        <Field class="w-full">
-                    </PopoverTrigger>
+                            <FieldContent>
-                    <PopoverContent class="w-auto p-0">
+                                <FieldLabel>Type</FieldLabel>
-                        <RangeCalendar v-model="value" initial-focus :number-of-months="2"
+                                <Select :model-value="field.value" @update:model-value="field.onChange">
-                            @update:start-value="(startDate) => value.start = startDate" />
+                                    <SelectTrigger class="w-full">
-                    </PopoverContent>
+                                        <SelectValue placeholder="Select type"></SelectValue>
-                </Popover>
+                                    </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>
+                                    <div class="relative inline-flex items-center group">
+                                        <PopoverTrigger as-child>
+                                            <Button :disabled="!values.type" 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>
+                                        <!-- Tooltip bubble -->
+                                        <div v-if="!values?.type" class="pointer-events-none absolute -top-9 left-1/2 -translate-x-1/2
+                                                    whitespace-nowrap rounded-md bg-popover px-2 py-1 text-xs
+                                                    text-popover-foreground shadow-md border border-border
+                                                    opacity-0 translate-y-1
+                                                    group-hover:opacity-100 group-hover:translate-y-0
+                                                    transition-opacity transition-transform duration-150">
+                                            Select an LOA type first
+                                        </div>
+                                    </div>
+                                    <PopoverContent class="w-auto p-0">
+                                        <Calendar
+                                            @update:model-value="(val: CalendarDate) => field.onChange(val.toDate(getLocalTimeZone()))"
+                                            layout="month-and-year"
+                                            :min-value="minStartDate || 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>
+                                    <div class="relative inline-flex items-center group">
+                                        <PopoverTrigger as-child>
+                                            <Button :disabled="!values.type" 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>
+                                        <!-- Tooltip bubble -->
+                                        <div v-if="!values?.type" class="pointer-events-none absolute -top-9 left-1/2 -translate-x-1/2
+                                                    whitespace-nowrap rounded-md bg-popover px-2 py-1 text-xs
+                                                    text-popover-foreground shadow-md border border-border
+                                                    opacity-0 translate-y-1
+                                                    group-hover:opacity-100 group-hover:translate-y-0
+                                                    transition-opacity transition-transform duration-150">
+                                            Select an LOA type first
+                                        </div>
+                                    </div>
+                                    <PopoverContent class="w-auto p-0">
+                                        <Calendar
+                                            @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" :disabled="submitting" class="w-35">
+                        <span class="flex items-center gap-2" v-if="submitting">
+                            <Spinner></Spinner> Submitting…
+                        </span>
+                        <span v-else>Submit</span>
+                    </Button>
+                </div>
+            </form>
+            <div v-else class="flex flex-col  gap-4 py-8 text-left">
+                <h2 class="text-xl font-semibold">
+                    LOA Request Submitted
+                </h2>
+
+                <p class="max-w-md text-muted-foreground">
+                    {{ adminMode ? 'You have successfully submitted a Leave of Absence on behalf of another member.' :
+                        `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>
-            <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,93 +15,302 @@ import {
     DropdownMenuItem,
     DropdownMenuTrigger,
 } from "@/components/ui/dropdown-menu"
-import { Ellipsis } from "lucide-vue-next";
+import { ChevronDown, ChevronUp, Ellipsis, X } from "lucide-vue-next";
-import { getAllLOAs, LOARequest } from "@/api/loa";
+import { cancelLOA, extendLOA, getAllLOAs, getMyLOAs } from "@/api/loa";
 import { onMounted, ref, computed } from "vue";
+import { LOARequest } from "@shared/types/loa";
+import Dialog from "../ui/dialog/Dialog.vue";
+import DialogTrigger from "../ui/dialog/DialogTrigger.vue";
+import DialogContent from "../ui/dialog/DialogContent.vue";
+import DialogHeader from "../ui/dialog/DialogHeader.vue";
+import DialogTitle from "../ui/dialog/DialogTitle.vue";
+import DialogDescription from "../ui/dialog/DialogDescription.vue";
+import Button from "../ui/button/Button.vue";
+import Calendar from "../ui/calendar/Calendar.vue";
+import {
+    CalendarDate,
+    getLocalTimeZone,
+} from "@internationalized/date"
+import { el } from "@fullcalendar/core/internal-common";
+import MemberCard from "../members/MemberCard.vue";
+import {
+    Pagination,
+    PaginationContent,
+    PaginationEllipsis,
+    PaginationItem,
+    PaginationNext,
+    PaginationPrevious,
+} from '@/components/ui/pagination'
+import { pagination } from "@shared/types/pagination";
+
+const props = defineProps<{
+    adminMode?: boolean
+}>()
 
 const LOAList = ref<LOARequest[]>([]);
 
 onMounted(async () => {
-    LOAList.value = await getAllLOAs();
+    await loadLOAs();
 });
 
-function formatDate(dateStr: string): string {
+async function loadLOAs() {
-    if (!dateStr) return "";
+    if (props.adminMode) {
-    return new Date(dateStr).toLocaleDateString("en-US", {
+        let result = await getAllLOAs(pageNum.value, pageSize.value);
+        LOAList.value = result.data;
+        pageData.value = result.pagination;
+    } else {
+        let result = await getMyLOAs(pageNum.value, pageSize.value);
+        LOAList.value = result.data;
+        pageData.value = result.pagination;
+    }
+}
+
+function formatDate(date: Date): string {
+    if (!date) return "";
+    date = typeof date === 'string' ? new Date(date) : date;
+    return date.toLocaleDateString("en-US", {
         year: "numeric",
         month: "short",
         day: "numeric",
     });
 }
 
-function loaStatus(loa: {
+function loaStatus(loa: LOARequest): "Upcoming" | "Active" | "Extended" | "Overdue" | "Closed" {
-    start_date: string;
+    if (loa.closed) return "Closed";
-    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);
     const end = new Date(loa.end_date);
+    const extension = new Date(loa.extended_till);
 
     if (now < start) return "Upcoming";
-    if (now >= start && now <= end) return "Active";
+    if (now >= start && (now <= end)) return "Active";
-    if (now > end) return "Expired";
+    if (now >= start && (now <= extension)) return "Extended";
+    if (now > loa.extended_till || end) return "Overdue";
 
-    return "Expired"; // fallback
+    return "Overdue"; // fallback
 }
 
-function sortByStartDate(loas: LOARequest[]): LOARequest[] {
+async function cancelAndReload(id: number) {
-    return [...loas].sort(
+    await cancelLOA(id, props.adminMode);
-        (a, b) => new Date(b.start_date).getTime() - new Date(a.start_date).getTime()
+    await loadLOAs();
-    );
 }
 
-const sortedLoas = computed(() => sortByStartDate(LOAList.value));
+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();
+}
 </script>
 
 <template>
-    <div class="w-5xl mx-auto">
+    <div>
-        <Table>
+        <Dialog :open="isExtending" @update:open="(val) => isExtending = val">
-            <TableHeader>
+            <DialogContent>
-                <TableRow>
+                <DialogHeader>
-                    <TableHead class="w-[100px]">Member</TableHead>
+                    <DialogTitle>Extend {{ targetLOA.name }}'s Leave of Absence </DialogTitle>
-                    <TableHead>Start</TableHead>
+                </DialogHeader>
-                    <TableHead>End</TableHead>
+                <div class="flex gap-5">
-                    <TableHead>Reason</TableHead>
+                    <Calendar v-model="extendTo" class="rounded-md border shadow-sm w-min" layout="month-and-year"
-                    <TableHead>Posted on</TableHead>
+                        :min-value="toCalendarDate(targetEnd)"
-                    <TableHead>Status</TableHead>
+                        :max-value="toCalendarDate(targetEnd).add({ years: 1 })" />
-                </TableRow>
+                    <div class="flex flex-col w-full gap-3 px-2">
-            </TableHeader>
+                        <p>Quick Options</p>
-            <TableBody>
+                        <Button variant="outline" @click="extendTo = toCalendarDate(targetEnd).add({ days: 7 })">1
-                <TableRow v-for="post in sortedLoas" :key="post.id" class="hover:bg-muted/50">
+                            Week</Button>
-                    <TableCell class="font-medium">
+                        <Button variant="outline" @click="extendTo = toCalendarDate(targetEnd).add({ months: 1 })">1
-                        {{ post.name }}
+                            Month</Button>
-                    </TableCell>
+                    </div>
-                    <TableCell>{{ formatDate(post.start_date) }}</TableCell>
+                </div>
-                    <TableCell>{{ formatDate(post.end_date) }}</TableCell>
+                <div class="flex justify-end gap-4">
-                    <TableCell>{{ post.reason }}</TableCell>
+                    <Button variant="outline" @click="isExtending = false">Cancel</Button>
-                    <TableCell>{{ formatDate(post.filed_date) }}</TableCell>
+                    <Button @click="commitExtend">Extend</Button>
-                    <TableCell>
+                </div>
-                        <Badge v-if="loaStatus(post) === 'Upcoming'" class="bg-blue-500">Upcoming</Badge>
+            </DialogContent>
-                        <Badge v-else-if="loaStatus(post) === 'Active'" class="bg-green-500">Active</Badge>
+        </Dialog>
-                        <Badge v-else-if="loaStatus(post) === 'Expired'" class="bg-gray-400">Expired</Badge>
+        <div class="max-w-7xl w-full mx-auto">
-                        <Badge v-else class="bg-red-500">Cancelled</Badge>
+            <Table>
-                    </TableCell>
+                <TableHeader>
-                    <TableCell @click.stop="console.log('hi')" class="text-right">
+                    <TableRow>
-                        <DropdownMenu>
+                        <TableHead>Member</TableHead>
-                            <DropdownMenuTrigger class="cursor-pointer">
+                        <TableHead>Type</TableHead>
-                                <Ellipsis></Ellipsis>
+                        <TableHead>Start</TableHead>
-                            </DropdownMenuTrigger>
+                        <TableHead>End</TableHead>
-                            <DropdownMenuContent>
+                        <!-- <TableHead class="w-[500px]">Reason</TableHead> -->
-                                <DropdownMenuItem :variant="'destructive'">Cancel</DropdownMenuItem>
+                        <TableHead>Posted on</TableHead>
-                            </DropdownMenuContent>
+                        <TableHead>Status</TableHead>
-                        </DropdownMenu>
+                    </TableRow>
-                    </TableCell>
+                </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) === 'Extended'" class="bg-green-500">Extended</Badge>
+                                <Badge v-else-if="loaStatus(post) === 'Overdue'" class="bg-yellow-400">Overdue</Badge>
+                                <Badge v-else class="bg-gray-400">Ended</Badge>
+                            </TableCell>
+                            <TableCell @click.stop="" class="text-right">
+                                <DropdownMenu>
+                                    <DropdownMenuTrigger class="cursor-pointer">
+                                        <Button variant="ghost" size="icon">
+                                            <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" size="icon"
+                                    variant="ghost">
+                                    <ChevronUp class="size-6" />
+                                </Button>
+                                <Button v-else @click.stop="expanded = post.id" size="icon" 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-4 mb-6 space-y-4">
 
-                </TableRow>
+                                    <!-- Dates -->
-            </TableBody>
+                                    <div class="grid grid-cols-3 gap-4 text-sm">
-        </Table>
+                                        <div>
+                                            <p class="text-muted-foreground">Start</p>
+                                            <p class="font-medium">
+                                                {{ formatDate(post.start_date) }}
+                                            </p>
+                                        </div>
+
+                                        <div>
+                                            <p class="text-muted-foreground">Original end</p>
+                                            <p class="font-medium">
+                                                {{ formatDate(post.end_date) }}
+                                            </p>
+                                        </div>
+
+                                        <div class="">
+                                            <p class="text-muted-foreground">Extended to</p>
+                                            <p class="font-medium text-foreground">
+                                                {{post.extended_till ? formatDate(post.extended_till) : 'N/A' }}
+                                            </p>
+                                        </div>
+                                    </div>
+
+                                    <!-- Reason -->
+                                    <div class="space-y-2">
+                                        <div class="flex items-center gap-2">
+                                            <h4 class="text-sm font-semibold text-foreground">
+                                                Reason
+                                            </h4>
+                                            <Separator class="flex-1" />
+                                        </div>
+
+                                        <div
+                                            class="rounded-lg border bg-muted/40 px-4 py-3 text-sm leading-relaxed whitespace-pre-wrap text-muted-foreground">
+                                            {{ post.reason || 'No reason provided.' }}
+                                        </div>
+                                    </div>
+
+                                </div>
+                            </TableCell>
+                        </TableRow>
+
+                    </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/members/DischargeMember.vue

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

ui/src/components/members/MemberCard.vue

@@ -0,0 +1,165 @@
+<script setup lang="ts">
+import { useMemberDirectory } from '@/stores/memberDirectory';
+import { ref, onMounted, computed } from 'vue';
+import { Member, MemberCardDetails, 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';
+import { Dot } from 'lucide-vue-next';
+
+
+// Props
+const props = defineProps({
+    memberId: {
+        type: Number,
+        required: true
+    }
+});
+
+// Local state
+const memberLight = ref<MemberLight | null>(null);
+const memberFull = ref<MemberCardDetails | 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.member
+    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-80 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.member.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.member.loa_until) }}
+                        </div>
+
+
+                        <div v-if="memberFull.member.rank" class="flex justify-between">
+                            <span class="text-muted-foreground">Rank</span>
+                            <span class="font-medium">{{ memberFull.member.rank }}</span>
+                        </div>
+
+                        <div v-if="memberFull.member.unit" class="flex justify-between items-center">
+                            <span class="text-muted-foreground">Unit</span>
+                            <span class="font-medium flex items-center gap-2">
+                                <span class="w-2 h-2 rounded-full" :style="{ backgroundColor: textColor }"></span>
+                                {{ memberFull.member.unit }}
+                            </span>
+                        </div>
+
+                        <div v-if="memberFull.member.status" class="flex justify-between">
+                            <span class="text-muted-foreground">Status</span>
+                            <span class="font-medium">{{ memberFull.member.status }}</span>
+                        </div>
+
+
+                        <div class="flex gap-2 flex-wrap mt-6">
+                            <div v-for="role in memberFull.roles" class="border rounded-full px-3 text-nowrap">
+                                {{ role.name }}
+                            </div>
+                        </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

@@ -0,0 +1,318 @@
+<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, setFieldValue, submitCount } = useForm({
+    validationSchema: toTypedSchema(batchPromotionSchema),
+    validateOnMount: false,
+})
+
+const submitting = ref(false);
+
+const submitForm = handleSubmit(
+    async (vals) => {
+        if (submitting.value) return;
+        submitting.value = true;
+        try {
+            let output = vals;
+            output.promotions.map(p => p.start_date = new Date(p.start_date).toISOString())
+            await submitRankChange(output);
+            formSubmitted.value = true;
+            emit("submitted");
+        } catch (error) {
+            submitError.value = error;
+            console.error(error);
+        } finally {
+            submitting.value = false;
+        }
+    }
+);
+
+const emit = defineEmits<{
+    submitted: [void]
+}>();
+
+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();
+})
+
+function setAllToday() {
+    const today = () => {
+        const d = new Date()
+        const year = d.getFullYear()
+        const month = String(d.getMonth() + 1).padStart(2, '0')
+        const day = String(d.getDate()).padStart(2, '0')
+
+        return `${year}-${month}-${day}`
+    }
+
+    values.promotions?.forEach((_, index) => {
+        // @ts-ignore
+        setFieldValue(`promotions[${index}].start_date`, today())
+    })
+}
+</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-4">
+            <div>
+                <FieldLegend class="scroll-m-20 text-2xl font-semibold tracking-tight">
+                    Promotion Form
+                </FieldLegend>
+            </div>
+            <VeeFieldArray name="promotions" v-slot="{ fields, push, remove }">
+                <FieldSet class="w-full min-w-0">
+                    <div class="flex flex-col gap-2">
+                        <!-- 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 class="flex justify-between">
+                                        <p>Date</p><button @click.prevent.stop="setAllToday"
+                                            class="cursor-pointer border-1 rounded-full px-3 hover:bg-secondary hover:border-accent">Today</button>
+                                    </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-between items-start">
+                <VeeField name="approver" v-slot="{ field, errors }">
+                    <div class="flex flex-col min-w-0 gap-2">
+                        <p>Approved By</p>
+                        <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>
+                <div class="flex flex-col items-end gap-2">
+                    <div class="h-6" />
+                    <Button type="submit" form="trainingForm" :disabled="submitting" class="w-35">
+                        <span class="flex items-center gap-2" v-if="submitting">
+                            <Spinner></Spinner> Submitting…
+                        </span>
+                        <span v-else>Submit</span>
+                    </Button>
+                    <p v-if="submitError" class="text-destructive">{{ submitError }}</p>
+                    <div v-else class="h-6 flex justify-end">
+                        <p v-if="submitCount > 0 && errors.promotions && typeof errors.promotions === 'string'"
+                            class="text-sm text-red-500">
+                            {{ errors.promotions }}
+                        </p>
+                    </div>
+                </div>
+            </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

@@ -0,0 +1,160 @@
+<script setup lang="ts">
+import { pagination } from '@shared/types/pagination';
+import { PromotionSummary } from '@shared/types/rank';
+import { onMounted, ref } from 'vue';
+import {
+    Pagination,
+    PaginationContent,
+    PaginationEllipsis,
+    PaginationItem,
+    PaginationNext,
+    PaginationPrevious,
+} from '@/components/ui/pagination'
+import {
+    Table,
+    TableBody,
+    TableCaption,
+    TableCell,
+    TableHead,
+    TableHeader,
+    TableRow,
+} from "@/components/ui/table"
+import { ChevronDown, ChevronUp } from 'lucide-vue-next';
+import Button from '../ui/button/Button.vue';
+import { getPromoHistory } from '@/api/rank';
+import Spinner from '../ui/spinner/Spinner.vue';
+import PromotionListDay from './promotionListDay.vue';
+
+
+const loading = ref(true);
+const batchList = ref<PromotionSummary[]>();
+
+onMounted(async () => {
+    await loadHistory();
+    loading.value = false;
+})
+
+async function loadHistory() {
+    let d = await getPromoHistory(pageNum.value, pageSize.value);
+    batchList.value = d.data;
+    pageData.value = d.pagination;
+}
+
+function refresh() {
+    loadHistory();
+    promoDayDetails.value?.[0].loadData();
+}
+
+defineExpose({
+    refresh
+})
+
+const promoDayDetails = ref<InstanceType<typeof PromotionListDay>[]>(null)
+
+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;
+    loadHistory();
+}
+
+function setPage(pagenum: number) {
+    pageNum.value = pagenum;
+    loadHistory();
+}
+
+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>
+    <div class="flex flex-col max-w-7xl w-full">
+        <div class="w-full mx-auto">
+            <Table>
+                <TableHeader>
+                    <TableRow>
+                        <TableHead>Date</TableHead>
+                        <TableHead></TableHead>
+                    </TableRow>
+                </TableHeader>
+                <TableBody>
+                    <template v-for="(batch, index) in batchList" :key="index">
+                        <TableRow class="hover:bg-muted/50 cursor-pointer" @click="expanded = index"
+                            @mouseenter="hoverID = index" @mouseleave="hoverID = null" :class="{
+                                'border-b-0': expanded === index,
+                                'bg-muted/50': hoverID === index
+                            }">
+                            <TableCell class="font-medium">
+                                {{ formatDate(new Date(batch.entry_day)) }}
+                            </TableCell>
+                            <TableCell class="text-right">
+                                <Button v-if="expanded === index" @click.stop="expanded = null" size="icon"
+                                    variant="ghost">
+                                    <ChevronUp class="size-6" />
+                                </Button>
+                                <Button v-else @click.stop="expanded = index" size="icon" variant="ghost">
+                                    <ChevronDown class="size-6" />
+                                </Button>
+                            </TableCell>
+                        </TableRow>
+                        <TableRow v-if="expanded === index" @mouseenter="hoverID = index" @mouseleave="hoverID = null"
+                            :class="{ 'bg-muted/50 border-t-0': hoverID === index }">
+                            <TableCell :colspan="8" class="p-0">
+                                <div class="w-full p-2 mb-6 space-y-3">
+                                    <PromotionListDay ref="promoDayDetails" :date="new Date(batch.entry_day)">
+                                    </PromotionListDay>
+                                </div>
+                            </TableCell>
+                        </TableRow>
+
+                    </template>
+                </TableBody>
+            </Table>
+            <div v-if="loading" class="w-full flex mx-auto justify-center my-15">
+                <Spinner class="size-7"></Spinner>
+            </div>
+            <div class="mt-5 flex justify-between mb-20">
+                <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/promotions/promotionListDay.vue

@@ -0,0 +1,65 @@
+<script setup lang="ts">
+import { getPromotionsOnDay } from '@/api/rank';
+import { onMounted, ref } from 'vue';
+import MemberCard from '../members/MemberCard.vue';
+import Spinner from '../ui/spinner/Spinner.vue';
+import { PromotionDetails } from '@shared/types/rank';
+
+
+const props = defineProps<{
+    date: Date
+}>()
+
+const promoList = ref<PromotionDetails[]>();
+const loading = ref(true);
+
+async function loadData() {
+    promoList.value = await getPromotionsOnDay(props.date);
+}
+
+defineExpose({
+    loadData
+})
+
+onMounted(async () => {
+    // promoList.value = await getPromotionsOnDay(props.date);
+    await loadData();
+    loading.value = false;
+})
+
+</script>
+
+<template>
+    <div class="overflow-x-auto">
+        <table v-if="!loading" class="min-w-full text-left border-collapse">
+            <thead>
+                <tr class="border-b-2 border-gray-200 bg-white/10">
+                    <th class="px-4 py-3 text-sm font-semibold">Member</th>
+                    <th class="px-4 py-3 text-sm font-semibold">Rank</th>
+                    <th class="px-4 py-3 text-sm font-semibold">Approved By</th>
+                    <th class="px-4 py-3 text-sm font-semibold text-right">Submitted By</th>
+                </tr>
+            </thead>
+
+            <tbody>
+                <tr v-for="p in promoList" :key="p.member_id" class="border-b transition-colors">
+                    <td class="px-2 py-2">
+                        <MemberCard :member-id="p.member_id" />
+                    </td>
+                    <td class="px-4 py-2 text-sm">
+                        {{ p.short_name }}
+                    </td>
+                    <td class="px-2 py-2 text-sm text-right">
+                        <MemberCard :member-id="p.authorized_by_id" />
+                    </td>
+                    <td class="px-2 py-2 text-sm text-right">
+                        <MemberCard :member-id="p.created_by_id" />
+                    </td>
+                </tr>
+            </tbody>
+        </table>
+        <div v-else class="overflow-hidden mx-auto flex w-full">
+            <Spinner class="size-7"></Spinner>
+        </div>
+    </div>
+</template>

ui/src/components/roles/addMember.vue

@@ -0,0 +1,111 @@
+<script setup lang="ts">
+import { addMemberToRole, removeMemberFromRole } from '@/api/roles';
+import { MemberLight } from '@shared/types/member';
+import { Role } from '@shared/types/roles';
+import { computed, ref } from 'vue';
+import Dialog from '../ui/dialog/Dialog.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 DialogFooter from '../ui/dialog/DialogFooter.vue'
+import Button from '../ui/button/Button.vue';
+import InputGroup from '../ui/input-group/InputGroup.vue';
+import InputGroupAddon from '../ui/input-group/InputGroupAddon.vue';
+import { SearchIcon } from 'lucide-vue-next';
+import Spinner from '../ui/spinner/Spinner.vue';
+
+const props = defineProps<{
+    allMembers: MemberLight[],
+    role: Role
+}>()
+
+const emit = defineEmits(['submit'])
+
+const showAddMemberDialog = ref(false)
+const memberToAdd = ref<MemberLight | null>(null)
+const searchQuery = ref('')
+
+const filteredMembers = computed(() => {
+    const q = searchQuery.value.trim().toLowerCase()
+    if (!q) return props.allMembers
+
+    return props.allMembers.filter(m =>
+        m.displayName?.toLowerCase().includes(q) ||
+        m.username?.toLowerCase().includes(q)
+    )
+})
+
+defineExpose({
+    openDialog,
+})
+
+function openDialog() {
+    showAddMemberDialog.value = true;
+}
+
+const submitting = ref(false);
+async function handleAddMember() {
+    //catch double submit
+    if (submitting.value) return;
+    submitting.value = true;
+    //guard
+    if (memberToAdd.value == null)
+        return;
+
+    await addMemberToRole(memberToAdd.value.id, props.role.id);
+    emit('submit');
+    showAddMemberDialog.value = false;
+    submitting.value = false;
+}
+
+</script>
+
+<template>
+    <Dialog v-model:open="showAddMemberDialog">
+        <DialogContent class="sm:max-w-md">
+            <DialogHeader>
+                <DialogTitle>Add member to {{ props.role?.name }}</DialogTitle>
+                <DialogDescription>
+                    Search for a member to add to this group.
+                </DialogDescription>
+            </DialogHeader>
+
+            <!-- Search -->
+            <InputGroup>
+                <InputGroupAddon>
+                    <SearchIcon class="h-4 w-4 text-muted-foreground" />
+                </InputGroupAddon>
+                <input v-model="searchQuery" type="text" placeholder="Search members…"
+                    class="flex-1 bg-transparent outline-none text-sm" />
+            </InputGroup>
+
+            <!-- Results -->
+            <div class="mt-3 h-64 overflow-y-auto scrollbar-themed rounded-md border">
+                <ul class="divide-y">
+                    <li v-for="member in filteredMembers" :key="member.id" @click="memberToAdd = member"
+                        class="flex items-center justify-between px-3 py-2 cursor-pointer hover:bg-muted"
+                        :class="memberToAdd?.id === member.id && 'bg-muted'">
+                        <span>{{ member.displayName || member.username }}</span>
+
+                        <span v-if="memberToAdd?.id === member.id" class="text-xs text-muted-foreground">
+                            Selected
+                        </span>
+                    </li>
+                </ul>
+            </div>
+
+            <DialogFooter>
+                <Button variant="secondary" @click="showAddMemberDialog = false">
+                    Cancel
+                </Button>
+                <Button :disabled="!memberToAdd || submitting" @click="handleAddMember">
+                    <span class="flex items-center gap-2" v-if="submitting">
+                        <Spinner></Spinner> Add
+                    </span>
+                    <span v-else>Add</span>
+                </Button>
+            </DialogFooter>
+        </DialogContent>
+    </Dialog>
+</template>

ui/src/components/roles/roleView.vue

@@ -0,0 +1,143 @@
+<script setup lang="ts">
+import { addMemberToRole, getRoleDetails, getRoleMembers, removeMemberFromRole } from '@/api/roles'
+import type { MemberLight } from '@shared/types/member'
+import type { Role } from '@shared/types/roles'
+import { computed, onMounted, ref, watch } from 'vue'
+import { useRoute } from 'vue-router'
+import Button from '@/components/ui/button/Button.vue'
+import Separator from '@/components/ui/separator/Separator.vue'
+import { Plus, SearchIcon, X } from 'lucide-vue-next'
+import MemberCard from '../members/MemberCard.vue'
+import InputGroup from '../ui/input-group/InputGroup.vue'
+import InputGroupAddon from '../ui/input-group/InputGroupAddon.vue'
+
+import AddMember from './addMember.vue'
+import Spinner from '../ui/spinner/Spinner.vue'
+
+const route = useRoute()
+
+const roleData = ref<Role | null>(null)
+const roleMembers = ref<MemberLight[]>([])
+const loading = ref(true)
+
+async function loadRole() {
+    const id = Number(route.params.id)
+    roleData.value = await getRoleDetails(id)
+    roleMembers.value = await getRoleMembers(id)
+
+    loading.value = false
+}
+
+const searchQuery = ref('')
+const roleMembersFiltered = computed(() => {
+    if (!searchQuery.value) return roleMembers.value
+    const query = searchQuery.value.toLowerCase()
+    return roleMembers.value.filter(member =>
+        member.displayName?.toLowerCase().includes(query) ||
+        member.username?.toLowerCase().includes(query)
+    )
+})
+
+const props = defineProps<{
+    allMembers: MemberLight[]
+}>()
+
+
+const availableMembers = computed(() =>
+    props.allMembers.filter(
+        m => !roleMembers.value.some(rm => rm.id === m.id)
+    )
+)
+
+async function handleRemoveMember(memberId: number) {
+    await removeMemberFromRole(memberId, Number(route.params.id));
+    await loadRole();
+}
+
+const addMemberRef = ref<InstanceType<typeof AddMember> | null>(null)
+
+onMounted(loadRole)
+watch(() => route.params.id, loadRole)
+</script>
+
+<template>
+    <AddMember ref="addMemberRef" :all-members="availableMembers" :role="roleData" @submit="loadRole"></AddMember>
+    <div class="h-full px-6 py-2">
+        <!-- Loading -->
+        <div v-if="loading" class="h-full flex items-center justify-center text-muted-foreground">
+            <Spinner class="size-8" />
+        </div>
+
+        <!-- No role selected -->
+        <div v-else-if="!roleData" class="text-muted-foreground">
+            Select a group to view details
+        </div>
+
+        <!-- Role details -->
+        <div v-else class="space-y-6">
+            <!-- Header -->
+            <div class="flex items-start justify-between">
+                <div class="space-y-1">
+                    <div class="flex items-center gap-3">
+                        <span class="h-3 w-3 rounded-full" :style="{ backgroundColor: roleData.color }" />
+                        <h2 class="text-2xl font-semibold tracking-tight">
+                            {{ roleData.name }}
+                        </h2>
+                    </div>
+
+                    <p class="text-sm text-muted-foreground">
+                        {{ roleData.description || 'No description provided.' }}
+                    </p>
+                </div>
+
+                <!-- <Button variant="ghost" size="sm" class="text-destructive">
+                    Delete
+                </Button> -->
+            </div>
+
+            <Separator />
+
+            <!-- Members -->
+            <div class="space-y-3">
+                <div class="flex items-center justify-between">
+                    <h3 class="text-sm font-medium">
+                        Members ({{ roleMembers.length }})
+                    </h3>
+                    <div class="flex items-center gap-5">
+                        <InputGroup class="w-64">
+                            <InputGroupAddon>
+                                <SearchIcon class="h-4 w-4 text-muted-foreground" />
+                            </InputGroupAddon>
+
+                            <input v-model="searchQuery" type="text" placeholder="Search members…"
+                                class="flex-1 bg-transparent outline-none text-sm" />
+                        </InputGroup>
+                        <Button variant="secondary" @click="addMemberRef.openDialog()">
+                            <Plus class="mr-2 h-4 w-4" />
+                            Add Member
+                        </Button>
+                    </div>
+                </div>
+
+                <!-- Empty state -->
+                <div v-if="roleMembers.length === 0" class="text-sm text-muted-foreground py-6 text-center">
+                    No members in this group yet.
+                </div>
+
+                <div class="overflow-y-auto max-h-[55dvh] pr-1 scrollbar-themed">
+                    <ul class="space-y-1">
+                        <li v-for="member in roleMembersFiltered" :key="member.id"
+                            class="flex items-center justify-between rounded-md px-3 py-2 hover:bg-muted/50">
+                            <MemberCard :member-id="member.id" />
+
+                            <Button variant="ghost" size="icon" class="text-muted-foreground"
+                                @click="handleRemoveMember(member.id)">
+                                <X class="h-4 w-4" />
+                            </Button>
+                        </li>
+                    </ul>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>

ui/src/components/tooltip/Tooltip.vue

@@ -0,0 +1,20 @@
+<script setup lang="ts">
+defineProps<{
+    open: boolean,
+    message: string
+}>();
+</script>
+
+<template>
+    <div class="relative inline-flex items-center group w-min">
+        <slot></slot>
+        <div v-if="open" class="pointer-events-none absolute -top-9 left-1/2 -translate-x-1/2
+                                                whitespace-nowrap rounded-md bg-popover px-2 py-1 text-xs
+                                                text-popover-foreground shadow-md border border-border
+                                                opacity-0 translate-y-1
+                                                group-hover:opacity-100 group-hover:translate-y-0
+                                                transition-opacity transition-transform duration-150">
+            {{ message }}
+        </div>
+    </div>
+</template>

ui/src/components/trainingReport/trainingReportForm.vue

@@ -3,9 +3,10 @@ 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, onMounted, ref, watch } from 'vue'
+import { computed, nextTick, onMounted, reactive, ref, watch } from 'vue'
 import { getAllAttendeeRoles, getAllTrainings, postTrainingReport } from '@/api/trainingReport'
-import { getMembers, Member } from '@/api/member'
+import { getAllLightMembers, getLightMembers, getMembers } from '@/api/member'
+import { Member, MemberLight } from '@shared/types/member'
 
 import FieldGroup from '../ui/field/FieldGroup.vue'
 import Field from '../ui/field/Field.vue'
@@ -13,12 +14,19 @@ 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 { Plus, X } from 'lucide-vue-next';
+import { Check, 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'
+import Tooltip from '../tooltip/Tooltip.vue'
+import Spinner from '../ui/spinner/Spinner.vue'
 
 
 const { handleSubmit, resetForm, errors, values, setFieldValue } = useForm({
@@ -44,7 +52,9 @@ watch(() => values.course_id, (newCourseId, oldCourseId) => {
     if (!oldCourseId) return;
 
     values.attendees.forEach((a, index) => {
+        // @ts-ignore
         setFieldValue(`attendees[${index}].passed_bookwork`, false);
+        // @ts-ignore
         setFieldValue(`attendees[${index}].passed_qual`, false);
     });
 });
@@ -58,19 +68,24 @@ function toMySQLDateTime(date: Date): string {
         .replace("T", " ") + "000";    // becomes → 2025-11-19 00:00:00.000000
 }
 
-
+const submitting = ref(false);
-function onSubmit(vals) {
+async function onSubmit(vals) {
+    //catch double submit
+    if (submitting.value) return;
+    submitting.value = true;
     try {
         const clean: CourseEventDetails = {
             ...vals,
             event_date: new Date(vals.event_date),
         }
 
-        postTrainingReport(clean).then((newID) => {
+        await postTrainingReport(clean).then((newID) => {
             emit("submit", newID);
         });
     } catch (err) {
         console.error("There was an error submitting the training report", err);
+    } finally {
+        submitting.value = false;
     }
 }
 
@@ -79,16 +94,44 @@ 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<Member[] | null>(null);
+const members = ref<MemberLight[] | null>(null);
 const eventRoles = ref<CourseAttendeeRole[] | null>(null);
 
 const emit = defineEmits(['submit'])
 
 onMounted(async () => {
     trainings.value = await getAllTrainings();
-    members.value = await getMembers();
+    members.value = await getAllLightMembers();
     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">
@@ -99,13 +142,37 @@ onMounted(async () => {
                     <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>
-                            <select v-bind="field"
+                            <Combobox :model-value="field.value" @update:open="selectCourse = $event"
-                                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">
+                                :open="selectCourse" @update:model-value="(v) => {
-                                <option value="" disabled>Select a course</option>
+                                    field.onChange(v);
-                                <option v-for="course in trainings" :key="course.id" :value="course.id">
+                                    selectCourse = false
-                                    {{ course.name }}
+                                }" class="w-full">
-                                </option>
+                                <ComboboxAnchor class="w-full">
-                            </select>
+                                    <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>
                             <div class="h-4">
                                 <FieldError v-if="errors.length" :errors="errors" />
                             </div>
@@ -113,6 +180,7 @@ onMounted(async () => {
                     </VeeField>
                 </FieldGroup>
             </div>
+
             <div class="w-[150px]">
                 <FieldGroup>
                     <VeeField v-slot="{ field, errors }" name="event_date">
@@ -180,13 +248,38 @@ onMounted(async () => {
                             <!-- Member Select -->
                             <VeeField :name="`attendees[${index}].attendee_id`" v-slot="{ field: f, errors: e }">
                                 <div>
-                                    <select v-bind="f"
+                                    <Combobox :model-value="f.value"
-                                        class="border rounded p-2 w-full focus-visible:border-ring focus-visible:ring-ring/50 focus-visible:ring-[3px] bg-background outline-none">
+                                        @update:open="openMap['member-' + field.key] = $event"
-                                        <option value="">Select member...</option>
+                                        :open="openMap['member-' + field.key]" @update:model-value="(v) => {
-                                        <option v-for="m in members" :key="m.member_id" :value="m.member_id">
+                                            f.onChange(v);
-                                            {{ m.member_name }}
+                                            openMap['member-' + field.key] = false
-                                        </option>
+                                        }" class="w-full">
-                                    </select>
+                                        <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>
                                     <div class="h-4">
                                         <FieldError v-if="e.length" :errors="e" />
                                     </div>
@@ -196,13 +289,42 @@ onMounted(async () => {
                             <!-- Role Select -->
                             <VeeField :name="`attendees[${index}].attendee_role_id`" v-slot="{ field: f, errors: e }">
                                 <div>
-                                    <select v-bind="f"
+                                    <Combobox :model-value="f.value"
-                                        class="border rounded p-2 w-full focus-visible:border-ring focus-visible:ring-ring/50 focus-visible:ring-[3px] bg-background outline-none">
+                                        @update:open="openMap['role-' + field.key] = $event"
-                                        <option value="">Select role...</option>
+                                        :open="openMap['role-' + field.key]" @update:model-value="(v) => {
-                                        <option v-for="r in eventRoles" :key="r.id" :value="r.id">
+                                            f.onChange(v);
-                                            {{ r.name }}
+                                            openMap['role-' + field.key] = false
-                                        </option>
+                                        }" class="w-full">
-                                    </select>
+                                        <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>
+
                                     <div class="h-4">
                                         <FieldError v-if="e.length" :errors="e" />
                                     </div>
@@ -213,22 +335,13 @@ onMounted(async () => {
                             <VeeField v-slot="{ field }" :name="`attendees[${index}].passed_bookwork`" type="checkbox"
                                 :value="false" :unchecked-value="true">
                                 <div class="flex flex-col items-center">
-                                    <div class="relative inline-flex items-center group">
+                                    <Tooltip :open="!selectedCourse?.hasBookwork"
-
+                                        message="This course does not have bookwork">
                                         <Checkbox :disabled="!selectedCourse?.hasBookwork"
                                             :name="`attendees[${index}].passed_bookwork`" :model-value="!field.checked"
                                             @update:model-value="field['onUpdate:modelValue']">
                                         </Checkbox>
-                                        <!-- Tooltip bubble -->
+                                    </Tooltip>
-                                        <div v-if="!selectedCourse?.hasBookwork" class="pointer-events-none absolute -top-9 left-1/2 -translate-x-1/2
-                                                whitespace-nowrap rounded-md bg-popover px-2 py-1 text-xs
-                                                text-popover-foreground shadow-md border border-border
-                                                opacity-0 translate-y-1
-                                                group-hover:opacity-100 group-hover:translate-y-0
-                                                transition-opacity transition-transform duration-150">
-                                            This course does not have bookwork
-                                        </div>
-                                    </div>
                                     <div class="h-4">
                                     </div>
                                 </div>
@@ -238,20 +351,12 @@ onMounted(async () => {
                             <VeeField v-slot="{ field }" :name="`attendees[${index}].passed_qual`" type="checkbox"
                                 :value="false" :unchecked-value="true">
                                 <div class="flex flex-col items-center">
-                                    <div class="relative inline-flex items-center group">
+                                    <Tooltip :open="!selectedCourse?.hasQual"
+                                        message="This course does not have a qualification">
                                         <Checkbox :disabled="!selectedCourse?.hasQual"
                                             :name="`attendees[${index}].passed_qual`" :model-value="!field.checked"
                                             @update:model-value="field['onUpdate:modelValue']"></Checkbox>
-                                        <!-- Tooltip bubble -->
+                                    </Tooltip>
-                                        <div v-if="!selectedCourse?.hasQual" class="pointer-events-none absolute -top-9 left-1/2 -translate-x-1/2
-                                                whitespace-nowrap rounded-md bg-popover px-2 py-1 text-xs
-                                                text-popover-foreground shadow-md border border-border
-                                                opacity-0 translate-y-1
-                                                group-hover:opacity-100 group-hover:translate-y-0
-                                                transition-opacity transition-transform duration-150">
-                                            This course does not have a qualification
-                                        </div>
-                                    </div>
                                     <div class="h-4">
                                     </div>
                                 </div>
@@ -303,7 +408,12 @@ onMounted(async () => {
         </FieldGroup>
         <div class="flex gap-3 justify-end">
             <Button type="button" variant="outline" @click="resetForm">Reset</Button>
-            <Button type="submit" form="trainingForm">Submit</Button>
+            <Button type="submit" form="trainingForm" :disabled="submitting" class="w-35">
+                <span class="flex items-center gap-2" v-if="submitting">
+                    <Spinner></Spinner> Submitting…
+                </span>
+                <span v-else>Submit</span>
+            </Button>
         </div>
     </form>
 </template>

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

@@ -8,7 +8,7 @@ export const buttonVariants = cva(
     variants: {
       variant: {
         default:
-          "bg-primary text-primary-foreground shadow-xs hover:bg-primary/90",
+          "bg-primary text-primary-foreground shadow-xs hover:bg-primary/70",
         destructive:
           "bg-destructive text-white shadow-xs hover:bg-destructive/90 focus-visible:ring-destructive/20 dark:focus-visible:ring-destructive/40 dark:bg-destructive/60",
         outline:
@@ -16,7 +16,7 @@ export const buttonVariants = cva(
         secondary:
           "bg-secondary text-secondary-foreground shadow-xs hover:bg-secondary/80",
         ghost:
-          "hover:bg-accent hover:text-accent-foreground dark:hover:bg-accent/50",
+          "hover:bg-accent active:bg-accent hover:text-accent-foreground dark:hover:bg-accent/50",
         success:
           "bg-success text-success-foreground shadow-xs hover:bg-success/90",
         link: "text-primary underline-offset-4 hover:underline",

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

@@ -1,7 +1,14 @@
 <script setup>
-import { reactiveOmit } from "@vueuse/core";
+import { getLocalTimeZone, today } from "@internationalized/date";
-import { CalendarRoot, useForwardPropsEmits } from "reka-ui";
+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 { cn } from "@/lib/utils";
+import {
+  NativeSelect,
+  NativeSelectOption,
+} from '@/components/ui/native-select';
 import {
   CalendarCell,
   CalendarCellTrigger,
@@ -38,34 +45,165 @@ const props = defineProps({
   dir: { type: String, required: false },
   nextPage: { type: Function, required: false },
   prevPage: { type: Function, required: false },
-  modelValue: { type: null, required: false },
+  modelValue: { type: null, required: false, default: undefined },
   multiple: { type: Boolean, required: false },
   disableDaysOutsideCurrentView: { type: Boolean, required: false },
   asChild: { type: Boolean, required: false },
-  as: { type: [String, Object, Function], required: false },
+  as: { type: null, 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");
+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 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 }"
+    v-slot="{ grid, weekDays, date }"
+    v-bind="forwarded"
+    v-model:placeholder="placeholder"
     data-slot="calendar"
     :class="cn('p-3', props.class)"
-    v-bind="forwarded"
   >
-    <CalendarHeader>
+    <CalendarHeader class="pt-0">
-      <CalendarHeading />
+      <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>
 
-      <div class="flex items-center gap-1">
+      <slot
-        <CalendarPrevButton />
+        name="calendar-heading"
-        <CalendarNextButton />
+        :date="date"
-      </div>
+        :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>
     </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: [String, Object, Function], required: false },
+  as: { type: null, 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: [String, Object, Function], required: false, default: "button" },
+  as: { type: null, 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: [String, Object, Function], required: false },
+  as: { type: null, required: false },
   class: { type: null, required: false },
 });