Improved mobile support on training report list

Reviewed-on: #206

.gitea/workflows/deploy-dev.yaml

@@ -89,6 +89,12 @@ jobs:
           sed -i "s/APPLICATION_VERSION=.*/APPLICATION_VERSION=$version/" .env
           chown -R nginx:nginx .
 
+      - name: Run Database Migrations
+        run: |
+          cd /var/www/html/milsim-site-v4/api
+          npx db-migrate up -e prod
+          chown -R nginx:nginx .
+
       - name: Reset File Permissions
         run: |
           sudo chown -R nginx:nginx /var/www/html/milsim-site-v4

.gitea/workflows/deploy-prod.yaml

@@ -89,6 +89,12 @@ jobs:
           sed -i "s/APPLICATION_VERSION=.*/APPLICATION_VERSION=$version/" .env
           chown -R nginx:nginx .
 
+      - name: Run Database Migrations
+        run: |
+          cd /var/www/html/milsim-site-v4/api
+          npx db-migrate up -e prod
+          chown -R nginx:nginx .
+
       - name: Reset File Permissions
         run: |
           sudo chown -R nginx:nginx /var/www/html/milsim-site-v4

.gitea/workflows/pull-request.yaml

@@ -10,7 +10,7 @@ on:
 
 jobs:
   build:
-    name: Update Deployment
+    name: Merge Check
     runs-on: ubuntu-latest
     container:
     steps:

api/migrations/20260212165353-audit-log.js

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

api/migrations/sqls/20260212165353-audit-log-down.sql

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

api/migrations/sqls/20260212165353-audit-log-up.sql

@@ -0,0 +1,17 @@
+CREATE TABLE audit_log (
+    id INT PRIMARY KEY AUTO_INCREMENT,
+    -- "area.action" (e.g., 'calendarEvent.create', 'member.update_rank')
+    action_type VARCHAR(100) NOT NULL,
+    -- The JSON blob containing detailed information
+    payload JSON DEFAULT NULL,
+    -- Identifying the actor
+    created_by INT,
+    -- The ID of the resource being acted upon
+    target_id INT DEFAULT NULL,
+
+    created_at DATETIME DEFAULT CURRENT_TIMESTAMP,
+    CONSTRAINT fk_created_by FOREIGN KEY (created_by) REFERENCES members(id) ON DELETE
+    SET NULL,
+        INDEX idx_action (action_type),
+        INDEX idx_target (target_id)
+);

api/src/index.ts

