Improved promotion page readability on mobile

Reviewed-on: #143

api/.env.example

@@ -21,7 +21,13 @@ CLIENT_URL= # This is whatever URL the client web app is served on
 CLIENT_DOMAIN= #whatever.com
 APPLICATION_VERSION= # Should match release tag
 APPLICATION_ENVIRONMENT= # dev / prod
-CONFIG_ID= # configures 
+CONFIG_ID= # config version 
+
+# webhooks/integrations
+DISCORD_APPLICATIONS_WEBHOOK=
+
+# Logger
+LOG_DEPTH= # normal / verbose / profiling
 
 # Glitchtip
 GLITCHTIP_DSN=

api/package-lock.json

@@ -11,7 +11,6 @@
       "dependencies": {
         "@sentry/node": "^10.27.0",
         "@types/express-session": "^1.18.2",
-        "chalk": "^5.6.2",
         "connect-sqlite3": "^0.9.16",
         "cors": "^2.8.5",
         "dotenv": "^17.2.1",
@@ -1315,18 +1314,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/chalk": {
-      "version": "5.6.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.6.2.tgz",
-      "integrity": "sha512-7NzBL0rN6fMUW+f7A6Io4h40qQlG+xGmtMxfbnH/K7TAtt8JQWVQK+6g0UXKMeVJoyV5EkkNsErQ8pVD3bLHbA==",
-      "license": "MIT",
-      "engines": {
-        "node": "^12.17.0 || ^14.13 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
     "node_modules/chokidar": {
       "version": "3.6.0",
       "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz",
@@ -3235,9 +3222,9 @@
       }
     },
     "node_modules/qs": {
-      "version": "6.14.0",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.14.0.tgz",
-      "integrity": "sha512-YWWTjgABSKcvs/nWBi9PycY/JiPJqOD4JA6o9Sej2AtvSGarXxKC3OQSk4pAarbdQlKAh5D4FCQkJNkW+GAn3w==",
+      "version": "6.14.1",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.14.1.tgz",
+      "integrity": "sha512-4EK3+xJl8Ts67nLYNwqw/dsFVnCf+qR7RgXSK9jEEm9unao3njwMDdmsdvoKBKHzxd7tCYz5e5M+SnMjdtXGQQ==",
       "license": "BSD-3-Clause",
       "dependencies": {
         "side-channel": "^1.1.0"

api/package.json

@@ -14,7 +14,6 @@
   "dependencies": {
     "@sentry/node": "^10.27.0",
     "@types/express-session": "^1.18.2",
-    "chalk": "^5.6.2",
     "connect-sqlite3": "^0.9.16",
     "cors": "^2.8.5",
     "dotenv": "^17.2.1",

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,

api/src/index.ts

@@ -1,31 +1,40 @@
 import dotenv = require('dotenv');
-dotenv.config();
+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()
-import chalk from 'chalk';
+
 app.use(morgan((tokens: morgan.TokenIndexer, req: express.Request, res: express.Response) => {
-  const status = Number(tokens.status(req, res));
 
-  // Colorize status code
-  const statusColor = status >= 500 ? chalk.red
-    : status >= 400 ? chalk.yellow
-      : status >= 300 ? chalk.cyan
-        : chalk.green;
+  const head: LogHeader = {
+    type: 'http',
+    level: 'info',
+    depth: 'normal',
+    timestamp: new Date().toISOString(),
+  }
 
-  return [
-    chalk.gray(`[${new Date().toISOString()}]`),
-    chalk.blue.bold(tokens.method(req, res)),
-    tokens.url(req, res),
-    statusColor(status),
-    chalk.magenta(tokens['response-time'](req, res) + ' ms'),
-    chalk.yellow(`- User: ${req.user?.name ? `${req.user.name} (${req.user.id})` : 'Unauthenticated'}`),
-  ].join(' ');
+  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';
+    return req.originalUrl === '/members/me' || req.originalUrl === '/ping';
   }
 }))
 
@@ -43,14 +52,13 @@ const port = process.env.SERVER_PORT;
 //glitchtip setup
 import sentry = require('@sentry/node');
 if (process.env.DISABLE_GLITCHTIP === "true") {
-  console.log("Glitchtip disabled")
+  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;
-  console.log(release, environment)
   sentry.init({ dsn: dsn, release: release, environment: environment, integrations: [sentry.captureConsoleIntegration({ levels: ['error'] })] });
-  console.log("Glitchtip initialized");
+  logger.info('app', 'Glitchtip initialized', null, 'normal')
 }
 
 //session setup
@@ -75,6 +83,11 @@ const sessionOptions: session.SessionOptions = {
   cookie: cookieOptions
 }
 
+import { initializeDiscordIntegrations } from './services/integrations/discord';
+
+//event bus setup
+initializeDiscordIntegrations();
+
 app.use(session(sessionOptions));
 app.use(passport.authenticate('session'));
 
@@ -110,5 +123,5 @@ app.get('/ping', (req, res) => {
 });
 
 app.listen(port, () => {
-  console.log(`Example app listening on port ${port} `)
+  logger.info('app', `Example app listening on port ${port} `)
 })

api/src/routes/applications.ts

@@ -2,59 +2,97 @@ const express = require('express');
 const router = express.Router();
 
 import pool from '../db';
-import { approveApplication, createApplication, denyApplication, getAllMemberApplications, getApplicationByID, getApplicationComments, getApplicationList, getMemberApplication } from '../services/applicationService';
-import { setUserState } from '../services/memberService';
+import { approveApplication, createApplication, denyApplication, getAllMemberApplications, getApplicationByID, getApplicationComments, getApplicationList, getMemberApplication } from '../services/db/applicationService';
+import { setUserState } from '../services/db/memberService';
 import { MemberState } from '@app/shared/types/member';
-import { getRankByName, insertMemberRank } from '../services/rankService';
+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/rolesService';
+import { getUserRoles } from '../services/db/rolesService';
 import { requireLogin, requireRole } from '../middleware/auth';
+import { logger } from '../services/logging/logger';
+import { bus } from '../services/events/eventBus';
 
 //get CoC
 router.get('/coc', async (req: Request, res: Response) => {
-  const output = await fetch(`${process.env.DOC_HOST}/api/pages/714`, {
+  try {
+    const response = await fetch(`${process.env.DOC_HOST}/api/pages/714`, {
       headers: {
         Authorization: `Token ${process.env.DOC_TOKEN_ID}:${process.env.DOC_TOKEN_SECRET}`,
-    }
-  })
+      },
+    });
 
-  if (output.ok) {
-    const out = await output.json();
+    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);
+    }
+
+    const out = await response.json();
     res.status(200).json(out.html);
-  } else {
-    console.error("Failed to fetch LOA policy from bookstack");
+
+  } catch (error) {
+    logger.error('app', 'Error fetching LOA policy from Bookstack', {
+      error: error instanceof Error ? error.message : String(error),
+    });
     res.sendStatus(500);
   }
-})
+});
 
 
 // POST /application
-router.post('/', [requireLogin], async (req, res) => {
-  try {
-    const App = req.body?.App || {};
+router.post('/', [requireLogin], async (req: Request, res: Response) => {
   const memberID = req.user.id;
-
+  const App = req.body?.App || {};
   const appVersion = 1;
 
-    await createApplication(memberID, appVersion, JSON.stringify(App))
+  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) {
-    console.error('Failed to create application: \n', 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', [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);
   }
 });
@@ -68,8 +106,16 @@ router.get('/meList', async (req, res) => {
 
     return res.status(200).json(application);
   } catch (error) {
-    console.error('Failed to load applications: \n', error);
-    return res.status(500).json(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);
   }
 })
 
@@ -80,8 +126,10 @@ router.get('/me', [requireLogin], async (req, res) => {
   try {
     let application = await getMemberApplication(userID);
 
-    if (application === undefined)
+    if (application === undefined) {
       res.sendStatus(204);
+      return;
+    }
 
     const comments: CommentRow[] = await getApplicationComments(application.id);
 
@@ -92,12 +140,20 @@ router.get('/me', [requireLogin], 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('/me/:id', [requireLogin], async (req: Request, res: Response) => {
   let appID = Number(req.params.id);
   let member = req.user.id;
@@ -117,9 +173,18 @@ router.get('/me/:id', [requireLogin], async (req: Request, res: Response) => {
     }
     return res.status(200).json(output);
   }
-  catch (err) {
-    console.error('Query failed:', err);
-    return res.status(500).json({ error: 'Failed to load application' });
+  catch (error) {
+    logger.error(
+      '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);
   }
 });
 
@@ -141,9 +206,17 @@ router.get('/:id', [requireLogin, requireRole("Recruiter")], async (req: Request
     }
     return res.status(200).json(output);
   }
-  catch (err) {
-    console.error('Query failed:', err);
-    return res.status(500).json({ error: 'Failed to load application' });
+  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);
   }
 });
 
@@ -161,9 +234,22 @@ router.post('/approve/:id', [requireLogin, requireRole("Recruiter")], async (req
 
     await pool.query('CALL sp_accept_new_recruit_validation(?, ?, ?, ?)', [Number(process.env.CONFIG_ID), app.member_id, approved_by, approved_by])
 
+    logger.info('app', "Member application approved", {
+      application: app.id,
+      applicant: app.member_id,
+      approver: approved_by
+    })
     res.sendStatus(200);
-  } catch (err) {
-    console.error('Approve failed:', err);
+  } catch (error) {
+    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' });
   }
 });
@@ -177,9 +263,23 @@ router.post('/deny/:id', [requireLogin, requireRole("Recruiter")], async (req: R
     const app = await getApplicationByID(appID);
     await denyApplication(appID, approver);
     await setUserState(app.member_id, MemberState.Denied);
+
+    logger.info('app', "Member application approved", {
+      application: app.id,
+      applicant: app.member_id,
+      approver: approver
+    })
     res.sendStatus(200);
-  } catch (err) {
-    console.error('Approve failed:', err);
+  } catch (error) {
+    logger.error(
+      'app',
+      'Failed to deny 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 deny application' });
   }
 });
@@ -217,10 +317,25 @@ 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) {
-    console.error('Comment failed:', err);
+  } 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();
@@ -261,10 +376,24 @@ VALUES(?, ?, ?, 1);`
           INNER JOIN members AS member ON member.id = app.poster_id
         WHERE app.id = ?; `;
     const comment = await conn.query(getSQL, [result.insertId])
-    res.status(201).json(comment[0]);
 
-  } catch (err) {
-    console.error('Comment failed:', err);
+    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();
@@ -275,9 +404,22 @@ 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) {
-    console.error('Comment failed:', 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' });
   }
 })

api/src/routes/auth.ts

@@ -1,7 +1,5 @@
 const passport = require('passport');
 const OpenIDConnectStrategy = require('passport-openidconnect');
-const dotenv = require('dotenv');
-dotenv.config();
 
 const express = require('express');
 const { param } = require('./applications');
@@ -9,11 +7,14 @@ const router = express.Router();
 import { Role } from '@app/shared/types/roles';
 import pool from '../db';
 import { requireLogin } from '../middleware/auth';
