Merge pull request 'Calendar-attendance-fix' (#108) from Calendar-attendance-fix into main

Reviewed-on: #108

.gitea/workflows/cd-deploy.yaml

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

api/src/index.ts

@@ -1,11 +1,15 @@
-const dotenv = require('dotenv')
+import dotenv = require('dotenv');
 dotenv.config();
 
-const express = require('express')
+import express = require('express');
-const cors = require('cors')
+import cors = require('cors');
-const morgan = require('morgan')
+import morgan = require('morgan');
 const app = express()
-app.use(morgan('dev'))
+app.use(morgan('dev', {
+  skip: (req) => {
+    return req.path === '/members/me';
+  }
+}))
 
 app.use(cors({
   origin: [process.env.CLIENT_URL], // your SPA origins
@@ -19,7 +23,7 @@ app.set('trust proxy', 1);
 const port = process.env.SERVER_PORT;
 
 //glitchtip setup
-const sentry = require('@sentry/node');
+import sentry = require('@sentry/node');
 if (process.env.DISABLE_GLITCHTIP === "true") {
   console.log("Glitchtip disabled")
 } else {
@@ -27,14 +31,14 @@ if (process.env.DISABLE_GLITCHTIP === "true") {
   let release = process.env.APPLICATION_VERSION;
   let environment = process.env.APPLICATION_ENVIRONMENT;
   console.log(release, environment)
-  sentry.init({ dsn: dsn, release: release, environment: environment });
+  sentry.init({ dsn: dsn, release: release, environment: environment, integrations: [sentry.captureConsoleIntegration({ levels: ['error'] })] });
   console.log("Glitchtip initialized");
 }
 
 //session setup
-const path = require('path')
+import path = require('path');
-const session = require('express-session')
+import session = require('express-session');
-const passport = require('passport')
+import passport = require('passport');
 const SQLiteStore = require('connect-sqlite3')(session);
 
 app.use(session({
@@ -51,23 +55,21 @@ app.use(session({
 app.use(passport.authenticate('session'));
 
 // Mount route modules
-const applicationsRouter = require('./routes/applications');
+import { applicationRouter } from './routes/applications';
-const { memberRanks, ranks } = require('./routes/ranks');
+import { memberRanks, ranks } from './routes/ranks';
-const members = require('./routes/members');
+import { memberRouter } from './routes/members';
-const loaHandler = require('./routes/loa')
+import { loaRouter } from './routes/loa';
-const { status, memberStatus } = require('./routes/statuses')
+import { status, memberStatus } from './routes/statuses';
-const authRouter = require('./routes/auth')
+import { authRouter } from './routes/auth';
-const { roles, memberRoles } = require('./routes/roles');
+import { roles, memberRoles } from './routes/roles';
-const { courseRouter, eventRouter } = require('./routes/course');
+import { courseRouter, eventRouter } from './routes/course';
-const { calendarRouter } = require('./routes/calendar')
+import { calendarRouter } from './routes/calendar';
-const morgan = require('morgan');
-const { env } = require('process');
 
-app.use('/application', applicationsRouter);
+app.use('/application', applicationRouter);
 app.use('/ranks', ranks);
 app.use('/memberRanks', memberRanks);
-app.use('/members', members);
+app.use('/members', memberRouter);
-app.use('/loa', loaHandler);
+app.use('/loa', loaRouter);
 app.use('/status', status)
 app.use('/memberStatus', memberStatus)
 app.use('/roles', roles)

api/src/middleware/auth.ts

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

api/src/routes/applications.ts

@@ -3,12 +3,14 @@ const router = express.Router();
 
 import pool from '../db';
 import { approveApplication, createApplication, denyApplication, getAllMemberApplications, getApplicationByID, getApplicationComments, getApplicationList, getMemberApplication } from '../services/applicationService';
-import { MemberState, setUserState } from '../services/memberService';
+import { setUserState } from '../services/memberService';
+import { MemberState } from '@app/shared/types/member';
 import { getRankByName, insertMemberRank } from '../services/rankService';
 import { ApplicationFull, CommentRow } from "@app/shared/types/application"
 import { assignUserToStatus } from '../services/statusService';
 import { Request, response, Response } from 'express';
 import { getUserRoles } from '../services/rolesService';
+import { requireLogin, requireRole } from '../middleware/auth';
 
 //get CoC
 router.get('/coc', async (req: Request, res: Response) => {
@@ -29,7 +31,7 @@ router.get('/coc', async (req: Request, res: Response) => {
 
 
 // POST /application
-router.post('/', async (req, res) => {
+router.post('/', [requireLogin], async (req, res) => {
   try {
     const App = req.body?.App || {};
     const memberID = req.user.id;
@@ -47,7 +49,7 @@ router.post('/', async (req, res) => {
 });
 
 // GET /application/all
-router.get('/all', async (req, res) => {
+router.get('/all', [requireLogin, requireRole("Recruiter")], async (req, res) => {
   try {
     const rows = await getApplicationList();
     res.status(200).json(rows);
@@ -71,7 +73,7 @@ router.get('/meList', async (req, res) => {
   }
 })
 
-router.get('/me', async (req, res) => {
+router.get('/me', [requireLogin], async (req, res) => {
 
   let userID = req.user.id;
 
@@ -96,7 +98,7 @@ router.get('/me', async (req, res) => {
 })
 
 // GET /application/:id
-router.get('/me/:id', async (req: Request, res: Response) => {
+router.get('/me/:id', [requireLogin], async (req: Request, res: Response) => {
   let appID = Number(req.params.id);
   let member = req.user.id;
   try {
@@ -123,22 +125,10 @@ router.get('/me/:id', async (req: Request, res: Response) => {
 });
 
 // GET /application/:id
-router.get('/:id', async (req: Request, res: Response) => {
+router.get('/:id', [requireLogin, requireRole("Recruiter")], async (req: Request, res: Response) => {
   let appID = Number(req.params.id);
   let asAdmin = !!req.query.admin || false;
-  let user = req.user.id;
 
-  //TODO: Replace this with bigger authorization system eventually
-  if (asAdmin) {
-    let allowed = (await getUserRoles(user)).some((role) =>
-      role.name.toLowerCase() === 'dev' ||
-      role.name.toLowerCase() === 'recruiter' ||
-      role.name.toLowerCase() === 'administrator')
-    console.log(allowed)
-    if (!allowed) {
-      return res.sendStatus(403)
-    }
-  }
   try {
     const application = await getApplicationByID(appID);
     if (application === undefined)
@@ -159,27 +149,19 @@ router.get('/:id', async (req: Request, res: Response) => {
 });
 
 // POST /application/approve/:id
-router.post('/approve/:id', async (req: Request, res: Response) => {
+router.post('/approve/:id', [requireLogin, requireRole("Recruiter")], async (req: Request, res: Response) => {
   const appID = Number(req.params.id);
   const approved_by = req.user.id;
 
   try {
     const app = await getApplicationByID(appID);
-    const result = await approveApplication(appID);
+    await approveApplication(appID, approved_by);
-
-    //guard against failures
-    if (result.affectedRows != 1) {
-      throw new Error("Something went wrong approving the application");
-    }
 
     //update user profile
     await setUserState(app.member_id, MemberState.Member);
 
     await pool.query('CALL sp_accept_new_recruit_validation(?, ?, ?, ?)', [Number(process.env.CONFIG_ID), app.member_id, approved_by, approved_by])
-    // let nextRank = await getRankByName('Recruit')
+
-    // await insertMemberRank(app.member_id, nextRank.id);
-    // //assign user to "pending basic"
-    // await assignUserToStatus(app.member_id, 1);
     res.sendStatus(200);
   } catch (err) {
     console.error('Approve failed:', err);
@@ -188,12 +170,13 @@ router.post('/approve/:id', async (req: Request, res: Response) => {
 });
 
 // POST /application/deny/:id
-router.post('/deny/:id', async (req, res) => {
+router.post('/deny/:id', [requireLogin, requireRole("Recruiter")], async (req: Request, res: Response) => {
-  const appID = req.params.id;
+  const appID = Number(req.params.id);
+  const approver = Number(req.user.id);
 
   try {
     const app = await getApplicationByID(appID);
-    await denyApplication(appID);
+    await denyApplication(appID, approver);
     await setUserState(app.member_id, MemberState.Denied);
     res.sendStatus(200);
   } catch (err) {
@@ -203,7 +186,7 @@ router.post('/deny/:id', async (req, res) => {
 });
 
 // POST /application/:id/comment
-router.post('/:id/comment', async (req: Request, res: Response) => {
+router.post('/:id/comment', [requireLogin], async (req: Request, res: Response) => {
   const appID = req.params.id;
   const data = req.body.message;
   const user = req.user;
@@ -217,8 +200,9 @@ router.post('/:id/comment', async (req: Request, res: Response) => {
   )
 VALUES(?, ?, ?);`
 
+
   try {
-    const conn = await pool.getConnection();
+    var conn = await pool.getConnection();
 
     const result = await conn.query(sql, [appID, user.id, data])
     console.log(result)
@@ -242,11 +226,13 @@ VALUES(?, ?, ?);`
   } catch (err) {
     console.error('Comment failed:', err);
     res.status(500).json({ error: 'Could not post comment' });
+  } finally {
+    conn.release();
   }
 });
 
 // POST /application/:id/comment
-router.post('/:id/adminComment', async (req: Request, res: Response) => {
+router.post('/:id/adminComment', [requireLogin, requireRole("Recruiter")], async (req: Request, res: Response) => {
   const appID = req.params.id;
   const data = req.body.message;
   const user = req.user;
@@ -262,7 +248,7 @@ router.post('/:id/adminComment', async (req: Request, res: Response) => {
 VALUES(?, ?, ?, 1);`
 
   try {
-    const conn = await pool.getConnection();
+    var conn = await pool.getConnection();
 
     const result = await conn.query(sql, [appID, user.id, data])
     console.log(result)
@@ -287,6 +273,8 @@ VALUES(?, ?, ?, 1);`
   } catch (err) {
     console.error('Comment failed:', err);
     res.status(500).json({ error: 'Could not post comment' });
+  } finally {
+    conn.release();
   }
 });
 
@@ -301,5 +289,4 @@ router.post('/restart', async (req: Request, res: Response) => {
   }
 })
 
-
+export const applicationRouter = router;
-module.exports = router;

api/src/routes/auth.ts

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

api/src/routes/calendar.ts

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

api/src/routes/course.ts

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

api/src/routes/loa.ts

@@ -5,6 +5,9 @@ import { Request, Response } from 'express';
 import pool from '../db';
 import { closeLOA, createNewLOA, getAllLOA, getLOAbyID, getLoaTypes, getUserLOA, setLOAExtension } from '../services/loaService';
 import { LOARequest } from '@app/shared/types/loa';
+import { requireLogin, requireRole } from '../middleware/auth';
+
+router.use(requireLogin);
 
 //member posts LOA
 router.post("/", async (req: Request, res: Response) => {
@@ -23,7 +26,7 @@ router.post("/", async (req: Request, res: Response) => {
 });
 
 //admin posts LOA
-router.post("/admin", async (req: Request, res: Response) => {
+router.post("/admin", [requireRole("17th Administrator")], async (req: Request, res: Response) => {
     let LOARequest = req.body as LOARequest;
     LOARequest.created_by = req.user.id;
     LOARequest.filed_date = new Date();
@@ -63,9 +66,11 @@ router.get("/history", async (req: Request, res: Response) => {
     }
 })
 
-router.get('/all', async (req, res) => {
+router.get('/all', [requireRole("17th Administrator")], async (req: Request, res: Response) => {
     try {
-        const result = await getAllLOA();
+        const page = Number(req.query.page) || undefined;
+        const pageSize = Number(req.query.pageSize) || undefined;
+        const result = await getAllLOA(page, pageSize);
         res.status(200).json(result)
     } catch (error) {
         console.error(error);
@@ -101,7 +106,7 @@ router.post('/cancel/:id', async (req: Request, res: Response) => {
 })
 
 //TODO: enforce admin only
-router.post('/adminCancel/:id', async (req: Request, res: Response) => {
+router.post('/adminCancel/:id', [requireRole("17th Administrator")], async (req: Request, res: Response) => {
     let closer = req.user.id;
     try {
         await closeLOA(Number(req.params.id), closer);
@@ -113,7 +118,7 @@ router.post('/adminCancel/:id', async (req: Request, res: Response) => {
 })
 
 // TODO: Enforce admin only
-router.post('/extend/:id', async (req: Request, res: Response) => {
+router.post('/extend/:id', [requireRole("17th Administrator")], async (req: Request, res: Response) => {
     const to: Date = req.body.to;
 
     if (!to) {
@@ -145,4 +150,4 @@ router.get('/policy', async (req: Request, res: Response) => {
     }
 })
 
-module.exports = router;
+export const loaRouter = router;

api/src/routes/members.js

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

api/src/routes/members.ts

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

api/src/routes/ranks.ts

@@ -1,10 +1,18 @@
-const express = require('express');
+import { MemberState } from "@app/shared/types/member";
+import { requireLogin, requireMemberState, requireRole } from "../middleware/auth";
+import { getAllRanks, insertMemberRank } from "../services/rankService";
+
+import express = require('express');
 const r = express.Router();
 const ur = express.Router();
-const { getAllRanks, insertMemberRank } = require('../services/rankService')
+
+
+r.use(requireLogin)
+ur.use(requireLogin)
 
 //insert a new latest rank for a user
-ur.post('/', async (req, res) => {3
+ur.post('/', [requireRole(["17th Command", "17th Administrator", "17th HQ"]), requireMemberState(MemberState.Member)], async (req, res) => {
+    3
     try {
         const change = req.body?.change;
         await insertMemberRank(change.member_id, change.rank_id, change.date);
@@ -27,5 +35,5 @@ r.get('/', async (req, res) => {
     }
 });
 
-module.exports.ranks = r;
+export const ranks = r;
-module.exports.memberRanks = ur;
+export const memberRanks = ur;

api/src/routes/roles.ts

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

api/src/routes/statuses.ts

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

api/src/services/CourseSerivce.ts

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

api/src/services/applicationService.ts

@@ -31,7 +31,7 @@ export async function getApplicationByID(appID: number): Promise<ApplicationRow>
   return app[0];
 }
 
-export async function getApplicationList(): Promise<ApplicationListRow[]> {
+export async function getApplicationList(page: number = 1, pageSize: number = 25): Promise<ApplicationListRow[]> {
   const sql = `SELECT
       member.name AS member_name,
       app.id,
@@ -40,9 +40,11 @@ export async function getApplicationList(): Promise<ApplicationListRow[]> {
       app.app_status
     FROM applications AS app
     LEFT JOIN members AS member
-      ON member.id = app.member_id;`
+      ON member.id = app.member_id
+    ORDER BY app.submitted_at DESC
+    LIMIT ? OFFSET ?;`
 
-  const rows: ApplicationListRow[] = await pool.query(sql);
+  const rows: ApplicationListRow[] = await pool.query(sql, [pageSize, page]);
   return rows;
 }
 
@@ -59,30 +61,35 @@ export async function getAllMemberApplications(memberID: number): Promise<Applic
 }
 
 
-export async function approveApplication(id: number) {
+export async function approveApplication(id: number, approver: number) {
   const sql = `
       UPDATE applications
-         SET approved_at = NOW()
+         SET approved_at = NOW(), approved_by = ?
        WHERE id = ?
         AND approved_at IS NULL
         AND denied_at IS NULL
       `;
 
-  const result = await pool.execute(sql, id);
+  const result = await pool.execute(sql, [approver, id]);
-  return result;
+  console.log(result);
+  if (result.affectedRows == 1) {
+    return
+  } else {
+    throw new Error(`"Something went wrong approving application with ID ${id}`);
+  }
 }
 
-export async function denyApplication(id: number) {
+export async function denyApplication(id: number, approver: number) {
   const sql = `
       UPDATE applications
-         SET denied_at = NOW()
+         SET denied_at = NOW(), approved_by = ?
        WHERE id = ?
         AND approved_at IS NULL
         AND denied_at IS NULL
       `;
 
-  const result = await pool.execute(sql, id);
+  const result = await pool.execute(sql, [approver, id]);
-
+  console.log(result);
   if (result.affectedRows == 1) {
     return
   } else {

api/src/services/loaService.ts

@@ -1,12 +1,13 @@
 import { toDateTime } from "@app/shared/utils/time";
 import pool from "../db";
 import { LOARequest, LOAType } from '@app/shared/types/loa'
+import { PagedData } from '@app/shared/types/pagination'
 
 export async function getLoaTypes(): Promise<LOAType[]> {
     return await pool.query('SELECT * FROM leave_of_absences_types;');
 }
 
-export async function getAllLOA(page = 1, pageSize = 20): Promise<LOARequest[]> {
+export async function getAllLOA(page = 1, pageSize = 10): Promise<PagedData<LOARequest>> {
     const offset = (page - 1) * pageSize;
 
     const sql = `
@@ -26,9 +27,13 @@ export async function getAllLOA(page = 1, pageSize = 20): Promise<LOARequest[]>
             loa.start_date DESC
         LIMIT ? OFFSET ?;
     `;
+    let loaList: LOARequest[] = await pool.query(sql, [pageSize, offset]) as LOARequest[];
 
-    let res: LOARequest[] = await pool.query(sql, [pageSize, offset]) as LOARequest[];
+    let loaCount = Number((await pool.query(`SELECT COUNT(*) as count FROM leave_of_absences;`))[0].count);
-    return res;
+    let pageCount = loaCount / pageSize;
+
+    let output: PagedData<LOARequest> = { data: loaList, pagination: { page: page, pageSize: pageSize, total: loaCount, totalPages: pageCount } }
+    return output;
 }
 
 export async function getUserLOA(userId: number): Promise<LOARequest[]> {
@@ -73,7 +78,8 @@ export async function createNewLOA(data: LOARequest) {
 export async function closeLOA(id: number, closer: number) {
     const sql = `UPDATE leave_of_absences
                 SET closed = 1,
-                closed_by = ?
+                closed_by = ?,
+                ended_at = NOW()
                 WHERE leave_of_absences.id = ?`;
     let out = await pool.query(sql, [closer, id]);
     console.log(out);

api/src/services/memberService.ts

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

shared/types/calendar.ts

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

shared/types/member.ts

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

shared/types/pagination.ts

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

ui/index.html

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

ui/src/api/application.ts

@@ -59,7 +59,9 @@ export async function postAdminChatMessage(message: any, post_id: number) {
 }
 
 export async function getAllApplications(): Promise<ApplicationFull> {
-  const res = await fetch(`${addr}/application/all`)
+  const res = await fetch(`${addr}/application/all`, {
+    credentials: 'include',
+  })
 
   if (res.ok) {
     return res.json()
@@ -92,16 +94,18 @@ export async function approveApplication(id: Number) {
   const res = await fetch(`${addr}/application/approve/${id}`, { method: 'POST', credentials: 'include' })
 
   if (!res.ok) {
-    console.error("Something went wrong approving the application")
+    throw new Error("Something went wrong approving the application");
   }
+  return;
 }
 
 export async function denyApplication(id: Number) {
   const res = await fetch(`${addr}/application/deny/${id}`, { method: 'POST', credentials: 'include' })
 
   if (!res.ok) {
-    console.error("Something went wrong denying the application")
+    throw new Error("Something went wrong denyting the application");
   }
+  return;
 }
 
 export async function restartApplication() {

ui/src/api/calendar.ts

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

ui/src/api/loa.ts

@@ -1,4 +1,5 @@
 import { LOARequest, LOAType } from '@shared/types/loa'
+import { PagedData } from '@shared/types/pagination'
 // @ts-ignore
 const addr = import.meta.env.VITE_APIHOST;
 
@@ -43,6 +44,7 @@ export async function getMyLOA(): Promise<LOARequest | null> {
         headers: {
             "Content-Type": "application/json",
         },
+        credentials: 'include',
     });
 
 
@@ -57,12 +59,23 @@ export async function getMyLOA(): Promise<LOARequest | null> {
     }
 }
 
-export function getAllLOAs(): Promise<LOARequest[]> {
+export async function getAllLOAs(page?: number, pageSize?: number): Promise<PagedData<LOARequest>> {
-    return fetch(`${addr}/loa/all`, {
+    const params = new URLSearchParams();
+
+    if (page !== undefined) {
+        params.set("page", page.toString());
+    }
+
+    if (pageSize !== undefined) {
+        params.set("pageSize", pageSize.toString());
+    }
+
+    return fetch(`${addr}/loa/all?${params}`, {
         method: "GET",
         headers: {
             "Content-Type": "application/json",
         },
+        credentials: 'include',
     }).then((res) => {
         if (res.ok) {
             return res.json();

ui/src/api/member.ts

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

ui/src/api/trainingReport.ts

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

ui/src/components/Navigation/Navbar.vue

@@ -19,6 +19,8 @@ import NavigationMenuContent from '../ui/navigation-menu/NavigationMenuContent.v
 import { navigationMenuTriggerStyle } from '../ui/navigation-menu/'
 import { useAuth } from '@/composables/useAuth';
 import { ArrowUpRight, CircleArrowOutUpRight } from 'lucide-vue-next';
+import DropdownMenuGroup from '../ui/dropdown-menu/DropdownMenuGroup.vue';
+import DropdownMenuSeparator from '../ui/dropdown-menu/DropdownMenuSeparator.vue';
 
 const userStore = useUserStore();
 const auth = useAuth();
@@ -177,13 +179,17 @@ function blurAfter() {
             <div>
                 <DropdownMenu v-if="userStore.isLoggedIn">
                     <DropdownMenuTrigger class="cursor-pointer">
-                        <p>{{ userStore.user.name }}</p>
+                        <Button variant="ghost" class="px-4">
+                            {{ userStore.displayName }}
+                        </Button>
                     </DropdownMenuTrigger>
                     <DropdownMenuContent>
-                        <!-- <DropdownMenuItem>My Profile</DropdownMenuItem> -->
+                        <DropdownMenuItem @click="$router.push('/profile')">My Profile</DropdownMenuItem>
+                        <DropdownMenuSeparator></DropdownMenuSeparator>
                         <!-- <DropdownMenuItem>Settings</DropdownMenuItem> -->
                         <DropdownMenuItem @click="$router.push('/join')">My Application</DropdownMenuItem>
                         <DropdownMenuItem @click="$router.push('/applications')">Application History</DropdownMenuItem>
+                        <DropdownMenuSeparator></DropdownMenuSeparator>
                         <DropdownMenuItem :variant="'destructive'" @click="logout()">Logout</DropdownMenuItem>
                     </DropdownMenuContent>
                 </DropdownMenu>

ui/src/components/application/ApplicationChat.vue

@@ -15,10 +15,14 @@ import { useAuth } from '@/composables/useAuth'
 import { CommentRow } from '@shared/types/application'
 import { Dot } from 'lucide-vue-next'
 import { ref } from 'vue'
+import MemberCard from '../members/MemberCard.vue'
 
-const props = defineProps<{
+const props = withDefaults(defineProps<{
   messages: CommentRow[]
-}>()
+  adminMode?: boolean
+}>(), {
+  adminMode: false,
+})
 
 const emit = defineEmits<{
   (e: 'post', text: string): void
@@ -59,7 +63,7 @@ function onSubmit(values: { text: string }, { resetForm }: { resetForm: () => vo
 
       <!-- Button below, right-aligned -->
       <div class="mt-2 flex justify-end gap-2">
-        <Button type="submit" @click="submitMode = 'internal'" variant="outline">Post (Internal)</Button>
+        <Button v-if="adminMode" type="submit" @click="submitMode = 'internal'" variant="outline">Post (Internal)</Button>
         <Button type="submit" @click="submitMode = 'public'">Post (Public)</Button>
       </div>
     </Form>
@@ -71,7 +75,7 @@ function onSubmit(values: { text: string }, { resetForm }: { resetForm: () => vo
         <!-- Comment header -->
         <div class="flex justify-between">
           <div class="flex">
-            <p>{{ message.poster_name }}</p>
+            <MemberCard :member-id="message.poster_id"></MemberCard>
             <p v-if="message.admin_only" class="flex">
               <Dot /><span class="text-amber-300">Internal</span>
             </p>

ui/src/components/application/ApplicationForm.vue

@@ -174,7 +174,7 @@ watch(() => showCoC.value, async () => {
         <FormLabel>Have you ever served in the military?</FormLabel>
         <FormControl>
           <div class="flex items-center gap-2">
-            <Checkbox :checked="value ?? false" @update:checked="handleChange" :disabled="readOnly" />
+            <Checkbox :model-value="value" @update:model-value="handleChange" :disabled="readOnly" />
             <span>Yes (checked) / No (unchecked)</span>
           </div>
         </FormControl>

ui/src/components/calendar/ViewCalendarEvent.vue

@@ -12,6 +12,8 @@ import DropdownMenuTrigger from '../ui/dropdown-menu/DropdownMenuTrigger.vue';
 import DropdownMenuContent from '../ui/dropdown-menu/DropdownMenuContent.vue';
 import DropdownMenuItem from '../ui/dropdown-menu/DropdownMenuItem.vue';
 import { Calendar } from 'lucide-vue-next';
+import MemberCard from '../members/MemberCard.vue';
+import Spinner from '../ui/spinner/Spinner.vue';
 
 const route = useRoute();
 
@@ -62,11 +64,11 @@ const maybe = computed<CalendarSignup[]>(() => { return activeEvent.value.eventS
 const declined = computed<CalendarSignup[]>(() => { return activeEvent.value.eventSignups.filter((s) => s.status == CalendarAttendance.NotAttending) })
 const viewedState = ref<CalendarAttendance>(CalendarAttendance.Attending);
 
-let user = useUserStore();
+let userStore = useUserStore();
 const myAttendance = computed<CalendarSignup | null>(() => {
-    if (!user.isLoggedIn) return null;
+    if (!userStore.isLoggedIn) return null;
     return activeEvent.value.eventSignups.find(
-        (s) => s.member_id === user.user.id
+        (s) => s.member_id === userStore.user.member.member_id
     ) || null;
 });
 
@@ -77,8 +79,8 @@ async function setAttendance(state: CalendarAttendance) {
 }
 
 const canEditEvent = computed(() => {
-    if (!user.isLoggedIn) return false;
+    if (!userStore.isLoggedIn) return false;
-    if (user.user.id == activeEvent.value.creator_id)
+    if (userStore.user.member.member_id == activeEvent.value.creator_id)
         return true;
 });
 
@@ -102,11 +104,11 @@ const attendanceTab = ref<"Alpha" | "Echo" | "Other">("Alpha");
 const attendanceList = computed<CalendarSignup[]>(() => {
     let out: CalendarSignup[] = [];
     if (attendanceTab.value === 'Alpha') {
-        out = activeEvent.value.eventSignups?.filter((s) => s.member_unit === 'Alpha Company');
+        out = activeEvent.value.eventSignups?.filter((s) => s.unit_name === 'Alpha Company');
     } else if (attendanceTab.value === 'Echo') {
-        out = activeEvent.value.eventSignups?.filter((s) => s.member_unit === 'Echo Company')
+        out = activeEvent.value.eventSignups?.filter((s) => s.unit_name === 'Echo Company')
     } else {
-        out = activeEvent.value.eventSignups?.filter((s) => s.member_unit != 'Alpha Company' && s.member_unit != 'Echo Company')
+        out = activeEvent.value.eventSignups?.filter((s) => s.unit_name != 'Alpha Company' && s.unit_name != 'Echo Company')
     }
 
     const statusOrder: Record<CalendarAttendance, number> = {
@@ -124,11 +126,11 @@ const attendanceCountsByGroup = computed(() => {
     const signups = activeEvent.value.eventSignups ?? [];
 
     return {
-        Alpha: signups.filter(s => s.member_unit === "Alpha Company").length,
+        Alpha: signups.filter(s => s.unit_name === "Alpha Company").length,
-        Echo: signups.filter(s => s.member_unit === "Echo Company").length,
+        Echo: signups.filter(s => s.unit_name === "Echo Company").length,
         Other: signups.filter(s =>
-            s.member_unit !== "Alpha Company" &&
+            s.unit_name !== "Alpha Company" &&
-            s.member_unit !== "Echo Company"
+            s.unit_name !== "Echo Company"
         ).length,
     };
 });
@@ -213,7 +215,7 @@ defineExpose({ forceReload })
                     <CircleAlert></CircleAlert> This event has been cancelled
                 </div>
             </section>
-            <section v-if="isPast && user.isLoggedIn" class="w-full">
+            <section v-if="isPast && userStore.isLoggedIn" class="w-full">
                 <ButtonGroup class="flex w-full">
                     <Button variant="outline"
                         :class="myAttendance?.status === CalendarAttendance.Attending ? 'border-2 border-primary text-primary' : ''"
@@ -239,7 +241,8 @@ defineExpose({ forceReload })
                     <MapPin :size="20"></MapPin> {{ activeEvent.location || "Unknown" }}
                 </div>
                 <div class="text-foreground/80 flex gap-3 items-center">
-                    <User :size="20"></User> {{ activeEvent.creator_name || "Unknown User" }}
+                    <User :size="20"></User>
+                    <MemberCard :member-id="activeEvent.creator_id"></MemberCard>
                 </div>
             </section>
             <!-- Description -->
@@ -276,7 +279,9 @@ defineExpose({ forceReload })
 
                         <div v-for="person in attendanceList" :key="person.member_id"
                             class="grid grid-cols-2 py-1 *:px-3 hover:bg-muted">
-                            <p>{{ person.member_name }}</p>
+                            <div>
+                                <MemberCard :member-id="person.member_id"></MemberCard>
+                            </div>
                             <p :class="statusColor(person.status)" class="text-right">
                                 {{ displayStatus(person.status) }}
                             </p>
@@ -286,4 +291,13 @@ defineExpose({ forceReload })
             </section>
         </div>
     </div>
+    <div v-else class="flex justify-center h-full items-center">
+        <button
+            class="absolute top-4 right-4 inline-flex flex-none size-8 items-center justify-center rounded-md border hover:bg-muted/40 transition cursor-pointer z-50"
+            aria-label="Close" @click="emit('close')">
+            <X class="size-4" />
+        </button>
+
+        <Spinner class="size-8"></Spinner>
+    </div>
 </template>

ui/src/components/loa/loaForm.vue

@@ -2,7 +2,8 @@
 import { Check, Search } from "lucide-vue-next"
 import { ComboboxAnchor, ComboboxEmpty, ComboboxGroup, ComboboxInput, ComboboxItem, ComboboxItemIndicator, ComboboxList } from "@/components/ui/combobox"
 import { computed, onMounted, ref, watch } from "vue";
-import { Member, getMembers } from "@/api/member";
+import { getMembers } from "@/api/member";
+import { Member } from "@shared/types/member";
 import Button from "@/components/ui/button/Button.vue";
 import {
     CalendarDate,
@@ -70,6 +71,8 @@ const { handleSubmit, values, resetForm } = useForm({
     validationSchema: toTypedSchema(loaSchema),
 })
 
+const formSubmitted = ref(false);
+
 const onSubmit = handleSubmit(async (values) => {
     console.log(values);
     const out: LOARequest = {
@@ -85,6 +88,7 @@ const onSubmit = handleSubmit(async (values) => {
         await submitLOA(out);
         userStore.loadUser();
     }
+    formSubmitted.value = true;
 })
 
 onMounted(async () => {
@@ -101,7 +105,11 @@ onMounted(async () => {
         console.error(error);
     }
 
+    if (props.adminMode) {
         members.value = await getMembers();
+    } else {
+        members.value.push(props.member);
+    }
     loaTypes.value = await getLoaTypes();
     resetForm({ values: { member_id: currentMember.value?.member_id } });
 });
@@ -137,7 +145,7 @@ const maxEndDate = computed(() => {
             </div>
         </div>
         <div class="flex-1 flex flex-col gap-5">
-            <form @submit="onSubmit" class="flex flex-col gap-2">
+            <form v-if="!formSubmitted" @submit="onSubmit" class="flex flex-col gap-2">
                 <div class="flex w-full gap-5">
                     <VeeField v-slot="{ field, errors }" name="member_id">
                         <Field>
@@ -149,7 +157,7 @@ const maxEndDate = computed(() => {
                                         <ComboboxInput placeholder="Search members..." class="w-full pl-3"
                                             :display-value="(id) => {
                                                 const m = members.find(mem => mem.member_id === id)
-                                                return m ? m.member_name : ''
+                                                return m ?  m.displayName || m.member_name : ''
                                             }" />
                                     </ComboboxAnchor>
                                     <ComboboxList class="*:w-64">
@@ -158,7 +166,7 @@ const maxEndDate = computed(() => {
                                             <template v-for="member in members" :key="member.member_id">
                                                 <ComboboxItem :value="member.member_id"
                                                     class="data-[highlighted]:bg-accent data-[highlighted]:text-accent-foreground relative cursor-pointer select-none px-2 py-1.5 w-full">
-                                                    {{ member.member_name }}
+                                                    {{ member.displayName || member.member_name }}
                                                     <ComboboxItemIndicator
                                                         class="absolute left-2 inline-flex items-center">
                                                         <Check class="h-4 w-4" />
@@ -272,6 +280,24 @@ const maxEndDate = computed(() => {
                     <Button type="submit">Submit</Button>
                 </div>
             </form>
+            <div v-else class="flex flex-col  gap-4 py-8 text-left">
+                <h2 class="text-xl font-semibold">
+                    LOA Request Submitted
+                </h2>
+
+                <p class="max-w-md text-muted-foreground">
+                    Your Leave of Absence request has been submitted successfully.
+                    It will take effect on your selected start date.
+                </p>
+
+
+                <div class="flex gap-3 mt-4">
+                    <Button variant="secondary" @click="formSubmitted = false">
+                        Submit another request
+                    </Button>
+                </div>
+            </div>
+
         </div>
     </div>
 </template>

ui/src/components/loa/loaList.vue

@@ -15,7 +15,7 @@ import {
     DropdownMenuItem,
     DropdownMenuTrigger,
 } from "@/components/ui/dropdown-menu"
-import { Ellipsis } from "lucide-vue-next";
+import { ChevronDown, ChevronUp, Ellipsis, X } from "lucide-vue-next";
 import { cancelLOA, extendLOA, getAllLOAs, getMyLOAs } from "@/api/loa";
 import { onMounted, ref, computed } from "vue";
 import { LOARequest } from "@shared/types/loa";
@@ -32,6 +32,16 @@ import {
     getLocalTimeZone,
 } from "@internationalized/date"
 import { el } from "@fullcalendar/core/internal-common";
+import MemberCard from "../members/MemberCard.vue";
+import {
+    Pagination,
+    PaginationContent,
+    PaginationEllipsis,
+    PaginationItem,
+    PaginationNext,
+    PaginationPrevious,
+} from '@/components/ui/pagination'
+import { pagination } from "@shared/types/pagination";
 
 const props = defineProps<{
     adminMode?: boolean
@@ -45,7 +55,9 @@ onMounted(async () => {
 
 async function loadLOAs() {
     if (props.adminMode) {
-        LOAList.value = await getAllLOAs();
+        let result = await getAllLOAs(pageNum.value, pageSize.value);
+        LOAList.value = result.data;
+        pageData.value = result.pagination;
     } else {
         LOAList.value = await getMyLOAs();
     }
@@ -75,12 +87,6 @@ function loaStatus(loa: LOARequest): "Upcoming" | "Active" | "Overdue" | "Closed
     return "Overdue"; // fallback
 }
 
-function sortByStartDate(loas: LOARequest[]): LOARequest[] {
-    return [...loas].sort(
-        (a, b) => new Date(b.start_date).getTime() - new Date(a.start_date).getTime()
-    );
-}
-
 async function cancelAndReload(id: number) {
     await cancelLOA(id, props.adminMode);
     await loadLOAs();
@@ -103,6 +109,26 @@ async function commitExtend() {
     isExtending.value = false;
     await loadLOAs();
 }
+
+const expanded = ref<number | null>(null);
+const hoverID = ref<number | null>(null);
+
+const pageNum = ref<number>(1);
+const pageData = ref<pagination>();
+
+const pageSize = ref<number>(15)
+const pageSizeOptions = [10, 15, 30]
+
+function setPageSize(size: number) {
+    pageSize.value = size
+    pageNum.value = 1;
+    loadLOAs();
+}
+
+function setPage(pagenum: number) {
+    pageNum.value = pagenum;
+    loadLOAs();
+}
 </script>
 
 <template>
@@ -138,21 +164,27 @@ async function commitExtend() {
                         <TableHead>Type</TableHead>
                         <TableHead>Start</TableHead>
                         <TableHead>End</TableHead>
-                        <TableHead class="w-[500px]">Reason</TableHead>
+                        <!-- <TableHead class="w-[500px]">Reason</TableHead> -->
                         <TableHead>Posted on</TableHead>
                         <TableHead>Status</TableHead>
                     </TableRow>
                 </TableHeader>
                 <TableBody>
-                    <TableRow v-for="post in LOAList" :key="post.id" class="hover:bg-muted/50">
+                    <template v-for="post in LOAList" :key="post.id">
+                        <TableRow class="hover:bg-muted/50 cursor-pointer" @click="expanded = post.id"
+                            @mouseenter="hoverID = post.id" @mouseleave="hoverID = null" :class="{
+                                'border-b-0': expanded === post.id,
+                                'bg-muted/50': hoverID === post.id
+                            }">
                             <TableCell class="font-medium">
-                            {{ post.name }}
+                                <MemberCard :member-id="post.member_id"></MemberCard>
                             </TableCell>
                             <TableCell>{{ post.type_name }}</TableCell>
                             <TableCell>{{ formatDate(post.start_date) }}</TableCell>
-                        <TableCell>{{ post.extended_till ? formatDate(post.extended_till) : formatDate(post.end_date) }}
+                            <TableCell>{{ post.extended_till ? formatDate(post.extended_till) :
+                                formatDate(post.end_date) }}
                             </TableCell>
-                        <TableCell>{{ post.reason }}</TableCell>
+                            <!-- <TableCell>{{ post.reason }}</TableCell> -->
                             <TableCell>{{ formatDate(post.filed_date) }}</TableCell>
                             <TableCell>
                                 <Badge v-if="loaStatus(post) === 'Upcoming'" class="bg-blue-400">Upcoming</Badge>
@@ -163,7 +195,9 @@ async function commitExtend() {
                             <TableCell @click.stop="" class="text-right">
                                 <DropdownMenu>
                                     <DropdownMenuTrigger class="cursor-pointer">
-                                    <Ellipsis></Ellipsis>
+                                        <Button variant="ghost">
+                                            <Ellipsis class="size-6"></Ellipsis>
+                                        </Button>
                                     </DropdownMenuTrigger>
                                     <DropdownMenuContent>
                                         <DropdownMenuItem v-if="!post.closed && props.adminMode"
@@ -171,18 +205,80 @@ async function commitExtend() {
                                             Extend
                                         </DropdownMenuItem>
                                         <DropdownMenuItem v-if="!post.closed" :variant="'destructive'"
-                                        @click="cancelAndReload(post.id)">End
+                                            @click="cancelAndReload(post.id)">{{ loaStatus(post) === 'Upcoming' ?
+                                                'Cancel' :
+                                                'End' }}
                                         </DropdownMenuItem>
                                         <!-- Fallback: no actions available -->
-                                    <p v-if="post.closed || (!props.adminMode && post.closed)" class="p-2 text-center text-sm">
+                                        <p v-if="post.closed || (!props.adminMode && post.closed)"
+                                            class="p-2 text-center text-sm">
                                             No actions
                                         </p>
                                     </DropdownMenuContent>
                                 </DropdownMenu>
                             </TableCell>
+                            <TableCell>
+                                <Button v-if="expanded === post.id" @click.stop="expanded = null" variant="ghost">
+                                    <ChevronUp class="size-6" />
+                                </Button>
+                                <Button v-else @click.stop="expanded = post.id" variant="ghost">
+                                    <ChevronDown class="size-6" />
+                                </Button>
+                            </TableCell>
                         </TableRow>
+                        <TableRow v-if="expanded === post.id" @mouseenter="hoverID = post.id"
+                            @mouseleave="hoverID = null" :class="{ 'bg-muted/50 border-t-0': hoverID === post.id }">
+                            <TableCell :colspan="8" class="p-0">
+                                <div class="w-full p-3 mb-6 space-y-3">
+                                    <div class="flex justify-between items-start gap-4">
+                                        <div class="flex-1">
+                                            <!-- Title -->
+                                            <p class="text-md font-semibold text-foreground">
+                                                Reason
+                                            </p>
+
+                                            <!-- Content -->
+                                            <p
+                                                class="mt-1 text-md whitespace-pre-wrap leading-relaxed text-muted-foreground">
+                                                {{ post.reason }}
+                                            </p>
+                                        </div>
+                                    </div>
+                                </div>
+                            </TableCell>
+                        </TableRow>
+
+                    </template>
                 </TableBody>
             </Table>
+            <div class="mt-5 flex justify-between">
+                <div></div>
+                <Pagination v-slot="{ page }" :items-per-page="pageData?.pageSize || 10" :total="pageData?.total || 10"
+                    :default-page="2" :page="pageNum" @update:page="setPage">
+                    <PaginationContent v-slot="{ items }">
+                        <PaginationPrevious />
+                        <template v-for="(item, index) in items" :key="index">
+                            <PaginationItem v-if="item.type === 'page'" :value="item.value"
+                                :is-active="item.value === page">
+                                {{ item.value }}
+                            </PaginationItem>
+                        </template>
+                        <PaginationEllipsis :index="4" />
+                        <PaginationNext />
+                    </PaginationContent>
+                </Pagination>
+                <div class="flex items-center gap-3 text-sm">
+                    <p class="text-muted-foreground text-nowrap">Per page:</p>
+
+                    <button v-for="size in pageSizeOptions" :key="size" @click="setPageSize(size)"
+                        class="px-2 py-1 rounded transition-colors" :class="{
+                            'bg-muted font-semibold': pageSize === size,
+                            'hover:bg-muted/50': pageSize !== size
+                        }">
+                        {{ size }}
+                    </button>
+                </div>
+            </div>
         </div>
     </div>
 </template>

ui/src/components/members/MemberCard.vue

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

ui/src/components/trainingReport/trainingReportForm.vue

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

ui/src/components/ui/pagination/Pagination.vue

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

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

@@ -0,0 +1,24 @@
+<script setup>
+import { reactiveOmit } from "@vueuse/core";
+import { PaginationList } from "reka-ui";
+import { cn } from "@/lib/utils";
+
+const props = defineProps({
+  asChild: { type: Boolean, required: false },
+  as: { type: null, required: false },
+  class: { type: null, required: false },
+});
+
+const delegatedProps = reactiveOmit(props, "class");
+</script>
+
+<template>
+  <PaginationList
+    v-slot="slotProps"
+    data-slot="pagination-content"
+    v-bind="delegatedProps"
+    :class="cn('flex flex-row items-center gap-1', props.class)"
+  >
+    <slot v-bind="slotProps" />
+  </PaginationList>
+</template>

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

@@ -0,0 +1,27 @@
+<script setup>
+import { reactiveOmit } from "@vueuse/core";
+import { MoreHorizontal } from "lucide-vue-next";
+import { PaginationEllipsis } from "reka-ui";
+import { cn } from "@/lib/utils";
+
+const props = defineProps({
+  asChild: { type: Boolean, required: false },
+  as: { type: null, required: false },
+  class: { type: null, required: false },
+});
+
+const delegatedProps = reactiveOmit(props, "class");
+</script>
+
+<template>
+  <PaginationEllipsis
+    data-slot="pagination-ellipsis"
+    v-bind="delegatedProps"
+    :class="cn('flex size-9 items-center justify-center', props.class)"
+  >
+    <slot>
+      <MoreHorizontal class="size-4" />
+      <span class="sr-only">More pages</span>
+    </slot>
+  </PaginationEllipsis>
+</template>

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

ui/src/composables/useAuth.ts

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

ui/src/pages/Application.vue

@@ -8,6 +8,7 @@ import Button from '@/components/ui/button/Button.vue';
 import { CheckIcon, XIcon } from 'lucide-vue-next';
 import Unauthorized from './Unauthorized.vue';
 import { ApplicationData, ApplicationFull, ApplicationStatus, CommentRow } from '@shared/types/application';
+import Spinner from '@/components/ui/spinner/Spinner.vue';
 
 const appData = ref<ApplicationData>(null);
 const appID = ref<number | null>(null);
@@ -105,12 +106,21 @@ async function postApp(appData) {
 }
 
 async function handleApprove(id) {
-    console.log("hi");
+    try {
         await approveApplication(id);
+        loadData(await loadApplication(Number(route.params.id), true))
+    } catch (error) {
+        console.error(error);
+    }
 }
 
 async function handleDeny(id) {
+    try {
         await denyApplication(id);
+        loadData(await loadApplication(Number(route.params.id), true))
+    } catch (error) {
+        console.error(error);
+    }
 }
 </script>
 
@@ -164,12 +174,15 @@ async function handleDeny(id) {
             </ApplicationForm>
             <div v-if="!newApp" class="pb-15">
                 <h3 class="scroll-m-20 text-2xl font-semibold tracking-tight mb-4">Discussion</h3>
-                <ApplicationChat :messages="chatData" @post="postComment" @post-internal="postCommentInternal">
+                <ApplicationChat :messages="chatData" @post="postComment" @post-internal="postCommentInternal"
+                    :admin-mode="finalMode === 'view-recruiter'">
                 </ApplicationChat>
             </div>
         </div>
 
     </div>
     <!-- TODO: Implement some kinda loading screen -->
-    <div v-else class="flex items-center justify-center h-full">Loading</div>
+    <div v-else class="flex items-center justify-center h-full">
+        <Spinner class="size-8"/>
+    </div>
 </template>

ui/src/pages/Calendar.vue

@@ -217,7 +217,7 @@ onMounted(() => {
             <aside v-if="panelOpen"
                 class="3xl:w-lg 2xl:w-md border-l bg-card text-foreground flex flex-col overflow-auto scrollbar-themed"
                 :style="{ height: 'calc(100vh - 61px)', position: 'sticky', top: '64px' }">
-                <ViewCalendarEvent ref="eventViewRef" @close="() => { router.push('/calendar'); }"
+                <ViewCalendarEvent ref="eventViewRef" :key="currentEventID" @close="() => { router.push('/calendar'); }"
                     @reload="loadEvents()" @edit="(val) => { dialogRef.openDialog(null, 'edit', val) }">
                 </ViewCalendarEvent>
             </aside>

ui/src/pages/Join.vue

@@ -18,7 +18,9 @@ import { restartApplication } from '@/api/application';
 
 function goToLogin() {
     const redirectUrl = encodeURIComponent(window.location.origin + '/join')
-    window.location.href = `https://aj17thdevapi.nexuszone.net/login?redirect=${redirectUrl}`;
+    //@ts-ignore
+    const addr = import.meta.env.VITE_APIHOST;
+    window.location.href = `${addr}/login?redirect=${redirectUrl}`;
 }
 
 let userStore = useUserStore();

ui/src/pages/ManageApplications.vue

@@ -11,10 +11,11 @@ import {
     TableRow,
 } from '@/components/ui/table'
 import Button from '@/components/ui/button/Button.vue';
-import { onMounted, ref, watch } from 'vue';
+import { computed, onMounted, ref, watch } from 'vue';
 import { useRoute, useRouter } from 'vue-router';
 import { CheckIcon, XIcon } from 'lucide-vue-next';
 import Application from './Application.vue';
+import MemberCard from '@/components/members/MemberCard.vue';
 
 const appList = ref([]);
 const now = Date.now();
@@ -51,36 +52,26 @@ function formatExact(iso) {
     return isNaN(d) ? '' : exactFmt.format(d)
 }
 
-async function handleApprove(id) {
-    await approveApplication(id);
-    appList.value = await getAllApplications();
-}
-
-async function handleDeny(id) {
-    await denyApplication(id);
-    appList.value = await getAllApplications();
-}
-
 const router = useRouter();
 function openApplication(id) {
+    if (!id) return;
     router.push(`/administration/applications/${id}`)
-    openPanel.value = true;
 }
 
 function closeApplication() {
     router.push('/administration/applications')
-    openPanel.value = false;
 }
 
 const route = useRoute();
 
 watch(() => route.params.id, (newId) => {
     if (newId === undefined) {
-        openPanel.value = false;
     }
 })
 
-const openPanel = ref(false);
+// const openPanel = ref(false);
+const openPanel = computed(() => route.params.id !== undefined)
+
 
 onMounted(async () => {
     appList.value = await getAllApplications();
@@ -101,7 +92,7 @@ onMounted(async () => {
                     <TableHeader>
                         <TableRow>
                             <TableHead>User</TableHead>
-                            <TableHead>Date Submitted</TableHead>
+                            <TableHead class="text-right">Date Submitted</TableHead>
                             <TableHead class="text-right">Status</TableHead>
                         </TableRow>
                     </TableHeader>
@@ -113,19 +104,11 @@ onMounted(async () => {
                         <TableBody>
                             <TableRow v-for="app in appList" :key="app.id" class="cursor-pointer"
                                 @click="openApplication(app.id)">
-                                <TableCell class="font-medium">{{ app.member_name }}</TableCell>
+                                <TableCell class="font-medium">
-                                <TableCell :title="formatExact(app.submitted_at)">
+                                    <MemberCard :memberId="app.member_id"></MemberCard>
-                                    {{ formatAgo(app.submitted_at) }}
                                 </TableCell>
-
+                                <TableCell class="text-right" :title="formatExact(app.submitted_at)">
-                                <TableCell v-if="app.app_status === ApplicationStatus.Pending"
+                                    {{ formatAgo(app.submitted_at) }}
-                                    class="inline-flex items-end gap-2">
-                                    <Button variant="success" @click.stop="handleApprove(app.id)">
-                                        <CheckIcon />
-                                    </Button>
-                                    <Button variant="destructive" @click.stop="handleDeny(app.id)">
-                                        <XIcon />
-                                    </Button>
                                 </TableCell>
 
                                 <TableCell class="text-right font-semibold" :class="[

ui/src/pages/ManageLOA.vue

@@ -30,10 +30,12 @@ const showLOADialog = ref(false);
             </DialogContent>
         </Dialog>
         <div class="max-w-5xl mx-auto pt-10">
-            <div class="flex justify-end mb-4">
+            <div class="flex justify-between mb-4">
+                <h1 class="scroll-m-20 text-2xl font-semibold tracking-tight">LOA Log</h1>
+                <div>
                     <Button @click="showLOADialog = true">Post LOA</Button>
                 </div>
-            <h1>LOA Log</h1>
+            </div>
             <LoaList :admin-mode="true"></LoaList>
         </div>
     </div>

ui/src/pages/MyProfile.vue

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

ui/src/pages/SubmitLOA.vue

@@ -1,20 +1,11 @@
 <script setup lang="ts">
 import LoaForm from '@/components/loa/loaForm.vue';
 import { useUserStore } from '@/stores/user';
-import { Member } from '@/api/member';
+import { Member } from '@shared/types/member';
 import LoaList from '@/components/loa/loaList.vue';
 import { ref } from 'vue';
 
 const userStore = useUserStore();
-const user = userStore.user;
-const memberFull: Member = {
-    member_id: user.id,
-    member_name: user.name,
-    rank: null,
-    rank_date: null,
-    status: null,
-    status_date: null,
-};
 
 const mode = ref<'submit' | 'view'>('submit')
 </script>
@@ -32,7 +23,7 @@ const mode = ref<'submit' | 'view'>('submit')
                 </div>
             </div>
         </div>
-        <LoaForm v-if="mode === 'submit'" :member="memberFull"></LoaForm>
+        <LoaForm v-if="mode === 'submit'" :member="userStore.user.member"></LoaForm>
         <LoaList v-if="mode === 'view'" :admin-mode="false"></LoaList>
     </div>
 </template>

ui/src/pages/TrainingReport.vue

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

ui/src/router/index.js

@@ -16,10 +16,11 @@ const router = createRouter({
     { path: '/members', component: () => import('@/pages/memberList.vue'), meta: { requiresAuth: true, memberOnly: true } },
     { path: '/loa', component: () => import('@/pages/SubmitLOA.vue'), meta: { requiresAuth: true, memberOnly: true } },
     { path: '/transfer', component: () => import('@/pages/Transfer.vue'), meta: { requiresAuth: true, memberOnly: true } },
+    { path: '/profile', component: () => import('@/pages/MyProfile.vue'), meta: { requiresAuth: true, memberOnly: true } },
 
 
-    { path: '/calendar', component: () => import('@/pages/Calendar.vue'), meta: { requiresAuth: true, memberOnly: true }, },
+    { path: '/calendar', component: () => import('@/pages/Calendar.vue') },
-    { path: '/calendar/event/:id', component: () => import('@/pages/Calendar.vue'), meta: { requiresAuth: true, memberOnly: true }, },
+    { path: '/calendar/event/:id', component: () => import('@/pages/Calendar.vue') },
 
     // disabled in favor of linking 
     // { path: '/documents', component: () => import('@/pages/Documentation.vue'), meta: { requiresAuth: true, memberOnly: true }, },
@@ -31,7 +32,7 @@ const router = createRouter({
     // ADMIN / STAFF ROUTES
     {
       path: '/administration',
-      meta: { requiresAuth: true, memberOnly: true, roles: ['staff', 'admin'] },
+      meta: { requiresAuth: true, memberOnly: true, roles: ['17th Administrator', '17th HQ', '17th Command'] },
       children: [
         { path: 'applications', component: () => import('@/pages/ManageApplications.vue') },
         { path: 'applications/:id', component: () => import('@/pages/ManageApplications.vue') },

ui/src/stores/memberDirectory.ts

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

ui/src/stores/user.ts

@@ -1,12 +1,18 @@
-import { ref, computed } from 'vue'
+import { ref, computed, watch } from 'vue'
 import { defineStore } from 'pinia'
+import { useRoute, useRouter } from 'vue-router'
+import { myData } from '@shared/types/member'
+
+
+const POLL_INTERVAL = 10_000
 
 export const useUserStore = defineStore('user', () => {
-    const user = ref(null)
+    const user = ref<myData>(null)
-    const roles = computed(() => new Set(user.value?.roleData?.map(r => r.name) ?? []));
+    const roles = computed(() => new Set(user.value?.roles?.map(r => r.name) ?? []));
     const loaded = ref(false);
     const state = computed<string | undefined>(() => user.value?.state || undefined);
     const isLoggedIn = computed(() => user.value !== null)
+    const displayName = computed(() => user.value?.member.displayName || user.value?.member.member_name)
 
     async function loadUser() {
         //@ts-ignore
@@ -16,7 +22,6 @@ export const useUserStore = defineStore('user', () => {
 
         if (res.ok) {
             const data = await res.json();
-            console.log(data);
             user.value = data;
         }
 
@@ -33,5 +38,56 @@ export const useUserStore = defineStore('user', () => {
         return requiredRoles.some(r => roles.value.has(r))
     }
 
-    return { user, isLoggedIn, roles, loadUser, loaded, hasAnyRole, hasRole, state }
+    const route = useRoute();
+    const router = useRouter();
+    watch(user, (newUser) => {
+        if (!newUser) return
+
+        const currentRoute = route.meta
+
+        // Member-only route
+        if (currentRoute.memberOnly && state.value !== 'member') {
+            router.replace('/unauthorized')
+            return
+        }
+
+        // Role-based route
+        if (currentRoute.roles && !hasRole('Dev') && !hasAnyRole(currentRoute.roles as string[])) {
+            return '/unauthorized'
+        }
+    },
+        { deep: true } // deep watch ensures nested changes trigger
+    )
+
+    //polling system
+    let pollTimeout: number | null = null
+    let polling = false;
+    let lastVersion: string | null = null
+
+    async function poll() {
+        // Only poll if tab is visible
+        if (document.hidden) {
+            polling = false;
+            return
+        }
+
+        await loadUser();
+
+        scheduleNext()
+    }
+
+    function scheduleNext() {
+        polling = true;
+        pollTimeout = window.setTimeout(poll, POLL_INTERVAL)
+    }
+
+    poll() //start polling
+
+    document.addEventListener('visibilitychange', () => {
+        if (!document.hidden && polling === false) {
+            poll()
+        }
+    })
+
+    return { user, displayName, isLoggedIn, roles, loadUser, loaded, hasAnyRole, hasRole, state }
 })