@@ -18,7 +18,8 @@ app.use(morgan((tokens: morgan.TokenIndexer, req: express.Request, res: express.
   }
 
   const payload: LogPayload = {
-    message: 'HTTP request completed',
+    message: `${tokens.method(req, res)} ${tokens.url(req, res)}`,
+    // message: 'HTTP request completed',
     data: {
       method: tokens.method(req, res),
       path: tokens.url(req, res),
@@ -102,7 +103,7 @@ import { roles, memberRoles } from './routes/roles';
 import { courseRouter, eventRouter } from './routes/course';
 import { calendarRouter } from './routes/calendar';
 import { docsRouter } from './routes/docs';
-import { units } from './routes/units';
+import { memberUnits, units } from './routes/units';
 
 app.use('/application', applicationRouter);
 app.use('/ranks', ranks);
@@ -117,6 +118,7 @@ app.use('/course', courseRouter)
 app.use('/courseEvent', eventRouter)
 app.use('/calendar', calendarRouter)
 app.use('/units', units)
+app.use('/memberUnits', memberUnits);
 app.use('/docs', docsRouter)
 app.use('/', authRouter)
 

api/src/routes/applications.ts

@@ -12,6 +12,7 @@ import { Request, response, Response } from 'express';
 import { getUserRoles } from '../services/db/rolesService';
 import { requireLogin, requireRole } from '../middleware/auth';
 import { logger } from '../services/logging/logger';
+import { audit, AuditContext } from '../services/logging/auditLog';
 import { bus } from '../services/events/eventBus';
 
 //get CoC
@@ -58,6 +59,8 @@ router.post('/', [requireLogin], async (req: Request, res: Response) => {
 
     res.sendStatus(201);
 
+    audit.application('created', { actorId: memberID, targetId: appID });
+
     bus.emit("application.create", { application: appID, member_name: req.user.name, member_discord_id: req.user.discord_id || null })
 
     logger.info('app', 'Application Posted', {
@@ -228,31 +231,26 @@ router.post('/approve/:id', [requireLogin, requireRole("Recruiter")], async (req
   const app = await getApplicationByID(appID);
 
   try {
-    console.log("HELLO MFS")
     var con = await pool.getConnection();
-    console.log("START")
 
     con.beginTransaction();
-    console.log("APPROVE")
 
     await approveApplication(appID, approved_by, con);
-    console.log("STATE")
 
     //update user profile
     await setUserState(app.member_id, MemberState.Member, "Application Accepted", approved_by, con);
 
-    console.log("SP")
-
     await con.query('CALL sp_accept_new_recruit_validation(?, ?, ?, ?)', [Number(process.env.CONFIG_ID), app.member_id, approved_by, approved_by])
 
-    console.log("COMMIT")
-
     con.commit();
     logger.info('app', "Member application approved", {
       application: app.id,
       applicant: app.member_id,
       approver: approved_by
     })
+
+    audit.application('approved', { actorId: approved_by, targetId: appID }, { applicantId: app.member_id });
+
     res.sendStatus(200);
   } catch (error) {
 
@@ -288,6 +286,7 @@ router.post('/deny/:id', [requireLogin, requireRole("Recruiter")], async (req: R
       applicant: app.member_id,
       approver: approver
     })
+    audit.application('denied', { actorId: approver, targetId: appID }, { applicantId: app.member_id });
     res.sendStatus(200);
   } catch (error) {
     logger.error(
@@ -305,7 +304,7 @@ router.post('/deny/:id', [requireLogin, requireRole("Recruiter")], async (req: R
 
 // POST /application/:id/comment
 router.post('/:id/comment', [requireLogin], async (req: Request, res: Response) => {
-  const appID = req.params.id;
+  const appID = Number(req.params.id);
   const data = req.body.message;
   const user = req.user;
 
@@ -337,10 +336,12 @@ VALUES(?, ?, ?);`
         WHERE app.id = ?; `;
     const comment = await conn.query(getSQL, [result.insertId])
 
+    audit.record('application', 'comment_added', { actorId: user.id, targetId: appID }, { commentId: Number(result.insertId) });
+
     logger.info('app', "Application comment posted", {
       application: appID,
       poster: user.id,
-      comment: result.insertId,
+      comment: Number(result.insertId),
     })
 
     res.status(201).json(comment[0]);
@@ -363,7 +364,7 @@ VALUES(?, ?, ?);`
 
 // POST /application/:id/comment
 router.post('/:id/adminComment', [requireLogin, requireRole("Recruiter")], async (req: Request, res: Response) => {
-  const appID = req.params.id;
+  const appID = Number(req.params.id);
   const data = req.body.message;
   const user = req.user;
 
@@ -395,11 +396,11 @@ VALUES(?, ?, ?, 1);`
           INNER JOIN members AS member ON member.id = app.poster_id
         WHERE app.id = ?; `;
     const comment = await conn.query(getSQL, [result.insertId])
-
+    audit.record('application', 'comment_added', { actorId: user.id, targetId: appID }, { commentId: Number(result.insertId) });
     logger.info('app', "Admin application comment posted", {
       application: appID,
       poster: user.id,
-      comment: result.insertId,
+      comment: Number(result.insertId),
     })
 
     res.status(201).json(comment[0]);
@@ -424,6 +425,7 @@ router.post('/restart', async (req: Request, res: Response) => {
   try {
     await setUserState(user, MemberState.Guest, "Restarted Application", user);
 
+    audit.application('restarted', { actorId: user, targetId: user });
     logger.info('app', "Member restarted application", {
       user: user
     })

api/src/routes/calendar.ts

@@ -4,6 +4,7 @@ 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";
+import { audit } from "../services/logging/auditLog";
 
 const express = require('express');
 const r = express.Router();
@@ -46,10 +47,12 @@ r.get('/upcoming', async (req, res) => {
 })
 
 r.post('/:id/cancel', [requireLogin, requireMemberState(MemberState.Member)], async (req: Request, res: Response) => {
+    let member = req.user.id;
     try {
         const eventID = Number(req.params.id);
-        setEventCancelled(eventID, true);
+        await setEventCancelled(eventID, true);
 
+        audit.calendar('cancelled', { actorId: member, targetId: eventID });
         logger.info('app', 'Calendar event cancelled', {
             event: eventID,
             user: req.user.id
@@ -68,10 +71,12 @@ r.post('/:id/cancel', [requireLogin, requireMemberState(MemberState.Member)], as
     }
 })
 r.post('/:id/uncancel', [requireLogin, requireMemberState(MemberState.Member)], async (req: Request, res: Response) => {
+    let member = req.user.id;
     try {
         const eventID = Number(req.params.id);
         setEventCancelled(eventID, false);
 
+        audit.calendar('un-cancelled', { actorId: member, targetId: eventID });
         logger.info('app', 'Calendar event un-cancelled', {
             event: eventID,
             user: req.user.id
@@ -96,8 +101,9 @@ r.post('/:id/attendance', [requireLogin, requireMemberState(MemberState.Member)]
         let member = req.user.id;
         let event = Number(req.params.id);
         let state = req.query.state as CalendarAttendance;
-        setAttendanceStatus(member, event, state);
+        await setAttendanceStatus(member, event, state);
 
+        audit.calendar('attendance_set', { actorId: member, targetId: event }, { attendanceState: state });
         logger.info('app', 'Member set calendar event attendance', {
             event: event,
             user: req.user.id,
@@ -148,8 +154,8 @@ r.post('/', [requireLogin, requireMemberState(MemberState.Member)], async (req:
         event.creator_id = member;
         event.start = new Date(event.start);
         event.end = new Date(event.end);
-        createEvent(event);
+        let eventID = await createEvent(event);
-
+        audit.calendar('event_created', { actorId: member, targetId: eventID });
         logger.info('app', 'Calendar event posted', {
             event: event.id,
             user: req.user.id
@@ -170,12 +176,14 @@ r.post('/', [requireLogin, requireMemberState(MemberState.Member)], async (req:
 })
 
 r.put('/', [requireLogin, requireMemberState(MemberState.Member)], async (req: Request, res: Response) => {
+    let member = req.user.id;
     try {
         let event: CalendarEvent = req.body;
         event.start = new Date(event.start);
         event.end = new Date(event.end);
         updateEvent(event);
 
+        audit.calendar('event_updated', { actorId: member, targetId: event.id });
         logger.info('app', 'Calendar event updated', {
             event: event.id,
             user: req.user.id

api/src/routes/course.ts

@@ -4,6 +4,7 @@ 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";
+import { audit } from "../services/logging/auditLog";
 
 const cr = Router();
 const er = Router();
@@ -125,6 +126,7 @@ er.post('/', async (req: Request, res: Response) => {
         data.event_date = new Date(data.event_date);
         const id = await insertCourseEvent(data);
 
+        audit.course('report_created', { actorId: posterID, targetId: id });
         logger.info('app', 'Training report posted', { user: posterID, report: id })
         res.status(201).json(id);
     } catch (error) {

api/src/routes/loa.ts

@@ -7,6 +7,7 @@ import { closeLOA, createNewLOA, getAllLOA, getLOAbyID, getLoaTypes, getUserLOA,
 import { LOARequest } from '@app/shared/types/loa';
 import { requireLogin, requireRole } from '../middleware/auth';
 import { logger } from '../services/logging/logger';
+import { audit } from '../services/logging/auditLog';
 
 router.use(requireLogin);
 
@@ -18,7 +19,9 @@ router.post("/", async (req: Request, res: Response) => {
     LOARequest.filed_date = new Date();
 
     try {
-        await createNewLOA(LOARequest);
+        let loaID = await createNewLOA(LOARequest);
+
+        audit.leaveOfAbsence('created', { actorId: req.user.id, targetId: loaID })
         logger.info('app', 'LOA Posted', { poster: req.user.id, user: LOARequest.member_id })
         res.sendStatus(201);
     } catch (error) {
@@ -40,7 +43,8 @@ router.post("/admin", [requireRole(['17th Administrator', '17th HQ', '17th Comma
     LOARequest.created_by = req.user.id;
     LOARequest.filed_date = new Date();
     try {
-        await createNewLOA(LOARequest);
+        let loaID = await createNewLOA(LOARequest);
+        audit.leaveOfAbsence('admin_created', { actorId: req.user.id, targetId: loaID }, { for: LOARequest.member_id })
         logger.info('app', 'LOA Posted', { poster: req.user.id, user: LOARequest.member_id })
         res.sendStatus(201);
     } catch (error) {
@@ -144,6 +148,7 @@ router.post('/cancel/:id', async (req: Request, res: Response) => {
 
         await closeLOA(Number(req.params.id), closer);
 
+        audit.leaveOfAbsence('ended', { actorId: req.user.id, targetId: id });
         logger.info('app', 'LOA Closed', { closed_by: closer, LOA: id })
 
         res.sendStatus(200);
@@ -166,6 +171,7 @@ router.post('/adminCancel/:id', [requireRole(['17th Administrator', '17th HQ', '
     try {
         await closeLOA(Number(req.params.id), closer);
 
+        audit.leaveOfAbsence('admin_ended', { actorId: req.user.id, targetId: Number(req.params.id) });
         logger.info('app', 'LOA Closed', { closed_by: closer, LOA: req.params.id })
 
         res.sendStatus(200);
@@ -183,7 +189,50 @@ router.post('/adminCancel/:id', [requireRole(['17th Administrator', '17th HQ', '
 })
 
 // extend LOA
-router.post('/extend/:id', [requireRole(['17th Administrator', '17th HQ', '17th Command'])], async (req: Request, res: Response) => {
+router.post('/extend/:id', async (req: Request, res: Response) => {
+    const to: Date = req.body.to;
+
+    const member = req.user.id;
+
+    let LOA = await getLOAbyID(Number(req.params.id));
+    if (!LOA) {
+        return res.status(404).send("LOA not found");
+    }
+
+    if (LOA.member_id !== member) {
+        return res.status(403).send("You do not have permission to extend this LOA");
+    }
+
+    if (LOA.extended_till !== null) {
+        return res.status(409).send("You must contact the administration team to extend your LOA again");
+    }
+
+    if (!to) {
+        return res.status(400).send("Extension length is required");
+    }
+
+    try {
+        await setLOAExtension(Number(req.params.id), to);
+
+        audit.leaveOfAbsence('extended', { actorId: req.user.id, targetId: Number(req.params.id) });
+        logger.info('app', 'LOA Extended', { extended_by: req.user.id, LOA: req.params.id })
+
+        res.sendStatus(200);
+    } catch (error) {
+        logger.error(
+            'app',
+            'Failed to extend LOA',
+            {
+                error: error instanceof Error ? error.message : String(error),
+                stack: error instanceof Error ? error.stack : undefined,
+            }
+        );
+        res.status(500).json(error);
+    }
+})
+
+// admin extend LOA
+router.post('/extendAdmin/:id', [requireRole(['17th Administrator', '17th HQ', '17th Command'])], async (req: Request, res: Response) => {
     const to: Date = req.body.to;
 
     if (!to) {
@@ -192,6 +241,8 @@ router.post('/extend/:id', [requireRole(['17th Administrator', '17th HQ', '17th
 
     try {
         await setLOAExtension(Number(req.params.id), to);
+
+        audit.leaveOfAbsence('extended', { actorId: req.user.id, targetId: Number(req.params.id) });
         logger.info('app', 'LOA Extended', { extended_by: req.user.id, LOA: req.params.id })
 
         res.sendStatus(200);

api/src/routes/members.ts

@@ -6,8 +6,8 @@ import pool from '../db';
 import { requireLogin, requireMemberState, requireRole } from '../middleware/auth';
 import { getUserActiveLOA } from '../services/db/loaService';
 import { getAllMembersLite, getMemberSettings, getMembersFull, getMembersLite, getUserData, getUserState, setUserSettings, getFilteredMembers, setUserState, getLastNonSuspendedState } from '../services/db/memberService';
-import { getUserRoles } from '../services/db/rolesService';
+import { getUserRoles, stripUserRoles } from '../services/db/rolesService';
-import { memberSettings, MemberState, myData } from '@app/shared/types/member';
+import { memberSettings, MemberState, myData, UserCacheBustResult } from '@app/shared/types/member';
 import { Discharge } from '@app/shared/schemas/dischargeSchema';
 
 import { Performance } from 'perf_hooks';
@@ -15,6 +15,7 @@ import { logger } from '../services/logging/logger';
 import { memberCache } from './auth';
 import { cancelLatestRank } from '../services/db/rankService';
 import { cancelLatestUnit } from '../services/db/unitService';
+import { audit } from '../services/logging/auditLog';
 
 //get all users
 router.get('/', [requireLogin, requireMemberState(MemberState.Member)], async (req, res) => {
@@ -157,7 +158,9 @@ router.put('/settings', [requireLogin], async (req: Request, res: Response) => {
 
 router.get('/lite', [requireLogin], async (req: Request, res: Response) => {
     try {
-        let out = await getAllMembersLite();
+        let activeOnly = Boolean(req.query.active);
+        console.log(activeOnly);
+        let out = await getAllMembersLite(activeOnly);
         res.status(200).json(out);
     } catch (error) {
         logger.error(
@@ -208,6 +211,32 @@ router.post('/full/bulk', async (req: Request, res: Response) => {
     }
 })
 
+router.post('/cache/user/bust', [requireLogin, requireMemberState(MemberState.Member), requireRole('dev')], async (req: Request, res: Response) => {
+    try {
+        const clearedEntries = memberCache.Clear();
+        const payload: UserCacheBustResult = {
+            success: true,
+            clearedEntries,
+            bustedAt: new Date().toISOString(),
+        };
+
+        logger.info('app', 'User cache manually busted', {
+            actor: req.user.id,
+            clearedEntries,
+        });
+
+        return res.status(200).json(payload);
+    } catch (error) {
+        logger.error('app', 'Failed to bust user cache', {
+            caller: req.user?.id,
+            error: error instanceof Error ? error.message : String(error),
+            stack: error instanceof Error ? error.stack : undefined,
+        });
+
+        return res.status(500).json({ error: 'Failed to bust user cache' });
+    }
+})
+
 router.get('/:id', [requireLogin], async (req, res) => {
     const userId = req.params.id;
 
@@ -246,11 +275,15 @@ router.post('/discharge', [requireLogin, requireMemberState(MemberState.Member),
 
         var data: Discharge = req.body;
         setUserState(data.userID, MemberState.Discharged, "Member Discharged", author, con, data.reason);
+        stripUserRoles(data.userID, con);
         cancelLatestRank(data.userID, con);
         cancelLatestUnit(data.userID, con);
         con.commit();
         memberCache.Invalidate(data.userID);
 
+
+        audit.member('discharged', { actorId: req.user.id, targetId: data.userID }, { reason: data.reason });
+
         res.sendStatus(200);
     } catch (error) {
         logger.error('app', 'Failed to discharge user', {
@@ -272,6 +305,9 @@ router.post('/suspend', [requireLogin, requireMemberState(MemberState.Member), r
     let target = Number(req.query.target);
     try {
         await setUserState(target, MemberState.Suspended, "Member Suspended", author, null);
+
+        audit.member('suspension_added', { actorId: author, targetId: target });
+
         res.sendStatus(200);
     } catch (error) {
         logger.error('app', 'Failed to suspend user', {
@@ -291,6 +327,8 @@ router.post('/unsuspend', [requireLogin, requireMemberState(MemberState.Member),
     try {
         let prevState = await getLastNonSuspendedState(target);
         await setUserState(target, prevState, "Member Suspension Removed", author, null);
+        audit.member('suspension_removed', { actorId: author, targetId: target });
+
         res.sendStatus(200);
     } catch (error) {
         logger.error('app', 'Failed to suspend user', {

api/src/routes/ranks.ts

@@ -5,6 +5,7 @@ import { BatchPromotion, BatchPromotionMember } from '@app/shared/schemas/promot
 
 import express = require('express');
 import { logger } from "../services/logging/logger";
+import { audit } from "../services/logging/auditLog";
 const r = express.Router();
 const ur = express.Router();
 
@@ -21,6 +22,8 @@ ur.post('/', [requireRole(["17th Command", "17th Administrator", "17th HQ"]), re
         if (!change) res.sendStatus(400);
 
         await batchInsertMemberRank(change, author, approver);
+
+        audit.member('update_rank', { actorId: author, targetId: null }, { changes: change.length });
         logger.info('app', 'Promotion batch submitted', { author: author })
         res.sendStatus(201);
     } catch (error) {

api/src/routes/roles.ts

@@ -8,6 +8,7 @@ import { requireLogin, requireMemberState, requireRole } from '../middleware/aut
 import { assignUserGroup, createGroup, getAllRoles, getRole, getUsersWithRole } from '../services/db/rolesService';
 import { Request, Response } from 'express';
 import { logger } from '../services/logging/logger';
+import { audit } from '../services/logging/auditLog';
 
 r.use(requireLogin)
 ur.use(requireLogin)
@@ -22,6 +23,8 @@ ur.post('/', [requireMemberState(MemberState.Member), requireRole("17th Administ
 
         logger.info('app', 'User assigned role', { user: body.member_id, role: body.role_id, assigner: req.user.id })
         res.sendStatus(201);
+        audit.roles('add_member', { actorId: req.user.id, targetId: body.role_id }, { member: body.member_id, role: body.role_id });
+
     } catch (error) {
         if (error?.code === 'ER_DUP_ENTRY') {
             return res.status(400).json({
@@ -54,6 +57,7 @@ ur.delete('/', [requireMemberState(MemberState.Member), requireRole("17th Admini
         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 })
+        audit.roles('remove_member', { actorId: req.user.id, targetId: body.role_id }, { member: body.member_id, role: body.role_id });
 
         res.sendStatus(200);
     }
@@ -77,7 +81,7 @@ ur.delete('/', [requireMemberState(MemberState.Member), requireRole("17th Admini
 r.get('/', [requireMemberState(MemberState.Member)], async (req, res) => {
     try {
         const roles = await getAllRoles();
-        
+
         res.status(200).json(roles);
     } catch (error) {
         logger.error(
@@ -144,7 +148,8 @@ r.post('/', [requireMemberState(MemberState.Member), requireRole("dev")], async
             return res.status(400).json({ error: 'Color must be a valid hex color (#ffffff)' });
         }
 
-        await createGroup(name, color, description);
+        let out = await createGroup(name, color, description);
+        audit.roles('create', { actorId: req.user.id, targetId: out.id });
 
         res.sendStatus(201);
     } catch (err) {
@@ -159,6 +164,9 @@ r.delete('/:id', [requireMemberState(MemberState.Member), requireRole("dev")], a
 
         const sql = 'DELETE FROM roles WHERE id = ?';
         const res = await pool.query(sql, [id]);
+
+        audit.roles('delete', { actorId: req.user.id, targetId: id });
+
         res.sendStatus(200);
     } catch (error) {
         console.error(error);

api/src/routes/units.ts

@@ -1,10 +1,17 @@
 import express = require('express');
 const unitsRouter = express.Router();
+const memberUnitsRouter = express.Router();
+
+import { Request, Response } from 'express';
 
 import pool from '../db';
-import { requireLogin } from '../middleware/auth';
+import { requireLogin, requireMemberState, requireRole } from '../middleware/auth';
 import { logger } from '../services/logging/logger';
 import { Unit } from '@app/shared/types/units';
+import { MemberState } from '@app/shared/types/member';
+import { assignNewUnit } from '../services/db/unitService';
+import { audit } from '../services/logging/auditLog';
+import { forceInsertMemberRank, insertMemberRank } from '../services/db/rankService';
 
 unitsRouter.use(requireLogin);
 
@@ -26,4 +33,41 @@ unitsRouter.get('/', async (req, res) => {
     }
 });
 
+memberUnitsRouter.post('/admin', [requireMemberState(MemberState.Member), requireRole("17th Administrator")], async (req: Request, res: Response) => {
+    const memberId = Number(req.query.memberId);
+    const unitId = Number(req.query.unitId);
+    const rankId = Number(req.query.rankId);
+    const reason = req.query.reason as string;
+
+    try {
+
+        if (!memberId || !unitId) {
+            return res.status(400).json({ error: 'memberId and unitId query parameters are required' });
+        }
+
+        await assignNewUnit(memberId, unitId, req.user.id, req.user.id, reason);
+        await forceInsertMemberRank(memberId, rankId, req.user.id, req.user.id, reason);
+        logger.info('app', 'Member force assigned unit', {
+            member: memberId,
+            unit: unitId,
+            rank: rankId,
+            caller: req.user.id,
+        });
+        audit.member('update_unit', { actorId: req.user.id, targetId: memberId }, { unit: unitId, rank: rankId, reason: reason });
+
+        res.sendStatus(200);
+    } catch (error) {
+        logger.error('app', 'Failed to force assign unit', {
+            member: memberId,
+            unit: unitId,
+            caller: req.user.id,
+            error: error instanceof Error ? error.message : String(error),
+            stack: error instanceof Error ? error.stack : undefined,
+        })
+
+        res.sendStatus(500);
+    }
+});
+
 export const units = unitsRouter;
+export const memberUnits = memberUnitsRouter;

api/src/services/cache/cache.ts

@@ -16,4 +16,14 @@ export class CacheService<Key, Value> {
     public Invalidate(key: Key): boolean {
         return this.cacheMap.delete(key);
     }
+
+    public Size(): number {
+        return this.cacheMap.size;
+    }
+
+    public Clear(): number {
+        const priorSize = this.cacheMap.size;
+        this.cacheMap.clear();
+        return priorSize;
+    }
 }

api/src/services/db/calendarService.ts

@@ -19,7 +19,8 @@ export async function createEvent(eventObject: Omit<CalendarEvent, 'id' | 'creat
     ];
 
     const result = await pool.query(sql, params);
-    return { id: result.insertId, ...eventObject };
+    let id = Number(result.insertId);
+    return id;
 }
 
 export async function updateEvent(eventObject: CalendarEvent) {

api/src/services/db/loaService.ts

@@ -74,12 +74,13 @@ export async function getUserActiveLOA(userId: number): Promise<LOARequest[]> {
     return LOAData;
 }
 
-export async function createNewLOA(data: LOARequest) {
+export async function createNewLOA(data: LOARequest): Promise<number> {
     const sql = `INSERT INTO leave_of_absences 
                 (member_id, filed_date, start_date, end_date, type_id, reason) 
              VALUES (?, ?, ?, ?, ?, ?)`;
-    await pool.query(sql, [data.member_id, toDateTime(data.filed_date), toDateTime(data.start_date), toDateTime(data.end_date), data.type_id, data.reason])
+    let out = await pool.query(sql, [data.member_id, toDateTime(data.filed_date), toDateTime(data.start_date), toDateTime(data.end_date), data.type_id, data.reason])
-    return;
+
+    return Number(out.insertId);
 }
 
 export async function closeLOA(id: number, closer: number) {

api/src/services/db/memberService.ts

@@ -23,7 +23,8 @@ export async function getFilteredMembers(
         }
 
         if (search) {
-            whereClauses.push(`v.member_name LIKE ?`);
+            whereClauses.push(`(v.member_name LIKE ? OR v.displayName LIKE ?)`);
+            params.push(`%${search}%`);
             params.push(`%${search}%`);
         }
 
@@ -170,14 +171,16 @@ export async function getMembersLite(ids: number[]): Promise<MemberLight[]> {
     return res;
 }
 
-export async function getAllMembersLite(): Promise<MemberLight[]> {
+export async function getAllMembersLite(activeOnly: boolean): Promise<MemberLight[]> {
+
+    const filter = activeOnly ? `\nWHERE member_state = ${MemberState.Member}` : ''
     const sql = `SELECT m.member_id AS id,
                   m.member_name AS username,
                   m.displayName,
                   u.color
               FROM view_member_rank_unit_status_latest m
-                  LEFT JOIN units u ON u.name = m.unit;`;
+                  LEFT JOIN units u ON u.name = m.unit ${filter};`;
-
+    console.log(sql);
     const res: MemberLight[] = await pool.query(sql);
     return res;
 }
@@ -217,7 +220,10 @@ export async function getMembersFull(ids: number[]): Promise<MemberCardDetails[]
             loa_until: row.loa_until ? new Date(row.loa_until) : undefined,
         };
         // roles comes as array of strings; parse each one
-        const roles: Role[] = row.roles;
+        const roles: Role[] =
+            typeof row.roles === "string"
+                ? JSON.parse(row.roles)
+                : row.roles;
 
         return { member, roles };
     });

api/src/services/db/rankService.ts

@@ -36,6 +36,16 @@ export async function insertMemberRank(member_id: number, rank_id: number, date?
     await pool.query(sql, params);
 }
 
+export async function forceInsertMemberRank(member_id: number, rank_id: number, authorized: number, creator: number, reason: string) {
+    const sql = `CALL sp_update_member_rank(?, ?, ?, ?, ?, NOW())`;
+
+    const result = await pool.query(sql, [member_id, rank_id, authorized, creator, reason]);
+
+    if (!result || result.affectedRows === 0) {
+        throw new Error("Failed to update member rank");
+    }
+}
+
 
 export async function batchInsertMemberRank(promos: BatchPromotionMember[], author: number, approver: number) {
     try {

api/src/services/db/rolesService.ts

@@ -3,6 +3,7 @@ import pool from '../../db';
 import { Role, RoleSummary } from '@app/shared/types/roles'
 import { logger } from '../logging/logger';
 import { memberCache } from '../../routes/auth';
+import * as mariadb from 'mariadb';
 
 export async function assignUserGroup(userID: number, roleID: number) {
     try {
@@ -62,4 +63,16 @@ export async function getUsersWithRole(roleId: number): Promise<MemberLight[]> {
     )
 
     return out as MemberLight[]
+}
+
+export async function stripUserRoles(userID: number, con: mariadb.Pool | mariadb.Connection = pool) {
+    try {
+        const out = await con.query(`DELETE FROM members_roles WHERE member_id = ?;`, [userID]);
+        return { success: true, affectedRows: out.affectedRows };
+    } catch (error) {
+        logger.error('app', 'Failed to strip user roles', error);
+        throw error;
+    } finally {
+        memberCache.Invalidate(userID);
+    }
 }

api/src/services/db/unitService.ts

@@ -10,4 +10,13 @@ export async function cancelLatestUnit(userID: number, con: mariadb.Pool | maria
     } catch (error) {
         throw error;
     }
+}
+
+export async function assignNewUnit(memberID: number, unitID: number, authorizedID: number, creatorID: number, reason: string) {
+    let sql = `CALL sp_update_member_unit(?, ?, ?, ?, ?, NOW())`;
+
+    const result = await pool.query(sql, [memberID, unitID, authorizedID, creatorID, reason]);
+    if (!result || result.affectedRows === 0) {
+        throw new Error('Record was not updated');
+    }
 }

api/src/services/logging/auditLog.ts

@@ -0,0 +1,61 @@
+import pool from "../../db";
+import { logger } from "./logger";
+
+export type AuditArea = 'member' | 'calendar' | 'roles' | 'auth' | 'leave_of_absence' | 'application' | 'course';
+
+export interface AuditContext {
+    actorId: number;       // The person doing the action (created_by)
+    targetId?: number;     // The ID of the thing being changed (target_id)
+}
+
+class AuditLogger {
+    async record(
+        area: AuditArea,
+        action: string,
+        context: AuditContext,
+        data: Record<string, any> = {} // Already optional with default {}
+    ) {
+        const actionType = `${area}.${action}`;
+
+        try {
+            await pool.query(
+                `INSERT INTO audit_log (action_type, payload, target_id, created_by) 
+                 VALUES (?, ?, ?, ?)`, // Fixed: removed extra comma/placeholder
+                [
+                    actionType,
+                    JSON.stringify(data),
+                    context.targetId || null,
+                    context.actorId,
+                ]
+            );
+        } catch (err) {
+            logger.error('audit', `AUDIT_FAILURE: Failed to log ${actionType}`, { error: err });
+        }
+    }
+    
+    member(action: 'update_rank'| 'update_unit' | 'suspension_added' | 'suspension_removed' | 'discharged', context: AuditContext, data: any = {}) {
+        return this.record('member', action, context, data);
+    }
+
+    roles(action: 'add_member' | 'remove_member' | 'create' | 'delete', context: AuditContext, data: any = {}) {
+        return this.record('roles', action, context, data);
+    }
+
+    leaveOfAbsence(action: 'created' | 'admin_created' | 'ended' | 'admin_ended' | 'extended', context: AuditContext, data: any = {}) {
+        return this.record('leave_of_absence', action, context, data);
+    }
+
+    calendar(action: 'event_created' | 'event_updated' | 'attendance_set' | 'cancelled' | 'un-cancelled', context: AuditContext, data: any = {}) {
+        return this.record('calendar', action, context, data);
+    }
+
+    application(action: 'created' | 'approved' | 'denied' | 'restarted', context: AuditContext, data: any = {}) {
+        return this.record('application', action, context, data);
+    }
+
+    course(action: 'report_created' | 'report_edited', context: AuditContext, data: any = {}) {
+        return this.record('course', action, context, data);
+    }
+}
+
+export const audit = new AuditLogger();

api/src/services/logging/logger.ts

@@ -1,6 +1,6 @@
 export type LogLevel = 'debug' | 'info' | 'warn' | 'error';
 export type LogDepth = 'normal' | 'verbose' | 'profiling';
-export type LogType = 'http' | 'app' | 'auth' | 'profiling';
+export type LogType = 'http' | 'app' | 'auth' | 'profiling' | 'audit';
 
 export interface LogHeader {
     timestamp: string;

shared/types/member.ts

@@ -50,4 +50,10 @@ export interface myData {
     LOAs: LOARequest[];
     roles: Role[];
     state: MemberState;
+}
+
+export interface UserCacheBustResult {
+    success: boolean;
+    clearedEntries: number;
+    bustedAt: string;
 }

ui/src/api/loa.ts

@@ -169,6 +169,23 @@ export async function extendLOA(id: number, to: Date) {
         }
     });
 
+    if (res.ok) {
+        return
+    } else {
+        throw new Error("Could not extend LOA");
+    }
+}
+
+export async function adminExtendLOA(id: number, to: Date) {
+    const res = await fetch(`${addr}/loa/extendAdmin/${id}`, {
+        method: "POST",
+        credentials: 'include',
+        body: JSON.stringify({ to }),
+        headers: {
+            "Content-Type": "application/json",
+        }
+    });
+
     if (res.ok) {
         return
     } else {

ui/src/api/member.ts

@@ -1,5 +1,5 @@
 import { Discharge } from "@shared/schemas/dischargeSchema";
-import { memberSettings, Member, MemberLight, MemberCardDetails, PaginatedMembers, MemberState } from "@shared/types/member";
+import { memberSettings, Member, MemberLight, MemberCardDetails, PaginatedMembers, MemberState, UserCacheBustResult } from "@shared/types/member";
 
 //  @ts-ignore
 const addr = import.meta.env.VITE_APIHOST;
@@ -66,8 +66,8 @@ export async function setMemberSettings(settings: memberSettings) {
     return;
 }
 
-export async function getAllLightMembers(): Promise<MemberLight[]> {
+export async function getAllLightMembers(activeOnly: boolean = true): Promise<MemberLight[]> {
-    const response = await fetch(`${addr}/members/lite`, {
+    const response = await fetch(`${addr}/members/lite${activeOnly ? '?active=true' : '?active=false'}`, {
         credentials: 'include',
         headers: {
             "Content-Type": "application/json",
@@ -157,4 +157,17 @@ export async function unsuspendMember(memberID: number): Promise<boolean> {
         throw new Error("Failed to discharge member");
     }
     return true;
+}
+
+export async function bustUserCache(): Promise<UserCacheBustResult> {
+    const response = await fetch(`${addr}/members/cache/user/bust`, {
+        credentials: 'include',
+        method: 'POST',
+    });
+
+    if (!response.ok) {
+        throw new Error('Failed to bust user cache');
+    }
+
+    return response.json();
 }

ui/src/api/units.ts

@@ -12,4 +12,15 @@ export async function getUnits(): Promise<Unit[]> {
         throw new Error("Failed to fetch units");
     }
     return response.json();
+}
+
+export async function adminAssignUnit(member: number, unit: number, rank: number, reason: string) {
+    const response = await fetch(`${addr}/memberUnits/admin?memberId=${member}&unitId=${unit}&rankId=${rank}&reason=${encodeURIComponent(reason)}`, {
+        method: 'POST',
+        credentials: 'include'
+    });
+    if (!response.ok) {
+        throw new Error("Failed to assign unit");
+    }
+    return;
 }

ui/src/components/Navigation/Navbar.vue

@@ -1,58 +1,193 @@
 <script setup lang="ts">
-import { RouterLink } from 'vue-router';
+    import { RouterLink, useRouter } from 'vue-router';
-import Separator from '../ui/separator/Separator.vue';
+    import Separator from '../ui/separator/Separator.vue';
-import { Popover, PopoverContent, PopoverTrigger } from '../ui/popover';
+    import { Popover, PopoverContent, PopoverTrigger } from '../ui/popover';
-import {
+    import {
-    DropdownMenu,
+        DropdownMenu,
-    DropdownMenuContent,
+        DropdownMenuContent,
-    DropdownMenuItem,
+        DropdownMenuItem,
-    DropdownMenuTrigger,
+        DropdownMenuTrigger,
-} from '../ui/dropdown-menu';
+    } from '../ui/dropdown-menu';
-import { useUserStore } from '@/stores/user';
+    import { useUserStore } from '@/stores/user';
-import Button from '../ui/button/Button.vue';
+    import Button from '../ui/button/Button.vue';
-import NavigationMenu from '../ui/navigation-menu/NavigationMenu.vue';
+    import NavigationMenu from '../ui/navigation-menu/NavigationMenu.vue';
-import NavigationMenuList from '../ui/navigation-menu/NavigationMenuList.vue';
+    import NavigationMenuList from '../ui/navigation-menu/NavigationMenuList.vue';
-import NavigationMenuItem from '../ui/navigation-menu/NavigationMenuItem.vue';
+    import NavigationMenuItem from '../ui/navigation-menu/NavigationMenuItem.vue';
-import NavigationMenuLink from '../ui/navigation-menu/NavigationMenuLink.vue';
+    import NavigationMenuLink from '../ui/navigation-menu/NavigationMenuLink.vue';
-import NavigationMenuTrigger from '../ui/navigation-menu/NavigationMenuTrigger.vue';
+    import NavigationMenuTrigger from '../ui/navigation-menu/NavigationMenuTrigger.vue';
-import NavigationMenuContent from '../ui/navigation-menu/NavigationMenuContent.vue';
+    import NavigationMenuContent from '../ui/navigation-menu/NavigationMenuContent.vue';
-import { navigationMenuTriggerStyle } from '../ui/navigation-menu/'
+    import { navigationMenuTriggerStyle } from '../ui/navigation-menu/'
-import { useAuth } from '@/composables/useAuth';
+    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 DropdownMenuGroup from '../ui/dropdown-menu/DropdownMenuGroup.vue';
-import DropdownMenuSeparator from '../ui/dropdown-menu/DropdownMenuSeparator.vue';
+    import DropdownMenuSeparator from '../ui/dropdown-menu/DropdownMenuSeparator.vue';
-import { MemberState } from '@shared/types/member';
+    import { MemberState } from '@shared/types/member';
+    import { computed, nextTick, ref } from 'vue';
 
-const userStore = useUserStore();
+    const userStore = useUserStore();
-const auth = useAuth();
+    const auth = useAuth();
 
-//@ts-ignore
+    //@ts-ignore
-const APIHOST = import.meta.env.VITE_APIHOST;
+    const APIHOST = import.meta.env.VITE_APIHOST;
-//@ts-ignore
+    //@ts-ignore
-const DOCHOST = import.meta.env.VITE_DOCHOST;
+    const DOCHOST = import.meta.env.VITE_DOCHOST;
 
-async function logout() {
+    async function logout() {
-    userStore.user = null;
+        userStore.user = null;
-    window.location.href = APIHOST + "/logout";
+        window.location.href = APIHOST + "/logout";
-}
+    }
 
-function blurAfter() {
+    function blurAfter() {
-    requestAnimationFrame(() => {
+        requestAnimationFrame(() => {
-        (document.activeElement as HTMLElement)?.blur();
+            (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: 'Member Management',
+                    to: '/administration/members',
+                },
+                {
+                    title: 'Role Management',
+                    to: '/administration/roles',
+                    roles: ['17th Administrator']
+                },
+            ]
+        },
+        {
+            title: 'Developer',
+            to: '/developer',
+            roles: ['Dev']
+        },
+        {
+            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 === MemberState.Guest;
+            } else if (item.status === 'member') {
+                // Show ONLY if logged in as member
+                shouldShow = isLoggedIn && auth.accountStatus.value === MemberState.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="/">
                     <img src="/17RBN_Logo.png" class="w-10 h-10 object-contain"></img>
                 </RouterLink>
                 <!-- Member navigation -->
-                <div v-if="auth.accountStatus.value == MemberState.Member" class="h-15 flex items-center justify-center">
+                <div v-if="auth.accountStatus.value == MemberState.Member"
+                    class="h-15 flex items-center justify-center">
                     <NavigationMenu>
                         <NavigationMenuList class="gap-3">
 
@@ -153,6 +288,12 @@ function blurAfter() {
                                     </NavigationMenuLink>
                                 </NavigationMenuContent>
                             </NavigationMenuItem>
+
+                            <NavigationMenuItem v-if="auth.hasRole('Dev')">
+                                <NavigationMenuLink as-child :class="navigationMenuTriggerStyle()">
+                                    <RouterLink to="/developer" @click="blurAfter">Developer</RouterLink>
+                                </NavigationMenuLink>
+                            </NavigationMenuItem>
                         </NavigationMenuList>
                     </NavigationMenu>
                 </div>
@@ -196,6 +337,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/loa/loaForm.vue

@@ -169,16 +169,16 @@ const filteredMembers = computed(() => {
 </script>
 
 <template>
-    <div class="flex flex-row-reverse gap-6 mx-auto w-full" :class="!adminMode ? 'max-w-5xl' : 'max-w-5xl'">
+    <div class="mx-auto flex w-full max-w-5xl flex-col gap-4 lg:flex-row-reverse lg:gap-6">
-        <div v-if="!adminMode" class="flex-1 flex flex-col space-x-4 rounded-md border p-4">
+        <div v-if="!adminMode" class="order-2 flex flex-1 flex-col rounded-md border p-4 lg:order-1">
             <p class="scroll-m-20 text-2xl font-semibold tracking-tight">LOA Policy</p>
             <div ref="policyRef" class="bookstack-container">
                 <!-- LOA policy gets loaded here -->
             </div>
         </div>
-        <div class="flex-1 flex flex-col gap-5">
+        <div class="order-1 flex flex-1 flex-col gap-5 lg:order-2">
             <form v-if="!formSubmitted" @submit="onSubmit" class="flex flex-col gap-2">
-                <div class="flex w-full gap-5">
+                <div class="grid w-full grid-cols-1 gap-4 sm:grid-cols-2 sm:gap-5">
                     <VeeField v-slot="{ field, errors }" name="member_id">
                         <Field>
                             <FieldContent>
@@ -237,13 +237,13 @@ const filteredMembers = computed(() => {
                         </Field>
                     </VeeField>
                 </div>
-                <div class="flex gap-5">
+                <div class="grid grid-cols-1 gap-4 sm:grid-cols-2 sm:gap-5">
                     <VeeField v-slot="{ field, errors }" name="start_date">
-                        <Field>
+                        <Field class="w-full">
                             <FieldContent>
                                 <FieldLabel>Start Date</FieldLabel>
                                 <Popover>
-                                    <div class="relative inline-flex items-center group">
+                                    <div class="group relative flex w-full items-center">
                                         <PopoverTrigger as-child>
                                             <Button :disabled="!values.type" variant="outline" :class="cn(
                                                 'w-full justify-start text-left font-normal',
@@ -259,7 +259,7 @@ const filteredMembers = computed(() => {
                                                     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">
+                                                    transition-all duration-150">
                                             Select an LOA type first
                                         </div>
                                     </div>
@@ -277,11 +277,11 @@ const filteredMembers = computed(() => {
                         </Field>
                     </VeeField>
                     <VeeField v-slot="{ field, errors }" name="end_date">
-                        <Field>
+                        <Field class="w-full">
                             <FieldContent>
                                 <FieldLabel>End Date</FieldLabel>
                                 <Popover>
-                                    <div class="relative inline-flex items-center group">
+                                    <div class="group relative flex w-full items-center">
                                         <PopoverTrigger as-child>
                                             <Button :disabled="!values.type" variant="outline" :class="cn(
                                                 'w-full justify-start text-left font-normal',
@@ -297,7 +297,7 @@ const filteredMembers = computed(() => {
                                                     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">
+                                                    transition-all duration-150">
                                             Select an LOA type first
                                         </div>
                                     </div>
@@ -330,8 +330,8 @@ const filteredMembers = computed(() => {
                         </Field>
                     </VeeField>
                 </div>
-                <div class="flex justify-end">
+                <div class="flex justify-stretch sm:justify-end">
-                    <Button type="submit" :disabled="submitting" class="w-35">
+                    <Button type="submit" :disabled="submitting" class="w-full sm:w-35">
                         <span class="flex items-center gap-2" v-if="submitting">
                             <Spinner></Spinner> Submitting…
                         </span>
@@ -352,7 +352,7 @@ const filteredMembers = computed(() => {
                 </p>
 
 
-                <div class="flex gap-3 mt-4">
+                <div class="mt-4 flex flex-col gap-3 sm:flex-row">
                     <Button variant="secondary" @click="formSubmitted = false">
                         Submit another request
                     </Button>

ui/src/components/loa/loaList.vue

@@ -1,166 +1,265 @@
 <script setup lang="ts">
-import {
+    import {
-    Table,
+        Table,
-    TableBody,
+        TableBody,
-    TableCaption,
+        TableCaption,
-    TableCell,
+        TableCell,
-    TableHead,
+        TableHead,
-    TableHeader,
+        TableHeader,
-    TableRow,
+        TableRow,
-} from "@/components/ui/table"
+    } from "@/components/ui/table"
-import { Badge } from '@/components/ui/badge'
+    import { Badge } from '@/components/ui/badge'
-import {
+    import {
-    DropdownMenu,
+        DropdownMenu,
-    DropdownMenuContent,
+        DropdownMenuContent,
-    DropdownMenuItem,
+        DropdownMenuItem,
-    DropdownMenuTrigger,
+        DropdownMenuTrigger,
-} from "@/components/ui/dropdown-menu"
+    } from "@/components/ui/dropdown-menu"
-import { ChevronDown, ChevronUp, Ellipsis, X } from "lucide-vue-next";
+    import { ChevronDown, ChevronUp, Ellipsis, X } from "lucide-vue-next";
-import { cancelLOA, extendLOA, getAllLOAs, getMyLOAs } from "@/api/loa";
+    import { adminExtendLOA, cancelLOA, extendLOA, getAllLOAs, getMyLOAs } from "@/api/loa";
-import { onMounted, ref, computed } from "vue";
+    import { onMounted, ref, computed } from "vue";
-import { LOARequest } from "@shared/types/loa";
+    import { LOARequest } from "@shared/types/loa";
-import Dialog from "../ui/dialog/Dialog.vue";
+    import Dialog from "../ui/dialog/Dialog.vue";
-import DialogTrigger from "../ui/dialog/DialogTrigger.vue";
+    import DialogTrigger from "../ui/dialog/DialogTrigger.vue";
-import DialogContent from "../ui/dialog/DialogContent.vue";
+    import DialogContent from "../ui/dialog/DialogContent.vue";
-import DialogHeader from "../ui/dialog/DialogHeader.vue";
+    import DialogHeader from "../ui/dialog/DialogHeader.vue";
-import DialogTitle from "../ui/dialog/DialogTitle.vue";
+    import DialogTitle from "../ui/dialog/DialogTitle.vue";
-import DialogDescription from "../ui/dialog/DialogDescription.vue";
+    import DialogDescription from "../ui/dialog/DialogDescription.vue";
-import Button from "../ui/button/Button.vue";
+    import Button from "../ui/button/Button.vue";
-import Calendar from "../ui/calendar/Calendar.vue";
+    import Calendar from "../ui/calendar/Calendar.vue";
-import {
+    import {
-    CalendarDate,
+        CalendarDate,
-    getLocalTimeZone,
+        getLocalTimeZone,
-} from "@internationalized/date"
+    } from "@internationalized/date"
-import { el } from "@fullcalendar/core/internal-common";
+    import { el } from "@fullcalendar/core/internal-common";
-import MemberCard from "../members/MemberCard.vue";
+    import MemberCard from "../members/MemberCard.vue";
-import {
+    import {
-    Pagination,
+        Pagination,
-    PaginationContent,
+        PaginationContent,
-    PaginationEllipsis,
+        PaginationEllipsis,
-    PaginationItem,
+        PaginationItem,
-    PaginationNext,
+        PaginationNext,
-    PaginationPrevious,
+        PaginationPrevious,
-} from '@/components/ui/pagination'
+    } from '@/components/ui/pagination'
-import { pagination } from "@shared/types/pagination";
+    import { pagination } from "@shared/types/pagination";
 
-const props = defineProps<{
+    const props = defineProps<{
-    adminMode?: boolean
+        adminMode?: boolean
-}>()
+    }>()
 
-const LOAList = ref<LOARequest[]>([]);
+    const LOAList = ref<LOARequest[]>([]);
 
-onMounted(async () => {
+    onMounted(async () => {
-    await loadLOAs();
+        await loadLOAs();
-});
-
-async function loadLOAs() {
-    if (props.adminMode) {
-        let result = await getAllLOAs(pageNum.value, pageSize.value);
-        LOAList.value = result.data;
-        pageData.value = result.pagination;
-    } else {
-        let result = await getMyLOAs(pageNum.value, pageSize.value);
-        LOAList.value = result.data;
-        pageData.value = result.pagination;
-    }
-}
-
-function formatDate(date: Date): string {
-    if (!date) return "";
-    date = typeof date === 'string' ? new Date(date) : date;
-    return date.toLocaleDateString("en-US", {
-        year: "numeric",
-        month: "short",
-        day: "numeric",
     });
-}
 
-function loaStatus(loa: LOARequest): "Upcoming" | "Active" | "Extended" | "Overdue" | "Closed" {
+    async function loadLOAs() {
-    if (loa.closed) return "Closed";
+        if (props.adminMode) {
+            let result = await getAllLOAs(pageNum.value, pageSize.value);
+            LOAList.value = result.data;
+            pageData.value = result.pagination;
+        } else {
+            let result = await getMyLOAs(pageNum.value, pageSize.value);
+            LOAList.value = result.data;
+            pageData.value = result.pagination;
+        }
+    }
 
-    const now = new Date();
+    function formatDate(date: Date): string {
-    const start = new Date(loa.start_date);
+        if (!date) return "";
-    const end = new Date(loa.end_date);
+        date = typeof date === 'string' ? new Date(date) : date;
-    const extension = new Date(loa.extended_till);
+        return date.toLocaleDateString("en-US", {
+            year: "numeric",
+            month: "short",
+            day: "numeric",
+        });
+    }
 
-    if (now < start) return "Upcoming";
+    function loaStatus(loa: LOARequest): "Upcoming" | "Active" | "Extended" | "Overdue" | "Closed" {
-    if (now >= start && (now <= end)) return "Active";
+        if (loa.closed) return "Closed";
-    if (now >= start && (now <= extension)) return "Extended";
-    if (now > loa.extended_till || end) return "Overdue";
 
-    return "Overdue"; // fallback
+        const now = new Date();
-}
+        const start = new Date(loa.start_date);
+        const end = new Date(loa.end_date);
+        const extension = new Date(loa.extended_till);
 
-async function cancelAndReload(id: number) {
+        if (now < start) return "Upcoming";
-    await cancelLOA(id, props.adminMode);
+        if (now >= start && (now <= end)) return "Active";
-    await loadLOAs();
+        if (now >= start && (now <= extension)) return "Extended";
-}
+        if (now > loa.extended_till || end) return "Overdue";
 
-const isExtending = ref(false);
+        return "Overdue"; // fallback
-const targetLOA = ref<LOARequest | null>(null);
+    }
-const extendTo = ref<CalendarDate | null>(null);
 
-const targetEnd = computed(() => { return targetLOA.value.extended_till ? targetLOA.value.extended_till : targetLOA.value.end_date })
+    async function cancelAndReload(id: number) {
+        await cancelLOA(id, props.adminMode);
+        await loadLOAs();
+    }
 
-function toCalendarDate(date: Date): CalendarDate {
+    const isExtending = ref(false);
-    if (typeof date === 'string')
+    const targetLOA = ref<LOARequest | null>(null);
-        date = new Date(date);
+    const extendTo = ref<CalendarDate | null>(null);
-    return new CalendarDate(date.getFullYear(), date.getMonth() + 1, date.getDate())
-}
 
-async function commitExtend() {
+    const targetEnd = computed(() => { return targetLOA.value.extended_till ? targetLOA.value.extended_till : targetLOA.value.end_date })
-    await extendLOA(targetLOA.value.id, extendTo.value.toDate(getLocalTimeZone()));
+    function toCalendarDate(date: Date): CalendarDate {
-    isExtending.value = false;
+        if (typeof date === 'string')
-    await loadLOAs();
+            date = new Date(date);
-}
+        return new CalendarDate(date.getFullYear(), date.getMonth() + 1, date.getDate())
+    }
 
-const expanded = ref<number | null>(null);
+    async function commitExtend() {
-const hoverID = ref<number | null>(null);
+        if (props.adminMode) {
+            await adminExtendLOA(targetLOA.value.id, extendTo.value.toDate(getLocalTimeZone()));
+        } else {
+            await extendLOA(targetLOA.value.id, extendTo.value.toDate(getLocalTimeZone()));
+        }
+        isExtending.value = false;
+        await loadLOAs();
+    }
 
-const pageNum = ref<number>(1);
+    const expanded = ref<number | null>(null);
-const pageData = ref<pagination>();
+    const hoverID = ref<number | null>(null);
 
-const pageSize = ref<number>(15)
+    const pageNum = ref<number>(1);
-const pageSizeOptions = [10, 15, 30]
+    const pageData = ref<pagination>();
 
-function setPageSize(size: number) {
+    const pageSize = ref<number>(15)
-    pageSize.value = size
+    const pageSizeOptions = [10, 15, 30]
-    pageNum.value = 1;
-    loadLOAs();
-}
 
-function setPage(pagenum: number) {
+    function setPageSize(size: number) {
-    pageNum.value = pagenum;
+        pageSize.value = size
-    loadLOAs();
+        pageNum.value = 1;
-}
+        loadLOAs();
+    }
+
+    function setPage(pagenum: number) {
+        pageNum.value = pagenum;
+        loadLOAs();
+    }
 </script>
 
 <template>
     <div>
         <Dialog :open="isExtending" @update:open="(val) => isExtending = val">
-            <DialogContent>
+            <DialogContent class="w-[95vw] max-w-[95vw] p-4 sm:max-w-fit sm:p-6">
-                <DialogHeader>
+                <DialogHeader class="gap-1 pr-12 text-left">
-                    <DialogTitle>Extend {{ targetLOA.name }}'s Leave of Absence </DialogTitle>
+                    <DialogTitle class="text-base leading-tight sm:text-lg">Extend Leave of Absence</DialogTitle>
+                    <DialogDescription class="truncate text-xs text-muted-foreground sm:text-sm">
+                        {{ targetLOA?.name }}
+                    </DialogDescription>
                 </DialogHeader>
-                <div class="flex gap-5">
+                <div class="flex flex-col gap-4 sm:flex-row sm:items-start sm:gap-5">
-                    <Calendar v-model="extendTo" class="rounded-md border shadow-sm w-min" layout="month-and-year"
+                    <Calendar v-model="extendTo"
+                        class="mx-auto w-min rounded-md border shadow-sm sm:mx-0"
+                        layout="month-and-year"
                         :min-value="toCalendarDate(targetEnd)"
-                        :max-value="toCalendarDate(targetEnd).add({ years: 1 })" />
+                        :max-value="props.adminMode ? toCalendarDate(targetEnd).add({ years: 1 }) : toCalendarDate(targetEnd).add({ months: 1 })" />
-                    <div class="flex flex-col w-full gap-3 px-2">
+                    <div class="flex w-full flex-col gap-2 sm:gap-3">
-                        <p>Quick Options</p>
+                        <p class="text-sm font-medium text-muted-foreground">Quick Options</p>
-                        <Button variant="outline" @click="extendTo = toCalendarDate(targetEnd).add({ days: 7 })">1
+                        <Button class="w-full" variant="outline" @click="extendTo = toCalendarDate(targetEnd).add({ days: 7 })">1
                             Week</Button>
-                        <Button variant="outline" @click="extendTo = toCalendarDate(targetEnd).add({ months: 1 })">1
+                        <Button class="w-full" variant="outline" @click="extendTo = toCalendarDate(targetEnd).add({ months: 1 })">1
                             Month</Button>
                     </div>
                 </div>
-                <div class="flex justify-end gap-4">
+                <div class="flex flex-row justify-end gap-2 pt-2 sm:gap-4 sm:pt-0">
-                    <Button variant="outline" @click="isExtending = false">Cancel</Button>
+                    <Button class="flex-1 sm:flex-none" variant="outline" @click="isExtending = false">Cancel</Button>
-                    <Button @click="commitExtend">Extend</Button>
+                    <Button class="flex-1 sm:flex-none" @click="commitExtend">Extend</Button>
                 </div>
             </DialogContent>
         </Dialog>
         <div class="max-w-7xl w-full mx-auto">
+            <div class="space-y-3 md:hidden">
+                <template v-for="post in LOAList" :key="`mobile-${post.id}`">
+                    <div class="rounded-lg border bg-card p-2.5 shadow-sm">
+                        <div class="grid grid-cols-[minmax(0,1fr)_auto] items-center gap-2">
+                            <div class="min-w-0 overflow-hidden">
+                                <div class="max-w-[70vw] overflow-hidden whitespace-nowrap">
+                                    <MemberCard :member-id="post.member_id"></MemberCard>
+                                </div>
+                            </div>
+                            <Badge v-if="loaStatus(post) === 'Upcoming'" class="shrink-0 bg-blue-400">Upcoming</Badge>
+                            <Badge v-else-if="loaStatus(post) === 'Active'" class="shrink-0 bg-green-500">Active</Badge>
+                            <Badge v-else-if="loaStatus(post) === 'Extended'" class="shrink-0 bg-green-500">Extended</Badge>
+                            <Badge v-else-if="loaStatus(post) === 'Overdue'" class="shrink-0 bg-yellow-400">Overdue</Badge>
+                            <Badge v-else class="shrink-0 bg-gray-400">Ended</Badge>
+                        </div>
+
+                        <div class="mt-1 grid grid-cols-2 gap-x-4 gap-y-1">
+                            <div>
+                                <p class="text-[11px] uppercase tracking-wide text-muted-foreground/90">Start</p>
+                                <p class="text-sm font-semibold text-foreground">{{ formatDate(post.start_date) }}</p>
+                            </div>
+                            <div class="text-right">
+                                <p class="text-[11px] uppercase tracking-wide text-muted-foreground/90">End</p>
+                                <p class="text-sm font-semibold text-foreground">{{ post.extended_till ? formatDate(post.extended_till) : formatDate(post.end_date) }}</p>
+                            </div>
+                        </div>
+
+                        <div class="mt-1 flex items-center justify-end gap-1">
+                            <Button variant="ghost" class="h-8 px-2 text-xs text-muted-foreground" @click="expanded = expanded === post.id ? null : post.id">
+                                <span class="mr-1">Details</span>
+                                <ChevronUp v-if="expanded === post.id" class="size-4" />
+                                <ChevronDown v-else class="size-4" />
+                            </Button>
+
+                            <DropdownMenu>
+                                <DropdownMenuTrigger class="cursor-pointer">
+                                    <Button variant="ghost" size="icon" class="size-8 text-muted-foreground">
+                                        <Ellipsis class="size-5"></Ellipsis>
+                                    </Button>
+                                </DropdownMenuTrigger>
+                                <DropdownMenuContent>
+                                    <DropdownMenuItem v-if="!post.closed"
+                                        :disabled="post.extended_till !== null && !props.adminMode"
+                                        @click="isExtending = true; targetLOA = post">
+                                        {{ (post.extended_till !== null && !props.adminMode) ? 'Extend (Already Extended)' : 'Extend' }}
+                                    </DropdownMenuItem>
+                                    <DropdownMenuItem v-if="!post.closed" :variant="'destructive'"
+                                        @click="cancelAndReload(post.id)">{{ loaStatus(post) === 'Upcoming' ?
+                                            'Cancel' :
+                                            'End' }}
+                                    </DropdownMenuItem>
+                                    <p v-if="post.closed || (!props.adminMode && post.closed)"
+                                        class="p-2 text-center text-sm">
+                                        No actions
+                                    </p>
+                                </DropdownMenuContent>
+                            </DropdownMenu>
+                        </div>
+
+                        <div v-if="expanded === post.id" class="mt-2 space-y-2.5 border-t pt-2 text-sm">
+                            <div class="space-y-1.5">
+                                <div class="flex items-center justify-between gap-3">
+                                    <span class="text-muted-foreground/90">Type</span>
+                                    <span class="text-right font-semibold text-foreground">{{ post.type_name }}</span>
+                                </div>
+                                <div class="flex items-center justify-between gap-3">
+                                    <span class="text-muted-foreground/90">Posted on</span>
+                                    <span class="text-right font-semibold text-foreground">{{ formatDate(post.filed_date) }}</span>
+                                </div>
+                                <div class="flex items-center justify-between gap-3">
+                                    <span class="text-muted-foreground/90">Original end</span>
+                                    <span class="text-right font-semibold text-foreground">{{ formatDate(post.end_date) }}</span>
+                                </div>
+                                <div class="flex items-center justify-between gap-3">
+                                    <span class="text-muted-foreground/90">Extended to</span>
+                                    <span class="text-right font-semibold text-foreground">{{ post.extended_till ? formatDate(post.extended_till) : 'N/A' }}</span>
+                                </div>
+                            </div>
+
+                            <div>
+                                <h4 class="text-[11px] font-semibold uppercase tracking-wide text-muted-foreground/90">Reason</h4>
+                                <p class="mt-1 whitespace-pre-wrap text-sm leading-relaxed text-foreground/90">
+                                    {{ post.reason || 'No reason provided.' }}
+                                </p>
+                            </div>
+                        </div>
+                    </div>
+                </template>
+            </div>
+
+            <div class="hidden overflow-x-auto md:block">
             <Table>
                 <TableHeader>
                     <TableRow>
@@ -205,9 +304,10 @@ function setPage(pagenum: number) {
                                         </Button>
                                     </DropdownMenuTrigger>
                                     <DropdownMenuContent>
-                                        <DropdownMenuItem v-if="!post.closed && props.adminMode"
+                                        <DropdownMenuItem v-if="!post.closed"
+                                            :disabled="post.extended_till !== null && !props.adminMode"
                                             @click="isExtending = true; targetLOA = post">
-                                            Extend
+                                             {{ (post.extended_till !== null && !props.adminMode) ? 'Extend (Already Extended)' : 'Extend' }}
                                         </DropdownMenuItem>
                                         <DropdownMenuItem v-if="!post.closed" :variant="'destructive'"
                                             @click="cancelAndReload(post.id)">{{ loaStatus(post) === 'Upcoming' ?
@@ -238,7 +338,7 @@ function setPage(pagenum: number) {
                                 <div class="w-full p-4 mb-6 space-y-4">
 
                                     <!-- Dates -->
-                                    <div class="grid grid-cols-3 gap-4 text-sm">
+                                    <div class="grid grid-cols-1 gap-4 text-sm lg:grid-cols-3">
                                         <div>
                                             <p class="text-muted-foreground">Start</p>
                                             <p class="font-medium">
@@ -256,22 +356,18 @@ function setPage(pagenum: number) {
                                         <div class="">
                                             <p class="text-muted-foreground">Extended to</p>
                                             <p class="font-medium text-foreground">
-                                                {{post.extended_till ? formatDate(post.extended_till) : 'N/A' }}
+                                                {{ post.extended_till ? formatDate(post.extended_till) : 'N/A' }}
                                             </p>
                                         </div>
                                     </div>
 
                                     <!-- Reason -->
-                                    <div class="space-y-2">
+                                    <div class="space-y-2 border-t pt-3">
-                                        <div class="flex items-center gap-2">
+                                        <h4 class="text-sm font-semibold text-foreground">
-                                            <h4 class="text-sm font-semibold text-foreground">
+                                            Reason
-                                                Reason
+                                        </h4>
-                                            </h4>
-                                            <Separator class="flex-1" />
-                                        </div>
 
-                                        <div
+                                        <div class="text-sm leading-relaxed whitespace-pre-wrap text-muted-foreground">
-                                            class="rounded-lg border bg-muted/40 px-4 py-3 text-sm leading-relaxed whitespace-pre-wrap text-muted-foreground">
                                             {{ post.reason || 'No reason provided.' }}
                                         </div>
                                     </div>
@@ -283,8 +379,9 @@ function setPage(pagenum: number) {
                     </template>
                 </TableBody>
             </Table>
-            <div class="mt-5 flex justify-between">
+            </div>
-                <div></div>
+            <div class="mt-5 flex flex-col gap-3 md:flex-row md:items-center md:justify-between">
+                <div class="hidden md:block"></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 }">
@@ -299,7 +396,7 @@ function setPage(pagenum: number) {
                         <PaginationNext />
                     </PaginationContent>
                 </Pagination>
-                <div class="flex items-center gap-3 text-sm">
+                <div class="flex items-center justify-end 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)"

ui/src/components/members/DischargeMember.vue

@@ -26,7 +26,10 @@ const props = defineProps<{
     member: Member | null
 }>()
 
-const emit = defineEmits(['update:open', 'discharged'])
+const emit = defineEmits<{
+    'update:open': [value: boolean]
+    'discharged': [value: { data: Discharge }]
+}>()
 
 const formSchema = toTypedSchema(dischargeSchema);
 

ui/src/components/members/TransferMember.vue

@@ -0,0 +1,250 @@
+<script setup lang="ts">
+import { computed, ref, watch } from 'vue'
+
+import { adminAssignUnit, getUnits } from '@/api/units'
+import { getAllRanks } from '@/api/rank'
+import { Button } from '@/components/ui/button'
+import {
+    Dialog,
+    DialogContent,
+    DialogDescription,
+    DialogFooter,
+    DialogHeader,
+    DialogTitle,
+} from '@/components/ui/dialog'
+import { Field, FieldError, FieldLabel } from '@/components/ui/field'
+import { Input } from '@/components/ui/input'
+import {
+    Select,
+    SelectContent,
+    SelectItem,
+    SelectTrigger,
+    SelectValue,
+} from '@/components/ui/select'
+import MemberCard from './MemberCard.vue'
+import type { Member } from '@shared/types/member'
+import type { Rank } from '@shared/types/rank'
+import type { Unit } from '@shared/types/units'
+
+const props = defineProps<{
+    open: boolean
+    member: Member | null
+}>()
+
+const emit = defineEmits<{
+    'update:open': [value: boolean]
+    transferred: [value: { memberId: number; unitId: number; rankId: number; reason: string }]
+}>()
+
+const units = ref<Unit[]>([])
+const ranks = ref<Rank[]>([])
+const loadingUnits = ref(false)
+const loadingRanks = ref(false)
+const submitting = ref(false)
+const formError = ref('')
+
+const selectedUnitId = ref('')
+const selectedRankId = ref('')
+const selectedReason = ref('transfer_request')
+const customReason = ref('')
+
+const reasonOptions = [
+    { label: 'Transfer Request', value: 'transfer_request' },
+    { label: 'Leadership Vote', value: 'leadership_vote' },
+    { label: 'Appointment', value: 'appointment' },
+    { label: 'Step Down', value: 'step_down' },
+    { label: 'Custom', value: 'custom' },
+]
+
+const resolvedReason = computed(() => {
+    if (selectedReason.value === 'custom') {
+        return customReason.value.trim()
+    }
+    return selectedReason.value
+})
+
+const canSubmit = computed(() => {
+    return !!props.member && !!selectedUnitId.value && !!selectedRankId.value && !!resolvedReason.value
+})
+
+function resolveDefaultRankId(member: Member | null): string {
+    if (!member || !member.rank) {
+        return ''
+    }
+
+    const normalizedMemberRank = member.rank.trim().toLowerCase()
+    const matchedRank = ranks.value.find((rank) => {
+        return rank.name.trim().toLowerCase() === normalizedMemberRank
+            || rank.short_name.trim().toLowerCase() === normalizedMemberRank
+    })
+
+    return matchedRank ? String(matchedRank.id) : ''
+}
+
+function resetForm() {
+    selectedUnitId.value = ''
+    selectedRankId.value = ''
+    selectedReason.value = 'transfer_request'
+    customReason.value = ''
+    formError.value = ''
+}
+
+async function loadUnits() {
+    loadingUnits.value = true
+    formError.value = ''
+    try {
+        units.value = await getUnits()
+    } catch {
+        formError.value = 'Failed to load units. Please try again.'
+    } finally {
+        loadingUnits.value = false
+    }
+}
+
+async function loadRanks() {
+    loadingRanks.value = true
+    formError.value = ''
+    try {
+        ranks.value = await getAllRanks()
+        selectedRankId.value = resolveDefaultRankId(props.member)
+    } catch {
+        formError.value = 'Failed to load ranks. Please try again.'
+    } finally {
+        loadingRanks.value = false
+    }
+}
+
+watch(
+    () => props.open,
+    (isOpen) => {
+        if (isOpen) {
+            resetForm()
+            loadUnits()
+            loadRanks()
+        }
+    },
+)
+
+async function onSubmit() {
+    if (!props.member) {
+        return
+    }
+
+    if (!selectedUnitId.value) {
+        formError.value = 'Please select a target unit.'
+        return
+    }
+
+    if (!selectedRankId.value) {
+        formError.value = 'Please select a target rank.'
+        return
+    }
+
+    if (!resolvedReason.value) {
+        formError.value = 'Please select a reason or enter a custom reason.'
+        return
+    }
+
+    submitting.value = true
+    formError.value = ''
+    try {
+        const unitId = Number(selectedUnitId.value)
+        const rankId = Number(selectedRankId.value)
+        await adminAssignUnit(props.member.member_id, unitId, rankId, resolvedReason.value)
+
+        emit('transferred', {
+            memberId: props.member.member_id,
+            unitId,
+            rankId,
+            reason: resolvedReason.value,
+        })
+        emit('update:open', false)
+    } catch {
+        formError.value = 'Failed to transfer member. Please try again.'
+    } finally {
+        submitting.value = false
+    }
+}
+</script>
+
+<template>
+    <Dialog :open="open" @update:open="emit('update:open', $event)">
+        <DialogContent class="sm:max-w-[425px]">
+            <DialogHeader>
+                <DialogTitle>Transfer Member</DialogTitle>
+                <DialogDescription>
+                    Select a new unit assignment for
+                    <MemberCard v-if="member" :member-id="member.member_id" />
+                </DialogDescription>
+            </DialogHeader>
+
+            <form id="transferForm" @submit.prevent="onSubmit" class="space-y-4 py-2">
+                <Field>
+                    <FieldLabel>Target Unit</FieldLabel>
+                    <Select v-model="selectedUnitId" :disabled="loadingUnits || submitting">
+                        <SelectTrigger>
+                            <SelectValue placeholder="Select unit" />
+                        </SelectTrigger>
+                        <SelectContent>
+                            <SelectItem v-for="unit in units" :key="unit.id" :value="String(unit.id)">
+                                {{ unit.name }}
+                            </SelectItem>
+                        </SelectContent>
+                    </Select>
+                </Field>
+
+                <Field>
+                    <FieldLabel>Target Rank</FieldLabel>
+                    <Select v-model="selectedRankId" :disabled="loadingRanks || submitting">
+                        <SelectTrigger>
+                            <SelectValue placeholder="Select rank" />
+                        </SelectTrigger>
+                        <SelectContent>
+                            <SelectItem v-for="rank in ranks" :key="rank.id" :value="String(rank.id)">
+                                {{ rank.name }}
+                            </SelectItem>
+                        </SelectContent>
+                    </Select>
+                </Field>
+
+                <Field>
+                    <FieldLabel>Reason</FieldLabel>
+                    <Select v-model="selectedReason" :disabled="submitting">
+                        <SelectTrigger>
+                            <SelectValue placeholder="Select reason" />
+                        </SelectTrigger>
+                        <SelectContent>
+                            <SelectItem
+                                v-for="reason in reasonOptions"
+                                :key="reason.value"
+                                :value="reason.value"
+                            >
+                                {{ reason.label }}
+                            </SelectItem>
+                        </SelectContent>
+                    </Select>
+                </Field>
+
+                <Field v-if="selectedReason === 'custom'">
+                    <FieldLabel>Custom Reason</FieldLabel>
+                    <Input
+                        v-model="customReason"
+                        :disabled="submitting"
+                        placeholder="Enter custom transfer reason"
+                    />
+                </Field>
+
+                <FieldError v-if="formError" :errors="[formError]" />
+            </form>
+
+            <DialogFooter class="gap-2">
+                <Button variant="ghost" @click="emit('update:open', false)">
+                    Cancel
+                </Button>
+                <Button type="submit" form="transferForm" :disabled="!canSubmit || loadingUnits || loadingRanks || submitting">
+                    {{ submitting ? 'Transferring...' : 'Transfer Member' }}
+                </Button>
+            </DialogFooter>
+        </DialogContent>
+    </Dialog>
+</template>

ui/src/components/promotions/promotionForm.vue

@@ -135,11 +135,7 @@ function setAllToday() {
     <div class="w-xl">
         <form v-if="!formSubmitted" id="trainingForm" @submit.prevent="submitForm"
             class="w-full min-w-0 flex flex-col gap-4">
-            <div>
+
-                <FieldLegend class="scroll-m-20 text-2xl font-semibold tracking-tight">
-                    Promotion Form
-                </FieldLegend>
-            </div>
             <VeeFieldArray name="promotions" v-slot="{ fields, push, remove }">
                 <FieldSet class="w-full min-w-0">
                     <div class="flex flex-col gap-2">

ui/src/components/ui/dialog/DialogContent.vue

@@ -47,7 +47,7 @@ const forwarded = useForwardPropsEmits(delegatedProps, emits);
       <slot />
 
       <DialogClose
-        class="ring-offset-background focus:ring-ring data-[state=open]:bg-accent data-[state=open]:text-muted-foreground absolute top-4 right-4 rounded-xs opacity-70 transition-opacity hover:opacity-100 focus:ring-2 focus:ring-offset-2 focus:outline-hidden disabled:pointer-events-none [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4"
+        class="ring-offset-background focus:ring-ring data-[state=open]:bg-accent data-[state=open]:text-muted-foreground absolute top-3.5 right-3.5 inline-flex h-9 w-9 items-center justify-center rounded-xs opacity-70 transition-opacity hover:opacity-100 focus:ring-2 focus:ring-offset-2 focus:outline-hidden disabled:pointer-events-none sm:top-4 sm:right-4 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-5"
       >
         <X />
         <span class="sr-only">Close</span>

ui/src/pages/Calendar.vue

@@ -227,6 +227,9 @@ onMounted(() => {
 /* Ensure the calendar fills the container properly */
 :global(.fc) {
     height: 100% !important;
+    --fc-page-bg-color: transparent;
+    --fc-neutral-bg-color: color-mix(in srgb, var(--color-foreground) 8%, transparent);
+    --fc-neutral-text-color: var(--color-muted-foreground);
     --fc-border-color: var(--color-border);
     --fc-button-bg-color: transparent;
     --fc-button-border-color: var(--color-border);
@@ -299,6 +302,7 @@ onMounted(() => {
 :global(.fc .fc-scrollgrid td),
 :global(.fc .fc-scrollgrid th) {
     border-color: var(--color-border);
+    background: var(--fc-page-bg-color);
 }
 
 /* ---------- Built-in toolbar (if you keep it) ---------- */
@@ -346,9 +350,7 @@ onMounted(() => {
     text-decoration: none;
 }
 
-:global(#app > div > div.flex-1.min-h-0 > div > div > div > div.fc.fc-media-screen.fc-direction-ltr.fc-theme-standard > div.fc-view-harness.fc-view-harness-passive > div > table > thead > tr > th) {
+
-    background-color: transparent;
-}
 :global(.fc .fc-daygrid-day-top) {
     padding: 8px 8px 0 8px;
 }

ui/src/pages/DeveloperTools.vue

@@ -0,0 +1,52 @@
+<script setup lang="ts">
+import Button from '@/components/ui/button/Button.vue';
+import { bustUserCache } from '@/api/member';
+import type { UserCacheBustResult } from '@shared/types/member';
+import { ref } from 'vue';
+
+const loading = ref(false);
+const result = ref<UserCacheBustResult | null>(null);
+const error = ref<string | null>(null);
+
+async function onBustUserCache() {
+    loading.value = true;
+    error.value = null;
+
+    try {
+        result.value = await bustUserCache();
+    } catch (err) {
+        result.value = null;
+        error.value = err instanceof Error ? err.message : 'Failed to bust user cache';
+    } finally {
+        loading.value = false;
+    }
+}
+</script>
+
+<template>
+    <div class="max-w-3xl mx-auto pt-10 px-4">
+        <h1 class="scroll-m-20 text-2xl font-semibold tracking-tight">Developer Tools</h1>
+        <p class="mt-2 text-sm text-muted-foreground">
+            Use this page to recover from stale in-memory authentication data after manual database changes.
+        </p>
+
+        <div class="mt-6 rounded-lg border p-5 bg-card">
+            <p class="font-medium">Server User Cache</p>
+            <p class="text-sm text-muted-foreground mt-1">
+                This clears the API server's cached user session data so the next request reloads from the database.
+            </p>
+
+            <div class="mt-4 flex items-center gap-3">
+                <Button :disabled="loading" @click="onBustUserCache">
+                    {{ loading ? 'Busting Cache...' : 'Bust User Cache' }}
+                </Button>
+            </div>
+
+            <p v-if="result" class="mt-4 text-sm text-green-700">
+                Cache busted successfully. Cleared {{ result.clearedEntries }} entr{{ result.clearedEntries === 1 ? 'y' : 'ies' }} at
+                {{ new Date(result.bustedAt).toLocaleString() }}.
+            </p>
+            <p v-if="error" class="mt-4 text-sm text-red-700">{{ error }}</p>
+        </div>
+    </div>
+</template>

ui/src/pages/ManageLOA.vue

@@ -19,17 +19,20 @@ const showLOADialog = ref(false);
 <template>
     <div>
         <Dialog v-model:open="showLOADialog" v-on:update:open="showLOADialog = false">
-            <DialogContent class="sm:max-w-fit">
+            <DialogContent class="w-[95vw] max-w-[95vw] max-h-[90dvh] overflow-y-auto p-4 sm:max-w-fit sm:p-6">
                 <DialogHeader>
                     <DialogTitle>Post LOA</DialogTitle>
                     <DialogDescription>
                         Post an LOA on behalf of a member.
                     </DialogDescription>
                 </DialogHeader>
-                <LoaForm :admin-mode="true" class="my-3"></LoaForm>
+                <LoaForm :admin-mode="true"></LoaForm>
+                <DialogFooter>
+                    <Button variant="outline" @click="showLOADialog = false">Cancel</Button>
+                </DialogFooter>
             </DialogContent>
         </Dialog>
-        <div class="max-w-5xl mx-auto pt-10">
+        <div class="mx-auto max-w-5xl px-3 pt-10 sm:px-4 lg:px-0">
             <div class="flex justify-between mb-4">
                 <h1 class="scroll-m-20 text-2xl font-semibold tracking-tight">LOA Log</h1>
                 <div>

ui/src/pages/RankChange.vue

@@ -1,29 +1,48 @@
+<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'
+
+const isFormOpen = ref(false)
+const listRef = ref(null)
+
+const isMobileFormOpen = ref(false);
+</script>
+
 <template>
     <div class="mx-auto mt-6 lg:mt-10 px-4 lg:px-8">
 
-        <div class="flex items-center justify-between mb-6 lg:hidden">
+        <div class="flex flex-col items-center justify-between mb-6 lg:hidden">
-            <h1 class="text-2xl font-semibold tracking-tight">Promotion History</h1>
+            <div v-if="isMobileFormOpen">
-
+                <div class="mb-4 flex justify-between items-center">
-            <Dialog v-model:open="isFormOpen">
+                    <p class="scroll-m-20 text-2xl font-semibold tracking-tight">
-                <DialogTrigger as-child>
+                        Promotion Form
-                    <Button size="sm" class="gap-2">
+                    </p>
-                        <Plus class="size-4" />
+                    <Button variant="ghost" size="icon" @click="isMobileFormOpen = false">
-                        Promote
+                        <X v-if="isMobileFormOpen" class="size-6"></X>
                     </Button>
-                </DialogTrigger>
+                </div>
-                <DialogContent class="w-full h-full max-w-none m-0 rounded-none flex flex-col">
+                <PromotionForm @submitted="listRef?.refresh" />
-                    <DialogHeader class="flex-row items-center justify-between border-b pb-4">
+            </div>
-                        <DialogTitle>New Promotion</DialogTitle>
+            <div v-else>
-                    </DialogHeader>
+                <div class="flex justify-between w-full">
-
+                    <h1 class="text-2xl font-semibold tracking-tight">Promotion History</h1>
-                    <div class="flex-1 overflow-y-auto pt-6">
+                    <Button @click="isMobileFormOpen = true">
-                        <PromotionForm @submitted="handleMobileSubmit" />
+                        <PlusIcon />Submit
-                    </div>
+                    </Button>
-                </DialogContent>
+                </div>
-            </Dialog>
+                <PromotionList></PromotionList>
+            </div>
         </div>
 
-        <div class="flex flex-col lg:flex-row lg:max-h-[70vh] gap-8">
+        <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
@@ -41,25 +60,4 @@
             </div>
         </div>
     </div>
-</template>
+</template>
-
-<script setup>
-import { ref } from 'vue'
-import { Plus } 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'
-
-const isFormOpen = ref(false)
-const listRef = ref(null)
-
-const handleMobileSubmit = () => {
-    isFormOpen.value = false // Close the "Whole page" modal
-    listRef.value?.refresh()  // Refresh the list behind it
-}
-</script>

ui/src/pages/SubmitLOA.vue

@@ -11,7 +11,7 @@ const mode = ref<'submit' | 'view'>('submit')
 </script>
 
 <template>
-    <div class="max-w-5xl mx-auto flex w-full flex-col mt-4 mb-10">
+    <div class="mx-auto mt-4 mb-10 flex w-full max-w-5xl flex-col px-3 sm:px-4 lg:px-0">
         <div class="mb-8">
             <p class="scroll-m-20 text-2xl font-semibold tracking-tight">Leave of Absence</p>
             <div class="pt-3">

ui/src/pages/TrainingReport.vue

@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import { getTrainingReport, getTrainingReports } from '@/api/trainingReport';
 import { CourseAttendee, CourseEventDetails, CourseEventSummary } from '@shared/types/course';
-import { computed, onMounted, ref, watch } from 'vue';
+import { computed, onBeforeUnmount, onMounted, ref, watch } from 'vue';
 import {
     Table,
     TableBody,
@@ -10,7 +10,7 @@ import {
     TableHeader,
     TableRow,
 } from '@/components/ui/table'
-import { ArrowUpDown, ChevronDown, ChevronUp, Funnel, Link, Plus, Search, X } from 'lucide-vue-next';
+import { ArrowUpDown, ChevronDown, ChevronLeft, 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';
@@ -49,6 +49,21 @@ const sidePanel = computed<sidePanelState>(() => {
     return sidePanelState.closed;
 })
 
+const isMobile = ref(false);
+const mobilePanel = ref<sidePanelState>(sidePanelState.closed);
+let mobileMediaQuery: MediaQueryList | null = null;
+
+function syncMobileMode() {
+    isMobile.value = mobileMediaQuery?.matches ?? window.innerWidth < 1024;
+    if (!isMobile.value) {
+        mobilePanel.value = sidePanelState.closed;
+    }
+}
+
+const effectivePanel = computed<sidePanelState>(() => {
+    return isMobile.value ? mobilePanel.value : sidePanel.value;
+})
+
 watch(() => route.params.id, async (newID) => {
     if (!newID) {
         focusedTrainingReport.value = null;
@@ -82,6 +97,41 @@ async function closeTrainingReport() {
     focusedTrainingReport.value = null;
 }
 
+async function openTrainingReport(id: number) {
+    if (isMobile.value) {
+        focusedTrainingReport.value = null;
+        TRLoaded.value = false;
+        expanded.value = null;
+        mobilePanel.value = sidePanelState.view;
+        await viewTrainingReport(id);
+        return;
+    }
+
+    router.push(`/trainingReport/${id}`);
+}
+
+function openCreatePanel() {
+    if (isMobile.value) {
+        mobilePanel.value = sidePanelState.create;
+        focusedTrainingReport.value = null;
+        return;
+    }
+
+    router.push('/trainingReport/new');
+}
+
+async function closePanel() {
+    if (isMobile.value) {
+        mobilePanel.value = sidePanelState.closed;
+        focusedTrainingReport.value = null;
+        TRLoaded.value = false;
+        expanded.value = null;
+        return;
+    }
+
+    await closeTrainingReport();
+}
+
 const sortMode = ref<string>("descending");
 const searchString = ref<string>("");
 let debounceTimer: ReturnType<typeof setTimeout> | null = null;
@@ -105,12 +155,20 @@ async function loadTrainingReports() {
 }
 
 onMounted(async () => {
+    mobileMediaQuery = window.matchMedia('(max-width: 1023px)');
+    syncMobileMode();
+    mobileMediaQuery.addEventListener('change', syncMobileMode);
+
     await loadTrainingReports();
     if (route.params.id)
         viewTrainingReport(Number(route.params.id))
     loaded.value = true;
 })
 
+onBeforeUnmount(() => {
+    mobileMediaQuery?.removeEventListener('change', syncMobileMode);
+})
+
 const TRLoaded = ref(false);
 
 const pageNum = ref<number>(1);
@@ -119,6 +177,16 @@ const pageData = ref<pagination>();
 const pageSize = ref<number>(15)
 const pageSizeOptions = [10, 15, 30]
 
+function formatDate(date: Date | string): string {
+    if (!date) return '';
+    const dateObj = typeof date === 'string' ? new Date(date) : date;
+    return dateObj.toLocaleDateString('en-US', {
+        year: 'numeric',
+        month: 'short',
+        day: 'numeric',
+    });
+}
+
 function setPageSize(size: number) {
     pageSize.value = size
     pageNum.value = 1;
@@ -134,21 +202,22 @@ const expanded = ref<number>(null);
 </script>
 
 <template>
-    <div class="px-20 mx-auto max-w-[100rem] w-full flex mt-5">
+    <div class="mx-auto mt-5 flex w-full max-w-[100rem] flex-col px-3 sm:px-4 lg:flex-row lg:px-8 xl:px-20">
         <!-- training report list -->
-        <div class="px-4 my-3" :class="sidePanel == sidePanelState.closed ? 'w-full' : 'w-2/5'">
+        <div v-show="!isMobile || effectivePanel === sidePanelState.closed" class="my-3 px-0 lg:px-4"
+            :class="effectivePanel == sidePanelState.closed ? 'w-full' : 'w-full lg:w-2/5'">
             <div class="flex justify-between mb-4">
                 <p class="scroll-m-20 text-2xl font-semibold tracking-tight">Training Reports</p>
-                <Button @click="router.push('/trainingReport/new')">
+                <Button @click="openCreatePanel()">
                     <Plus></Plus> New Training Report
                 </Button>
             </div>
             <!-- search/filter -->
-            <div class="flex justify-between">
+            <div class="flex flex-col gap-3 sm:flex-row sm:items-end sm:justify-between">
                 <!-- <Search></Search>
                 <Funnel></Funnel> -->
                 <div></div>
-                <div class="flex flex-row gap-5">
+                <div class="flex flex-col gap-3 sm:flex-row sm:gap-5">
                     <div>
                         <label class="text-muted-foreground">Search</label>
                         <Input v-model="searchString" placeholder="Search..."></Input>
@@ -172,7 +241,24 @@ const expanded = ref<number>(null);
                     </div>
                 </div>
             </div>
-            <div class="overflow-y-auto max-h-[70vh] mt-5 scrollbar-themed">
+            <div class="mt-5">
+                <div class="space-y-2 md:hidden">
+                    <button v-for="report in trainingReports" :key="`mobile-report-${report.event_id}`"
+                        class="w-full rounded-lg border bg-card px-3 py-2 text-left transition-colors hover:bg-muted/40"
+                        @click="openTrainingReport(report.event_id)">
+                        <p class="font-semibold text-foreground">
+                            {{ report.course_name.length > 35 ? report.course_shortname : report.course_name }}
+                        </p>
+                        <p class="mt-1 text-sm text-muted-foreground">{{ formatDate(report.date) }}</p>
+                        <div class="mt-2 flex items-center gap-2 text-xs text-muted-foreground">
+                            <span class="font-medium">Posted by:</span>
+                            <MemberCard v-if="report.created_by" :member-id="report.created_by"></MemberCard>
+                            <span v-else>Unknown User</span>
+                        </div>
+                    </button>
+                </div>
+
+                <div class="hidden md:block">
                 <Table>
                     <TableHeader class="">
                         <TableRow>
@@ -187,12 +273,12 @@ const expanded = ref<number>(null);
                     </TableHeader>
                     <TableBody v-if="loaded">
                         <TableRow class="cursor-pointer" v-for="report in trainingReports" :key="report.event_id"
-                            @click="router.push(`/trainingReport/${report.event_id}`)">
+                            @click="openTrainingReport(report.event_id)">
                             <TableCell class="font-medium">{{ report.course_name.length > 30 ? report.course_shortname :
                                 report.course_name }}</TableCell>
                             <TableCell>{{ report.date.split('T')[0] }}</TableCell>
                             <TableCell class="text-right">
-                                <MemberCard v-if="report.created_by_name" :member-id="report.created_by"></MemberCard>
+                                <MemberCard v-if="report.created_by" :member-id="report.created_by"></MemberCard>
                                 <span v-else>Unknown User</span>
                             </TableCell>
                             <!-- <TableCell class="text-right">{{ report.created_by_name === null ? "Unknown User" :
@@ -201,10 +287,11 @@ const expanded = ref<number>(null);
                         </TableRow>
                     </TableBody>
                 </Table>
+                </div>
             </div>
-            <div class="mt-5 flex justify-between"
+            <div class="mt-5 flex flex-col gap-3 md:flex-row md:items-center md:justify-between"
-                :class="sidePanel !== sidePanelState.closed ? 'flex-col items-center' : 'items-center justify-between'">
+                :class="effectivePanel !== sidePanelState.closed ? 'items-center' : ''">
-                <div></div>
+                <div class="hidden md:block"></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 }">
@@ -219,8 +306,9 @@ const expanded = ref<number>(null);
                         <PaginationNext />
                     </PaginationContent>
                 </Pagination>
-                <div class="flex items-center gap-3 text-sm" :class="sidePanel !== sidePanelState.closed ? 'mt-3' : ''">
+                <div class="flex flex-wrap items-center justify-end gap-2 text-sm"
-                    <p class="text-muted-foreground text-nowrap">Per page:</p>
+                    :class="effectivePanel !== sidePanelState.closed ? 'w-full justify-center md:w-auto md:justify-end' : ''">
+                    <p class="text-muted-foreground">Per page:</p>
 
                     <button v-for="size in pageSizeOptions" :key="size" @click="setPageSize(size)"
                         class="px-2 py-1 rounded transition-colors" :class="{
@@ -234,31 +322,35 @@ const expanded = ref<number>(null);
 
         </div>
         <!-- view training report section -->
-        <div v-if="focusedTrainingReport != null && sidePanel == sidePanelState.view" class="pl-9 my-3 border-l w-3/5">
+        <div v-if="focusedTrainingReport != null && effectivePanel == sidePanelState.view"
+            :class="isMobile
+                ? 'fixed inset-0 z-[60] overflow-y-auto bg-background px-3 py-3'
+                : 'my-3 mt-2 w-full lg:mt-0 lg:w-3/5 lg:border-l lg:pl-9'">
             <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()">
+                    <Button v-if="isMobile" @click="closePanel" class="cursor-pointer" variant="outline" size="sm">
+                        <ChevronLeft class="size-4"></ChevronLeft> Back
+                    </Button>
+                    <Button v-else class="cursor-pointer" variant="ghost" size="icon" @click="CopyLink()">
                         <Link class="size-4" />
                     </Button>
-                    <Button @click="closeTrainingReport" class="cursor-pointer" variant="ghost" size="icon">
+                    <Button v-if="!isMobile" @click="closePanel" 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 v-if="TRLoaded" :class="isMobile ? 'my-3 pb-8' : 'max-h-[70vh] overflow-auto scrollbar-themed my-5'">
                 <div class="flex flex-col mb-5 border rounded-lg bg-muted/70 p-2 py-3 px-4">
                     <p class="scroll-m-20 text-xl font-semibold tracking-tight">{{ focusedTrainingReport.course_name }}
                     </p>
                     <div class="flex gap-10 items-center">
-                        <p class="text-muted-foreground">{{ focusedTrainingReport.event_date.split('T')[0] }}</p>
+                        <p class="text-muted-foreground">{{ formatDate(focusedTrainingReport.event_date) }}</p>
-                        <p class="flex gap-2 items-center">Created by:
+                        <div class="flex gap-2 items-center">Created by:
                             <MemberCard v-if="focusedTrainingReport.created_by"
                                 :member-id="focusedTrainingReport.created_by" />
-                        <p v-else>{{ focusedTrainingReport.created_by_name === null ? "Unknown User" :
+                            <span v-else>Unknown User</span>
-                            focusedTrainingReport.created_by_name
+                        </div>
-                            }}</p>
-                        </p>
                     </div>
                 </div>
                 <div class="flex flex-col gap-8 ">
@@ -452,18 +544,31 @@ const expanded = ref<number>(null);
                 <Spinner class="size-8"></Spinner>
             </div>
         </div>
-        <div v-if="sidePanel == sidePanelState.create" class="pl-7 border-l w-3/5 max-w-5xl">
+        <div v-if="effectivePanel == sidePanelState.create" :class="isMobile
+            ? 'fixed inset-0 z-[60] overflow-y-auto bg-background px-3 py-3'
+            : 'mt-2 w-full max-w-5xl lg:mt-0 lg:w-3/5 lg:border-l lg:pl-7'">
             <div class="flex justify-between items-center my-3">
-                <div class="flex pl-2 gap-5">
+                <div class="flex gap-5 lg:pl-2">
                     <p class="scroll-m-20 text-2xl font-semibold tracking-tight">New Training Report</p>
                 </div>
-                <Button @click="closeTrainingReport" class="cursor-pointer" variant="ghost" size="icon">
+                <Button v-if="isMobile" @click="closePanel" class="cursor-pointer" variant="outline" size="sm">
+                    <ChevronLeft class="size-4"></ChevronLeft> Back
+                </Button>
+                <Button v-else @click="closePanel" class="cursor-pointer" variant="ghost" size="icon">
                     <X class="size-6"></X>
                 </Button>
             </div>
-            <div class="overflow-y-auto max-h-[70vh] mt-5 scrollbar-themed">
+            <div :class="isMobile ? 'mt-3 pb-8' : 'overflow-y-auto max-h-[70vh] mt-5 scrollbar-themed'">
-                <TrainingReportForm class="w-full pl-2"
+                <TrainingReportForm class="w-full lg:pl-2"
-                    @submit="(newID) => { router.push(`/trainingReport/${newID}`); loadTrainingReports() }">
+                    @submit="async (newID) => {
+                        if (isMobile) {
+                            await viewTrainingReport(newID);
+                            mobilePanel = sidePanelState.view;
+                        } else {
+                            router.push(`/trainingReport/${newID}`);
+                        }
+                        loadTrainingReports()
+                    }">
                 </TrainingReportForm>
             </div>
         </div>

ui/src/pages/memberList.vue

@@ -32,6 +32,9 @@
     import Spinner from "@/components/ui/spinner/Spinner.vue";
     import DischargeMember from "@/components/members/DischargeMember.vue";
     import MemberCard from "@/components/members/MemberCard.vue";
+    import { useMemberDirectory } from "@/stores/memberDirectory";
+    import { Discharge } from "@shared/schemas/dischargeSchema";
+    import TransferMember from "@/components/members/TransferMember.vue";
 
     // --- State ---
     const router = useRouter();
@@ -139,25 +142,41 @@
 
     //discharge form logic
     const isDischargeOpen = ref(false)
-    const targetMember = ref(null)
+    const isTransferOpen = ref(false)
+    const targetMember = ref<Member | null>(null)
 
     function openDischargeModal(member: Member) {
         targetMember.value = member
         isDischargeOpen.value = true
     }
 
+    function openTransferModal(member: Member) {
+        targetMember.value = member
+        isTransferOpen.value = true
+    }
+
     async function onSuspend(member: Member) {
         await suspendMember(member.member_id);
         await fetchMembers();
+        memberCache.invalidateMember(member.member_id);
     }
 
     async function onUnsuspend(member: Member) {
         await unsuspendMember(member.member_id);
         await fetchMembers();
+        memberCache.invalidateMember(member.member_id);
     }
 
-    function handleDischargeSuccess(data) {
+    const memberCache = useMemberDirectory();
+
+    function handleDischargeSuccess(value: { data: Discharge }) {
         fetchMembers();
+        memberCache.invalidateMember(value.data.userID);
+    }
+
+    function handleTransferSuccess(value: { memberId: number; unitId: number; rankId: number; reason: string }) {
+        fetchMembers();
+        memberCache.invalidateMember(value.memberId);
     }
 </script>
 
@@ -165,6 +184,8 @@
     <div>
         <DischargeMember v-model:open="isDischargeOpen" :member="targetMember" @discharged="handleDischargeSuccess">
         </DischargeMember>
+        <TransferMember v-model:open="isTransferOpen" :member="targetMember" @transferred="handleTransferSuccess">
+        </TransferMember>
         <div class="mx-auto max-w-7xl w-full py-10 px-4">
             <div class="flex flex-col gap-2">
                 <div class="flex flex-col md:flex-row md:items-center justify-between gap-4">
@@ -245,7 +266,8 @@
                                 <TableCell>{{ member.rank }}</TableCell>
                                 <TableCell>{{ member.unit }}</TableCell>
                                 <TableCell>
-                                    <Badge variant="outline" class="capitalize font-normal">{{ MemberState[member.member_state] }}</Badge>
+                                    <Badge variant="outline" class="capitalize font-normal">{{
+                                        MemberState[member.member_state] }}</Badge>
                                 </TableCell>
                                 <TableCell>
                                     <Badge v-if="member.loa_until" variant="secondary"
@@ -262,11 +284,17 @@
                                             <!-- <DropdownMenuItem @click="navigateToMember(member.member_id)">
                                                 View Profile
                                             </DropdownMenuItem> -->
-                                            <DropdownMenuItem @click="openDischargeModal(member)"
+                                            <DropdownMenuItem v-if="member.member_state === MemberState.Member"
+                                                @click="openTransferModal(member)">
+                                                Transfer Member
+                                            </DropdownMenuItem>
+                                            <DropdownMenuItem v-if="member.member_state !== MemberState.Discharged"
+                                                @click="openDischargeModal(member)"
                                                 class="text-destructive focus:bg-destructive focus:text-destructive-foreground font-medium">
                                                 Discharge Member
                                             </DropdownMenuItem>
-                                            <DropdownMenuItem v-if="member.member_state !== MemberState.Suspended" @click="onSuspend(member)"
+                                            <DropdownMenuItem v-if="member.member_state !== MemberState.Suspended"
+                                                @click="onSuspend(member)"
                                                 class="text-destructive focus:bg-destructive focus:text-destructive-foreground font-medium">
                                                 Suspend Member
                                             </DropdownMenuItem>

ui/src/router/index.ts

@@ -28,10 +28,12 @@ const router = createRouter({
     { path: '/trainingReport/new', component: () => import('@/pages/TrainingReport.vue'), meta: { requiresAuth: true, memberOnly: true } },
     { path: '/trainingReport/:id', component: () => import('@/pages/TrainingReport.vue'), meta: { requiresAuth: true, memberOnly: true } },
 
+    { path: '/developer', component: () => import('@/pages/DeveloperTools.vue'), meta: { requiresAuth: true, memberOnly: true, roles: ['Dev'] } },
+
     // ADMIN / STAFF ROUTES
     {
       path: '/administration',
-      meta: { requiresAuth: true, memberOnly: true, roles: ['17th Administrator', '17th HQ', '17th Command'] },
+      meta: { requiresAuth: true, memberOnly: true, roles: ['17th Administrator', '17th HQ', '17th Command', '17th Recruiter'] },
       children: [
         { path: 'applications', component: () => import('@/pages/ManageApplications.vue') },
         { path: 'applications/:id', component: () => import('@/pages/ManageApplications.vue') },