-import { getUserRoles } from '../services/rolesService';
-import { getUserState, mapDiscordtoID } from '../services/memberService';
+import { 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';
+
 
 function parseJwt(token) {
     return JSON.parse(Buffer.from(token.split('.')[1], 'base64').toString());
@@ -37,10 +38,10 @@ passport.use(new OpenIDConnectStrategy({
     // console.log('profile:', profile);
     // console.log('jwt: ', parseJwt(jwtClaims));
     // console.log('params:', params);
-
+    let con;
 
     try {
-        var con = await pool.getConnection();
+        con = await pool.getConnection();
 
         await con.beginTransaction();
 
@@ -49,7 +50,13 @@ passport.use(new OpenIDConnectStrategy({
         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);
@@ -61,13 +68,17 @@ passport.use(new OpenIDConnectStrategy({
 
             if (discordID && memberId) {
                 // claim account
-                console.log("Claiming 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 {
-                console.log("New Account");
                 // new account
                 const username = sub.username;
                 const result = await con.query(
@@ -75,6 +86,13 @@ passport.use(new OpenIDConnectStrategy({
                     [username, sub, issuer]
                 )
                 memberId = Number(result.insertId);
+
+                logger.info('auth', `New member account created`, {
+                    memberId,
+                    username,
+                    issuer,
+                });
+
             }
         }
 
@@ -83,10 +101,26 @@ passport.use(new OpenIDConnectStrategy({
         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 {
-        con.release();
+        if (con) con.release();
     }
 }));
 
@@ -133,8 +167,12 @@ router.get('/logout', [requireLogin], function (req, res, next) {
                 client_id: process.env.AUTH_CLIENT_ID,
                 returnTo: process.env.CLIENT_URL
             };
-            res.redirect(process.env.AUTH_END_SESSION_URI + '?' + querystring.stringify(params));
 
+            logger.info('auth', `Member logged out`, {
+                user: req.user.id,
+            });
+
+            res.redirect(process.env.AUTH_END_SESSION_URI + '?' + querystring.stringify(params));
         })
     });
 });
@@ -146,34 +184,83 @@ passport.serializeUser(function (user, cb) {
 });
 
 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;
 
-
-        var userData: { id: number, name: string, roles: Role[], state: MemberState };
         try {
-            var con = await pool.getConnection();
-            let userResults = await con.query(`SELECT id, name FROM members WHERE id = ?;`, [memberID])
-            userData = userResults[0];
-            let userRoles = await getUserRoles(memberID);
+            let t;
+
+            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: {
+                id: number;
+                name: string;
+                roles: Role[];
+                state: MemberState;
+                discord_id?: string;
+            } = userResults[0];
+
+            t = performance.now();
+            const userRoles = await getUserRoles(memberID);
+            timings.roles = performance.now() - t;
             userData.roles = userRoles || [];
+
+            t = performance.now();
             userData.state = await getUserState(memberID);
-        } catch (error) {
-            console.error(error)
-        } finally {
-            con.release();
-        }
+            timings.state = performance.now() - t;
+
+            // 📊 PROFILING LOG
+            logger.info(
+                'profiling',
+                'passport.deserializeUser completed',
+                {
+                    memberId: memberID,
+                    total_ms: performance.now() - start,
+                    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;
             };

api/src/routes/calendar.ts

@@ -1,8 +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();
@@ -28,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');
     }
 });
@@ -41,9 +49,21 @@ r.post('/:id/cancel', [requireLogin, requireMemberState(MemberState.Member)], as
     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');
     }
 })
@@ -51,9 +71,21 @@ r.post('/:id/uncancel', [requireLogin, requireMemberState(MemberState.Member)],
     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');
     }
 })
@@ -65,12 +97,27 @@ r.post('/:id/attendance', [requireLogin, requireMemberState(MemberState.Member)]
         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 {
@@ -79,9 +126,16 @@ 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) {
-        console.error('Insert failed:', err);
-        res.status(500).json(err);
+    } catch (error) {
+        logger.error(
+            '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);
     }
 })
 
@@ -95,9 +149,22 @@ r.post('/', [requireLogin, requireMemberState(MemberState.Member)], async (req:
         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);
     }
 })
@@ -108,9 +175,22 @@ r.put('/', [requireLogin, requireMemberState(MemberState.Member)], async (req: R
         event.start = new Date(event.start);
         event.end = new Date(event.end);
         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);
     }
 })

api/src/routes/course.ts

@@ -1,8 +1,9 @@
 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 cr = Router();
 const er = Router();
@@ -16,9 +17,16 @@ cr.get('/', async (req, res) => {
     try {
         const courses = await getAllCourses();
         res.status(200).json(courses);
-    } catch (err) {
-        console.error('failed to fetch courses', err);
-        res.status(500).json('failed to fetch courses\n' + err);
+    } catch (error) {
+        logger.error(
+            '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');
     }
 })
 
@@ -26,12 +34,20 @@ cr.get('/roles', async (req, res) => {
     try {
         const roles = await getCourseEventRoles();
         res.status(200).json(roles);
-    } catch (err) {
-        console.error('failed to fetch course roles', err);
-        res.status(500).json('failed to fetch course roles\n' + err);
+    } catch (error) {
+        logger.error(
+            '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');
     }
 })
 
+//get event list
 er.get('/', async (req: Request, res: Response) => {
     try {
         const allowedSorts = new Map([
@@ -55,7 +71,14 @@ er.get('/', async (req: Request, res: Response) => {
         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);
     }
 });
@@ -65,7 +88,14 @@ er.get('/:id', async (req: Request, res: Response) => {
         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);
     }
 });
@@ -74,9 +104,16 @@ 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) {
-        console.error('failed to fetch attendees', err);
-        res.status(500).json("failed to fetch attendees\n" + err);
+    } catch (error) {
+        logger.error(
+            '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");
     }
 })
 
@@ -87,9 +124,19 @@ er.post('/', async (req: Request, res: Response) => {
         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)
     }
 })

api/src/routes/docs.ts

@@ -3,22 +3,55 @@ 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 output = await fetch(`${process.env.DOC_HOST}/api/pages/717`, {
+    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 (output.ok) {
-        const out = await output.json();
+        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);
-    } else {
-        console.error("Failed to fetch LOA policy from bookstack");
+
+        // 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.ts

@@ -3,9 +3,10 @@ const router = express.Router();
 
 import { Request, Response } from 'express';
 import pool from '../db';
-import { closeLOA, createNewLOA, getAllLOA, getLOAbyID, getLoaTypes, getUserLOA, setLOAExtension } from '../services/loaService';
+import { 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);
 
@@ -18,24 +19,39 @@ router.post("/", async (req: Request, res: Response) => {
 
     try {
         await createNewLOA(LOARequest);
+        logger.info('app', 'LOA Posted', { poster: req.user.id, user: LOARequest.member_id })
         res.sendStatus(201);
     } catch (error) {
-        console.error(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")], async (req: Request, res: Response) => {
+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) {
-        console.error(error);
-        res.status(500).send(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);
     }
 });
 
@@ -46,7 +62,14 @@ router.get("/me", async (req: Request, res: Response) => {
         const result = await getUserLOA(user);
         res.status(200).json(result)
     } catch (error) {
-        console.error(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);
     }
 })
@@ -62,19 +85,33 @@ router.get("/history", async (req: Request, res: Response) => {
         const result = await getUserLOA(user, page, pageSize);
         res.status(200).json(result)
     } catch (error) {
-        console.error(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")], async (req: Request, res: Response) => {
+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) {
-        console.error(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);
     }
 })
@@ -84,8 +121,15 @@ router.get('/types', async (req: Request, res: Response) => {
         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);
-        console.error(error);
     }
 })
 
