Upgraded handling of duplicate member roles Close #56

Reviewed-on: #117

api/package-lock.json

@@ -10,6 +10,7 @@
       "license": "ISC",
       "dependencies": {
         "@sentry/node": "^10.27.0",
+        "chalk": "^5.6.2",
         "connect-sqlite3": "^0.9.16",
         "cors": "^2.8.5",
         "dotenv": "^17.2.1",
@@ -1314,6 +1315,18 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/chalk": {
+      "version": "5.6.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.6.2.tgz",
+      "integrity": "sha512-7NzBL0rN6fMUW+f7A6Io4h40qQlG+xGmtMxfbnH/K7TAtt8JQWVQK+6g0UXKMeVJoyV5EkkNsErQ8pVD3bLHbA==",
+      "license": "MIT",
+      "engines": {
+        "node": "^12.17.0 || ^14.13 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
     "node_modules/chokidar": {
       "version": "3.6.0",
       "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz",

api/package.json

@@ -13,6 +13,7 @@
   },
   "dependencies": {
     "@sentry/node": "^10.27.0",
+    "chalk": "^5.6.2",
     "connect-sqlite3": "^0.9.16",
     "cors": "^2.8.5",
     "dotenv": "^17.2.1",

api/src/db.ts

@@ -12,7 +12,7 @@ const pool = mariadb.createPool({
     connectionLimit: 5,
     connectTimeout: 10000,        // give it more breathing room
     acquireTimeout: 15000,
-    database: 'ranger_unit_tracker',
+    database: process.env.DB_DATABASE,
     ssl: false,
 });
 

api/src/index.ts

@@ -5,9 +5,27 @@ import express = require('express');
 import cors = require('cors');
 import morgan = require('morgan');
 const app = express()
-app.use(morgan('dev', {
-  skip: (req) => {
-    return req.path === '/members/me';
+import chalk from 'chalk';
+app.use(morgan((tokens: morgan.TokenIndexer, req: express.Request, res: express.Response) => {
+  const status = Number(tokens.status(req, res));
+
+  // Colorize status code
+  const statusColor = status >= 500 ? chalk.red
+    : status >= 400 ? chalk.yellow
+      : status >= 300 ? chalk.cyan
+        : chalk.green;
+
+  return [
+    chalk.gray(`[${new Date().toISOString()}]`),
+    chalk.blue.bold(tokens.method(req, res)),
+    tokens.url(req, res),
+    statusColor(status),
+    chalk.magenta(tokens['response-time'](req, res) + ' ms'),
+    chalk.yellow(`- User: ${req.user?.name ? `${req.user.name} (${req.user.id})` : 'Unauthenticated'}`),
+  ].join(' ');
+}, {
+  skip: (req: express.Request) => {
+    return req.originalUrl === '/members/me';
   }
 }))
 
@@ -64,6 +82,7 @@ import { authRouter } from './routes/auth';
 import { roles, memberRoles } from './routes/roles';
 import { courseRouter, eventRouter } from './routes/course';
 import { calendarRouter } from './routes/calendar';
+import { docsRouter } from './routes/docs';
 
 app.use('/application', applicationRouter);
 app.use('/ranks', ranks);
@@ -77,6 +96,7 @@ app.use('/memberRoles', memberRoles)
 app.use('/course', courseRouter)
 app.use('/courseEvent', eventRouter)
 app.use('/calendar', calendarRouter)
+app.use('/docs', docsRouter)
 app.use('/', authRouter)
 
 app.get('/ping', (req, res) => {

api/src/routes/applications.ts

@@ -105,7 +105,6 @@ router.get('/me/:id', [requireLogin], async (req: Request, res: Response) => {
     const application = await getApplicationByID(appID);
     if (application === undefined)
       return res.sendStatus(204);
-    console.log(application.member_id, member)
     if (application.member_id != member) {
       return res.sendStatus(403);
     }
@@ -155,21 +154,13 @@ router.post('/approve/:id', [requireLogin, requireRole("Recruiter")], async (req
 
   try {
     const app = await getApplicationByID(appID);
-    const result = await approveApplication(appID);
-
-    //guard against failures
-    if (result.affectedRows != 1) {
-      throw new Error("Something went wrong approving the application");
-    }
+    await approveApplication(appID, approved_by);
 
     //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);
@@ -178,12 +169,13 @@ router.post('/approve/:id', [requireLogin, requireRole("Recruiter")], async (req
 });
 
 // POST /application/deny/:id
-router.post('/deny/:id', [requireLogin, requireRole("Recruiter")], async (req, res) => {
-  const appID = req.params.id;
+router.post('/deny/:id', [requireLogin, requireRole("Recruiter")], async (req: Request, res: Response) => {
+  const appID = Number(req.params.id);
+  const approver = Number(req.user.id);
 
   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) {
@@ -198,8 +190,6 @@ router.post('/:id/comment', [requireLogin], async (req: Request, res: Response)
   const data = req.body.message;
   const user = req.user;
 
-  console.log(user)
-
   const sql = `INSERT INTO application_comments(
     application_id,
     poster_id,
@@ -212,7 +202,6 @@ VALUES(?, ?, ?);`
     var conn = await pool.getConnection();
 
     const result = await conn.query(sql, [appID, user.id, data])
-    console.log(result)
     if (result.affectedRows !== 1) {
       conn.release();
       throw new Error("Insert Failure")
@@ -244,8 +233,6 @@ router.post('/:id/adminComment', [requireLogin, requireRole("Recruiter")], async
   const data = req.body.message;
   const user = req.user;
 
-  console.log(user)
-
   const sql = `INSERT INTO application_comments(
     application_id,
     poster_id,
@@ -258,7 +245,6 @@ VALUES(?, ?, ?, 1);`
     var conn = await pool.getConnection();
 
     const result = await conn.query(sql, [appID, user.id, data])
-    console.log(result)
     if (result.affectedRows !== 1) {
       conn.release();
       throw new Error("Insert Failure")

api/src/routes/auth.ts

@@ -115,11 +115,24 @@ router.get('/callback', (req, res, next) => {
 router.get('/logout', [requireLogin], function (req, res, next) {
     req.logout(function (err) {
         if (err) { return next(err); }
-        var params = {
-            client_id: process.env.AUTH_CLIENT_ID,
-            returnTo: process.env.CLIENT_URL
-        };
-        res.redirect(process.env.AUTH_END_SESSION_URI + '?' + querystring.stringify(params));
+
+        req.session.destroy((err) => {
+            if (err) { return next(err); }
+
+            res.clearCookie('connect.sid', {
+                path: '/',
+                domain: process.env.CLIENT_DOMAIN,
+                httpOnly: true,
+                sameSite: 'lax'
+            });
+
+            var params = {
+                client_id: process.env.AUTH_CLIENT_ID,
+                returnTo: process.env.CLIENT_URL
+            };
+            res.redirect(process.env.AUTH_END_SESSION_URI + '?' + querystring.stringify(params));
+
+        })
     });
 });
 

api/src/routes/calendar.ts

@@ -107,7 +107,6 @@ r.put('/', [requireLogin, requireMemberState(MemberState.Member)], async (req: R
         let event: CalendarEvent = req.body;
         event.start = new Date(event.start);
         event.end = new Date(event.end);
-        console.log(event);
         updateEvent(event);
         res.sendStatus(200);
     } catch (error) {

api/src/routes/course.ts

@@ -33,23 +33,26 @@ cr.get('/roles', async (req, res) => {
 })
 
 er.get('/', async (req: Request, res: Response) => {
-    const allowedSorts = new Map([
-        ["ascending", "ASC"],
-        ["descending", "DESC"]
-    ]);
-
-    const sort = String(req.query.sort || "").toLowerCase();
-    const search = String(req.query.search || "").toLowerCase();
-    if (!allowedSorts.has(sort)) {
-        return res.status(400).json({
-            message: `Invalid sort direction '${req.query.sort}'. Allowed values are 'ascending' or 'descending'.`
-        });
-    }
-
-    const sortDir = allowedSorts.get(sort);
-
     try {
-        let events = await getCourseEvents(sortDir, search);
+        const allowedSorts = new Map([
+            ["ascending", "ASC"],
+            ["descending", "DESC"]
+        ]);
+
+        const page = Number(req.query.page) || undefined;
+        const pageSize = Number(req.query.pageSize) || undefined;
+
+        const sort = String(req.query.sort || "").toLowerCase();
+        const search = String(req.query.search || "").toLowerCase();
+        if (!allowedSorts.has(sort)) {
+            return res.status(400).json({
+                message: `Invalid sort direction '${req.query.sort}'. Allowed values are 'ascending' or 'descending'.`
+            });
+        }
+
+        const sortDir = allowedSorts.get(sort);
+
+        let events = await getCourseEvents(sortDir, search, page, pageSize);
         res.status(200).json(events);
     } catch (error) {
         console.error('failed to fetch reports', error);
@@ -80,7 +83,6 @@ er.get('/attendees/:id', async (req: Request, res: Response) => {
 er.post('/', async (req: Request, res: Response) => {
     const posterID: number = req.user.id;
     try {
-        console.log();
         let data: CourseEventDetails = req.body;
         data.created_by = posterID;
         data.event_date = new Date(data.event_date);

api/src/routes/docs.ts

@@ -0,0 +1,24 @@
+const express = require('express');
+const router = express.Router();
+
+import { Request, Response } from 'express';
+import { requireLogin } from '../middleware/auth';
+
+router.get('/welcome', [requireLogin], async (req: Request, res: Response) => {
+    const output = await fetch(`${process.env.DOC_HOST}/api/pages/717`, {
+        headers: {
+            Authorization: `Token ${process.env.DOC_TOKEN_ID}:${process.env.DOC_TOKEN_SECRET}`,
+        }
+    })
+
+    if (output.ok) {
+        const out = await output.json();
+        res.status(200).json(out.html);
+    } else {
+        console.error("Failed to fetch LOA policy from bookstack");
+        res.sendStatus(500);
+    }
+})
+
+
+export const docsRouter = router;

api/src/routes/loa.ts

@@ -30,9 +30,6 @@ router.post("/admin", [requireRole("17th Administrator")], async (req: Request,
     let LOARequest = req.body as LOARequest;
     LOARequest.created_by = req.user.id;
     LOARequest.filed_date = new Date();
-
-    console.log(LOARequest);
-
     try {
         await createNewLOA(LOARequest);
         res.sendStatus(201);
@@ -56,9 +53,13 @@ router.get("/me", async (req: Request, res: Response) => {
 
 //get my LOA history
 router.get("/history", async (req: Request, res: Response) => {
-    const user = req.user.id;
     try {
-        const result = await getUserLOA(user);
+        const user = req.user.id;
+
+        const page = Number(req.query.page) || undefined;
+        const pageSize = Number(req.query.pageSize) || undefined;
+
+        const result = await getUserLOA(user, page, pageSize);
         res.status(200).json(result)
     } catch (error) {
         console.error(error);
@@ -66,9 +67,11 @@ router.get("/history", async (req: Request, res: Response) => {
     }
 })
 
-router.get('/all', [requireRole("17th Administrator")], 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);

api/src/routes/members.ts

@@ -5,9 +5,9 @@ import { Request, Response } from 'express';
 import pool from '../db';
 import { requireLogin, requireMemberState, requireRole } from '../middleware/auth';
 import { getUserActiveLOA } from '../services/loaService';
-import { getMemberSettings, getMembersFull, getMembersLite, getUserData, setUserSettings } from '../services/memberService';
+import { getAllMembersLite, getMemberSettings, getMembersFull, getMembersLite, getUserData, getUserState, setUserSettings } from '../services/memberService';
 import { getUserRoles } from '../services/rolesService';
-import { memberSettings, MemberState } from '@app/shared/types/member';
+import { memberSettings, MemberState, myData } from '@app/shared/types/member';
 
 //get all users
 router.get('/', [requireLogin, requireMemberState(MemberState.Member)], async (req, res) => {
@@ -37,12 +37,12 @@ router.get('/me', [requireLogin], async (req, res) => {
         return res.sendStatus(401)
 
     try {
-        const { id, name, state } = await getUserData(req.user.id);
+        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 = { id, name, state, LOAData, roleData };
+        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);
@@ -53,7 +53,6 @@ router.get('/me', [requireLogin], async (req, res) => {
 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) {
@@ -66,7 +65,6 @@ 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) {
@@ -75,6 +73,16 @@ router.put('/settings', [requireLogin], async (req: Request, res: Response) => {
     }
 })
 
+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;
@@ -86,6 +94,7 @@ router.post('/lite/bulk', async (req: Request, res: Response) => {
     }
 })
 
+
 router.post('/full/bulk', async (req: Request, res: Response) => {
     try {
         let ids = req.body.ids;

api/src/routes/roles.ts

@@ -5,7 +5,8 @@ const ur = express.Router();
 import { MemberState } from '@app/shared/types/member';
 import pool from '../db';
 import { requireLogin, requireMemberState, requireRole } from '../middleware/auth';
-import { assignUserGroup, createGroup } from '../services/rolesService';
+import { assignUserGroup, createGroup, getAllRoles, getRole, getUsersWithRole } from '../services/rolesService';
+import { Request, Response } from 'express';
 
 r.use(requireLogin)
 ur.use(requireLogin)
@@ -15,10 +16,16 @@ ur.post('/', [requireMemberState(MemberState.Member), requireRole("17th Administ
     try {
         const body = req.body;
 
-        assignUserGroup(body.member_id, body.role_id);
+        await assignUserGroup(body.member_id, body.role_id);
 
         res.sendStatus(201);
     } catch (err) {
+        if (err?.code === 'ER_DUP_ENTRY') {
+            return res.status(400).json({
+                error: 'Member already has this role',
+            });
+        }
+
         console.error('Insert failed:', err);
         res.status(500).json({ error: 'Failed to add to group' });
     }
@@ -28,7 +35,6 @@ ur.post('/', [requireMemberState(MemberState.Member), requireRole("17th Administ
 ur.delete('/', [requireMemberState(MemberState.Member), requireRole("17th Administrator")], async (req, res) => {
     try {
         const body = req.body;
-        console.log(body);
 
         const sql = 'DELETE FROM members_roles WHERE member_id = ? AND role_id = ?'
         await pool.query(sql, [body.member_id, body.role_id])
@@ -45,48 +51,41 @@ ur.delete('/', [requireMemberState(MemberState.Member), requireRole("17th Admini
 //get all roles
 r.get('/', [requireMemberState(MemberState.Member)], async (req, res) => {
     try {
-        var con = await pool.getConnection();
-
-        // Get all roles
-        const roles = await con.query('SELECT * FROM roles;');
-
-        // Get all members for each role
-        const membersRoles = await con.query(`
-            SELECT mr.role_id, v.*
-            FROM members_roles mr
-            JOIN view_member_rank_unit_status_latest v ON mr.member_id = v.member_id
-            `);
-
-
-        // Group members by role_id
-        const roleIdToMembers = {};
-        for (const row of membersRoles) {
-            if (!roleIdToMembers[row.role_id]) roleIdToMembers[row.role_id] = [];
-            // Remove role_id from member object
-            const { role_id, ...member } = row;
-            roleIdToMembers[role_id].push(member);
-        }
-
-        // Attach members to each role
-        const result = roles.map(role => ({
-            ...role,
-            members: roleIdToMembers[role.id] || []
-        }));
-
-        res.json(result);
+        const roles = await getAllRoles();
+        res.status(200).json(roles);
     } catch (err) {
         console.error(err);
-        res.status(500).json({ error: 'Internal server error' });
-    } finally {
-        con.release();
+        res.sendStatus(500);
     }
 });
 
+r.get('/:id/members', [requireMemberState(MemberState.Member)], async (req: Request, res: Response) => {
+    try {
+        const members = await getUsersWithRole(Number(req.params.id));
+        res.status(200).json(members);
+    } catch (err) {
+        console.error(err);
+        res.sendStatus(500);
+    }
+})
+
+
+r.get('/:id', [requireMemberState(MemberState.Member)], async (req: Request, res: Response) => {
+    try {
+        const role = await getRole(Number(req.params.id));
+        res.status(200).json(role);
+    } catch (err) {
+        console.error(err);
+        res.sendStatus(500);
+    }
+})
+
+
+
 //create a new role
-r.post('/', [requireMemberState(MemberState.Member), requireRole("17th Administrator")], async (req, res) => {
+r.post('/', [requireMemberState(MemberState.Member), requireRole("dev")], async (req, res) => {
     try {
         const { name, color, description } = req.body;
-        console.log('Creating role:', { name, color, description });
         if (!name || !color) {
             return res.status(400).json({ error: 'Name and color are required' });
         }
@@ -105,7 +104,7 @@ r.post('/', [requireMemberState(MemberState.Member), requireRole("17th Administr
     }
 })
 
-r.delete('/:id', [requireMemberState(MemberState.Member), requireRole("17th Administrator")], async (req, res) => {
+r.delete('/:id', [requireMemberState(MemberState.Member), requireRole("dev")], async (req, res) => {
     try {
         const id = req.params.id;
 
@@ -113,7 +112,7 @@ r.delete('/:id', [requireMemberState(MemberState.Member), requireRole("17th Admi
         const res = await pool.query(sql, [id]);
         res.sendStatus(200);
     } catch (error) {
-        console.log(error);
+        console.error(error);
         res.sendStatus(500);
     }
 })

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;"
@@ -107,7 +108,8 @@ export async function insertCourseEvent(event: CourseEventDetails): Promise<numb
     }
 }
 
-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};`;
-    console.log(sql)
-    console.log(params)
-    let events: CourseEventSummary[] = await pool.query(sql, params);
-    return events;
+                ORDER BY E.event_date ${sortDir}         
+                LIMIT ? OFFSET ?;`;
+
+    let countSQL = `SELECT COUNT(*) AS count
+                    FROM course_events AS E
+                    LEFT JOIN courses AS C
+                    ON E.course_id = C.id
+                    LEFT JOIN members AS M
+                    ON E.created_by = M.id ${searchString};`
+    let recordCount = Number((await pool.query(countSQL, [...params]))[0].count);
+    let pageCount = recordCount / pageSize;
+
+    let events: CourseEventSummary[] = await pool.query(sql, [...params, pageSize, offset]);
+
+    let output: PagedData<CourseEventSummary> = { data: events, pagination: { page: page, pageSize: pageSize, total: recordCount, totalPages: pageCount } }
+
+    return output;
 }
 
 export async function getCourseEventRoles(): Promise<CourseAttendeeRole[]> {

api/src/services/applicationService.ts

@@ -31,7 +31,9 @@ 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 offset = (page - 1) * pageSize;
+
   const sql = `SELECT
       member.name AS member_name,
       app.id,
@@ -40,9 +42,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, offset]);
   return rows;
 }
 
@@ -59,30 +63,33 @@ 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);
-  return result;
+  const result = await pool.execute(sql, [approver, id]);
+  if (result.affectedRows == 1) {
+    return
+  } else {
+    throw new Error(`"Something went wrong approving application with ID ${id}`);
+  }
 }
 
-export async function denyApplication(id: number) {
+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]);
   if (result.affectedRows == 1) {
     return
   } else {

api/src/services/calendarService.ts

@@ -126,6 +126,5 @@ export async function getEventAttendance(eventID: number): Promise<CalendarSignu
 
     const sql = "CALL `sp_GetCalendarEventSignups`(?)"
     const res = await pool.query(sql, [eventID]);
-    console.log(res[0]);
     return res[0];
 }

api/src/services/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,12 +27,19 @@ 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[];
-    return res;
+    let loaCount = Number((await pool.query(`SELECT COUNT(*) as count FROM leave_of_absences;`))[0].count);
+    let pageCount = loaCount / pageSize;
+
+    let output: PagedData<LOARequest> = { data: loaList, pagination: { page: page, pageSize: pageSize, total: loaCount, totalPages: pageCount } }
+    return output;
 }
 
-export async function getUserLOA(userId: number): Promise<LOARequest[]> {
+export async function getUserLOA(userId: number, page = 1, pageSize = 10): Promise<PagedData<LOARequest>> {
+
+    const offset = (page - 1) * pageSize;
+
     const result: LOARequest[] = await pool.query(`
         SELECT loa.*, members.name, t.name AS type_name
             FROM leave_of_absences AS loa
@@ -48,8 +56,12 @@ export async function getUserLOA(userId: number): Promise<LOARequest[]> {
                     WHEN loa.closed IS NOT NULL THEN 4
                 END,
                 loa.start_date DESC
-            `, [userId])
-    return result;
+                LIMIT ? OFFSET ?;`, [userId, pageSize, offset])
+
+    let loaCount = Number((await pool.query(`SELECT COUNT(*) as count FROM leave_of_absences WHERE member_id = ?;`, [userId]))[0].count);
+    let pageCount = loaCount / pageSize;
+    let output: PagedData<LOARequest> = { data: result, pagination: { page: page, pageSize: pageSize, total: loaCount, totalPages: pageCount } }
+    return output;
 }
 
 export async function getUserActiveLOA(userId: number): Promise<LOARequest[]> {
@@ -73,16 +85,15 @@ 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);
     return out;
 }
 
 export async function getLOAbyID(id: number): Promise<LOARequest> {
     let res = await pool.query(`SELECT * FROM leave_of_absences WHERE id = ?`, [id]);
-    console.log(res);
     if (res.length != 1)
         throw new Error(`LOA with id ${id} not found`);
     return res[0];

api/src/services/memberService.ts

@@ -1,9 +1,10 @@
+import { Role } from "@app/shared/types/roles";
 import pool from "../db";
-import { Member, MemberLight, memberSettings, MemberState } from '@app/shared/types/member'
+import { Member, MemberCardDetails, MemberLight, memberSettings, MemberState } from '@app/shared/types/member'
 
-export async function getUserData(userID: number) {
-  const sql = `SELECT * FROM members WHERE id = ?`;
-  const res = await pool.query(sql, [userID]);
+export async function getUserData(userID: number): Promise<Member> {
+  const sql = `SELECT * FROM view_member_rank_unit_status_latest WHERE member_id = ?`;
+  const res: Member = await pool.query(sql, [userID]);
   return res[0] ?? null;
 }
 
@@ -34,7 +35,6 @@ export async function setUserSettings(id: number, settings: memberSettings) {
                 displayName = ?
                 WHERE id = ?;`;
   let result = await pool.query(sql, [settings.displayName, id])
-  console.log(result);
 }
 
 export async function getMembersLite(ids: number[]): Promise<MemberLight[]> {
@@ -49,12 +49,64 @@ export async function getMembersLite(ids: number[]): Promise<MemberLight[]> {
   return res;
 }
 
-export async function getMembersFull(ids: number[]): Promise<Member[]> {
-  const sql = `SELECT * FROM view_member_rank_unit_status_latest WHERE member_id IN (?);`;
-  const res: Member[] = await pool.query(sql, [ids]);
+export async function getAllMembersLite(): Promise<MemberLight[]> {
+  const sql = `SELECT m.member_id AS id,
+                  m.member_name AS username,
+                  m.displayName,
+                  u.color
+              FROM view_member_rank_unit_status_latest m
+                  LEFT JOIN units u ON u.name = m.unit;`;
+
+  const res: MemberLight[] = await pool.query(sql);
   return res;
 }
 
+export async function getMembersFull(ids: number[]): Promise<MemberCardDetails[]> {
+  const sql = `
+    SELECT m.*,
+      COALESCE(
+        JSON_ARRAYAGG(
+          CASE
+            WHEN r.id IS NOT NULL THEN JSON_OBJECT(
+              'id', r.id,
+              'name', r.name,
+              'color', r.color,
+              'description', r.description
+            )
+          END
+        ),
+        JSON_ARRAY()
+      ) AS roles
+    FROM view_member_rank_unit_status_latest m
+    LEFT JOIN members_roles mr ON m.member_id = mr.member_id
+    LEFT JOIN roles r ON mr.role_id = r.id
+    WHERE m.member_id IN (?)
+    GROUP BY m.member_id;
+  `;
+
+  const rows: any[] = await pool.query(sql, [ids]);
+
+  return rows.map(row => {
+    const member: Member = {
+      member_id: row.member_id,
+      member_name: row.member_name,
+      displayName: row.displayName,
+      rank: row.rank,
+      rank_date: row.rank_date,
+      unit: row.unit,
+      unit_date: row.unit_date,
+      status: row.status,
+      status_date: row.status_date,
+      loa_until: row.loa_until ? new Date(row.loa_until) : undefined,
+    };
+
+    // roles comes as array of strings; parse each one
+    const roles: Role[] = JSON.parse(row.roles).map((r: string) => JSON.parse(r));
+
+    return { member, roles };
+  });
+}
+
 export async function mapDiscordtoID(id: number): Promise<number | null> {
   const sql = `SELECT id FROM members WHERE discord_id = ?;`
   let res = await pool.query(sql, [id]);

api/src/services/rolesService.ts

@@ -1,8 +1,8 @@
+import { MemberLight } from '@app/shared/types/member';
 import pool from '../db';
-import { Role } from '@app/shared/types/roles'
+import { Role, RoleSummary } from '@app/shared/types/roles'
 
 export async function assignUserGroup(userID: number, roleID: number) {
-
     const sql = `INSERT INTO members_roles (member_id, role_id) VALUES (?, ?);`;
     const params = [userID, roleID];
 
@@ -21,7 +21,37 @@ export async function getUserRoles(userID: number): Promise<Role[]> {
     const sql = `SELECT r.id, r.name
         FROM members_roles mr
         INNER JOIN roles r ON mr.role_id = r.id
-        WHERE mr.member_id = 190;`;
+        WHERE mr.member_id = ?;`;
 
     return await pool.query(sql, [userID]);
+}
+
+export async function getRole(id: number): Promise<Role> {
+    let res = await pool.query(`SELECT * FROM roles WHERE id = ?`, [id])
+    return res[0] as Role;
+}
+
+export async function getAllRoles(): Promise<RoleSummary> {
+    return await pool.query(`SELECT id, name, color FROM roles`);
+}
+
+export async function getUsersWithRole(roleId: number): Promise<MemberLight[]> {
+    const out = await pool.query(
+        `
+    SELECT
+      m.member_id   AS id,
+      m.member_name AS username,
+      m.displayName,
+      u.color
+    FROM members_roles mr
+    JOIN view_member_rank_unit_status_latest m
+      ON m.member_id = mr.member_id
+    LEFT JOIN units u
+      ON u.name = m.unit
+    WHERE mr.role_id = ?
+    `,
+        [roleId]
+    )
+
+    return out as MemberLight[]
 }

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

@@ -1,3 +1,6 @@
+import { LOARequest } from "./loa";
+import { Role } from "./roles";
+
 export interface memberSettings {
     displayName: string;
 }
@@ -14,6 +17,7 @@ export enum MemberState {
 export type Member = {
     member_id: number;
     member_name: string;
+    displayName?: string;
     rank: string | null;
     rank_date: string | null;
     unit: string | null;
@@ -28,4 +32,16 @@ export interface MemberLight {
     displayName: string
     username: string
     color: string
+}
+
+export interface MemberCardDetails {
+    member: Member;
+    roles: Role[];
+}
+
+export interface myData {
+    member: Member;
+    LOAs: LOARequest[];
+    roles: Role[];
+    state: MemberState;
 }

shared/types/pagination.ts

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

shared/types/roles.ts

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

shared/utils/time.ts

@@ -1,5 +1,4 @@
 export function toDateTime(date: Date): string {
-    console.log(date);
     if (typeof date === 'string') {
         date = new Date(date);
     }
@@ -12,4 +11,4 @@ export function toDateTime(date: Date): string {
     const second = date.getSeconds().toString().padStart(2, "0");
 
     return `${year}-${month}-${day} ${hour}:${minute}:${second}`;
-}
+}

ui/src/App.vue

@@ -22,7 +22,10 @@ const environment = import.meta.env.VITE_ENVIRONMENT;
 </script>
 
 <template>
-  <div class="flex flex-col min-h-screen">
+  <div class="flex flex-col min-h-screen" style="background-image: linear-gradient(rgba(0, 0, 0, 0.25), rgba(0, 0, 0, 0.25)), url('/bg.jpg'); 
+      background-size: contain; 
+      background-attachment: fixed;
+      background-position: center;">
     <div class="sticky top-0 bg-background z-50">
       <Navbar class="flex"></Navbar>
       <Alert v-if="environment == 'dev'" class="m-2 mx-auto w-5xl" variant="info">
@@ -30,10 +33,12 @@ const environment = import.meta.env.VITE_ENVIRONMENT;
           <p>This is a development build of the application. Some features will be unavailable or unstable.</p>
         </AlertDescription>
       </Alert>
-      <Alert v-if="userStore.user?.LOAData?.[0]" class="m-2 mx-auto w-5xl" variant="info">
+      <Alert v-if="userStore.user?.LOAs?.[0]" class="m-2 mx-auto w-5xl" variant="info">
         <AlertDescription class="flex flex-row items-center text-nowrap gap-5 mx-auto">
-          <p>You are on LOA until <strong>{{ formatDate(userStore.user?.LOAData?.[0].end_date) }}</strong></p>
-          <Button variant="secondary" @click="async () => { await cancelLOA(userStore.user?.LOAData?.[0].id); userStore.loadUser(); }">End
+          <p>You are on LOA until <strong>{{ formatDate(userStore.user?.LOAs?.[0].extended_till ||
+            userStore.user?.LOAs?.[0].end_date) }}</strong></p>
+          <Button variant="secondary"
+            @click="async () => { await cancelLOA(userStore.user.LOAs?.[0].id); userStore.loadUser(); }">End
             LOA</Button>
         </AlertDescription>
       </Alert>

ui/src/api/application.ts

@@ -94,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/docs.ts

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

ui/src/api/loa.ts

@@ -1,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;
 
@@ -30,9 +31,9 @@ export async function adminSubmitLOA(request: LOARequest): Promise<{ id?: number
     });
 
     if (res.ok) {
-        return res.json();
+        return
     } else {
-        return { error: "Failed to submit LOA" };
+        throw new Error("Failed to submit LOA");
     }
 }
 
@@ -58,8 +59,18 @@ export async function getMyLOA(): Promise<LOARequest | null> {
     }
 }
 
-export function getAllLOAs(): Promise<LOARequest[]> {
-    return fetch(`${addr}/loa/all`, {
+export async function getAllLOAs(page?: number, pageSize?: number): Promise<PagedData<LOARequest>> {
+    const params = new URLSearchParams();
+
+    if (page !== undefined) {
+        params.set("page", page.toString());
+    }
+
+    if (pageSize !== undefined) {
+        params.set("pageSize", pageSize.toString());
+    }
+
+    return fetch(`${addr}/loa/all?${params}`, {
         method: "GET",
         headers: {
             "Content-Type": "application/json",
@@ -74,8 +85,18 @@ export function getAllLOAs(): Promise<LOARequest[]> {
     });
 }
 
-export function getMyLOAs(): Promise<LOARequest[]> {
-    return fetch(`${addr}/loa/history`, {
+export function getMyLOAs(page?: number, pageSize?: number): Promise<PagedData<LOARequest>> {
+    const params = new URLSearchParams();
+
+    if (page !== undefined) {
+        params.set("page", page.toString());
+    }
+
+    if (pageSize !== undefined) {
+        params.set("pageSize", pageSize.toString());
+    }
+
+    return fetch(`${addr}/loa/history?${params}`, {
         method: "GET",
         credentials: 'include',
         headers: {

ui/src/api/member.ts

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

ui/src/api/roles.ts

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

ui/src/api/trainingReport.ts

@@ -1,15 +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[]> {
-    const res = await fetch(`${addr}/courseEvent?sort=${sortMode}&search=${search}`, {
+export async function getTrainingReports(sortMode?: string, search?: string, page?: number, pageSize?: number): Promise<PagedData<CourseEventSummary>> {
+    const params = new URLSearchParams();
+
+    if (page !== undefined) {
+        params.set("page", page.toString());
+    }
+
+    if (pageSize !== undefined) {
+        params.set("pageSize", pageSize.toString());
+    }
+
+    if (sortMode !== undefined) {
+        params.set("sort", sortMode.toString());
+    }
+
+    if (search !== undefined || search !== "") {
+        params.set("search", search.toString());
+    }
+
+    const res = await fetch(`${addr}/courseEvent?${params}`, {
         credentials: 'include',
     });
 
     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");
@@ -31,7 +50,7 @@ export async function getTrainingReport(id: number): Promise<CourseEventDetails>
 
 export async function getAllTrainings(): Promise<Course[]> {
     const res = await fetch(`${addr}/course`, {
-            credentials: 'include',
+        credentials: 'include',
     });
 
     if (res.ok) {

ui/src/assets/base.css

@@ -4,7 +4,7 @@
 @custom-variant dark (&:is(.dark *));
 
 :root {
-  --background: oklch(0.2046 0 0);
+  --background: oklch(19.125% 0.00002 271.152);
   --foreground: oklch(0.9219 0 0);
   --card: oklch(23.075% 0.00003 271.152);
   --card-foreground: oklch(0.9219 0 0);

ui/src/components/Navigation/Navbar.vue

@@ -85,11 +85,11 @@ function blurAfter() {
                                         </RouterLink>
                                     </NavigationMenuLink>
 
-                                    <NavigationMenuLink as-child :class="navigationMenuTriggerStyle()">
+                                    <!-- <NavigationMenuLink as-child :class="navigationMenuTriggerStyle()">
                                         <RouterLink to="/transfer" @click="blurAfter">
                                             Transfer Request
                                         </RouterLink>
-                                    </NavigationMenuLink>
+                                    </NavigationMenuLink> -->
 
                                     <NavigationMenuLink as-child :class="navigationMenuTriggerStyle()">
                                         <RouterLink to="/trainingReport" @click="blurAfter">
@@ -107,13 +107,13 @@ function blurAfter() {
                                 <NavigationMenuContent
                                     class="grid gap-1 p-2 text-left [&_a]:w-full [&_a]:block [&_a]:whitespace-nowrap *:bg-transparent">
 
-                                    <NavigationMenuLink
+                                    <!-- <NavigationMenuLink
                                         v-if="auth.hasAnyRole(['17th Administrator', '17th HQ', '17th Command'])"
                                         as-child :class="navigationMenuTriggerStyle()">
                                         <RouterLink to="/administration/rankChange" @click="blurAfter">
                                             Promotions
                                         </RouterLink>
-                                    </NavigationMenuLink>
+                                    </NavigationMenuLink> -->
 
                                     <NavigationMenuLink
                                         v-if="auth.hasAnyRole(['17th Administrator', '17th HQ', '17th Command'])"
@@ -123,13 +123,13 @@ function blurAfter() {
                                         </RouterLink>
                                     </NavigationMenuLink>
 
-                                    <NavigationMenuLink
+                                    <!-- <NavigationMenuLink
                                         v-if="auth.hasAnyRole(['17th Administrator', '17th HQ', '17th Command'])"
                                         as-child :class="navigationMenuTriggerStyle()">
                                         <RouterLink to="/administration/transfer" @click="blurAfter">
                                             Transfer Requests
                                         </RouterLink>
-                                    </NavigationMenuLink>
+                                    </NavigationMenuLink> -->
 
                                     <NavigationMenuLink v-if="auth.hasRole('Recruiter')" as-child
                                         :class="navigationMenuTriggerStyle()">
@@ -147,11 +147,11 @@ function blurAfter() {
                                 </NavigationMenuContent>
                             </NavigationMenuItem>
 
-                            <NavigationMenuItem as-child :class="navigationMenuTriggerStyle()">
+                            <!-- <NavigationMenuItem as-child :class="navigationMenuTriggerStyle()">
                                 <RouterLink to="/members" @click="blurAfter">
                                     Members (debug)
                                 </RouterLink>
-                            </NavigationMenuItem>
+                            </NavigationMenuItem> -->
 
                         </NavigationMenuList>
                     </NavigationMenu>
@@ -179,7 +179,9 @@ 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 @click="$router.push('/profile')">My Profile</DropdownMenuItem>

ui/src/components/application/ApplicationChat.vue

@@ -64,7 +64,7 @@ function onSubmit(values: { text: string }, { resetForm }: { resetForm: () => vo
       <!-- Button below, right-aligned -->
       <div class="mt-2 flex justify-end gap-2">
         <Button v-if="adminMode" type="submit" @click="submitMode = 'internal'" variant="outline">Post (Internal)</Button>
-        <Button type="submit" @click="submitMode = 'public'">Post (Public)</Button>
+        <Button type="submit" @click="submitMode = 'public'">{{ adminMode ? 'Post (Public)' : 'Post' }}</Button>
       </div>
     </Form>
 

ui/src/components/application/ApplicationForm.vue

@@ -33,7 +33,7 @@ const regexB = /^https?:\/\/steamcommunity\.com\/profiles\/\d+\/?$/;
 const formSchema = toTypedSchema(z.object({
   dob: z.string().refine(v => v, { message: "A date of birth is required." }),
   name: z.string().nonempty(),
-  playtime: z.coerce.number({ invalid_type_error: "Must be a number", }).min(0, "Cannot be less than 0"),
+  playtime: z.preprocess((v) => (v === "" ? undefined : String(v)),z.string({ required_error: "Required" }).regex(/^\d+(\.\d+)?$/, "Must be a number").transform(Number).refine((n) => n >= 0, "Cannot be less than 0")),
   hobbies: z.string().nonempty(),
   military: z.boolean(),
   communities: z.string().nonempty(),
@@ -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

@@ -13,6 +13,7 @@ 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();
 
@@ -63,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;
 });
 
@@ -78,8 +79,9 @@ async function setAttendance(state: CalendarAttendance) {
 }
 
 const canEditEvent = computed(() => {
-    if (!user.isLoggedIn) return false;
-    if (user.user.id == activeEvent.value.creator_id)
+    if (!userStore.isLoggedIn) return false;
+    if (userStore.state !== 'member') return false;
+    if (userStore.user.member.member_id == activeEvent.value.creator_id)
         return true;
 });
 
@@ -103,11 +105,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> = {
@@ -125,11 +127,11 @@ const attendanceCountsByGroup = computed(() => {
     const signups = activeEvent.value.eventSignups ?? [];
 
     return {
-        Alpha: signups.filter(s => s.member_unit === "Alpha Company").length,
-        Echo: signups.filter(s => s.member_unit === "Echo Company").length,
+        Alpha: signups.filter(s => s.unit_name === "Alpha Company").length,
+        Echo: signups.filter(s => s.unit_name === "Echo Company").length,
         Other: signups.filter(s =>
-            s.member_unit !== "Alpha Company" &&
-            s.member_unit !== "Echo Company"
+            s.unit_name !== "Alpha Company" &&
+            s.unit_name !== "Echo Company"
         ).length,
     };
 });
@@ -195,7 +197,7 @@ defineExpose({ forceReload })
                         <DropdownMenuItem v-if="activeEvent.cancelled" @click="setCancel(false)">
                             Un-Cancel
                         </DropdownMenuItem>
-                        <DropdownMenuItem v-else @click="setCancel(true)">
+                        <DropdownMenuItem v-else @click="setCancel(true)" class="text-destructive">
                             Cancel
                         </DropdownMenuItem>
                     </DropdownMenuContent>
@@ -214,7 +216,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.state === 'member'" class="w-full">
                 <ButtonGroup class="flex w-full">
                     <Button variant="outline"
                         :class="myAttendance?.status === CalendarAttendance.Attending ? 'border-2 border-primary text-primary' : ''"
@@ -240,7 +242,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> <MemberCard :member-id="activeEvent.creator_id"></MemberCard>
+                    <User :size="20"></User>
+                    <MemberCard :member-id="activeEvent.creator_id"></MemberCard>
                 </div>
             </section>
             <!-- Description -->
@@ -289,4 +292,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,8 +71,9 @@ const { handleSubmit, values, resetForm } = useForm({
     validationSchema: toTypedSchema(loaSchema),
 })
 
+const formSubmitted = ref(false);
+
 const onSubmit = handleSubmit(async (values) => {
-    console.log(values);
     const out: LOARequest = {
         member_id: values.member_id,
         start_date: values.start_date,
@@ -85,6 +87,7 @@ const onSubmit = handleSubmit(async (values) => {
         await submitLOA(out);
         userStore.loadUser();
     }
+    formSubmitted.value = true;
 })
 
 onMounted(async () => {
@@ -101,7 +104,11 @@ onMounted(async () => {
         console.error(error);
     }
 
-    members.value = await getMembers();
+    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 } });
 });
@@ -114,7 +121,7 @@ const minEndDate = computed(() => {
     if (values.start_date) {
         return new CalendarDate(values.start_date.getFullYear(), values.start_date.getMonth() + 1, values.start_date.getDate())
     } else {
-        return null;
+        return today(getLocalTimeZone());
     }
 })
 
@@ -126,6 +133,33 @@ const maxEndDate = computed(() => {
         return null;
     }
 })
+
+const minStartDate = computed(() => {
+    if (values.type && values.end_date) {
+        let endDateObj = new Date(values.end_date.getTime() - values.type.max_length_days * 24 * 60 * 60 * 1000);
+        let td = today(getLocalTimeZone());
+        let start = new CalendarDate(endDateObj.getFullYear(), endDateObj.getMonth() + 1, endDateObj.getDate())
+        return td.compare(start) > 0 ? td : start;
+    } else {
+        return today(getLocalTimeZone());
+    }
+})
+
+const memberFilter = ref('');
+
+const filteredMembers = computed(() => {
+    const q = memberFilter?.value?.toLowerCase() ?? ""
+    const results: Member[] = []
+
+    for (const m of members.value ?? []) {
+        if (!q || (m.displayName || m.member_name).toLowerCase().includes(q)) {
+            results.push(m)
+            if (results.length >= 50) break
+        }
+    }
+
+    return results
+})
 </script>
 
 <template>
@@ -137,7 +171,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,22 +183,24 @@ 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 : ''
+                                            }" @input="memberFilter = $event.target.value" />
                                     </ComboboxAnchor>
                                     <ComboboxList class="*:w-64">
                                         <ComboboxEmpty class="text-muted-foreground w-full">No results</ComboboxEmpty>
                                         <ComboboxGroup>
-                                            <template v-for="member in members" :key="member.member_id">
-                                                <ComboboxItem :value="member.member_id"
-                                                    class="data-[highlighted]:bg-accent data-[highlighted]:text-accent-foreground relative cursor-pointer select-none px-2 py-1.5 w-full">
-                                                    {{ member.member_name }}
-                                                    <ComboboxItemIndicator
-                                                        class="absolute left-2 inline-flex items-center">
-                                                        <Check class="h-4 w-4" />
-                                                    </ComboboxItemIndicator>
-                                                </ComboboxItem>
-                                            </template>
+                                            <div class="max-h-80 overflow-y-scroll scrollbar-themed min-w-3xs">
+                                                <template v-for="member in filteredMembers" :key="member.member_id">
+                                                    <ComboboxItem :value="member.member_id"
+                                                        class="data-[highlighted]:bg-accent data-[highlighted]:text-accent-foreground relative cursor-pointer select-none px-2 py-1.5 w-full">
+                                                        {{ member.displayName || member.member_name }}
+                                                        <ComboboxItemIndicator
+                                                            class="absolute left-2 inline-flex items-center">
+                                                            <Check class="h-4 w-4" />
+                                                        </ComboboxItemIndicator>
+                                                    </ComboboxItem>
+                                                </template>
+                                            </div>
                                         </ComboboxGroup>
                                     </ComboboxList>
                                 </Combobox>
@@ -201,21 +237,31 @@ const maxEndDate = computed(() => {
                             <FieldContent>
                                 <FieldLabel>Start Date</FieldLabel>
                                 <Popover>
-                                    <PopoverTrigger as-child>
-                                        <Button variant="outline" :class="cn(
-                                            'w-full justify-start text-left font-normal',
-                                            !field.value && 'text-muted-foreground',
-                                        )">
-                                            <CalendarIcon class="mr-2 h-4 w-4" />
-                                            {{ field.value ? df.format(field.value) : "Pick a date" }}
-                                        </Button>
-                                    </PopoverTrigger>
+                                    <div class="relative inline-flex items-center group">
+                                        <PopoverTrigger as-child>
+                                            <Button :disabled="!values.type" variant="outline" :class="cn(
+                                                'w-full justify-start text-left font-normal',
+                                                !field.value && 'text-muted-foreground',
+                                            )">
+                                                <CalendarIcon class="mr-2 h-4 w-4" />
+                                                {{ field.value ? df.format(field.value) : "Pick a date" }}
+                                            </Button>
+                                        </PopoverTrigger>
+                                        <!-- Tooltip bubble -->
+                                        <div v-if="!values?.type" class="pointer-events-none absolute -top-9 left-1/2 -translate-x-1/2
+                                                    whitespace-nowrap rounded-md bg-popover px-2 py-1 text-xs
+                                                    text-popover-foreground shadow-md border border-border
+                                                    opacity-0 translate-y-1
+                                                    group-hover:opacity-100 group-hover:translate-y-0
+                                                    transition-opacity transition-transform duration-150">
+                                            Select an LOA type first
+                                        </div>
+                                    </div>
                                     <PopoverContent class="w-auto p-0">
                                         <Calendar
-                                            :model-value="field.value
-                                                ? new CalendarDate(field.value.getFullYear(), field.value.getMonth() + 1, field.value.getDate()) : null"
                                             @update:model-value="(val: CalendarDate) => field.onChange(val.toDate(getLocalTimeZone()))"
-                                            layout="month-and-year" :min-value="today(getLocalTimeZone())" />
+                                            layout="month-and-year"
+                                            :min-value="minStartDate || today(getLocalTimeZone())" />
                                     </PopoverContent>
                                 </Popover>
                                 <div class="h-4">
@@ -229,18 +275,28 @@ const maxEndDate = computed(() => {
                             <FieldContent>
                                 <FieldLabel>End Date</FieldLabel>
                                 <Popover>
-                                    <PopoverTrigger as-child>
-                                        <Button variant="outline" :class="cn(
-                                            'w-full justify-start text-left font-normal',
-                                            !field.value && 'text-muted-foreground',
-                                        )">
-                                            <CalendarIcon class="mr-2 h-4 w-4" />
-                                            {{ field.value ? df.format(field.value) : "Pick a date" }}
-                                        </Button>
-                                    </PopoverTrigger>
+                                    <div class="relative inline-flex items-center group">
+                                        <PopoverTrigger as-child>
+                                            <Button :disabled="!values.type" variant="outline" :class="cn(
+                                                'w-full justify-start text-left font-normal',
+                                                !field.value && 'text-muted-foreground',
+                                            )">
+                                                <CalendarIcon class="mr-2 h-4 w-4" />
+                                                {{ field.value ? df.format(field.value) : "Pick a date" }}
+                                            </Button>
+                                        </PopoverTrigger>
+                                        <!-- Tooltip bubble -->
+                                        <div v-if="!values?.type" class="pointer-events-none absolute -top-9 left-1/2 -translate-x-1/2
+                                                    whitespace-nowrap rounded-md bg-popover px-2 py-1 text-xs
+                                                    text-popover-foreground shadow-md border border-border
+                                                    opacity-0 translate-y-1
+                                                    group-hover:opacity-100 group-hover:translate-y-0
+                                                    transition-opacity transition-transform duration-150">
+                                            Select an LOA type first
+                                        </div>
+                                    </div>
                                     <PopoverContent class="w-auto p-0">
                                         <Calendar
-                                            :model-value="field.value ? new CalendarDate(field.value.getFullYear(), field.value.getMonth() + 1, field.value.getDate()) : null"
                                             @update:model-value="(val: CalendarDate) => field.onChange(val.toDate(getLocalTimeZone()))"
                                             :default-placeholder="defaultPlaceholder" :min-value="minEndDate"
                                             :max-value="maxEndDate" layout="month-and-year">
@@ -272,6 +328,26 @@ 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">
+                    {{ adminMode ? 'You have successfully submitted a Leave of Absence on behalf of another member.' :
+                        `Your Leave
+                    of Absence request has been submitted successfully.
+                    It will take effect on your selected start date.` }}
+                </p>
+
+
+                <div class="flex gap-3 mt-4">
+                    <Button variant="secondary" @click="formSubmitted = false">
+                        Submit another request
+                    </Button>
+                </div>
+            </div>
+
         </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";
@@ -33,6 +33,15 @@ import {
 } 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
@@ -46,9 +55,13 @@ 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();
+        let result = await getMyLOAs(pageNum.value, pageSize.value);
+        LOAList.value = result.data;
+        pageData.value = result.pagination;
     }
 }
 
@@ -76,12 +89,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();
@@ -104,6 +111,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>
@@ -139,51 +166,121 @@ 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">
-                        <TableCell class="font-medium">
-                            <MemberCard :member-id="post.member_id"></MemberCard>
-                        </TableCell>
-                        <TableCell>{{ post.type_name }}</TableCell>
-                        <TableCell>{{ formatDate(post.start_date) }}</TableCell>
-                        <TableCell>{{ post.extended_till ? formatDate(post.extended_till) : formatDate(post.end_date) }}
-                        </TableCell>
-                        <TableCell>{{ post.reason }}</TableCell>
-                        <TableCell>{{ formatDate(post.filed_date) }}</TableCell>
-                        <TableCell>
-                            <Badge v-if="loaStatus(post) === 'Upcoming'" class="bg-blue-400">Upcoming</Badge>
-                            <Badge v-else-if="loaStatus(post) === 'Active'" class="bg-green-500">Active</Badge>
-                            <Badge v-else-if="loaStatus(post) === 'Overdue'" class="bg-yellow-400">Overdue</Badge>
-                            <Badge v-else class="bg-gray-400">Ended</Badge>
-                        </TableCell>
-                        <TableCell @click.stop="" class="text-right">
-                            <DropdownMenu>
-                                <DropdownMenuTrigger class="cursor-pointer">
-                                    <Ellipsis></Ellipsis>
-                                </DropdownMenuTrigger>
-                                <DropdownMenuContent>
-                                    <DropdownMenuItem v-if="!post.closed && props.adminMode"
-                                        @click="isExtending = true; targetLOA = post">
-                                        Extend
-                                    </DropdownMenuItem>
-                                    <DropdownMenuItem v-if="!post.closed" :variant="'destructive'"
-                                        @click="cancelAndReload(post.id)">End
-                                    </DropdownMenuItem>
-                                    <!-- Fallback: no actions available -->
-                                    <p v-if="post.closed || (!props.adminMode && post.closed)" class="p-2 text-center text-sm">
-                                        No actions
-                                    </p>
-                                </DropdownMenuContent>
-                            </DropdownMenu>
-                        </TableCell>
-                    </TableRow>
+                    <template v-for="post in LOAList" :key="post.id">
+                        <TableRow class="hover:bg-muted/50 cursor-pointer" @click="expanded = post.id"
+                            @mouseenter="hoverID = post.id" @mouseleave="hoverID = null" :class="{
+                                'border-b-0': expanded === post.id,
+                                'bg-muted/50': hoverID === post.id
+                            }">
+                            <TableCell class="font-medium">
+                                <MemberCard :member-id="post.member_id"></MemberCard>
+                            </TableCell>
+                            <TableCell>{{ post.type_name }}</TableCell>
+                            <TableCell>{{ formatDate(post.start_date) }}</TableCell>
+                            <TableCell>{{ post.extended_till ? formatDate(post.extended_till) :
+                                formatDate(post.end_date) }}
+                            </TableCell>
+                            <!-- <TableCell>{{ post.reason }}</TableCell> -->
+                            <TableCell>{{ formatDate(post.filed_date) }}</TableCell>
+                            <TableCell>
+                                <Badge v-if="loaStatus(post) === 'Upcoming'" class="bg-blue-400">Upcoming</Badge>
+                                <Badge v-else-if="loaStatus(post) === 'Active'" class="bg-green-500">Active</Badge>
+                                <Badge v-else-if="loaStatus(post) === 'Overdue'" class="bg-yellow-400">Overdue</Badge>
+                                <Badge v-else class="bg-gray-400">Ended</Badge>
+                            </TableCell>
+                            <TableCell @click.stop="" class="text-right">
+                                <DropdownMenu>
+                                    <DropdownMenuTrigger class="cursor-pointer">
+                                        <Button variant="ghost">
+                                            <Ellipsis class="size-6"></Ellipsis>
+                                        </Button>
+                                    </DropdownMenuTrigger>
+                                    <DropdownMenuContent>
+                                        <DropdownMenuItem v-if="!post.closed && props.adminMode"
+                                            @click="isExtending = true; targetLOA = post">
+                                            Extend
+                                        </DropdownMenuItem>
+                                        <DropdownMenuItem v-if="!post.closed" :variant="'destructive'"
+                                            @click="cancelAndReload(post.id)">{{ loaStatus(post) === 'Upcoming' ?
+                                                'Cancel' :
+                                                'End' }}
+                                        </DropdownMenuItem>
+                                        <!-- Fallback: no actions available -->
+                                        <p v-if="post.closed || (!props.adminMode && post.closed)"
+                                            class="p-2 text-center text-sm">
+                                            No actions
+                                        </p>
+                                    </DropdownMenuContent>
+                                </DropdownMenu>
+                            </TableCell>
+                            <TableCell>
+                                <Button v-if="expanded === post.id" @click.stop="expanded = null" variant="ghost">
+                                    <ChevronUp class="size-6" />
+                                </Button>
+                                <Button v-else @click.stop="expanded = post.id" variant="ghost">
+                                    <ChevronDown class="size-6" />
+                                </Button>
+                            </TableCell>
+                        </TableRow>
+                        <TableRow v-if="expanded === post.id" @mouseenter="hoverID = post.id"
+                            @mouseleave="hoverID = null" :class="{ 'bg-muted/50 border-t-0': hoverID === post.id }">
+                            <TableCell :colspan="8" class="p-0">
+                                <div class="w-full p-3 mb-6 space-y-3">
+                                    <div class="flex justify-between items-start gap-4">
+                                        <div class="flex-1">
+                                            <!-- Title -->
+                                            <p class="text-md font-semibold text-foreground">
+                                                Reason
+                                            </p>
+
+                                            <!-- Content -->
+                                            <p
+                                                class="mt-1 text-md whitespace-pre-wrap leading-relaxed text-muted-foreground">
+                                                {{ post.reason }}
+                                            </p>
+                                        </div>
+                                    </div>
+                                </div>
+                            </TableCell>
+                        </TableRow>
+
+                    </template>
                 </TableBody>
             </Table>
+            <div class="mt-5 flex justify-between">
+                <div></div>
+                <Pagination v-slot="{ page }" :items-per-page="pageData?.pageSize || 10" :total="pageData?.total || 10"
+                    :default-page="2" :page="pageNum" @update:page="setPage">
+                    <PaginationContent v-slot="{ items }">
+                        <PaginationPrevious />
+                        <template v-for="(item, index) in items" :key="index">
+                            <PaginationItem v-if="item.type === 'page'" :value="item.value"
+                                :is-active="item.value === page">
+                                {{ item.value }}
+                            </PaginationItem>
+                        </template>
+                        <PaginationEllipsis :index="4" />
+                        <PaginationNext />
+                    </PaginationContent>
+                </Pagination>
+                <div class="flex items-center gap-3 text-sm">
+                    <p class="text-muted-foreground text-nowrap">Per page:</p>
+
+                    <button v-for="size in pageSizeOptions" :key="size" @click="setPageSize(size)"
+                        class="px-2 py-1 rounded transition-colors" :class="{
+                            'bg-muted font-semibold': pageSize === size,
+                            'hover:bg-muted/50': pageSize !== size
+                        }">
+                        {{ size }}
+                    </button>
+                </div>
+            </div>
         </div>
     </div>
 </template>

ui/src/components/members/MemberCard.vue

@@ -1,13 +1,15 @@
 <script setup lang="ts">
 import { useMemberDirectory } from '@/stores/memberDirectory';
 import { ref, onMounted, computed } from 'vue';
-import { Member, type MemberLight } from '@shared/types/member'
+import { Member, MemberCardDetails, type MemberLight } from '@shared/types/member'
 import Popover from '../ui/popover/Popover.vue';
 import PopoverTrigger from '../ui/popover/PopoverTrigger.vue';
 import PopoverContent from '../ui/popover/PopoverContent.vue';
 import { cn } from '@/lib/utils.js'
 import { watch } from 'vue';
 import { format } from 'path';
+import Spinner from '../ui/spinner/Spinner.vue';
+import { Dot } from 'lucide-vue-next';
 
 
 // Props
@@ -20,7 +22,7 @@ const props = defineProps({
 
 // Local state
 const memberLight = ref<MemberLight | null>(null);
-const memberFull = ref<Member | null>(null)
+const memberFull = ref<MemberCardDetails | null>(null)
 const loadingFull = ref(false)
 const membersStore = useMemberDirectory();
 
@@ -62,7 +64,7 @@ const hasFullInfo = computed(() => {
     if (!memberFull.value) return false
 
     // check if any field has a value
-    const { rank, unit, status } = memberFull.value
+    const { rank, unit, status } = memberFull.value.member
     return !!(rank || unit || status)
 })
 
@@ -89,10 +91,10 @@ function formatDate(date: Date): string {
                 {{ displayName }}
             </p>
         </PopoverTrigger>
-        <PopoverContent class="w-72 p-0 overflow-hidden">
+        <PopoverContent class="w-80 p-0 overflow-hidden">
             <!-- Loading -->
-            <div v-if="loadingFull" class="p-4 text-sm text-muted-foreground">
-                Loading profile…
+            <div v-if="loadingFull" class="p-4 text-sm text-muted-foreground mx-auto flex justify-center my-5">
+                <Spinner></Spinner>
             </div>
 
             <!-- Profile -->
@@ -113,26 +115,36 @@ function formatDate(date: Date): string {
                 <div class="p-4 space-y-3 text-sm">
                     <!-- Full info -->
                     <template v-if="hasFullInfo">
-                        <div v-if="memberFull.loa_until"
+                        <div v-if="memberFull.member.loa_until"
                             class=" rounded-md text-center bg-yellow-500/10 px-2 py-1 text-xs text-yellow-600">
-                            On Leave of Absence until {{ formatDate(memberFull.loa_until) }}
+                            On Leave of Absence until {{ formatDate(memberFull.member.loa_until) }}
                         </div>
 
-                        <div v-if="memberFull.rank" class="flex justify-between">
+
+                        <div v-if="memberFull.member.rank" class="flex justify-between">
                             <span class="text-muted-foreground">Rank</span>
-                            <span class="font-medium">{{ memberFull.rank }}</span>
+                            <span class="font-medium">{{ memberFull.member.rank }}</span>
                         </div>
 
-                        <div v-if="memberFull.unit" class="flex justify-between">
+                        <div v-if="memberFull.member.unit" class="flex justify-between items-center">
                             <span class="text-muted-foreground">Unit</span>
-                            <span class="font-medium">{{ memberFull.unit }}</span>
+                            <span class="font-medium flex items-center gap-2">
+                                <span class="w-2 h-2 rounded-full" :style="{ backgroundColor: textColor }"></span>
+                                {{ memberFull.member.unit }}
+                            </span>
                         </div>
 
-                        <div v-if="memberFull.status" class="flex justify-between">
+                        <div v-if="memberFull.member.status" class="flex justify-between">
                             <span class="text-muted-foreground">Status</span>
-                            <span class="font-medium">{{ memberFull.status }}</span>
+                            <span class="font-medium">{{ memberFull.member.status }}</span>
                         </div>
 
+
+                        <div class="flex gap-2 flex-wrap mt-6">
+                            <div v-for="role in memberFull.roles" class="border rounded-full px-3 text-nowrap">
+                                {{ role.name }}
+                            </div>
+                        </div>
                     </template>
 
                     <!-- No info fallback -->

ui/src/components/roles/addMember.vue

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

ui/src/components/roles/roleView.vue

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

ui/src/components/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"
-                                class="h-9 border rounded p-2 w-auto focus-visible:border-ring focus-visible:ring-ring/50 focus-visible:ring-[3px] bg-background outline-none">
-                                <option value="" disabled>Select a course</option>
-                                <option v-for="course in trainings" :key="course.id" :value="course.id">
-                                    {{ course.name }}
-                                </option>
-                            </select>
+                            <Combobox :model-value="field.value" @update:open="selectCourse = $event"
+                                :open="selectCourse" @update:model-value="(v) => {
+                                    field.onChange(v);
+                                    selectCourse = false
+                                }" class="w-full">
+                                <ComboboxAnchor class="w-full">
+                                    <ComboboxInput @focus="selectCourse = true" placeholder="Search courses..."
+                                        class="w-full pl-3" :display-value="(id) => {
+                                            const c = trainings?.find(t => t.id === id)
+                                            return c ? c.name : '';
+                                        }" />
+                                </ComboboxAnchor>
+
+                                <ComboboxList class="w-full">
+                                    <ComboboxEmpty class="text-muted-foreground w-full">No results</ComboboxEmpty>
+                                    <ComboboxGroup>
+                                        <div class="max-h-80 overflow-y-scroll scrollbar-themed min-w-md">
+                                            <template v-for="course in trainings" :key="course.id">
+                                                <ComboboxItem :value="course.id"
+                                                    class="data-[highlighted]:bg-accent data-[highlighted]:text-accent-foreground relative cursor-pointer select-none px-2 py-1.5 w-full">
+                                                    {{ course.name }}
+                                                    <ComboboxItemIndicator
+                                                        class="absolute left-2 inline-flex items-center">
+                                                        <Check class="h-4 w-4" />
+                                                    </ComboboxItemIndicator>
+                                                </ComboboxItem>
+                                            </template>
+                                        </div>
+                                    </ComboboxGroup>
+                                </ComboboxList>
+                            </Combobox>
                             <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"
-                                        class="border rounded p-2 w-full focus-visible:border-ring focus-visible:ring-ring/50 focus-visible:ring-[3px] bg-background outline-none">
-                                        <option value="">Select member...</option>
-                                        <option v-for="m in members" :key="m.member_id" :value="m.member_id">
-                                            {{ m.member_name }}
-                                        </option>
-                                    </select>
+                                    <Combobox :model-value="f.value"
+                                        @update:open="openMap['member-' + field.key] = $event"
+                                        :open="openMap['member-' + field.key]" @update:model-value="(v) => {
+                                            f.onChange(v);
+                                            openMap['member-' + field.key] = false
+                                        }" class="w-full">
+                                        <ComboboxAnchor class="w-full">
+                                            <ComboboxInput
+                                                @focus="() => { openMap['member-' + field.key] = true; memberSearch = memberMap[f.value] }"
+                                                placeholder="Search members..." class="w-full pl-3"
+                                                :display-value="(id) => memberMap[id] || ''"
+                                                @input="memberSearch = $event.target.value" />
+                                        </ComboboxAnchor>
+                                        <ComboboxList class="w-full">
+                                            <ComboboxEmpty class="text-muted-foreground w-full">No results
+                                            </ComboboxEmpty>
+                                            <ComboboxGroup>
+                                                <div class="max-h-80 overflow-y-scroll scrollbar-themed min-w-3xs">
+                                                    <template v-for="m in filteredMembers" :key="m.id">
+                                                        <ComboboxItem :value="m.id"
+                                                            class="data-[highlighted]:bg-accent data-[highlighted]:text-accent-foreground relative cursor-pointer select-none px-2 py-1.5 w-full">
+                                                            {{ m.displayName || m.username }}
+                                                            <ComboboxItemIndicator
+                                                                class="absolute left-2 inline-flex items-center">
+                                                                <Check class="h-4 w-4" />
+                                                            </ComboboxItemIndicator>
+                                                        </ComboboxItem>
+                                                    </template>
+                                                </div>
+                                            </ComboboxGroup>
+                                        </ComboboxList>
+                                    </Combobox>
                                     <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"
-                                        class="border rounded p-2 w-full focus-visible:border-ring focus-visible:ring-ring/50 focus-visible:ring-[3px] bg-background outline-none">
-                                        <option value="">Select role...</option>
-                                        <option v-for="r in eventRoles" :key="r.id" :value="r.id">
-                                            {{ r.name }}
-                                        </option>
-                                    </select>
+                                    <Combobox :model-value="f.value"
+                                        @update:open="openMap['role-' + field.key] = $event"
+                                        :open="openMap['role-' + field.key]" @update:model-value="(v) => {
+                                            f.onChange(v);
+                                            openMap['role-' + field.key] = false
+                                        }" class="w-full">
+                                        <ComboboxAnchor class="w-full">
+                                            <ComboboxInput @focus="openMap['role-' + field.key] = true"
+                                                placeholder="Search roles..." class="w-full pl-3" :display-value="(id) => {
+                                                    const er = eventRoles?.find(t => t.id === id)
+                                                    return er?.name;
+                                                }" />
+                                        </ComboboxAnchor>
+                                        <ComboboxList class="w-full">
+                                            <ComboboxEmpty class="text-muted-foreground w-full">No results
+                                            </ComboboxEmpty>
+                                            <ComboboxGroup>
+                                                <div class="max-h-80 overflow-y-scroll scrollbar-themed min-w-3xs">
+                                                    <template v-for="r in eventRoles" :key="r.id">
+                                                        <ComboboxItem :value="r.id"
+                                                            class="data-[highlighted]:bg-accent data-[highlighted]:text-accent-foreground relative cursor-pointer select-none px-2 py-1.5 w-full">
+                                                            <div class="flex justify-between w-full gap-8">
+                                                                <p>{{ r.name }}</p>
+                                                                <p class="text-muted-foreground">{{ r.description }}</p>
+                                                            </div>
+                                                            <ComboboxItemIndicator
+                                                                class="absolute left-2 inline-flex items-center">
+                                                                <Check class="h-4 w-4" />
+                                                            </ComboboxItemIndicator>
+                                                        </ComboboxItem>
+                                                    </template>
+                                                </div>
+                                            </ComboboxGroup>
+                                        </ComboboxList>
+                                    </Combobox>
+
                                     <div class="h-4">
                                         <FieldError v-if="e.length" :errors="e" />
                                     </div>

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

@@ -8,7 +8,7 @@ export const buttonVariants = cva(
     variants: {
       variant: {
         default:
-          "bg-primary text-primary-foreground shadow-xs hover:bg-primary/90",
+          "bg-primary text-primary-foreground shadow-xs hover:bg-primary/70",
         destructive:
           "bg-destructive text-white shadow-xs hover:bg-destructive/90 focus-visible:ring-destructive/20 dark:focus-visible:ring-destructive/40 dark:bg-destructive/60",
         outline:

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

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

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

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

ui/src/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/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,17 +106,26 @@ async function postApp(appData) {
 }
 
 async function handleApprove(id) {
-    console.log("hi");
-    await approveApplication(id);
+    try {
+        await approveApplication(id);
+        loadData(await loadApplication(Number(route.params.id), true))
+    } catch (error) {
+        console.error(error);
+    }
 }
 
 async function handleDeny(id) {
-    await denyApplication(id);
+    try {
+        await denyApplication(id);
+        loadData(await loadApplication(Number(route.params.id), true))
+    } catch (error) {
+        console.error(error);
+    }
 }
 </script>
 
 <template>
-    <div v-if="!loading" class="w-full h-20">
+    <div v-if="!loading" class="w-full">
         <div v-if="unauthorized" class="flex justify-center w-full my-10">
             You do not have permission to view this application.
         </div>
@@ -124,7 +134,7 @@ async function handleDeny(id) {
                 <!-- Application header -->
                 <div>
                     <h3 class="scroll-m-20 text-2xl font-semibold tracking-tight">{{ member_name }}</h3>
-                    <p class="text-muted-foreground">Submitted: {{ submitDate.toLocaleString("en-US", {
+                    <p class="text-muted-foreground">Submitted: {{ submitDate?.toLocaleString("en-US", {
                         year: "numeric",
                         month: "long",
                         day: "numeric",
@@ -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" :admin-mode="finalMode === 'view-recruiter'">
+                <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

@@ -49,15 +49,8 @@ const dialogRef = ref<any>(null)
 // NEW: handle day/time slot clicks to start creating an event
 function onDateClick(arg: { dateStr: string }) {
     if (!userStore.isLoggedIn) return;
+    if (userStore.state !== 'member') return;
     dialogRef.value?.openDialog(arg.dateStr);
-    // For now, just open the panel with a draft payload.
-    // activeEvent.value = {
-    //     id: '__draft__',
-    //     title: 'New event',
-    //     start: arg.dateStr,
-    //     extendedProps: { draft: true }
-    // }
-    // panelOpen.value = true
 }
 
 const calendarOptions = ref({
@@ -203,7 +196,7 @@ onMounted(() => {
                                 @click="goToday">
                                 Today
                             </button>
-                            <button v-if="userStore.isLoggedIn"
+                            <button v-if="userStore.isLoggedIn && userStore.state === 'member'"
                                 class="cursor-pointer ml-1 inline-flex items-center gap-1.5 rounded-md bg-primary px-3 py-1.5 text-sm text-primary-foreground hover:opacity-90"
                                 @click="onCreateEvent">
                                 <Plus class="h-4 w-4" />
@@ -217,7 +210,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/Homepage.vue

@@ -1,6 +1,8 @@
 <script setup lang="ts">
+import { getWelcomeMessage } from '@/api/docs';
 import { Button } from '@/components/ui/button'
 import { useUserStore } from '@/stores/user'
+import { onMounted, ref } from 'vue';
 import { useRouter } from 'vue-router'
 
 const router = useRouter()
@@ -8,23 +10,126 @@ const router = useRouter()
 const user = useUserStore();
 
 function goToApplication() {
-    router.push('/apply') // change to your form route
+    router.push('/join') // change to your form route
 }
+
+onMounted(async () => {
+    if (user.state == 'member') {
+        let policy = await getWelcomeMessage() as any;
+        welcomeRef.value.innerHTML = policy;
+    }
+})
+
+const welcomeRef = ref<HTMLElement>(null);
 </script>
 
 <template>
     <div>
-        <div v-if="user.state == 'guest'" class="flex flex-col items-center justify-center">
-            <h1 class="text-4xl font-bold mb-4">Welcome to the 17th</h1>
-            <p class="text-neutral-400 mb-8 max-w-md">
-                To join our unit, please fill out an application to continue.
-            </p>
-            <Button @click="goToApplication" class="px-6 py-3 text-lg">
-                Begin Application
-            </Button>
+        <div v-if="user.state == 'member'" class="mt-10">
+            <div ref="welcomeRef" class="bookstack-container">
+                <!-- bookstack -->
+            </div>
         </div>
-        <div v-else>
-            HOMEPAGEEEEEEEEEEEEEEEEEEE
+        <div v-else class="text-foreground px-6 py-12 selection:bg-primary/10">
+            <div class="max-w-5xl mx-auto space-y-8">
+
+                <header class="space-y-4">
+                    <div class="flex flex-col md:flex-row md:items-end justify-between gap-4">
+                        <div>
+                            <h1 class="text-4xl font-semibold tracking-tight">17th Ranger Battalion</h1>
+                        </div>
+                    </div>
+                    <div class="h-px bg-border w-full"></div>
+                </header>
+
+                <div class="grid grid-cols-1 lg:grid-cols-12 gap-12">
+
+                    <div class="lg:col-span-7 space-y-6">
+                        <div class="space-y-2">
+                            <h2 class="text-sm font-medium uppercase tracking-wider text-primary">Unit Philosophy</h2>
+                            <p class="text-lg leading-relaxed font-normal">
+                                The 17th RBN emphasizes high-skill gameplay through real-world tactics, stripped of
+                                traditional military formalities. We prioritize effective coordination over enforced
+                                etiquette.
+                            </p>
+                        </div>
+
+                        <p class="text-muted-foreground leading-relaxed">
+                            Our "Real Life First" mindset ensures participation remains a hobby, not a second job. With
+                            a consistent roster of 40–50 members for Saturday operations, we focus on effective
+                            coordination and mission success without the requirement of "Yes sir, no sir" protocols.
+                        </p>
+
+                        <div class="flex flex-wrap items-center gap-6 pt-4">
+                            <Button size="lg" @click="goToApplication" class="font-medium">
+                                Begin Application
+                            </Button>
+                            <div class="flex flex-col">
+                                <span class="text-xs uppercase tracking-tighter text-muted-foreground">Age
+                                    Requirement</span>
+                                <span class="text-sm font-medium">18+</span>
+                            </div>
+                        </div>
+                    </div>
+
+                    <div class="lg:col-span-5 space-y-8">
+                        <section class="space-y-3">
+                            <h3 class="text-xs font-semibold uppercase tracking-widest text-muted-foreground">
+                                Operational Schedule</h3>
+                            <div class="rounded-lg border bg-card p-4 shadow-sm">
+                                <div class="flex justify-between items-center">
+                                    <span class="text-sm font-medium">Main Operation</span>
+                                    <span class="text-sm font-mono text-primary">Sat 19:00 CST</span>
+                                </div>
+                            </div>
+                        </section>
+
+                        <section class="space-y-4">
+                            <h3 class="text-xs font-semibold uppercase tracking-[0.2em] text-muted-foreground">
+                                Force Structure
+                            </h3>
+                            <ul class="space-y-3">
+                                <li class="flex items-start gap-4">
+                                    <span class="h-1.5 w-1.5 rounded-full bg-primary mt-2 shrink-0"></span>
+                                    <div class="space-y-1">
+                                        <p class="text-sm font-medium leading-none">Alpha Company</p>
+                                        <p class="text-[13px] text-muted-foreground leading-relaxed">
+                                            Rifleman, Medic, CLS, Anti-Tank, RTO, Leadership
+                                        </p>
+                                    </div>
+                                </li>
+
+                                <li class="flex items-start gap-4">
+                                    <span class="h-1.5 w-1.5 rounded-full bg-primary mt-2 shrink-0"></span>
+                                    <div class="space-y-1">
+                                        <p class="text-sm font-medium leading-none">Echo Company</p>
+                                        <p class="text-[13px] text-muted-foreground leading-relaxed">
+                                            Logistics, CAS Pilot, Armor, Artillery, JTAC, Forward Observer
+                                        </p>
+                                    </div>
+                                </li>
+                            </ul>
+
+                            <p class="text-[12px] text-muted-foreground/70 border-t pt-2 border-border">
+                                Roles are fluid; specialization or weekly rotation is supported.
+                            </p>
+                        </section>
+                    </div>
+                </div>
+
+                <section class="space-y-4">
+                    <div class="relative rounded-xl border bg-card shadow-sm overflow-hidden">
+                        <div class="aspect-video">
+                            <iframe class="w-full h-full"
+                                src="https://www.youtube.com/embed/61L397HwmrU?si=oY9qf6vFv6hXo6Fk&controls=1&mute=1&start=102&end=152"
+                                title="YouTube video player" frameborder="0"
+                                allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture; web-share"
+                                allowfullscreen>
+                            </iframe>
+                        </div>
+                    </div>
+                </section>
+            </div>
         </div>
     </div>
 </template>

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,7 +11,7 @@ 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';
@@ -52,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();
@@ -102,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>
@@ -117,20 +107,10 @@ onMounted(async () => {
                                 <TableCell class="font-medium">
                                     <MemberCard :memberId="app.member_id"></MemberCard>
                                 </TableCell>
-                                <TableCell :title="formatExact(app.submitted_at)">
+                                <TableCell class="text-right" :title="formatExact(app.submitted_at)">
                                     {{ formatAgo(app.submitted_at) }}
                                 </TableCell>
 
-                                <TableCell v-if="app.app_status === ApplicationStatus.Pending"
-                                    class="inline-flex items-end gap-2">
-                                    <Button variant="success" @click.stop="handleApprove(app.id)">
-                                        <CheckIcon />
-                                    </Button>
-                                    <Button variant="destructive" @click.stop="handleDeny(app.id)">
-                                        <XIcon />
-                                    </Button>
-                                </TableCell>
-
                                 <TableCell class="text-right font-semibold" :class="[
                                     app.app_status === ApplicationStatus.Pending && 'text-yellow-500',
                                     app.app_status === ApplicationStatus.Accepted && 'text-green-500',

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">
-                <Button @click="showLOADialog = true">Post LOA</Button>
+            <div class="flex justify-between mb-4">
+                <h1 class="scroll-m-20 text-2xl font-semibold tracking-tight">LOA Log</h1>
+                <div>
+                    <Button @click="showLOADialog = true">Post LOA</Button>
+                </div>
             </div>
-            <h1>LOA Log</h1>
             <LoaList :admin-mode="true"></LoaList>
         </div>
     </div>

ui/src/pages/ManageRoles.vue

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

ui/src/pages/MyProfile.vue

@@ -11,6 +11,7 @@ import { useMemberDirectory } from "@/stores/memberDirectory";
 import { useUserStore } from "@/stores/user";
 
 const saving = ref(false);
+const saveSuccess = ref(false);
 const loading = ref(true);
 const showLoading = ref(false);
 const form = ref<memberSettings>();
@@ -20,13 +21,14 @@ const userStore = useUserStore()
 
 function saveSettings() {
     saving.value = true;
+    saveSuccess.value = false;
 
     setTimeout(async () => {
         // Replace with your API save call
         setMemberSettings(form.value);
         saving.value = false;
-        console.log(userStore.user.id)
-        memberDictionary.invalidateMember(userStore.user.id)
+        memberDictionary.invalidateMember(userStore.user.member.member_id)
+        saveSuccess.value = true;
     }, 800);
 }
 
@@ -75,7 +77,8 @@ onMounted(async () => {
                 </CardContent>
             </Transition>
 
-            <CardFooter class="flex justify-end">
+            <CardFooter class="flex justify-end gap-5 items-center">
+                <p v-if="saveSuccess" class="text-green-500">Profile saved</p>
                 <Button @click="saveSettings" :disabled="saving">
                     {{ saving ? "Saving..." : "Save Changes" }}
                 </Button>

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

@@ -22,6 +22,16 @@ 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 };
 
@@ -42,6 +52,7 @@ watch(() => route.params.id, async (newID) => {
         focusedTrainingReport.value = null;
         return;
     }
+    TRLoaded.value = false;
     viewTrainingReport(Number(route.params.id));
 })
 
@@ -60,6 +71,7 @@ const focusedTrainingTrainers = computed<CourseAttendee[] | null>(() => {
 })
 async function viewTrainingReport(id: number) {
     focusedTrainingReport.value = await getTrainingReport(id);
+    TRLoaded.value = true;
 }
 
 async function closeTrainingReport() {
@@ -84,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>
@@ -113,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>
@@ -164,16 +197,46 @@ onMounted(async () => {
                     </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">
-                    <X></X>
-                </button>
+                <Button @click="closeTrainingReport" class="cursor-pointer" variant="ghost" size="icon">
+                    <X class="size-6"></X>
+                </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>
@@ -284,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">
-                    <X></X>
-                </button>
+                <Button @click="closeTrainingReport" class="cursor-pointer" variant="ghost" size="icon">
+                    <X class="size-6"></X>
+                </Button>
             </div>
             <div class="overflow-y-auto max-h-[70vh] mt-5 scrollbar-themed">
                 <TrainingReportForm class="w-full pl-2"

ui/src/router/index.js

@@ -16,7 +16,7 @@ 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: '/profile', component: () => import('@/pages/MyProfile.vue'), meta: { requiresAuth: true } },
 
 
     { path: '/calendar', component: () => import('@/pages/Calendar.vue') },
@@ -40,7 +40,8 @@ const router = createRouter({
         { path: 'applications/:id', component: () => import('@/pages/Application.vue') },
         { path: 'transfer', component: () => import('@/pages/ManageTransfers.vue') },
         { path: 'loa', component: () => import('@/pages/ManageLOA.vue') },
-        { path: 'roles', component: () => import('@/pages/ManageRoles.vue') }
+        { path: 'roles', component: () => import('@/pages/ManageRoles.vue') },
+        { path: 'roles/:id', component: () => import('@/pages/ManageRoles.vue') }
       ]
     },
 

ui/src/stores/memberDirectory.ts

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

ui/src/stores/user.ts

@@ -1,15 +1,18 @@
 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 roles = computed(() => new Set(user.value?.roleData?.map(r => r.name) ?? []));
+    const user = ref<myData>(null)
+    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
@@ -19,7 +22,6 @@ export const useUserStore = defineStore('user', () => {
 
         if (res.ok) {
             const data = await res.json();
-            console.log(data);
             user.value = data;
         }
 
@@ -40,7 +42,6 @@ export const useUserStore = defineStore('user', () => {
     const router = useRouter();
     watch(user, (newUser) => {
         if (!newUser) return
-        console.log(newUser);
 
         const currentRoute = route.meta
 
@@ -88,5 +89,5 @@ export const useUserStore = defineStore('user', () => {
         }
     })
 
-    return { user, isLoggedIn, roles, loadUser, loaded, hasAnyRole, hasRole, state }
+    return { user, displayName, isLoggedIn, roles, loadUser, loaded, hasAnyRole, hasRole, state }
 })