@@ -99,27 +143,47 @@ router.post('/cancel/:id', async (req: Request, res: Response) => {
         }
 
         await closeLOA(Number(req.params.id), closer);
+
+        logger.info('app', 'LOA Closed', { closed_by: closer, LOA: id })
+
         res.sendStatus(200);
     } catch (error) {
-        console.error(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")], async (req: Request, res: Response) => {
+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) {
-        console.error(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('/extend/:id', [requireRole("17th Administrator")], async (req: Request, res: Response) => {
+// 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) {
@@ -128,27 +192,71 @@ router.post('/extend/:id', [requireRole("17th Administrator")], async (req: Requ
 
     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) {
-        console.error(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 output = await fetch(`${process.env.DOC_HOST}/api/pages/42`, {
+    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 (output.ok) {
-        const out = await output.json();
+        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);
-    } else {
-        console.error("Failed to fetch LOA policy from bookstack");
+
+        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.ts

@@ -4,11 +4,14 @@ const router = express.Router();
 import { Request, Response } from 'express';
 import pool from '../db';
 import { requireLogin, requireMemberState, requireRole } from '../middleware/auth';
-import { getUserActiveLOA } from '../services/loaService';
-import { getAllMembersLite, getMemberSettings, getMembersFull, getMembersLite, getUserData, getUserState, setUserSettings } from '../services/memberService';
-import { getUserRoles } from '../services/rolesService';
+import { getUserActiveLOA } from '../services/db/loaService';
+import { getAllMembersLite, getMemberSettings, getMembersFull, getMembersLite, getUserData, getUserState, setUserSettings } from '../services/db/memberService';
+import { getUserRoles } from '../services/db/rolesService';
 import { memberSettings, MemberState, myData } from '@app/shared/types/member';
 
+import { Performance } from 'perf_hooks';
+import { logger } from '../services/logging/logger';
+
 //get all users
 router.get('/', [requireLogin, requireMemberState(MemberState.Member)], async (req, res) => {
     try {
@@ -26,29 +29,69 @@ router.get('/', [requireLogin, requireMemberState(MemberState.Member)], async (r
             END AS on_loa
             FROM view_member_rank_unit_status_latest v;`);
         return res.status(200).json(result);
-    } catch (err) {
-        console.error('Error fetching users:', err);
+    } 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('/me', [requireLogin], async (req, res) => {
-    if (req.user === undefined)
-        return res.sendStatus(401)
+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 {
-        const memData = await getUserData(req.user.id);
-        const LOAData = await getUserActiveLOA(req.user.id);
-        const memState = await getUserState(req.user.id);
-        const roleData = await getUserRoles(req.user.id);
+        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,
+        };
 
-        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) {
-        console.error('Error fetching user data:', 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 {
@@ -56,7 +99,14 @@ router.get('/settings', [requireLogin], async (req: Request, res: Response) => {
         let output = await getMemberSettings(user);
         res.status(200).json(output);
     } catch (error) {
-        console.error(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);
     }
 })
@@ -66,10 +116,17 @@ router.put('/settings', [requireLogin], async (req: Request, res: Response) => {
         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) {
-        console.error(error);
-        res.status(500).json(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);
     }
 })
 
@@ -78,7 +135,14 @@ router.get('/lite', [requireLogin], async (req: Request, res: Response) => {
         let out = await getAllMembersLite();
         res.status(200).json(out);
     } catch (error) {
-        console.error(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);
     }
 })
@@ -89,7 +153,14 @@ router.post('/lite/bulk', async (req: Request, res: Response) => {
         let out = await getMembersLite(ids);
         res.status(200).json(out);
     } catch (error) {
-        console.error(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);
     }
 })
@@ -101,22 +172,36 @@ router.post('/full/bulk', async (req: Request, res: Response) => {
         let out = await getMembersFull(ids);
         res.status(200).json(out);
     } catch (error) {
-        console.error(error);
-        res.status(500).json(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) => {
-    try {
     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 (err) {
-        console.error('Error fetching user:', err);
-        return res.status(500).json({ error: 'Failed to fetch user' });
+    } 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' });
     }
 });
 

api/src/routes/ranks.ts

@@ -1,8 +1,10 @@
 import { MemberState } from "@app/shared/types/member";
 import { requireLogin, requireMemberState, requireRole } from "../middleware/auth";
-import { getAllRanks, insertMemberRank } from "../services/rankService";
+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();
 
@@ -11,26 +13,81 @@ 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, res) => {
-    3
+ur.post('/', [requireRole(["17th Command", "17th Administrator", "17th HQ"]), requireMemberState(MemberState.Member)], async (req: express.Request, res: express.Response) => {
     try {
-        const change = req.body?.change;
-        await insertMemberRank(change.member_id, change.rank_id, change.date);
+        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 (err) {
-        console.error('Insert failed:', err);
+    } 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 (err) {
-        console.error(err);
+    } 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' });
     }
 });

api/src/routes/roles.ts

@@ -5,84 +5,134 @@ const ur = express.Router();
 import { MemberState } from '@app/shared/types/member';
 import pool from '../db';
 import { requireLogin, requireMemberState, requireRole } from '../middleware/auth';
-import { assignUserGroup, createGroup } from '../services/rolesService';
+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, res) => {
-    try {
+ur.post('/', [requireMemberState(MemberState.Member), requireRole("17th Administrator")], async (req: Request, res) => {
     const body = req.body;
 
-        assignUserGroup(body.member_id, body.role_id);
+    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 (err) {
-        console.error('Insert failed:', err);
+    } 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, res) => {
-    try {
+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 (err) {
-        console.error("delete failed: ", err)
+    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 {
-        var con = await pool.getConnection();
+        const roles = await getAllRoles();
         
-        // 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_unit_status_latest 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);
+        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,
             }
-
-        // Attach members to each role
-        const result = roles.map(role => ({
-            ...role,
-            members: roleIdToMembers[role.id] || []
-        }));
-
-        res.json(result);
-    } catch (err) {
-        console.error(err);
-        res.status(500).json({ error: 'Internal server error' });
-    } finally {
-        con.release();
+        );
+        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("17th Administrator")], async (req, res) => {
+r.post('/', [requireMemberState(MemberState.Member), requireRole("dev")], async (req, res) => {
     try {
         const { name, color, description } = req.body;
         if (!name || !color) {
@@ -103,7 +153,7 @@ r.post('/', [requireMemberState(MemberState.Member), requireRole("17th Administr
     }
 })
 
-r.delete('/:id', [requireMemberState(MemberState.Member), requireRole("17th Administrator")], async (req, res) => {
+r.delete('/:id', [requireMemberState(MemberState.Member), requireRole("dev")], async (req, res) => {
     try {
         const id = req.params.id;
 

api/src/routes/statuses.ts

@@ -4,6 +4,7 @@ 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);
@@ -38,9 +39,16 @@ statusR.get('/', async (req, res) => {
     try {
         const result = await pool.query('SELECT * FROM statuses;');
         res.json(result);
-    } catch (err) {
-        console.error(err);
-        res.status(500).json({ error: 'Internal server error' });
+    } catch (error) {
+        logger.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);
     }
 });
 

api/src/services/db/CourseSerivce.ts

@@ -1,4 +1,4 @@
-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";

api/src/services/db/applicationService.ts

@@ -1,11 +1,20 @@
 import { ApplicationListRow, ApplicationRow, CommentRow } from "@app/shared/types/application";
-import pool from "../db";
+import pool from "../../db";
 import { error } from "console";
 
-export async function createApplication(memberID: number, appVersion: number, app: string) {
+/**
+ * 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)]
-  return await pool.query(sql, params);
+
+  let result = await pool.query(sql, params);
+  return Number(result.insertId);
 }
 
 export async function getMemberApplication(memberID: number): Promise<ApplicationRow> {

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"
 

api/src/services/db/loaService.ts

@@ -1,5 +1,5 @@
 import { toDateTime } from "@app/shared/utils/time";
-import pool from "../db";
+import pool from "../../db";
 import { LOARequest, LOAType } from '@app/shared/types/loa'
 import { PagedData } from '@app/shared/types/pagination'
 

api/src/services/db/memberService.ts

@@ -1,5 +1,6 @@
-import pool from "../db";
-import { Member, MemberLight, memberSettings, MemberState } from '@app/shared/types/member'
+import { Role } from "@app/shared/types/roles";
+import pool from "../../db";
+import { Member, MemberCardDetails, MemberLight, memberSettings, MemberState } from '@app/shared/types/member'
 
 export async function getUserData(userID: number): Promise<Member> {
   const sql = `SELECT * FROM view_member_rank_unit_status_latest WHERE member_id = ?`;
@@ -60,10 +61,50 @@ export async function getAllMembersLite(): Promise<MemberLight[]> {
   return res;
 }
 
-export async function getMembersFull(ids: number[]): Promise<Member[]> {
-  const sql = `SELECT * FROM view_member_rank_unit_status_latest WHERE member_id IN (?);`;
-  const res: Member[] = await pool.query(sql, [ids]);
-  return res;
+export async function 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[] = JSON.parse(row.roles).map((r: string) => JSON.parse(r));
+
+    return { member, roles };
+  });
 }
 
 export async function mapDiscordtoID(id: number): Promise<number | null> {

api/src/services/db/rankService.ts

@@ -0,0 +1,108 @@
+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";
+
+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;
+}

api/src/services/db/rolesService.ts

@@ -0,0 +1,57 @@
+import { MemberLight } from '@app/shared/types/member';
+import pool from '../../db';
+import { Role, RoleSummary } 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 = ?;`;
+
+    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,4 +1,4 @@
-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, start_date) VALUES (?, ?, NOW())`

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/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, 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);
-}

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 = ?;`;
-
-    return await pool.query(sql, [userID]);
-}

api/tsconfig.json

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

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

@@ -34,6 +34,11 @@ export interface MemberLight {
     color: string
 }
 
+export interface MemberCardDetails {
+    member: Member;
+    roles: Role[];
+}
+
 export interface myData {
     member: Member;
     LOAs: LOARequest[];

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/utils/time.ts

@@ -12,3 +12,25 @@ export function toDateTime(date: Date): string {
 
     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/src/App.vue

@@ -19,6 +19,7 @@ function formatDate(dateStr) {
 }
 
 const environment = import.meta.env.VITE_ENVIRONMENT;
+const version = import.meta.env.VITE_APPLICATION_VERSION;
 </script>
 
 <template>
@@ -30,7 +31,7 @@ const environment = import.meta.env.VITE_ENVIRONMENT;
       <Navbar class="flex"></Navbar>
       <Alert v-if="environment == 'dev'" class="m-2 mx-auto w-5xl" variant="info">
         <AlertDescription class="flex flex-row items-center text-nowrap gap-5 mx-auto">
-          <p>This is a development build of the application. Some features will be unavailable or unstable.</p>
+          <p>Development environment (v{{ version }}). Features may be incomplete or unavailable.</p>
         </AlertDescription>
       </Alert>
       <Alert v-if="userStore.user?.LOAs?.[0]" class="m-2 mx-auto w-5xl" variant="info">

ui/src/api/member.ts

@@ -1,4 +1,4 @@
-import { memberSettings, Member, MemberLight } from "@shared/types/member";
+import { memberSettings, Member, MemberLight, MemberCardDetails } from "@shared/types/member";
 
 //  @ts-ignore
 const addr = import.meta.env.VITE_APIHOST;
@@ -71,7 +71,7 @@ export async function getLightMembers(ids: number[]): Promise<MemberLight[]> {
     return response.json();
 }
 
-export async function getFullMembers(ids: number[]): Promise<Member[]> {
+export async function getFullMembers(ids: number[]): Promise<MemberCardDetails[]> {
 
     if (ids.length === 0) return [];
 

ui/src/api/rank.ts

@@ -1,38 +1,73 @@
-export type Rank = {
-  id: number
-  name: string
-  short_name: string
-  sortOrder: number
-}
+import { BatchPromotion, BatchPromotionMember } from '@shared/schemas/promotionSchema';
+import { PagedData } from '@shared/types/pagination';
+import { PromotionDetails, PromotionSummary, Rank } from '@shared/types/rank'
 
 //  @ts-ignore
 const addr = import.meta.env.VITE_APIHOST;
 
-export async function getRanks(): Promise<Rank[]> {
-  const res = await fetch(`${addr}/ranks`)
+export async function getAllRanks(): Promise<Rank[]> {
+    const res = await fetch(`${addr}/ranks`, {
+        credentials: 'include'
+    })
 
     if (res.ok) {
         return res.json()
     } else {
         console.error("Something went wrong approving the application")
     }
-
 }
 
-// Placeholder: submit a rank change
-export async function submitRankChange(member_id: number, rank_id: number, date: string): Promise<{ ok: boolean }> {
+export async function submitRankChange(promo: BatchPromotion) {
     const res = await fetch(`${addr}/memberRanks`, {
         method: "POST",
         headers: {
             "Content-Type": "application/json",
         },
-    body: JSON.stringify({ change: { member_id, rank_id, date } }),
+        credentials: 'include',
+        body: JSON.stringify(promo),
     })
 
     if (res.ok) {
-    return { ok: true }
+        return
     } else {
-    console.error("Failed to submit rank change")
-    return { ok: false }
+        throw new Error("Failed to submit rank change: Server error");
+    }
+}
+
+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,10 +1,5 @@
-export type Role = {
-    id: number;
-    name: string;
-    color: string;
-    description: string | null;
-    members: any[];
-};
+import { Member, MemberLight } from "@shared/types/member";
+import { Role } from "@shared/types/roles";
 
 //  @ts-ignore
 const addr = import.meta.env.VITE_APIHOST;
@@ -22,6 +17,30 @@ 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",

ui/src/components/Navigation/Navbar.vue

@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { RouterLink } from 'vue-router';
+import { RouterLink, useRouter } from 'vue-router';
 import Separator from '../ui/separator/Separator.vue';
 import { Popover, PopoverContent, PopoverTrigger } from '../ui/popover';
 import {
@@ -18,9 +18,10 @@ import NavigationMenuTrigger from '../ui/navigation-menu/NavigationMenuTrigger.v
 import NavigationMenuContent from '../ui/navigation-menu/NavigationMenuContent.vue';
 import { navigationMenuTriggerStyle } from '../ui/navigation-menu/'
 import { useAuth } from '@/composables/useAuth';
-import { ArrowUpRight, CircleArrowOutUpRight } from 'lucide-vue-next';
+import { ArrowUpRight, ChevronDown, ChevronUp, CircleArrowOutUpRight, LogIn, LogOut, Menu, Settings, X } from 'lucide-vue-next';
 import DropdownMenuGroup from '../ui/dropdown-menu/DropdownMenuGroup.vue';
 import DropdownMenuSeparator from '../ui/dropdown-menu/DropdownMenuSeparator.vue';
+import { computed, nextTick, ref } from 'vue';
 
 const userStore = useUserStore();
 const auth = useAuth();
@@ -40,11 +41,135 @@ function blurAfter() {
         (document.activeElement as HTMLElement)?.blur();
     });
 }
+
+type NavItem = {
+    title: string;
+    to?: string;
+    href?: string;
+    status?: 'member' | 'guest';
+    isExternal?: boolean;
+    roles?: string[];
+    items?: NavItem[];
+};
+
+const navConfig: NavItem[] = [
+    {
+        title: 'Calendar',
+        to: '/calendar',
+    },
+    {
+        title: 'Documents',
+        href: 'https://docs.iceberg-gaming.com',
+        status: 'member',
+        isExternal: true
+    },
+    {
+        title: 'Forms',
+        status: 'member',
+        items: [
+            { title: 'Leave of Absence', to: '/loa' },
+            { title: 'Training Report', to: '/trainingReport' },
+        ]
+    },
+    {
+        title: 'Administration',
+        status: 'member',
+        roles: ['17th Administrator', '17th HQ', '17th Command', 'Recruiter'],
+        items: [
+            {
+                title: 'Leave of Absence',
+                to: '/administration/loa',
+                roles: ['17th Administrator', '17th HQ', '17th Command']
+            },
+            {
+                title: 'Promotions',
+                to: '/administration/rankChange',
+                roles: ['17th Administrator', '17th HQ', '17th Command']
+            },
+            {
+                title: 'Recruitment',
+                to: '/administration/applications',
+                roles: ['Recruiter']
+            },
+            {
+                title: 'Role Management',
+                to: '/administration/roles',
+                roles: ['17th Administrator']
+            },
+        ]
+    },
+    {
+        title: 'Join',
+        to: '/join',
+        status: 'guest',
+    },
+];
+
+const filteredNav = computed(() => {
+    return navConfig.flatMap(item => {
+        const filtered: NavItem[] = [];
+
+        // 1. Check Login Requirements
+        const isLoggedIn = userStore.isLoggedIn;
+
+        // 2. Determine visibility based on status
+        let shouldShow = false;
+
+        if (!item.status) {
+            // Public items - always show
+            shouldShow = true;
+        } else if (item.status === 'guest') {
+            // Show if NOT logged in OR logged in as guest (but NOT a member)
+            shouldShow = !isLoggedIn || auth.accountStatus.value === 'guest';
+        } else if (item.status === 'member') {
+            // Show ONLY if logged in as member
+            shouldShow = isLoggedIn && auth.accountStatus.value === 'member';
+        }
+
+        // 3. Check Role Requirements (if status check passed)
+        if (shouldShow && item.roles) {
+            shouldShow = auth.hasAnyRole(item.roles);
+        }
+
+        if (shouldShow) {
+            if (item.items) {
+                const filteredItems = item.items.filter(subItem =>
+                    !subItem.roles || auth.hasAnyRole(subItem.roles)
+                );
+                filtered.push({ ...item, items: filteredItems });
+            } else {
+                filtered.push(item);
+            }
+        }
+
+        return filtered;
+    });
+})
+
+const isMobileMenuOpen = ref(false);
+const expandedMenu = ref(null);
+
+const router = useRouter();
+
+function openMobileMenu() {
+    expandedMenu.value = null;
+    isMobileMenuOpen.value = true;
+}
+
+function closeMobileMenu() {
+    isMobileMenuOpen.value = false;
+    expandedMenu.value = null;
+}
+
+function mobileNavigateTo(to: string) {
+    closeMobileMenu();
+    router.push(to);
+}
 </script>
 
 <template>
     <div class="w-full border-b">
-        <div class="max-w-screen-3xl w-full mx-auto flex items-center justify-between pr-10 pl-7">
+        <div class="hidden lg:flex max-w-screen-3xl w-full mx-auto items-center justify-between pr-10 pl-7">
             <!-- left side -->
             <div class="flex items-center gap-7">
                 <RouterLink to="/">
@@ -123,13 +248,13 @@ function blurAfter() {
                                         </RouterLink>
                                     </NavigationMenuLink>
 
-                                    <!-- <NavigationMenuLink
+                                    <NavigationMenuLink
                                         v-if="auth.hasAnyRole(['17th Administrator', '17th HQ', '17th Command'])"
                                         as-child :class="navigationMenuTriggerStyle()">
-                                        <RouterLink to="/administration/transfer" @click="blurAfter">
-                                            Transfer Requests
+                                        <RouterLink to="/administration/rankChange" @click="blurAfter">
+                                            Promotions
                                         </RouterLink>
-                                    </NavigationMenuLink> -->
+                                    </NavigationMenuLink>
 
                                     <NavigationMenuLink v-if="auth.hasRole('Recruiter')" as-child
                                         :class="navigationMenuTriggerStyle()">
@@ -196,6 +321,109 @@ function blurAfter() {
                 <a v-else :href="APIHOST + '/login'">Login</a>
             </div>
         </div>
-        <!-- <Separator></Separator> -->
+
+        <!-- mobile navigation -->
+        <div class="flex flex-col lg:hidden w-full" :class="isMobileMenuOpen ? 'h-screen' : ''">
+            <div class="flex items-center justify-between w-full p-2">
+                <!-- <RouterLink to="/">
+                    <img src="/17RBN_Logo.png" class="w-10 h-10 object-contain"></img>
+                </RouterLink> -->
+                <button @click="mobileNavigateTo('/')">
+                    <img src="/17RBN_Logo.png" class="w-10 h-10 object-contain"></img>
+                </button>
+
+                <Button v-if="!isMobileMenuOpen" variant="ghost" size="icon" @click="openMobileMenu()">
+                    <Menu class="size-7" />
+                </Button>
+                <Button v-else variant="ghost" size="icon" @click="closeMobileMenu()">
+                    <X class="size-7" />
+                </Button>
+            </div>
+            <div v-if="isMobileMenuOpen" class="flex flex-col h-[calc(100vh-60px)] overflow-hidden">
+                <div class="flex-1 overflow-y-auto px-2 py-3 space-y-0.5">
+                    <div v-for="navItem in filteredNav" :key="navItem.title" class="group">
+
+                        <template v-if="!navItem.items">
+                            <a v-if="navItem.isExternal" :href="navItem.href" target="_blank"
+                                class="flex items-center justify-between w-full px-4 py-2.5 text-base font-medium rounded-md hover:bg-accent active:bg-accent transition-colors">
+                                <span class="flex items-center gap-2">
+                                    {{ navItem.title }}
+                                    <ArrowUpRight class="h-3.5 w-3.5 opacity-50" />
+                                </span>
+                            </a>
+                            <button v-else @click="mobileNavigateTo(navItem.to)"
+                                class="w-full text-left px-4 py-2.5 text-base font-medium rounded-md hover:bg-accent active:bg-accent transition-colors">
+                                {{ navItem.title }}
+                            </button>
+                        </template>
+
+                        <div v-else class="space-y-0.5">
+                            <button @click="expandedMenu = expandedMenu === navItem.title ? null : navItem.title"
+                                class="flex items-center justify-between w-full px-4 py-2.5 text-base font-medium rounded-md transition-colors"
+                                :class="expandedMenu === navItem.title ? 'bg-accent/50 text-primary' : 'hover:bg-accent'">
+                                {{ navItem.title }}
+                                <ChevronDown class="h-4 w-4 transition-transform duration-200"
+                                    :class="expandedMenu === navItem.title ? 'rotate-180' : ''" />
+                            </button>
+
+                            <div v-if="expandedMenu === navItem.title"
+                                class="ml-4 mr-2 border-l border-border space-y-0.5">
+                                <button v-for="subNavItem in navItem.items" :key="subNavItem.title"
+                                    @click="mobileNavigateTo(subNavItem.to)"
+                                    class="w-full text-left px-6 py-2 text-sm text-muted-foreground hover:text-foreground active:text-primary transition-colors">
+                                    {{ subNavItem.title }}
+                                </button>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+
+                <div class="p-3 border-t bg-background mt-auto">
+                    <div v-if="userStore.isLoggedIn" class="space-y-3">
+                        <div class="flex items-center justify-between px-2">
+                            <div class="flex gap-3">
+                                <!-- <div
+                                    class="size-8 rounded-full bg-primary/10 flex items-center justify-center text-xs font-bold text-primary">
+                                    {{ userStore.displayName?.charAt(0) }}
+                                </div> -->
+                                <div class="flex flex-col leading-tight">
+                                    <span class="text-sm font-semibold">
+                                        {{ userStore.displayName || userStore.user.member.member_name }}
+                                    </span>
+                                    <span v-if="userStore.displayName"
+                                        class="text-[10px] uppercase tracking-wider text-muted-foreground">
+                                        {{ userStore.user.member.member_name }}
+                                    </span>
+                                </div>
+                            </div>
+                            <div class="flex items-center gap-3">
+                                <Button variant="ghost" size="icon" @click="mobileNavigateTo('/profile')">
+                                    <Settings class="size-6"></Settings>
+                                </Button>
+                                <Button variant="ghost" size="icon" @click="logout()">
+                                    <LogOut class="size-6 text-destructive"></LogOut>
+                                </Button>
+                            </div>
+                        </div>
+
+                        <div class="flex gap-2">
+                            <!-- <Button variant="outline" size="xs" class="flex-1 h-8 text-xs"
+                                @click="mobileNavigateTo('/profile')">Profile</Button> -->
+                            <Button variant="secondary" size="xs" class="flex-1 h-8 text-xs"
+                                @click="mobileNavigateTo('/join')">My
+                                Application</Button>
+                            <Button variant="secondary" size="xs" class="flex-1 h-8 text-xs"
+                                @click="mobileNavigateTo('/applications')">Application History</Button>
+                        </div>
+                    </div>
+
+                    <a v-else :href="APIHOST + '/login'" class="block">
+                        <Button class="w-full text-sm h-10">
+                            <LogIn></LogIn> Login
+                        </Button>
+                    </a>
+                </div>
+            </div>
+        </div>
     </div>
 </template>

ui/src/components/application/ApplicationForm.vue

@@ -109,6 +109,17 @@ watch(() => showCoC.value, async () => {
   }
 });
 
+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>
 
 <template>
@@ -119,7 +130,10 @@ watch(() => showCoC.value, async () => {
       <FormItem>
         <FormLabel>What is your date of birth?</FormLabel>
         <FormControl>
+          <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>
         <div class="h-4">
           <FormMessage class="text-destructive" />

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';
@@ -14,6 +14,7 @@ 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();
 
@@ -178,17 +179,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">
-            <h2 class="text-lg font-semibold break-all">
+        <div class="flex items-center justify-between gap-3 border-b px-4 py-3 ">
+            <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)">
@@ -202,11 +206,17 @@ defineExpose({ forceReload })
                         </DropdownMenuItem>
                     </DropdownMenuContent>
                 </DropdownMenu>
-                <button
-                    class="inline-flex flex-none size-8 items-center justify-center rounded-md border hover:bg-muted/40 transition cursor-pointer"
+                <Button variant="ghost" size="icon" @click="CopyLink()">
+                    <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 -->
@@ -293,11 +303,9 @@ defineExpose({ forceReload })
         </div>
     </div>
     <div v-else class="flex justify-center h-full items-center">
-        <button
-            class="absolute top-4 right-4 inline-flex flex-none size-8 items-center justify-center rounded-md border hover:bg-muted/40 transition cursor-pointer z-50"
-            aria-label="Close" @click="emit('close')">
-            <X class="size-4" />
-        </button>
+        <Button variant="ghost" size="icon" @click="emit('close')">
+            <X class="size-5" />
+        </Button>
 
         <Spinner class="size-8"></Spinner>
     </div>

ui/src/components/loa/loaList.vue

@@ -84,7 +84,7 @@ function loaStatus(loa: LOARequest): "Upcoming" | "Active" | "Overdue" | "Closed
 
     if (now < start) return "Upcoming";
     if (now >= start && now <= end) return "Active";
-    if (now > end) return "Overdue";
+    if (now > loa.extended_till || end) return "Overdue";
 
     return "Overdue"; // fallback
 }
@@ -197,7 +197,7 @@ function setPage(pagenum: number) {
                             <TableCell @click.stop="" class="text-right">
                                 <DropdownMenu>
                                     <DropdownMenuTrigger class="cursor-pointer">
-                                        <Button variant="ghost">
+                                        <Button variant="ghost" size="icon">
                                             <Ellipsis class="size-6"></Ellipsis>
                                         </Button>
                                     </DropdownMenuTrigger>
@@ -220,10 +220,11 @@ function setPage(pagenum: number) {
                                 </DropdownMenu>
                             </TableCell>
                             <TableCell>
-                                <Button v-if="expanded === post.id" @click.stop="expanded = null" variant="ghost">
+                                <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" variant="ghost">
+                                <Button v-else @click.stop="expanded = post.id" size="icon" variant="ghost">
                                     <ChevronDown class="size-6" />
                                 </Button>
                             </TableCell>
@@ -233,18 +234,24 @@ function setPage(pagenum: number) {
                             <TableCell :colspan="8" class="p-0">
                                 <div class="w-full p-3 mb-6 space-y-3">
                                     <div class="flex justify-between items-start gap-4">
-                                        <div class="flex-1">
-                                            <!-- Title -->
-                                            <p class="text-md font-semibold text-foreground">
+                                        <div class="space-y-3 w-full">
+
+                                            <!-- Header -->
+                                            <div class="flex items-center gap-2">
+                                                <h4 class="text-sm font-semibold text-foreground">
                                                     Reason
-                                            </p>
+                                                </h4>
+                                                <Separator class="flex-1" />
+                                            </div>
 
                                             <!-- Content -->
-                                            <p
-                                                class="mt-1 text-md whitespace-pre-wrap leading-relaxed text-muted-foreground">
-                                                {{ post.reason }}
-                                            </p>
+                                            <div
+                                                class="rounded-lg border bg-muted/40 px-4 py-3 text-sm leading-relaxed whitespace-pre-wrap text-muted-foreground w-full">
+                                                {{ post.reason || 'No reason provided.' }}
                                             </div>
+
+                                        </div>
+
                                     </div>
                                 </div>
                             </TableCell>

ui/src/components/members/MemberCard.vue

@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import { useMemberDirectory } from '@/stores/memberDirectory';
 import { ref, onMounted, computed } from 'vue';
-import { Member, type MemberLight } from '@shared/types/member'
+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';
@@ -9,6 +9,7 @@ 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
@@ -21,7 +22,7 @@ const props = defineProps({
 
 // Local state
 const memberLight = ref<MemberLight | null>(null);
-const memberFull = ref<Member | null>(null)
+const memberFull = ref<MemberCardDetails | null>(null)
 const loadingFull = ref(false)
 const membersStore = useMemberDirectory();
 
@@ -63,7 +64,7 @@ const hasFullInfo = computed(() => {
     if (!memberFull.value) return false
 
     // check if any field has a value
-    const { rank, unit, status } = memberFull.value
+    const { rank, unit, status } = memberFull.value.member
     return !!(rank || unit || status)
 })
 
@@ -90,7 +91,7 @@ function formatDate(date: Date): string {
                 {{ displayName }}
             </p>
         </PopoverTrigger>
-        <PopoverContent class="w-72 p-0 overflow-hidden">
+        <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>
@@ -114,26 +115,36 @@ function formatDate(date: Date): string {
                 <div class="p-4 space-y-3 text-sm">
                     <!-- Full info -->
                     <template v-if="hasFullInfo">
-                        <div v-if="memberFull.loa_until"
+                        <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.loa_until) }}
+                            On Leave of Absence until {{ formatDate(memberFull.member.loa_until) }}
                         </div>
 
-                        <div v-if="memberFull.rank" class="flex justify-between">
+
+                        <div v-if="memberFull.member.rank" class="flex justify-between">
                             <span class="text-muted-foreground">Rank</span>
-                            <span class="font-medium">{{ memberFull.rank }}</span>
+                            <span class="font-medium">{{ memberFull.member.rank }}</span>
                         </div>
 
-                        <div v-if="memberFull.unit" class="flex justify-between">
+                        <div v-if="memberFull.member.unit" class="flex justify-between items-center">
                             <span class="text-muted-foreground">Unit</span>
-                            <span class="font-medium">{{ memberFull.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.status" class="flex justify-between">
+                        <div v-if="memberFull.member.status" class="flex justify-between">
                             <span class="text-muted-foreground">Status</span>
-                            <span class="font-medium">{{ memberFull.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 -->

ui/src/components/promotions/promotionForm.vue

@@ -0,0 +1,303 @@
+<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 submitForm = handleSubmit(
+    async (vals) => {
+        try {
+            let output = vals;
+            output.promotions.map(p => p.start_date = new Date(p.start_date).toISOString())
+            await submitRankChange(output);
+            formSubmitted.value = true;
+            emit("submitted");
+        } catch (error) {
+            submitError.value = error;
+            console.error(error);
+        }
+    }
+);
+
+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">
+
+            <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" class="w-min">Submit</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,103 @@
+<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';
+
+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;
+}
+
+
+async function handleAddMember() {
+    //guard
+    if (memberToAdd.value == null)
+        return;
+
+    await addMemberToRole(memberToAdd.value.id, props.role.id);
+    emit('submit');
+    showAddMemberDialog.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" @click="handleAddMember">
+                    Add
+                </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

@@ -25,6 +25,7 @@ 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'
 
 
 const { handleSubmit, resetForm, errors, values, setFieldValue } = useForm({
@@ -50,7 +51,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);
     });
 });
@@ -326,22 +329,13 @@ const filteredMembers = computed(() => {
                             <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 -->
-                                        <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>
+                                    </Tooltip>
                                     <div class="h-4">
                                     </div>
                                 </div>
@@ -351,20 +345,12 @@ const filteredMembers = computed(() => {
                             <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 -->
-                                        <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>
+                                    </Tooltip>
                                     <div class="h-4">
                                     </div>
                                 </div>

ui/src/components/ui/input-group/index.js

@@ -2,10 +2,10 @@ import { cva } from "class-variance-authority";
 
 export { default as InputGroup } from "./InputGroup.vue";
 export { default as InputGroupAddon } from "./InputGroupAddon.vue";
-export { default as InputGroupButton } from "./InputGroupButton.vue";
-export { default as InputGroupInput } from "./InputGroupInput.vue";
-export { default as InputGroupText } from "./InputGroupText.vue";
-export { default as InputGroupTextarea } from "./InputGroupTextarea.vue";
+// export { default as InputGroupButton } from "./InputGroupButton.vue";
+// export { default as InputGroupInput } from "./InputGroupInput.vue";
+// export { default as InputGroupText } from "./InputGroupText.vue";
+// export { default as InputGroupTextarea } from "./InputGroupTextarea.vue";
 
 export const inputGroupAddonVariants = cva(
   "text-muted-foreground flex h-auto cursor-text items-center justify-center gap-2 py-1.5 text-sm font-medium select-none [&>svg:not([class*='size-'])]:size-4 [&>kbd]:rounded-[calc(var(--radius)-5px)] group-data-[disabled=true]/input-group:opacity-50",

ui/src/components/ui/input/Input.vue

@@ -22,7 +22,7 @@ const modelValue = useVModel(props, "modelValue", emits, {
     data-slot="input"
     :class="
       cn(
-        'file:text-foreground placeholder:text-muted-foreground selection:bg-primary selection:text-primary-foreground dark:bg-input/30 border-input flex h-9 w-full min-w-0 rounded-md border bg-transparent px-3 py-1 text-base shadow-xs transition-[color,box-shadow] outline-none file:inline-flex file:h-7 file:border-0 file:bg-transparent file:text-sm file:font-medium disabled:pointer-events-none disabled:cursor-not-allowed disabled:opacity-50 md:text-sm',
+        'file:text-foreground placeholder:text-muted-foreground selection:bg-primary selection:text-primary-foreground dark:bg-input/30 border-input h-9 w-full min-w-0 rounded-md border bg-transparent px-3 py-1 text-base shadow-xs transition-[color,box-shadow] outline-none file:inline-flex file:h-7 file:border-0 file:bg-transparent file:text-sm file:font-medium disabled:pointer-events-none disabled:cursor-not-allowed disabled:opacity-50 md:text-sm',
         'focus-visible:border-ring focus-visible:ring-ring/50 focus-visible:ring-[3px]',
         'aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive',
         props.class,

ui/src/lib/copyLink.ts

@@ -0,0 +1,3 @@
+export function CopyLink() {
+    navigator.clipboard.writeText(window.location.href);
+}

ui/src/pages/Application.vue

@@ -5,10 +5,11 @@ import { onMounted, ref } from 'vue';
 import { approveApplication, denyApplication, loadApplication, postApplication, postChatMessage, getMyApplication, postAdminChatMessage } from '@/api/application';
 import { useRoute } from 'vue-router';
 import Button from '@/components/ui/button/Button.vue';
-import { CheckIcon, XIcon } from 'lucide-vue-next';
+import { CheckIcon, Link, XIcon } from 'lucide-vue-next';
 import Unauthorized from './Unauthorized.vue';
 import { ApplicationData, ApplicationFull, ApplicationStatus, CommentRow } from '@shared/types/application';
 import Spinner from '@/components/ui/spinner/Spinner.vue';
+import { CopyLink } from '@/lib/copyLink';
 
 const appData = ref<ApplicationData>(null);
 const appID = ref<number | null>(null);
@@ -20,6 +21,7 @@ const decisionDate = ref<Date | null>(null);
 const submitDate = ref<Date | null>(null);
 const loading = ref<boolean>(true);
 const member_name = ref<string>();
+const notFound = ref<boolean>(false);
 
 const props = defineProps<{
     mode?: "create" | "view-self" | "view-recruiter" | "view-self-id"
@@ -29,6 +31,11 @@ const finalMode = ref<"create" | "view-self" | "view-recruiter" | "view-self-id"
 
 function loadData(raw: ApplicationFull) {
 
+    if (!raw) {
+        notFound.value = true;
+        return;
+    }
+
     const data = raw.application;
 
     appID.value = data.id;
@@ -129,11 +136,18 @@ async function handleDeny(id) {
         <div v-if="unauthorized" class="flex justify-center w-full my-10">
             You do not have permission to view this application.
         </div>
+        <div v-else-if="notFound" class="flex justify-center w-full my-10 text-muted-foreground">
+            Looks like you dont have an application, reach out to the administration team if you believe this is an
+            error.
+        </div>
         <div v-else>
             <div v-if="!newApp" class="flex flex-row justify-between items-center py-2 mb-8">
                 <!-- Application header -->
                 <div>
+                    <div class="flex gap-4 items-center">
                         <h3 class="scroll-m-20 text-2xl font-semibold tracking-tight">{{ member_name }}</h3>
+                        <Button v-if="finalMode === 'view-recruiter'" variant="ghost" size="icon" @click="CopyLink()"><Link class="size-5"/></Button>
+                    </div>
                     <p class="text-muted-foreground">Submitted: {{ submitDate?.toLocaleString("en-US", {
                         year: "numeric",
                         month: "long",
@@ -181,7 +195,6 @@ async function handleDeny(id) {
         </div>
 
     </div>
-    <!-- TODO: Implement some kinda loading screen -->
     <div v-else class="flex items-center justify-center h-full">
         <Spinner class="size-8" />
     </div>

ui/src/pages/ManageApplications.vue

@@ -13,9 +13,10 @@ import {
 import Button from '@/components/ui/button/Button.vue';
 import { computed, onMounted, ref, watch } from 'vue';
 import { useRoute, useRouter } from 'vue-router';
-import { CheckIcon, XIcon } from 'lucide-vue-next';
+import { CheckIcon, Link, XIcon } from 'lucide-vue-next';
 import Application from './Application.vue';
 import MemberCard from '@/components/members/MemberCard.vue';
+import { CopyLink } from '@/lib/copyLink';
 
 const appList = ref([]);
 const now = Date.now();
@@ -127,9 +128,11 @@ onMounted(async () => {
         <div v-if="openPanel" class="pl-9 border-l w-3/5" :key="$route.params.id">
             <div class="mb-5 flex justify-between">
                 <p class="scroll-m-20 text-2xl font-semibold tracking-tight"> Application</p>
-                <button @click="closeApplication()" class="cursor-pointer">
-                    <XIcon></XIcon>
-                </button>
+                <div class="flex items-center gap-2">
+                    <Button @click="closeApplication()" variant="ghost" size="icon">
+                        <XIcon class="size-6"></XIcon>
+                    </Button>
+                </div>
             </div>
             <div class="overflow-y-auto max-h-[80vh] h-full mt-5 scrollbar-themed">
                 <Application :mode="'view-recruiter'"></Application>

ui/src/pages/ManageRoles.vue

@@ -9,7 +9,7 @@ import {
     CardTitle,
 } from '@/components/ui/card'
 import { onMounted, ref, computed, reactive, watch } from 'vue';
-import { addMemberToRole, createRole, deleteRole, getRoles, removeMemberFromRole, Role } from '@/api/roles';
+import { addMemberToRole, createRole, deleteRole, getRoles, removeMemberFromRole } from '@/api/roles';
 import Badge from '@/components/ui/badge/Badge.vue';
 import {
     Dialog,
@@ -34,8 +34,11 @@ import { Plus, X } from 'lucide-vue-next';
 import Separator from '@/components/ui/separator/Separator.vue';
 import Input from '@/components/ui/input/Input.vue';
 import Label from '@/components/ui/label/Label.vue';
-import { getMembers } from '@/api/member';
-import { Member } from '@shared/types/member';
+import { getAllLightMembers, getMembers } from '@/api/member';
+import { Member, MemberLight } from '@shared/types/member';
+import { Role } from '@shared/types/roles';
+import RoleView from '@/components/roles/roleView.vue';
+import { useRoute } from 'vue-router';
 
 const roles = ref<Role[]>([])
 const activeRole = ref<Role | null>(null)
@@ -43,16 +46,9 @@ const showDialog = ref(false);
 const showCreateGroupDialog = ref(false);
 const addingMember = ref(false);
 const memberToAdd = ref<Member | null>(null);
+const route = useRoute();
 
-const allMembers = ref<Member[]>([])
-const availableMembers = computed(() => {
-    if (!activeRole.value) return [];
-    return allMembers.value.filter(
-        member => !activeRole.value!.members.some(
-            roleMember => roleMember.member_id === member.member_id
-        )
-    );
-})
+const allMembers = ref<MemberLight[]>([])
 
 type RoleDraft = {
     name: string
@@ -117,141 +113,48 @@ async function handleCreateGroup() {
     }
 }
 
-async function handleAddMember() {
-    //guard
-    if (memberToAdd.value == null)
-        return;
-
-    await addMemberToRole(memberToAdd.value.member_id, activeRole.value.id);
-    roles.value = await getRoles();
-}
-
-async function handleRemoveMember(memberId: number) {
-    removeMemberFromRole(memberId, activeRole.value.id);
-    roles.value = await getRoles();
-}
-
-async function handleDeleteRole() {
-    await deleteRole(activeRole.value.id);
-}
+const viewingGroup = computed(() => {
+    return route.path.startsWith('/administration/roles/')
+        && route.params.id !== undefined
+})
 
 onMounted(async () => {
     roles.value = await getRoles();
-    allMembers.value = await getMembers();
+    allMembers.value = await getAllLightMembers();
 })
 </script>
 <template>
-    <div>
-        <Dialog v-model:open="showDialog"
-            v-on:update:open="() => { showDialog = false; addingMember = false; memberToAdd = null; }">
-            <DialogContent>
-                <DialogHeader>
-                    <DialogTitle class="flex justify-between items-center">{{ activeRole.name }}
-                        <Badge class="mr-5">
-                            {{ activeRole.color }}
-                        </Badge>
-                    </DialogTitle>
-                    <DialogDescription>
-                        {{ activeRole.description }}
-                    </DialogDescription>
-                </DialogHeader>
-                <div class="mt-5">
-                    <div class="flex justify-between items-center">
-                        <p>Members with this role</p>
+    <div class="max-w-7xl mx-auto w-full my-[0.2dvh] h-[0.8dvh]">
+        <div class="flex items-center justify-between">
+            <p class="scroll-m-20 text-2xl font-semibold tracking-tight my-5">Role Management</p>
         </div>
-                    <Separator class="my-2"></Separator>
-                    <ul class="flex flex-col gap-2">
-                        <li v-for="member in activeRole.members" class="flex justify-between items-center">
-                            <p>{{ member.member_name }}</p>
-                            <X class="text-muted-foreground" @click="handleRemoveMember(member.member_id)"></X>
-                        </li>
-                        <div v-if="!addingMember" @click="addingMember = true"
-                            class="flex gap-2 text-muted-foreground hover:text-primary hover:cursor-pointer">
-                            <Plus :size="20"></Plus>Add Member
+        <div class="grid grid-cols-[minmax(400px,280px)_1fr] gap-5">
+            <div class="w-full pr-5 border-r">
+                <div class="space-y-1">
+                    <p class="px-3 py-2 text-xs font-medium text-muted-foreground uppercase">
+                        Roles
+                    </p>
+
+                    <button v-for="r in roles" :key="r.id" @click="$router.push(`/administration/roles/${r.id}`)"
+                        :class="[
+                            'flex w-full items-center gap-3 rounded-md px-3 py-2 transition-colors cursor-pointer',
+                            Number(route.params.id) == r.id
+                                ? 'bg-muted font-medium'
+                                : 'hover:bg-muted/50'
+                        ]">
+                        <span class="h-2 w-2 rounded-full shrink-0" :style="{ backgroundColor: r.color }" />
+                        <span class="truncate">{{ r.name }}</span>
+                    </button>
                 </div>
-                        <div v-else class="flex gap-2">
-                            <Combobox v-model="memberToAdd" by="value">
-                                <ComboboxAnchor>
-                                    <div class="relative w-full max-w-sm items-center">
-                                        <ComboboxInput class="pl-9"
-                                            :display-value="(member: Member) => member?.member_name"
-                                            placeholder="Search Members" />
-                                    </div>
-                                </ComboboxAnchor>
-                                <ComboboxList>
-                                    <ComboboxEmpty>
-                                        No Members.
-                                    </ComboboxEmpty>
-                                    <ComboboxGroup>
-                                        <ComboboxItem v-for="member in availableMembers" :key="member.member_id"
-                                            :value="member">
-                                            {{ member.member_name }}
-                                        </ComboboxItem>
-                                    </ComboboxGroup>
-                                </ComboboxList>
-                            </Combobox>
-                            <Button variant="secondary" @click="addingMember = false">Cancel</Button>
-                            <Button @click="handleAddMember">Save</Button>
-                        </div>
-                    </ul>
-                </div>
-                <DialogFooter>
-                    <!-- <Button @click="handleDeleteRole">Delete Group</Button> -->
-                </DialogFooter>
-            </DialogContent>
-        </Dialog>
-        <Dialog v-model:open="showCreateGroupDialog" v-on:update:open="() => { showCreateGroupDialog = false; }">
-            <DialogContent>
-                <DialogHeader>
-                    <DialogTitle class="flex justify-between items-center">Create Group</DialogTitle>
-                    <DialogDescription>Create a new group of members</DialogDescription>
-                </DialogHeader>
-                <form class="mt-5 space-y-5" @submit.prevent="handleCreateGroup">
-                    <div>
-                        <Label class="mb-2 block" for="group-name">Group Name</Label>
-                        <Input id="group-name" v-model="roleDraft.name" :aria-invalid="!!draftErrors.name" />
-                        <p v-if="draftErrors.name" class="text-destructive text-sm mt-1">{{ draftErrors.name }}</p>
+
             </div>
             <div>
-                        <Label class="mb-2 block" for="group-desc">Description</Label>
-                        <Input id="group-desc" v-model="roleDraft.description" />
+                <RoleView v-if="viewingGroup" :all-members="allMembers" />
+                <div v-else class="h-full flex items-center justify-center">
+                    <p class="text-muted-foreground text-center">
+                        Select a group to manage
+                    </p>
                 </div>
-                    <div>
-                        <Label class="mb-2 block" for="group-color">Color</Label>
-                        <Input id="group-color" type="color" v-model="roleDraft.color" />
-                    </div>
-                    <DialogFooter>
-                        <Button type="button" variant="secondary" @click="showCreateGroupDialog = false"
-                            :disabled="creating">
-                            Cancel
-                        </Button>
-                        <Button type="submit" :disabled="creating">
-                            {{ creating ? "Saving..." : "Save" }}
-                        </Button>
-                    </DialogFooter>
-                </form>
-            </DialogContent>
-        </Dialog>
-        <div class="max-w-5xl mx-auto">
-            <div class="flex items-center justify-between my-4">
-                <p>Groups</p>
-                <!-- <Button @click="showCreateGroupDialog = true">+ Add New Group</Button> -->
-            </div>
-            <div class="grid grid-cols-3 gap-5">
-                <Card v-for="value in roles" :key="value.id" @click="activeRole = value; showDialog = true"
-                    class="cursor-pointer">
-                    <CardHeader>
-                        <CardTitle class="flex justify-between items-center">{{ value.name }}
-                            <Badge>
-                                {{ value.color }}
-                            </Badge>
-                        </CardTitle>
-                        <CardDescription>{{ value.description }}</CardDescription>
-                    </CardHeader>
-                    <CardFooter>
-                        <p class="text-muted-foreground">{{ value.members.length }} members</p>
-                    </CardFooter>
-                </Card>
             </div>
         </div>
     </div>

ui/src/pages/ManageTransfers.vue

@@ -1,106 +0,0 @@
-<script setup lang="ts">
-import Badge from '@/components/ui/badge/Badge.vue';
-import Button from '@/components/ui/button/Button.vue';
-import {
-    Card,
-    CardContent,
-    CardDescription,
-    CardFooter,
-    CardHeader,
-    CardTitle,
-} from '@/components/ui/card'
-import {
-    Dialog,
-    DialogContent,
-    DialogDescription,
-    DialogFooter,
-    DialogHeader,
-    DialogTitle,
-    DialogTrigger,
-} from '@/components/ui/dialog'
-import { Combobox, ComboboxAnchor, ComboboxEmpty, ComboboxGroup, ComboboxInput, ComboboxItem, ComboboxItemIndicator, ComboboxList } from "@/components/ui/combobox"
-
-import { onMounted, ref } from 'vue';
-import { getRanks } from '@/api/rank';
-
-const setRankDialog = ref(false);
-const rankOnTransfer = ref();
-const ranks = ref(null);
-
-onMounted(async () => {
-    ranks.value = await getRanks();
-});
-</script>
-<template>
-    <Dialog :open="setRankDialog" @update:open="setRankDialog = false">
-        <DialogContent>
-            <DialogHeader>
-                <DialogTitle>Set Rank on Transfer</DialogTitle>
-                <DialogDescription>
-                    Assign MEMBER a rank on transfer completion.
-                </DialogDescription>
-            </DialogHeader>
-            <!-- Rank Combobox -->
-            <Combobox v-model="rankOnTransfer">
-                <ComboboxAnchor class="w-[300px]">
-                    <ComboboxInput placeholder="Search ranks..." class="w-full pl-9"
-                        :display-value="(v) => v ? v.short_name : ''" />
-                </ComboboxAnchor>
-                <ComboboxList class="w-[300px]">
-                    <ComboboxEmpty class="text-muted-foreground">No results</ComboboxEmpty>
-                    <ComboboxGroup>
-                        <template v-for="rank in ranks" :key="rank.id">
-                            <ComboboxItem :value="rank"
-                                class="data-[highlighted]:bg-accent data-[highlighted]:text-accent-foreground relative cursor-pointer select-none px-2 py-1.5">
-                                {{ rank.short_name }}
-                                <ComboboxItemIndicator class="absolute left-2 inline-flex items-center">
-                                    <Check class="h-4 w-4" />
-                                </ComboboxItemIndicator>
-                            </ComboboxItem>
-                        </template>
-                    </ComboboxGroup>
-                </ComboboxList>
-            </Combobox>
-            <DialogFooter>
-                <Button variant="outline" @click="setRankDialog = false">Cancel</Button>
-                <Button>Confirm</Button>
-            </DialogFooter>
-        </DialogContent>
-    </Dialog>
-
-    <div class="max-w-5xl w-full mx-auto">
-        Active
-        <div>
-            <Card>
-                <CardHeader>
-                    <CardTitle class="flex justify-between">
-                        <div class="flex items-center gap-3">
-                            <Badge class="">Pending</Badge>
-                            <p>Name</p>
-                        </div>
-                        <div class="text-muted-foreground font-normal flex gap-2">
-                            Transfer To: <p class="text-white">Company</p>
-                        </div>
-                    </CardTitle>
-                    <CardDescription class="flex gap-2">Approved by: <p class="text-white">Someone, Someone?</p>
-                    </CardDescription>
-                    <CardDescription class="flex gap-2">Rank on transfer: <p class="text-white">Rank</p>
-                    </CardDescription>
-                </CardHeader>
-                <!-- <CardContent>
-                    Card Content
-                </CardContent> -->
-                <CardFooter class="flex justify-between">
-                    <p class="text-muted-foreground">Request Date:</p>
-                    <div class="flex gap-4">
-                        <Button variant="success">Approve</Button>
-                        <Button variant="destructive">Deny</Button>
-                    </div>
-                </CardFooter>
-            </Card>
-        </div>
-        <div>
-            Inactive
-        </div>
-    </div>
-</template>

ui/src/pages/RankChange.vue

@@ -1,115 +1,63 @@
-<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 { Popover, PopoverContent, PopoverTrigger } from "@/components/ui/popover"
-import { getRanks, Rank, submitRankChange } from "@/api/rank"
-import { onMounted, ref } from "vue";
-import { Member, getMembers } from "@/api/member";
-import { cn } from "@/lib/utils"
-import { CalendarIcon } from "lucide-vue-next"
+<script setup>
+import { ref } from 'vue'
+import { Plus, PlusIcon, X } from 'lucide-vue-next'
+import PromotionForm from '@/components/promotions/promotionForm.vue'
+import PromotionList from '@/components/promotions/promotionList.vue'
+import DialogContent from '@/components/ui/dialog/DialogContent.vue'
+import Dialog from '@/components/ui/dialog/Dialog.vue'
+import DialogTrigger from '@/components/ui/dialog/DialogTrigger.vue'
+import DialogHeader from '@/components/ui/dialog/DialogHeader.vue'
+import DialogTitle from '@/components/ui/dialog/DialogTitle.vue'
+import Button from '@/components/ui/button/Button.vue'
 
-import {
-    DateFormatter,
-
-    DateValue,
-
-    getLocalTimeZone,
-    today,
-} from "@internationalized/date"
-
-import Button from "@/components/ui/button/Button.vue";
-import Calendar from "@/components/ui/calendar/Calendar.vue";
-
-const members = ref<Member[]>([])
-const ranks = ref<Rank[]>([])
-const date = ref<DateValue>(today(getLocalTimeZone()))
-
-
-const currentMember = ref<Member | null>(null);
-const currentRank = ref<Rank | null>(null);
-onMounted(async () => {
-    members.value = await getMembers();
-    ranks.value = await getRanks();
-});
-
-const df = new DateFormatter("en-US", {
-    dateStyle: "long",
-})
-
-function submit() {
-    submitRankChange(currentMember.value.member_id, currentRank.value?.id, date.value.toString())
-        .then(() => {
-            alert("Rank change submitted!");
-            currentMember.value = null;
-            currentRank.value = null;
-            date.value = today(getLocalTimeZone());
-        })
-        .catch((err) => {
-            console.error(err);
-            alert("Failed to submit rank change.");
-        });
-}
+const isFormOpen = ref(false)
+const listRef = ref(null)
 
+const isMobileFormOpen = ref(false);
 </script>
 
 <template>
-    <div class="flex max-w-5xl justify-center gap-5 mx-auto mt-10">
-        <Combobox v-model="currentMember">
-            <ComboboxAnchor class="w-[300px]">
-                <ComboboxInput placeholder="Search members..." class="w-full pl-9"
-                    :display-value="(v) => v ? v.member_name : ''" />
-            </ComboboxAnchor>
-            <ComboboxList class="w-[300px]">
-                <ComboboxEmpty class="text-muted-foreground">No results</ComboboxEmpty>
-                <ComboboxGroup>
-                    <template v-for="member in members" :key="member.member_id">
-                        <ComboboxItem :value="member"
-                            class="data-[highlighted]:bg-accent data-[highlighted]:text-accent-foreground relative cursor-pointer select-none px-2 py-1.5">
-                            {{ member.member_name }}
-                            <ComboboxItemIndicator class="absolute left-2 inline-flex items-center">
-                                <Check class="h-4 w-4" />
-                            </ComboboxItemIndicator>
-                        </ComboboxItem>
-                    </template>
-                </ComboboxGroup>
-            </ComboboxList>
-        </Combobox>
+    <div class="mx-auto mt-6 lg:mt-10 px-4 lg:px-8">
 
-        <!-- Rank Combobox -->
-        <Combobox v-model="currentRank">
-            <ComboboxAnchor class="w-[300px]">
-                <ComboboxInput placeholder="Search ranks..." class="w-full pl-9"
-                    :display-value="(v) => v ? v.short_name : ''" />
-            </ComboboxAnchor>
-            <ComboboxList class="w-[300px]">
-                <ComboboxEmpty class="text-muted-foreground">No results</ComboboxEmpty>
-                <ComboboxGroup>
-                    <template v-for="rank in ranks" :key="rank.id">
-                        <ComboboxItem :value="rank"
-                            class="data-[highlighted]:bg-accent data-[highlighted]:text-accent-foreground relative cursor-pointer select-none px-2 py-1.5">
-                            {{ rank.short_name }}
-                            <ComboboxItemIndicator class="absolute left-2 inline-flex items-center">
-                                <Check class="h-4 w-4" />
-                            </ComboboxItemIndicator>
-                        </ComboboxItem>
-                    </template>
-                </ComboboxGroup>
-            </ComboboxList>
-        </Combobox>
-        <Popover>
-            <PopoverTrigger as-child>
-                <Button variant="outline" :class="cn(
-                    'w-[280px] justify-start text-left font-normal',
-                    !date && 'text-muted-foreground',
-                )">
-                    <CalendarIcon class="mr-2 h-4 w-4" />
-                    {{ date ? df.format(date.toDate(getLocalTimeZone())) : "Pick a date" }}
+        <div class="flex flex-col items-center justify-between mb-6 lg:hidden">
+            <div v-if="isMobileFormOpen">
+                <div class="mb-4 flex justify-between items-center">
+                    <p class="scroll-m-20 text-2xl font-semibold tracking-tight">
+                        Promotion Form
+                    </p>
+                    <Button variant="ghost" size="icon" @click="isMobileFormOpen = false">
+                        <X v-if="isMobileFormOpen" class="size-6"></X>
                     </Button>
-            </PopoverTrigger>
-            <PopoverContent class="w-auto p-0">
-                <Calendar v-model="date" initial-focus />
-            </PopoverContent>
-        </Popover>
-        <Button @click="submit">Submit</Button>
+                </div>
+                <PromotionForm @submitted="listRef?.refresh" />
+            </div>
+            <div v-else>
+                <div class="flex justify-between w-full">
+                    <h1 class="text-2xl font-semibold tracking-tight">Promotion History</h1>
+                    <Button @click="isMobileFormOpen = true">
+                        <PlusIcon />Submit
+                    </Button>
+                </div>
+                <PromotionList></PromotionList>
+            </div>
+        </div>
+
+        <div class="hidden lg:flex flex-row lg:max-h-[70vh] gap-8">
+            <div class="flex-1 lg:border-r lg:pr-8 w-full lg:min-w-2xl">
+                <p class="hidden lg:block scroll-m-20 text-2xl font-semibold tracking-tight mb-3">
+                    Promotion History
+                </p>
+                <div class="overflow-y-auto lg:max-h-full">
+                    <PromotionList ref="listRef"></PromotionList>
+                </div>
+            </div>
+
+            <div class="hidden lg:flex flex-1 pl-8">
+                <div class="w-full max-w-3xl">
+                    <p class="text-2xl font-semibold tracking-tight mb-3">New Promotion</p>
+                    <PromotionForm @submitted="listRef?.refresh" />
+                </div>
+            </div>
+        </div>
     </div>
 </template>

ui/src/pages/TrainingReport.vue

@@ -10,7 +10,7 @@ import {
     TableHeader,
     TableRow,
 } from '@/components/ui/table'
-import { ArrowUpDown, Funnel, Plus, Search, X } from 'lucide-vue-next';
+import { ArrowUpDown, ChevronDown, ChevronUp, Funnel, Link, Plus, Search, X } from 'lucide-vue-next';
 import Button from '@/components/ui/button/Button.vue';
 import TrainingReportForm from '@/components/trainingReport/trainingReportForm.vue';
 import Checkbox from '@/components/ui/checkbox/Checkbox.vue';
@@ -32,6 +32,8 @@ import {
     PaginationNext,
     PaginationPrevious,
 } from '@/components/ui/pagination'
+import Tooltip from '@/components/tooltip/Tooltip.vue';
+import { CopyLink } from '@/lib/copyLink';
 
 enum sidePanelState { view, create, closed };
 
@@ -53,6 +55,7 @@ watch(() => route.params.id, async (newID) => {
         return;
     }
     TRLoaded.value = false;
+    expanded.value = null;
     viewTrainingReport(Number(route.params.id));
 })
 
@@ -126,6 +129,8 @@ function setPage(pagenum: number) {
     pageNum.value = pagenum;
     loadTrainingReports();
 }
+
+const expanded = ref<number>(null);
 </script>
 
 <template>
@@ -197,8 +202,8 @@ function setPage(pagenum: number) {
                     </TableBody>
                 </Table>
             </div>
-            <div class="mt-5 flex justify-between" :class="sidePanel !== sidePanelState.closed ? 'flex-col items-center' : 'items-center justify-between'"
->
+            <div class="mt-5 flex justify-between"
+                :class="sidePanel !== sidePanelState.closed ? 'flex-col items-center' : 'items-center justify-between'">
                 <div></div>
                 <Pagination v-slot="{ page }" :items-per-page="pageData?.pageSize || 10" :total="pageData?.total || 10"
                     :default-page="2" :page="pageNum" @update:page="setPage">
@@ -232,10 +237,15 @@ function setPage(pagenum: number) {
         <div v-if="focusedTrainingReport != null && sidePanel == sidePanelState.view" class="pl-9 my-3 border-l w-3/5">
             <div class="flex justify-between items-center">
                 <p class="scroll-m-20 text-2xl font-semibold tracking-tight">Training Report Details</p>
+                <div class="flex items-center gap-2">
+                    <Button class="cursor-pointer" variant="ghost" size="icon" @click="CopyLink()">
+                        <Link class="size-4" />
+                    </Button>
                     <Button @click="closeTrainingReport" class="cursor-pointer" variant="ghost" size="icon">
                         <X class="size-6"></X>
                     </Button>
                 </div>
+            </div>
             <div v-if="TRLoaded" class="max-h-[70vh] overflow-auto scrollbar-themed my-5">
                 <div class="flex flex-col mb-5 border rounded-lg bg-muted/70 p-2 py-3 px-4">
                     <p class="scroll-m-20 text-xl font-semibold tracking-tight">{{ focusedTrainingReport.course_name }}
@@ -255,89 +265,180 @@ function setPage(pagenum: number) {
                     <!-- Trainers -->
                     <div>
                         <label class="scroll-m-20 text-xl font-semibold tracking-tight">Trainers</label>
-                        <div class="grid grid-cols-4 py-2 text-sm font-medium text-muted-foreground border-b">
+                        <div
+                            class="grid grid-cols-[1fr_1fr_2fr_3rem] py-2 text-sm font-medium text-muted-foreground border-b">
                             <span>Name</span>
                             <span class="">Role</span>
-                            <span class="text-right col-span-2">Remarks</span>
+                            <span class="text-right">Remarks</span>
+                            <span></span>
                         </div>
-                        <div v-for="person in focusedTrainingTrainers"
-                            class="grid grid-cols-4 py-2 items-center border-b last:border-none">
+                        <div v-for="person in focusedTrainingTrainers" class=" items-center border-b last:border-none"
+                            :class="expanded === person.attendee_id && 'bg-muted/20'">
+                            <div class="grid grid-cols-[1fr_1fr_2fr_3rem] items-center py-2">
                                 <div>
                                     <MemberCard v-if="person.attendee_id" :member-id="person.attendee_id"
                                         class="justify-self-start"></MemberCard>
                                     <p v-else>{{ person.attendee_name }}</p>
                                 </div>
                                 <p class="">{{ person.role.name }}</p>
-                            <p class="col-span-2 text-right px-2"
+                                <p class="text-right px-2 truncate"
                                     :class="person.remarks == '' ? 'text-muted-foreground' : ''">
                                     {{ person.remarks == "" ?
                                         '--'
                                         : person.remarks }}</p>
+                                <div class="w-min mx-auto">
+                                    <Button v-if="expanded === person.attendee_id" @click.stop="expanded = null"
+                                        variant="ghost" size="icon">
+                                        <ChevronUp class="size-6" />
+                                    </Button>
+                                    <Button v-else @click.stop="expanded = person.attendee_id" variant="ghost"
+                                        size="icon">
+                                        <ChevronDown class="size-6" />
+                                    </Button>
+                                </div>
+                            </div>
+                            <div class="col-span-full" v-if="expanded === person.attendee_id">
+                                <div class="px-6 pb-5 pt-2 space-y-2">
+                                    <p class="text-sm font-medium text-foreground">
+                                        Remarks
+                                    </p>
+                                    <p v-if="person.remarks"
+                                        class="text-sm text-muted-foreground leading-relaxed whitespace-pre-wrap max-h-72 overflow-y-auto">
+                                        {{ person.remarks }}
+                                    </p>
+                                    <p v-else class="text-sm text-muted-foreground italic">
+                                        None provided
+                                    </p>
+                                </div>
+                            </div>
                         </div>
                     </div>
                     <!-- trainees -->
                     <div>
                         <div class="flex flex-col">
                             <label class="scroll-m-20 text-xl font-semibold tracking-tight">Trainees</label>
-                            <div class="grid grid-cols-5 py-2 text-sm font-medium text-muted-foreground border-b">
+                            <div
+                                class="grid grid-cols-[1fr_5rem_5rem_2fr_3rem] py-2 text-sm font-medium text-muted-foreground border-b px-2">
                                 <span>Name</span>
-                                <span class="">Bookwork</span>
-                                <span class="">Qual</span>
-                                <span class="text-right col-span-2">Remarks</span>
+                                <span class="text-center">Bookwork</span>
+                                <span class="text-center">Qual</span>
+                                <span class="text-right">Remarks</span>
+                                <span class="w-15"></span>
                             </div>
                         </div>
-                        <div v-for="person in focusedTrainingTrainees"
-                            class="grid grid-cols-5 py-2 items-center border-b last:border-none">
+                        <div v-for="person in focusedTrainingTrainees" class="border-b last:border-none"
+                            :class="expanded === person.attendee_id && 'bg-muted/20'">
+                            <div class="grid grid-cols-[1fr_5rem_5rem_2fr_3rem] py-2 items-center mx-2">
                                 <div>
                                     <MemberCard v-if="person.attendee_id" :member-id="person.attendee_id"
                                         class="justify-self-start"></MemberCard>
                                     <p v-else>{{ person.attendee_name }}</p>
                                 </div>
-                            <Checkbox :disabled="!focusedTrainingReport.course.hasQual"
-                                :model-value="person.passed_bookwork" class="pointer-events-none ml-5">
+                                <Tooltip :open="!focusedTrainingReport.course.hasBookwork" class="mx-auto"
+                                    message="This course does not have bookwork">
+                                    <Checkbox :disabled="!focusedTrainingReport.course.hasBookwork"
+                                        :model-value="person.passed_bookwork" class="pointer-events-none">
                                     </Checkbox>
+                                </Tooltip>
+                                <Tooltip :open="!focusedTrainingReport.course.hasQual" class="mx-auto"
+                                    message="This course does not have a qualification">
                                     <Checkbox :disabled="!focusedTrainingReport.course.hasQual"
                                         :model-value="person.passed_qual" class="pointer-events-none ml-1">
                                     </Checkbox>
-                            <p class="col-span-2 text-right px-2"
+                                </Tooltip>
+                                <p class="text-right truncate"
                                     :class="person.remarks == '' ? 'text-muted-foreground' : ''">
                                     {{ person.remarks == "" ?
                                         '--'
                                         : person.remarks }}</p>
+                                <div class="w-min mx-auto">
+                                    <Button v-if="expanded === person.attendee_id" @click.stop="expanded = null"
+                                        variant="ghost" size="icon">
+                                        <ChevronUp class="size-6" />
+                                    </Button>
+                                    <Button v-else @click.stop="expanded = person.attendee_id" variant="ghost"
+                                        size="icon">
+                                        <ChevronDown class="size-6" />
+                                    </Button>
+                                </div>
+                            </div>
+                            <div class="col-span-full" v-if="expanded === person.attendee_id">
+                                <div class="px-6 pb-5 pt-2 space-y-2">
+                                    <p class="text-sm font-medium text-foreground">
+                                        Remarks
+                                    </p>
+                                    <p v-if="person.remarks"
+                                        class="text-sm text-muted-foreground leading-relaxed whitespace-pre-wrap max-h-72 overflow-y-auto">
+                                        {{ person.remarks }}
+                                    </p>
+                                    <p v-else class="text-sm text-muted-foreground italic">
+                                        None provided
+                                    </p>
+                                </div>
+                            </div>
                         </div>
                     </div>
                     <!-- No Shows -->
                     <div v-if="focusedNoShows.length != 0">
                         <div class="flex flex-col">
-                            <label class="scroll-m-20 text-xl font-semibold tracking-tight">No Shows</label>
-                            <div class="grid grid-cols-5 py-2 text-sm font-medium text-muted-foreground border-b">
+                            <label class="scroll-m-20 text-xl font-semibold tracking-tight">
+                                No Shows
+                            </label>
+
+                            <div
+                                class="grid grid-cols-[1fr_5rem_5rem_2fr_3rem] py-2 text-sm font-medium text-muted-foreground border-b">
                                 <span>Name</span>
-                                <!-- <span class="">Role</span>
-                                <span class="">Role</span> -->
-                                <div></div>
-                                <div></div>
-                                <span class="text-right col-span-2">Remarks</span>
+                                <span></span>
+                                <span></span>
+                                <span class="text-right">Remarks</span>
+                                <span></span>
                             </div>
                         </div>
-                        <div v-for="person in focusedNoShows"
-                            class="grid grid-cols-5 py-2 items-center border-b last:border-none">
+
+                        <div v-for="person in focusedNoShows" :key="person.attendee_id ?? person.attendee_name"
+                            class="border-b last:border-none transition-colors"
+                            :class="expanded === person.attendee_id && 'bg-muted/20'">
+                            <!-- Row -->
+                            <div class="grid grid-cols-[1fr_5rem_5rem_2fr_3rem] py-2 items-center">
+                                <!-- Name -->
                                 <div>
-                                <MemberCard v-if="person.attendee_id" :member-id="person.attendee_id"
-                                    class="justify-self-start"></MemberCard>
+                                    <MemberCard v-if="person.attendee_id" :member-id="person.attendee_id" />
                                     <p v-else>{{ person.attendee_name }}</p>
                                 </div>
-                            <!-- <Checkbox :default-value="person.passed_bookwork ? true : false" class="pointer-events-none">
-                            </Checkbox>
-                            <Checkbox :default-value="person.passed_qual ? true : false" class="pointer-events-none">
-                            </Checkbox> -->
+
                                 <div></div>
                                 <div></div>
-                            <p class="col-span-2 text-right px-2"
-                                :class="person.remarks == '' ? 'text-muted-foreground' : ''">
-                                {{ person.remarks == "" ?
-                                    '--'
-                                    : person.remarks }}</p>
+
+                                <p class="text-right px-2 truncate" :class="!person.remarks && 'text-muted-foreground'">
+                                    {{ person.remarks || '--' }}
+                                </p>
+
+                                <Button variant="ghost" size="icon" @click.stop="expanded === person.attendee_id
+                                    ? expanded = null
+                                    : expanded = person.attendee_id">
+                                    <ChevronDown v-if="expanded !== person.attendee_id" class="size-5" />
+                                    <ChevronUp v-else class="size-5" />
+                                </Button>
                             </div>
+
+                            <div v-if="expanded === person.attendee_id" class="col-span-full">
+                                <div class="px-6 py-4 space-y-2">
+                                    <p class="text-sm font-medium text-foreground">
+                                        Remarks
+                                    </p>
+
+                                    <p v-if="person.remarks"
+                                        class="text-sm text-muted-foreground leading-relaxed whitespace-pre-wrap max-h-72 overflow-y-auto">
+                                        {{ person.remarks }}
+                                    </p>
+
+                                    <p v-else class="text-sm text-muted-foreground italic">
+                                        None provided
+                                    </p>
+                                </div>
+                            </div>
+                        </div>
+
                     </div>
                     <div>
                         <label class="scroll-m-20 text-xl font-semibold tracking-tight">Remarks</label>
@@ -368,33 +469,3 @@ function setPage(pagenum: number) {
         </div>
     </div>
 </template>
-
-<style scoped>
-/* Firefox */
-.scrollbar-themed {
-    scrollbar-width: thin;
-    scrollbar-color: #555 #1f1f1f;
-    padding-right: 6px;
-}
-
-/* Chrome, Edge, Safari */
-.scrollbar-themed::-webkit-scrollbar {
-    width: 10px;
-    /* slightly wider to allow padding look */
-}
-
-.scrollbar-themed::-webkit-scrollbar-track {
-    background: #1f1f1f;
-    margin-left: 6px;
-    /* ❗ adds space between content + scrollbar */
-}
-
-.scrollbar-themed::-webkit-scrollbar-thumb {
-    background: #555;
-    border-radius: 9999px;
-}
-
-.scrollbar-themed::-webkit-scrollbar-thumb:hover {
-    background: #777;
-}
-</style>

ui/src/pages/Transfer.vue

@@ -1,95 +0,0 @@
-<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 { onMounted, ref } from "vue";
-import { Member, getMembers } from "@/api/member";
-import Button from "@/components/ui/button/Button.vue";
-import { Status, getAllStatuses, assignStatus } from "@/api/status";
-import { Rank, getRanks } from "@/api/rank";
-
-const members = ref<Member[]>([])
-const statuses = ref<Status[]>([])
-const allRanks = ref<Rank[]>([])
-
-const currentMember = ref<Member | null>(null);
-const currentStatus = ref<Status | null>(null);
-const currentRank = ref<Rank | null>(null);
-
-onMounted(async () => {
-    members.value = await getMembers();
-    statuses.value = await getAllStatuses();
-    allRanks.value = await getRanks();
-});
-
-</script>
-
-<template>
-    <div class="flex flex-row gap-6 mx-auto m-10 max-w-5xl">
-        <Combobox v-model="currentMember">
-            <ComboboxAnchor class="w-[300px]">
-                <ComboboxInput placeholder="Search members..." class="w-full pl-9"
-                    :display-value="(v) => v ? v.member_name : ''" />
-            </ComboboxAnchor>
-            <ComboboxList class="w-[300px]">
-                <ComboboxEmpty class="text-muted-foreground">No results</ComboboxEmpty>
-                <ComboboxGroup>
-                    <template v-for="member in members" :key="member.member_id">
-                        <ComboboxItem :value="member"
-                            class="data-[highlighted]:bg-accent data-[highlighted]:text-accent-foreground relative cursor-pointer select-none px-2 py-1.5">
-                            {{ member.member_name }}
-                            <ComboboxItemIndicator class="absolute left-2 inline-flex items-center">
-                                <Check class="h-4 w-4" />
-                            </ComboboxItemIndicator>
-                        </ComboboxItem>
-                    </template>
-                </ComboboxGroup>
-            </ComboboxList>
-        </Combobox>
-
-        <!-- Status Combobox -->
-        <Combobox v-model="currentStatus">
-            <ComboboxAnchor class="w-[300px]">
-                <ComboboxInput placeholder="Search statuses..." class="w-full pl-9"
-                    :display-value="(v) => v ? v.name : ''" />
-            </ComboboxAnchor>
-            <ComboboxList class="w-[300px]">
-                <ComboboxEmpty class="text-muted-foreground">No results</ComboboxEmpty>
-                <ComboboxGroup>
-                    <template v-for="status in statuses" :key="status.id">
-                        <ComboboxItem :value="status"
-                            class="data-[highlighted]:bg-accent data-[highlighted]:text-accent-foreground relative cursor-pointer select-none px-2 py-1.5">
-                            {{ status.name }}
-                            <ComboboxItemIndicator class="absolute left-2 inline-flex items-center">
-                                <Check class="h-4 w-4" />
-                            </ComboboxItemIndicator>
-                        </ComboboxItem>
-                    </template>
-                </ComboboxGroup>
-            </ComboboxList>
-        </Combobox>
-
-        <!-- rank -->
-        <Combobox v-model="currentRank">
-            <ComboboxAnchor class="w-[300px]">
-                <ComboboxInput placeholder="Search ranks..." class="w-full pl-9"
-                    :display-value="(v) => v ? v.short_name : ''" />
-            </ComboboxAnchor>
-            <ComboboxList class="w-[300px]">
-                <ComboboxEmpty class="text-muted-foreground">No results</ComboboxEmpty>
-                <ComboboxGroup>
-                    <template v-for="rank in allRanks" :key="rank.id">
-                        <ComboboxItem :value="rank"
-                            class="data-[highlighted]:bg-accent data-[highlighted]:text-accent-foreground relative cursor-pointer select-none px-2 py-1.5">
-                            {{ rank.short_name }}
-                            <ComboboxItemIndicator class="absolute left-2 inline-flex items-center">
-                                <Check class="h-4 w-4" />
-                            </ComboboxItemIndicator>
-                        </ComboboxItem>
-                    </template>
-                </ComboboxGroup>
-            </ComboboxList>
-        </Combobox>
-        <Button :onClick="() => { }">Submit</Button>
-    </div>
-</template>

ui/src/router/index.js

@@ -15,7 +15,6 @@ const router = createRouter({
     // MEMBER ROUTES
     { path: '/members', component: () => import('@/pages/memberList.vue'), meta: { requiresAuth: true, memberOnly: true } },
     { path: '/loa', component: () => import('@/pages/SubmitLOA.vue'), meta: { requiresAuth: true, memberOnly: true } },
-    { path: '/transfer', component: () => import('@/pages/Transfer.vue'), meta: { requiresAuth: true, memberOnly: true } },
     { path: '/profile', component: () => import('@/pages/MyProfile.vue'), meta: { requiresAuth: true } },
 
 
@@ -38,9 +37,9 @@ const router = createRouter({
         { path: 'applications/:id', component: () => import('@/pages/ManageApplications.vue') },
         { path: 'rankChange', component: () => import('@/pages/RankChange.vue') },
         { path: 'applications/:id', component: () => import('@/pages/Application.vue') },
-        { path: 'transfer', component: () => import('@/pages/ManageTransfers.vue') },
         { path: 'loa', component: () => import('@/pages/ManageLOA.vue') },
-        { path: 'roles', component: () => import('@/pages/ManageRoles.vue') }
+        { path: 'roles', component: () => import('@/pages/ManageRoles.vue') },
+        { path: 'roles/:id', component: () => import('@/pages/ManageRoles.vue') }
       ]
     },
 

ui/src/stores/memberDirectory.ts

@@ -1,5 +1,5 @@
 import { defineStore } from "pinia"
-import type { MemberLight, Member } from "@shared/types/member"
+import type { MemberLight, Member, MemberCardDetails } from "@shared/types/member"
 import { getLightMembers, getFullMembers } from "@/api/member"
 import { reactive, ref } from "vue"
 import { resolve } from "path"
@@ -7,7 +7,7 @@ import { rejects } from "assert"
 
 export const useMemberDirectory = defineStore('memberDirectory', () => {
     const light = reactive<Record<number, MemberLight>>({});
-    const full = reactive<Record<number, Member>>({})
+    const full = reactive<Record<number, MemberCardDetails>>({})
 
     function getLight(id: number): Promise<MemberLight> {
         if (light[id]) return Promise.resolve(light[id]);
@@ -24,7 +24,7 @@ export const useMemberDirectory = defineStore('memberDirectory', () => {
         })
     }
 
-    function getFull(id: number): Promise<Member> {
+    function getFull(id: number): Promise<MemberCardDetails> {
         if (full[id]) return Promise.resolve(full[id])
 
         if (!fullWaiters.has(id)) {
@@ -34,7 +34,7 @@ export const useMemberDirectory = defineStore('memberDirectory', () => {
 
         scheduleBatch()
 
-        return new Promise<Member>((resolve, reject) => {
+        return new Promise<MemberCardDetails>((resolve, reject) => {
             fullWaiters.get(id)!.push({ resolve, reject })
         })
     }
@@ -50,7 +50,7 @@ export const useMemberDirectory = defineStore('memberDirectory', () => {
 
     // promises
     const lightWaiters = new Map<number, Array<{ resolve: (m: MemberLight) => void; reject: (e: any) => void }>>()
-    const fullWaiters = new Map<number, Array<{ resolve: (m: Member) => void; reject: (e: any) => void }>>()
+    const fullWaiters = new Map<number, Array<{ resolve: (m: MemberCardDetails) => void; reject: (e: any) => void }>>()
 
     let batchTimer: ReturnType<typeof setTimeout> | null = null;
 
@@ -105,12 +105,12 @@ export const useMemberDirectory = defineStore('memberDirectory', () => {
                 try {
                     const res = await getFullMembers(ids);
                     for (const m of res) {
-                        full[m.member_id] = m;
+                        full[m.member.member_id] = m;
 
-                        const waiters = fullWaiters.get(m.member_id);
+                        const waiters = fullWaiters.get(m.member.member_id);
                         if (waiters) {
                             for (const w of waiters) w.resolve(m)
-                            fullWaiters.delete(m.member_id);
+                            fullWaiters.delete(m.member.member_id);
                         }
                     }