Merge branch 'main' into devcontainers

Reviewed-on: #182

.gitignore

@@ -31,4 +31,6 @@ coverage
 
 *.sql
 .env
-*.db
+*.db
+
+db_data

api/.gitignore

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

api/database.json

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

api/migrations/20260201154439-initial.js

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

api/migrations/20260204025935-remove-unused-tables.js

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

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

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

api/migrations/sqls/20260204025935-remove-unused-tables-down.sql

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

api/migrations/sqls/20260204025935-remove-unused-tables-up.sql

@@ -0,0 +1,9 @@
+/* Replace with your SQL commands */
+
+DROP TABLE 'mission_attendee_roles';
+DROP TABLE 'mission_event_attendees';
+DROP TABLE 'mission_events';
+
+DROP PROCEDURE 'sp_update_member_rank_Backup_1-27-2026';
+DROP PROCEDURE 'sp_update_member_status_Backup_1-27-2026';
+DROP PROCEDURE 'sp_update_member_unit_Backup_1-27-2026';

api/package.json

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

api/scripts/migrate.js

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

api/scripts/seed.js

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

api/src/index.ts

@@ -102,6 +102,7 @@ import { roles, memberRoles } from './routes/roles';
 import { courseRouter, eventRouter } from './routes/course';
 import { calendarRouter } from './routes/calendar';
 import { docsRouter } from './routes/docs';
+import { units } from './routes/units';
 
 app.use('/application', applicationRouter);
 app.use('/ranks', ranks);
@@ -115,6 +116,7 @@ app.use('/memberRoles', memberRoles)
 app.use('/course', courseRouter)
 app.use('/courseEvent', eventRouter)
 app.use('/calendar', calendarRouter)
+app.use('/units', units)
 app.use('/docs', docsRouter)
 app.use('/', authRouter)
 

api/src/routes/auth.ts

@@ -14,127 +14,157 @@ import { toDateTime } from '@app/shared/utils/time';
 import { logger } from '../services/logging/logger';
 const querystring = require('querystring');
 import { performance } from 'perf_hooks';
+import { CacheService } from '../services/cache/cache';
+import { Strategy as CustomStrategy } from 'passport-custom';
 
 
 function parseJwt(token) {
     return JSON.parse(Buffer.from(token.split('.')[1], 'base64').toString());
 }
 
-passport.use(new OpenIDConnectStrategy({
-    issuer: process.env.AUTH_ISSUER,
-    authorizationURL: process.env.AUTH_DOMAIN + '/authorize/',
-    tokenURL: process.env.AUTH_DOMAIN + '/token/',
-    userInfoURL: process.env.AUTH_DOMAIN + '/userinfo/',
-    clientID: process.env.AUTH_CLIENT_ID,
-    clientSecret: process.env.AUTH_CLIENT_SECRET,
-    callbackURL: process.env.AUTH_REDIRECT_URI,
-    scope: ['openid', 'profile', 'discord']
-}, async function verify(issuer, sub, profile, jwtClaims, accessToken, refreshToken, params, cb) {
+const devLogin = (req: any, res: any, next: any) => {
+    // The object here must match what your 'verify' function returns: { memberId }
+    const devUser = { memberId: 1 }; // Hardcoded ID
 
-    // console.log('--- OIDC verify() called ---');
-    // console.log('issuer:', issuer);
-    // console.log('sub:', sub);
-    // // console.log('discord:', discord);
-    // console.log('profile:', profile);
-    // console.log('jwt: ', parseJwt(jwtClaims));
-    // console.log('params:', params);
-    let con;
+    req.logIn(devUser, (err: any) => {
+        if (err) return next(err);
+        const redirectTo = req.session.redirectTo || process.env.CLIENT_URL;
+        delete req.session.redirectTo;
+        return res.redirect(redirectTo);
+    });
+};
 
-    try {
-        con = await pool.getConnection();
+if (process.env.AUTH_MODE === "mock") {
+    passport.use('mock', new CustomStrategy(async (req, done) => {
+        const mockUser = { memberId: 1 };
+        return done(null, mockUser);
+    }))
+} else {
+    passport.use('oidc', new OpenIDConnectStrategy({
+        issuer: process.env.AUTH_ISSUER,
+        authorizationURL: process.env.AUTH_DOMAIN + '/authorize/',
+        tokenURL: process.env.AUTH_DOMAIN + '/token/',
+        userInfoURL: process.env.AUTH_DOMAIN + '/userinfo/',
+        clientID: process.env.AUTH_CLIENT_ID,
+        clientSecret: process.env.AUTH_CLIENT_SECRET,
+        callbackURL: process.env.AUTH_REDIRECT_URI,
+        scope: ['openid', 'profile', 'discord']
+    }, async function verify(issuer, sub, profile, jwtClaims, accessToken, refreshToken, params, cb) {
 
-        await con.beginTransaction();
+        // console.log('--- OIDC verify() called ---');
+        // console.log('issuer:', issuer);
+        // console.log('sub:', sub);
+        // // console.log('discord:', discord);
+        // console.log('profile:', profile);
+        // console.log('jwt: ', parseJwt(jwtClaims));
+        // console.log('params:', params);
+        let con;
 
-        //lookup existing user
-        const existing = await con.query(`SELECT id FROM members WHERE authentik_issuer = ? AND authentik_sub = ? LIMIT 1;`, [issuer, sub]);
-        let memberId: number | null = null;
-        //if member exists
-        if (existing.length > 0) {
-            //login
-            memberId = existing[0].id;
-            logger.info('auth', `Existing member login`, {
-                memberId,
-                issuer,
-            });
+        try {
+            con = await pool.getConnection();
 
-        } else {
-            //otherwise: create account mode
-            const jwt = parseJwt(jwtClaims);
-            const discordID = jwt.discord?.id as number;
+            await con.beginTransaction();
 
-            //check if account is available to claim
-            if (discordID)
-                memberId = await mapDiscordtoID(discordID);
-
-            if (discordID && memberId) {
-                // claim account
-                const result = await con.query(
-                    `UPDATE members SET authentik_sub = ?, authentik_issuer = ? WHERE id = ?;`,
-                    [sub, issuer, memberId]
-                )
-                logger.info('auth', `Existing member claimed via Discord`, {
+            //lookup existing user
+            const existing = await con.query(`SELECT id FROM members WHERE authentik_issuer = ? AND authentik_sub = ? LIMIT 1;`, [issuer, sub]);
+            let memberId: number | null = null;
+            //if member exists
+            if (existing.length > 0) {
+                //login
+                memberId = existing[0].id;
+                logger.info('auth', `Existing member login`, {
                     memberId,
-                    discordID,
                     issuer,
                 });
 
             } else {
-                // new account
-                const username = sub.username;
-                const result = await con.query(
-                    `INSERT INTO members (name, authentik_sub, authentik_issuer) VALUES (?, ?, ?)`,
-                    [username, sub, issuer]
-                )
-                memberId = Number(result.insertId);
+                //otherwise: create account mode
+                const jwt = parseJwt(jwtClaims);
+                const discordID = jwt.discord?.id as number;
 
-                logger.info('auth', `New member account created`, {
-                    memberId,
-                    username,
-                    issuer,
-                });
+                //check if account is available to claim
+                if (discordID)
+                    memberId = await mapDiscordtoID(discordID);
 
+                if (discordID && memberId) {
+                    // claim account
+                    const result = await con.query(
+                        `UPDATE members SET authentik_sub = ?, authentik_issuer = ? WHERE id = ?;`,
+                        [sub, issuer, memberId]
+                    )
+                    logger.info('auth', `Existing member claimed via Discord`, {
+                        memberId,
+                        discordID,
+                        issuer,
+                    });
+
+                } else {
+                    // new account
+                    const username = sub.username;
+                    const result = await con.query(
+                        `INSERT INTO members (name, authentik_sub, authentik_issuer) VALUES (?, ?, ?)`,
+                        [username, sub, issuer]
+                    )
+                    memberId = Number(result.insertId);
+
+                    logger.info('auth', `New member account created`, {
+                        memberId,
+                        username,
+                        issuer,
+                    });
+
+                }
             }
-        }
 
-        await con.query(`UPDATE members SET last_login = ? WHERE id = ?`, [toDateTime(new Date()), memberId])
+            await con.query(`UPDATE members SET last_login = ? WHERE id = ?`, [toDateTime(new Date()), memberId])
 
-        await con.commit();
-        return cb(null, { memberId });
-    } catch (error) {
-        logger.error('auth', `Authentication transaction failed`, {
-            issuer,
-            error: error instanceof Error ? error.message : String(error),
-            stack: error instanceof Error ? error.stack : undefined,
-        });
+            await con.commit();
+            return cb(null, { memberId });
+        } catch (error) {
+            logger.error('auth', `Authentication transaction failed`, {
+                issuer,
+                error: error instanceof Error ? error.message : String(error),
+                stack: error instanceof Error ? error.stack : undefined,
+            });
 
-        if (con) {
-            try {
-                await con.rollback();
-            } catch (rollbackError) {
-                logger.error('auth', `Rollback failed`, {
-                    error: rollbackError instanceof Error
-                        ? rollbackError.message
-                        : String(rollbackError),
-                });
+            if (con) {
+                try {
+                    await con.rollback();
+                } catch (rollbackError) {
+                    logger.error('auth', `Rollback failed`, {
+                        error: rollbackError instanceof Error
+                            ? rollbackError.message
+                            : String(rollbackError),
+                    });
+                }
             }
+            return cb(error);
+        } finally {
+            if (con) con.release();
         }
-        return cb(error);
-    } finally {
-        if (con) con.release();
-    }
-}));
+    }));
+}
 
 router.get('/login', (req, res, next) => {
-    // Store redirect target in session if provided
-    req.session.redirectTo = req.query.redirect;
+    req.session.redirectTo = req.query.redirect as string;
 
-    next();
-}, passport.authenticate('openidconnect'));
+    const strategy = process.env.AUTH_MODE === 'mock' ? 'mock' : 'oidc';
 
+    passport.authenticate(strategy, {
+        successRedirect: (req.session.redirectTo || process.env.CLIENT_URL),
+        failureRedirect: '/login'
+    })(req, res, next);
+});
 
 router.get('/callback', (req, res, next) => {
+
+    //escape if mocked
+    if (process.env.AUTH_MODE === 'mock') {
+        return res.redirect(process.env.CLIENT_URL || '/');
+    }
+
     const redirectURI = req.session.redirectTo;
-    passport.authenticate('openidconnect', (err, user) => {
+    passport.authenticate('oidc', (err, user) => {
         if (err) return next(err);
         if (!user) return res.redirect(process.env.CLIENT_URL);
 
@@ -164,12 +194,21 @@ router.get('/logout', [requireLogin], function (req, res, next) {
                 sameSite: 'lax'
             });
 
+            if (process.env.AUTH_MODE === 'mock') {
+                return res.redirect(process.env.CLIENT_URL || '/');
+            }
+
             var params = {
                 client_id: process.env.AUTH_CLIENT_ID,
                 returnTo: process.env.CLIENT_URL
             };
 
-            res.redirect(process.env.AUTH_END_SESSION_URI + '?' + querystring.stringify(params));
+            const endSessionUri = process.env.AUTH_END_SESSION_URI;
+            if (endSessionUri) {
+                return res.redirect(endSessionUri + '?' + querystring.stringify(params));
+            } else {
+                return res.redirect(process.env.CLIENT_URL || '/');
+            }
         })
     });
 });
@@ -189,8 +228,31 @@ passport.deserializeUser(function (user, cb) {
         let con;
 
         try {
-            let t;
+            //cache lookup
+            let t = performance.now();
+            const cachedData: UserData | undefined = userCache.Get(memberID);
+            timings.cache_lookup = performance.now() - t;
 
+            if (cachedData) {
+                timings.total = performance.now() - start;
+
+                logger.info(
+                    'profiling',
+                    'passport.deserializeUser (cache hit)',
+                    {
+                        memberId: memberID,
+                        cache_hit: true,
+                        source: 'cache',
+                        total_ms: timings.total,
+                        breakdown_ms: timings,
+                    },
+                    'profiling'
+                );
+
+                return cb(null, cachedData);
+            }
+
+            //cache miss, db load
             t = performance.now();
             con = await pool.getConnection();
             timings.getConnection = performance.now() - t;
@@ -202,30 +264,30 @@ passport.deserializeUser(function (user, cb) {
             );
             timings.memberQuery = performance.now() - t;
 
-            const userData: {
-                id: number;
-                name: string;
-                roles: Role[];
-                state: MemberState;
-                discord_id?: string;
-            } = userResults[0];
+            const userData: UserData = userResults[0];
 
             t = performance.now();
-            const userRoles = await getUserRoles(memberID);
+            userData.roles = await getUserRoles(memberID) || [];
             timings.roles = performance.now() - t;
-            userData.roles = userRoles || [];
 
             t = performance.now();
             userData.state = await getUserState(memberID);
             timings.state = performance.now() - t;
 
-            // 📊 PROFILING LOG
+            t = performance.now();
+            userCache.Set(userData.id, userData);
+            timings.cache_set = performance.now() - t;
+
+            timings.total = performance.now() - start;
+
             logger.info(
                 'profiling',
-                'passport.deserializeUser completed',
+                'passport.deserializeUser (db load)',
                 {
                     memberId: memberID,
-                    total_ms: performance.now() - start,
+                    cache_hit: false,
+                    source: 'db',
+                    total_ms: timings.total,
                     breakdown_ms: timings,
                 },
                 'profiling'
@@ -243,14 +305,12 @@ passport.deserializeUser(function (user, cb) {
                 }
             );
             return cb(error);
-
         } finally {
             if (con) con.release();
         }
     });
 });
 
-
 declare global {
     namespace Express {
         interface Request {
@@ -265,5 +325,15 @@ declare global {
     }
 }
 
+export interface UserData {
+    id: number;
+    name: string;
+    roles: Role[];
+    state: MemberState;
+    discord_id?: string;
+}
 
-export const authRouter = router;
+const userCache = new CacheService<number, UserData>();
+
+export const authRouter = router;
+export const memberCache = userCache;

api/src/routes/members.ts

@@ -5,12 +5,16 @@ import { Request, Response } from 'express';
 import pool from '../db';
 import { requireLogin, requireMemberState, requireRole } from '../middleware/auth';
 import { getUserActiveLOA } from '../services/db/loaService';
-import { getAllMembersLite, getMemberSettings, getMembersFull, getMembersLite, getUserData, getUserState, setUserSettings } from '../services/db/memberService';
+import { getAllMembersLite, getMemberSettings, getMembersFull, getMembersLite, getUserData, getUserState, setUserSettings, getFilteredMembers, setUserState } from '../services/db/memberService';
 import { getUserRoles } from '../services/db/rolesService';
 import { memberSettings, MemberState, myData } from '@app/shared/types/member';
+import { Discharge } from '@app/shared/schemas/dischargeSchema';
 
 import { Performance } from 'perf_hooks';
 import { logger } from '../services/logging/logger';
+import { memberCache } from './auth';
+import { cancelLatestRank } from '../services/db/rankService';
+import { cancelLatestUnit } from '../services/db/unitService';
 
 //get all users
 router.get('/', [requireLogin, requireMemberState(MemberState.Member)], async (req, res) => {
@@ -42,6 +46,27 @@ router.get('/', [requireLogin, requireMemberState(MemberState.Member)], async (r
     }
 });
 
+router.get('/filtered', [requireLogin, requireMemberState(MemberState.Member)], async (req, res) => {
+    try {
+        // Extract Query Parameters
+        const page = parseInt(req.query.page as string) || 1;
+        const pageSize = parseInt(req.query.pageSize as string) || 15;
+        const search = req.query.search as string | undefined;
+        const status = req.query.status as string | undefined;
+        const unitId = req.query.unitId as string | undefined;
+
+        // Call the service function
+        const result = await getFilteredMembers(page, pageSize, search, status, unitId);
+
+        return res.status(200).json(result);
+    } catch (error) {
+        logger.error('app', 'Failed to get filtered users', {
+            error: error instanceof Error ? error.message : String(error),
+        });
+        return res.status(500).json({ error: 'Failed to fetch users' });
+    }
+});
+
 router.get('/me', [requireLogin], async (req: Request, res) => {
     if (!req.user) return res.sendStatus(401);
 
@@ -211,5 +236,32 @@ router.put('/:id/displayname', async (req, res) => {
     return res.status(501);
 });
 
+//discharge member
+router.post('/discharge', [requireLogin, requireMemberState(MemberState.Member), requireRole("17th Administrator")], async (req: Request, res: Response) => {
+    try {
+        var con = await pool.getConnection();
+
+        con.beginTransaction();
+
+        var data: Discharge = req.body;
+        setUserState(data.userID, MemberState.Retired, con);
+        cancelLatestRank(data.userID, con);
+        cancelLatestUnit(data.userID, con);
+        con.commit();
+        memberCache.Invalidate(data.userID);
+
+        res.sendStatus(200);
+    } catch (error) {
+        logger.error('app', 'Failed to discharge user', {
+            data: data,
+            caller: req.user.id,
+            error: error instanceof Error ? error.message : String(error),
+            stack: error instanceof Error ? error.stack : undefined,
+        })
+    } finally {
+        if (con)
+            con.release();
+    }
+});
 
 export const memberRouter = router;

api/src/routes/units.ts

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

api/src/services/cache/cache.ts

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

api/src/services/db/loaService.ts

@@ -69,7 +69,7 @@ export async function getUserActiveLOA(userId: number): Promise<LOARequest[]> {
             FROM leave_of_absences
             WHERE member_id = ?
             AND closed IS NULL
-            AND UTC_TIMESTAMP() BETWEEN start_date AND end_date;`
+            AND UTC_TIMESTAMP() > start_date;`
     const LOAData = await pool.query(sql, [userId]);
     return LOAData;
 }

api/src/services/db/memberService.ts

@@ -1,6 +1,97 @@
 import { Role } from "@app/shared/types/roles";
 import pool from "../../db";
-import { Member, MemberCardDetails, MemberLight, memberSettings, MemberState } from '@app/shared/types/member'
+import { Member, MemberCardDetails, MemberLight, memberSettings, MemberState, PaginatedMembers } from '@app/shared/types/member'
+import { logger } from "../logging/logger";
+import { memberCache } from "../../routes/auth";
+import * as mariadb from 'mariadb';
+
+export async function getFilteredMembers(
+  page: number = 1,
+  pageSize: number = 15,
+  search?: string,
+  status?: string,
+  unitId?: string
+): Promise<PaginatedMembers> {
+  try {
+    const offset = (page - 1) * pageSize;
+    const whereClauses: string[] = [];
+    const params: any[] = [];
+
+    if (status && status !== 'all') {
+      whereClauses.push(`m.state = ?`);
+      params.push(status);
+    }
+
+    if (search) {
+      whereClauses.push(`v.member_name LIKE ?`);
+      params.push(`%${search}%`);
+    }
+
+    if (unitId && unitId !== 'all') {
+      whereClauses.push(`v.unit = ?`);
+      params.push(unitId);
+    }
+
+    const whereClause = whereClauses.length > 0
+      ? ` WHERE ${whereClauses.join(' AND ')}`
+      : '';
+
+    // COUNT QUERY
+    const countQuery = `SELECT COUNT(*) as total FROM view_member_rank_unit_status_latest v INNER JOIN members m ON v.member_id = m.id ${whereClause}`;
+    const [countResults]: any[] = await pool.query(countQuery, params);
+    const total = Number(countResults?.total) || 0;
+
+    // DATA QUERY
+    const dataQuery = `
+      SELECT 
+        v.*,
+        CASE 
+          WHEN EXISTS (
+            SELECT 1 FROM leave_of_absences l 
+            WHERE l.member_id = v.member_id 
+              AND l.deleted = 0 
+              AND UTC_TIMESTAMP() BETWEEN l.start_date AND l.end_date
+          ) THEN 1 ELSE 0 
+        END AS on_loa
+      FROM view_member_rank_unit_status_latest v
+      INNER JOIN members m ON v.member_id = m.id
+      ${whereClause} -- Added back correctly
+      ORDER BY v.member_name ASC
+      LIMIT ? OFFSET ?
+    `;
+
+    const rows: any[] = await pool.query(dataQuery, [...params, pageSize, offset]);
+
+    // Map rows to Member type
+    const members: Member[] = rows.map(row => ({
+      member_id: Number(row.member_id),
+      member_name: row.member_name,
+      displayName: row.displayName,
+      rank: row.rank,
+      rank_date: row.rank_date,
+      unit: row.unit,
+      unit_date: row.unit_date,
+      status: row.status,
+      status_date: row.status_date,
+      loa_until: row.loa_until ? new Date(row.loa_until) : undefined,
+    }));
+
+    return {
+      data: members,
+      pagination: {
+        page,
+        pageSize,
+        total,
+        totalPages: Math.ceil(total / pageSize),
+      },
+    };
+  } catch (error) {
+    logger.error('app', 'Error fetching filtered members', {
+      error: error instanceof Error ? error.message : String(error),
+    });
+    throw error;
+  }
+}
 
 export async function getUserData(userID: number): Promise<Member> {
   const sql = `SELECT * FROM view_member_rank_unit_status_latest WHERE member_id = ?`;
@@ -8,11 +99,17 @@ export async function getUserData(userID: number): Promise<Member> {
   return res[0] ?? null;
 }
 
-export async function setUserState(userID: number, state: MemberState) {
-  const sql = `UPDATE members
+export async function setUserState(userID: number, state: MemberState, con: mariadb.Pool | mariadb.Connection = pool) {
+  try {
+    const sql = `UPDATE members
         SET state = ?
         WHERE id = ?;`;
-  return await pool.query(sql, [state, userID]);
+    return await con.query(sql, [state, userID]);
+  } catch (error) {
+    logger.error('app', 'Error setting user state', error);
+  } finally {
+    memberCache.Invalidate(userID);
+  }
 }
 
 export async function getUserState(user: number): Promise<MemberState> {
@@ -99,9 +196,8 @@ export async function getMembersFull(ids: number[]): Promise<MemberCardDetails[]
       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));
+    const roles: Role[] = row.roles;
 
     return { member, roles };
   });

api/src/services/db/rankService.ts

@@ -3,6 +3,7 @@ import { PromotionDetails, PromotionSummary } from "@app/shared/types/rank"
 import pool from "../../db";
 import { PagedData } from "@app/shared/types/pagination";
 import { toDate, toDateIgnoreZone, toDateTime } from "@app/shared/utils/time";
+import * as mariadb from 'mariadb';
 
 export async function getAllRanks() {
     const rows = await pool.query(
@@ -105,4 +106,14 @@ export async function getPromotionsOnDay(day: Date): Promise<PromotionDetails[]>
     let batchPromotion = await pool.query(sql, [dayString]) as PromotionDetails[];
 
     return batchPromotion;
+}
+
+export async function cancelLatestRank(userID: number, con: mariadb.Pool | mariadb.Connection = pool): Promise<boolean> {
+    try {
+        let sql = `CALL sp_end_member_rank(?,NOW())`;
+        con.query(sql, [userID]);
+        return true;
+    } catch (error) {
+        throw error;
+    }
 }

api/src/services/db/rolesService.ts

@@ -1,12 +1,20 @@
 import { MemberLight } from '@app/shared/types/member';
 import pool from '../../db';
 import { Role, RoleSummary } from '@app/shared/types/roles'
+import { logger } from '../logging/logger';
+import { memberCache } from '../../routes/auth';
 
 export async function assignUserGroup(userID: number, roleID: number) {
-    const sql = `INSERT INTO members_roles (member_id, role_id) VALUES (?, ?);`;
-    const params = [userID, roleID];
+    try {
+        const sql = `INSERT INTO members_roles (member_id, role_id) VALUES (?, ?);`;
+        const params = [userID, roleID];
 
-    return await pool.query(sql, params);
+        return await pool.query(sql, params);
+    } catch (error) {
+        logger.error('app', 'Failed to assign user group', error);
+    } finally {
+        memberCache.Invalidate(userID);
+    }
 }
 
 export async function createGroup(name: string, color: string, description: string) {

api/src/services/db/unitService.ts

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

docker-compose.dev.yml

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

readme.md

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

shared/schemas/dischargeSchema.ts

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

shared/types/member.ts

@@ -1,10 +1,13 @@
 import { LOARequest } from "./loa";
 import { Role } from "./roles";
+import { PagedData } from "./pagination";
 
 export interface memberSettings {
     displayName: string;
 }
 
+export type PaginatedMembers = PagedData<Member>;
+
 export enum MemberState {
     Guest = "guest",
     Applicant = "applicant",

shared/types/units.ts

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

ui/src/App.vue

@@ -36,8 +36,12 @@ const version = import.meta.env.VITE_APPLICATION_VERSION;
       </Alert>
       <Alert v-if="userStore.user?.LOAs?.[0]" class="m-2 mx-auto max-w-5xl" variant="info">
         <AlertDescription class="flex flex-row items-center text-nowrap gap-5 mx-auto">
-          <p>You are on LOA until <strong>{{ formatDate(userStore.user?.LOAs?.[0].extended_till ||
-            userStore.user?.LOAs?.[0].end_date) }}</strong></p>
+            <p v-if="new Date(userStore.user?.LOAs?.[0].extended_till || userStore.user?.LOAs?.[0].end_date) > new Date()">
+            LOA until <strong>{{ formatDate(userStore.user?.LOAs?.[0].extended_till || userStore.user?.LOAs?.[0].end_date) }}</strong>
+            </p>
+            <p v-else>
+            LOA expired on <strong>{{ formatDate(userStore.user?.LOAs?.[0].extended_till || userStore.user?.LOAs?.[0].end_date) }}</strong>
+            </p>
           <Button variant="secondary"
             @click="async () => { await cancelLOA(userStore.user.LOAs?.[0].id); userStore.loadUser(); }">End
             LOA</Button>

ui/src/api/member.ts

@@ -1,4 +1,5 @@
-import { memberSettings, Member, MemberLight, MemberCardDetails } from "@shared/types/member";
+import { Discharge } from "@shared/schemas/dischargeSchema";
+import { memberSettings, Member, MemberLight, MemberCardDetails, PaginatedMembers } from "@shared/types/member";
 
 //  @ts-ignore
 const addr = import.meta.env.VITE_APIHOST;
@@ -13,6 +14,33 @@ export async function getMembers(): Promise<Member[]> {
     return response.json();
 }
 
+export async function getMembersFiltered(params: {
+    page?: number;
+    pageSize?: number;
+    search?: string;
+    status?: string;
+    unitId?: string;
+} = {}): Promise<PaginatedMembers> {
+
+    // Construct the query string dynamically
+    const query = new URLSearchParams();
+    if (params.page) query.append('page', params.page.toString());
+    if (params.pageSize) query.append('pageSize', params.pageSize.toString());
+    if (params.search) query.append('search', params.search);
+    if (params.status && params.status !== 'all') query.append('status', params.status);
+    if (params.unitId && params.unitId !== 'all') query.append('unitId', params.unitId);
+
+    const response = await fetch(`${addr}/members/filtered?${query.toString()}`, {
+        credentials: 'include'
+    });
+
+    if (!response.ok) {
+        throw new Error("Failed to fetch members");
+    }
+
+    return response.json();
+}
+
 export async function getMemberSettings(): Promise<memberSettings> {
     const response = await fetch(`${addr}/members/settings`, {
         credentials: 'include'
@@ -87,4 +115,24 @@ export async function getFullMembers(ids: number[]): Promise<MemberCardDetails[]
         throw new Error("Failed to fetch settings");
     }
     return response.json();
+}
+
+/**
+ * Requests for the given member to be discharged
+ * @param data discharge packet
+ * @returns true on success
+ */
+export async function dischargeMember(data: Discharge): Promise<boolean> {
+    const response = await fetch(`${addr}/members/discharge`, {
+        credentials: 'include',
+        method: 'POST',
+        headers: {
+            "Content-Type": "application/json",
+        },
+        body: JSON.stringify(data)
+    });
+    if (!response.ok) {
+        throw new Error("Failed to discharge member");
+    }
+    return true;
 }

ui/src/api/units.ts

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

ui/src/components/Navigation/Navbar.vue

@@ -138,6 +138,12 @@ function blurAfter() {
                                         </RouterLink>
                                     </NavigationMenuLink>
 
+                                    <NavigationMenuItem as-child :class="navigationMenuTriggerStyle()">
+                                        <RouterLink to="/administration/members" @click="blurAfter">
+                                            Member Management
+                                        </RouterLink>
+                                    </NavigationMenuItem>
+
                                     <NavigationMenuLink v-if="auth.hasRole('17th Administrator')" as-child
                                         :class="navigationMenuTriggerStyle()">
                                         <RouterLink to="/administration/roles" @click="blurAfter">
@@ -146,13 +152,6 @@ function blurAfter() {
                                     </NavigationMenuLink>
                                 </NavigationMenuContent>
                             </NavigationMenuItem>
-
-                            <!-- <NavigationMenuItem as-child :class="navigationMenuTriggerStyle()">
-                                <RouterLink to="/members" @click="blurAfter">
-                                    Members (debug)
-                                </RouterLink>
-                            </NavigationMenuItem> -->
-
                         </NavigationMenuList>
                     </NavigationMenu>
                 </div>

ui/src/components/loa/loaForm.vue

@@ -66,14 +66,19 @@ import { loaSchema } from '@shared/schemas/loaSchema'
 import { toTypedSchema } from "@vee-validate/zod";
 import Calendar from "../ui/calendar/Calendar.vue";
 import { useUserStore } from "@/stores/user";
+import Spinner from "../ui/spinner/Spinner.vue";
 
 const { handleSubmit, values, resetForm } = useForm({
     validationSchema: toTypedSchema(loaSchema),
 })
 
 const formSubmitted = ref(false);
+const submitting = ref(false);
 
 const onSubmit = handleSubmit(async (values) => {
+    //catch double submit
+    if (submitting.value) return;
+    submitting.value = true;
     const out: LOARequest = {
         member_id: values.member_id,
         start_date: values.start_date,
@@ -88,6 +93,7 @@ const onSubmit = handleSubmit(async (values) => {
         userStore.loadUser();
     }
     formSubmitted.value = true;
+    submitting.value = false;
 })
 
 onMounted(async () => {
@@ -325,7 +331,12 @@ const filteredMembers = computed(() => {
                     </VeeField>
                 </div>
                 <div class="flex justify-end">
-                    <Button type="submit">Submit</Button>
+                    <Button type="submit" :disabled="submitting" class="w-35">
+                        <span class="flex items-center gap-2" v-if="submitting">
+                            <Spinner></Spinner> Submitting…
+                        </span>
+                        <span v-else>Submit</span>
+                    </Button>
                 </div>
             </form>
             <div v-else class="flex flex-col  gap-4 py-8 text-left">

ui/src/components/members/DischargeMember.vue

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

ui/src/components/promotions/promotionForm.vue

@@ -31,8 +31,12 @@ const { handleSubmit, errors, values, resetForm, setFieldValue, submitCount } =
     validateOnMount: false,
 })
 
+const submitting = ref(false);
+
 const submitForm = handleSubmit(
     async (vals) => {
+        if (submitting.value) return;
+        submitting.value = true;
         try {
             let output = vals;
             output.promotions.map(p => p.start_date = new Date(p.start_date).toISOString())
@@ -42,6 +46,8 @@ const submitForm = handleSubmit(
         } catch (error) {
             submitError.value = error;
             console.error(error);
+        } finally {
+            submitting.value = false;
         }
     }
 );
@@ -281,7 +287,12 @@ function setAllToday() {
                 </VeeField>
                 <div class="flex flex-col items-end gap-2">
                     <div class="h-6" />
-                    <Button type="submit" class="w-min">Submit</Button>
+                    <Button type="submit" form="trainingForm" :disabled="submitting" class="w-35">
+                        <span class="flex items-center gap-2" v-if="submitting">
+                            <Spinner></Spinner> Submitting…
+                        </span>
+                        <span v-else>Submit</span>
+                    </Button>
                     <p v-if="submitError" class="text-destructive">{{ submitError }}</p>
                     <div v-else class="h-6 flex justify-end">
                         <p v-if="submitCount > 0 && errors.promotions && typeof errors.promotions === 'string'"

ui/src/components/roles/addMember.vue

@@ -13,6 +13,7 @@ import Button from '../ui/button/Button.vue';
 import InputGroup from '../ui/input-group/InputGroup.vue';
 import InputGroupAddon from '../ui/input-group/InputGroupAddon.vue';
 import { SearchIcon } from 'lucide-vue-next';
+import Spinner from '../ui/spinner/Spinner.vue';
 
 const props = defineProps<{
     allMembers: MemberLight[],
@@ -43,8 +44,11 @@ function openDialog() {
     showAddMemberDialog.value = true;
 }
 
-
+const submitting = ref(false);
 async function handleAddMember() {
+    //catch double submit
+    if (submitting.value) return;
+    submitting.value = true;
     //guard
     if (memberToAdd.value == null)
         return;
@@ -52,6 +56,7 @@ async function handleAddMember() {
     await addMemberToRole(memberToAdd.value.id, props.role.id);
     emit('submit');
     showAddMemberDialog.value = false;
+    submitting.value = false;
 }
 
 </script>
@@ -94,8 +99,11 @@ async function handleAddMember() {
                 <Button variant="secondary" @click="showAddMemberDialog = false">
                     Cancel
                 </Button>
-                <Button :disabled="!memberToAdd" @click="handleAddMember">
-                    Add
+                <Button :disabled="!memberToAdd || submitting" @click="handleAddMember">
+                    <span class="flex items-center gap-2" v-if="submitting">
+                        <Spinner></Spinner> Add
+                    </span>
+                    <span v-else>Add</span>
                 </Button>
             </DialogFooter>
         </DialogContent>

ui/src/pages/Calendar.vue

@@ -11,6 +11,7 @@ import { useRouter, useRoute } from 'vue-router'
 import { useCalendarEvents } from '@/composables/useCalendarEvents'
 import { useCalendarNavigation } from '@/composables/useCalendarNavigation'
 import { useUserStore } from '@/stores/user'
+import { CalendarOptions } from '@fullcalendar/core'
 
 const monthLabels = [
     'January', 'February', 'March', 'April', 'May', 'June',
@@ -53,10 +54,10 @@ function onDateClick(arg: { dateStr: string }) {
     dialogRef.value?.openDialog(arg.dateStr);
 }
 
-const calendarOptions = ref({
+const calendarOptions = ref<CalendarOptions>({
     plugins: [dayGridPlugin, interactionPlugin],
     initialView: 'dayGridMonth',
-    height: '100%',
+    height: 'auto',
     expandRows: true,
     headerToolbar: {
         left: '',
@@ -70,6 +71,7 @@ const calendarOptions = ref({
     eventClick: onEventClick,
     editable: false,
 
+
     // force block-mode in dayGrid so we can lay it out on one line
     eventDisplay: 'block',
 
@@ -156,7 +158,7 @@ onMounted(() => {
         <CreateCalendarEvent ref="dialogRef" @reload="loadEvents(); eventViewRef.forceReload();"></CreateCalendarEvent>
         <div class="flex">
             <div class="flex-1 min-h-0 mt-5" :class="{ 'hidden md:block': panelOpen }">
-                <div class="h-[80vh] min-h-0">
+                <div class="max-h-[80vh] overflow-y-auto min-h-0 scrollbar-themed p-2">
                     <!-- calendar header -->
                     <div class="flex items-center justify-between mx-5">
                         <!-- Left: title + pickers -->
@@ -211,47 +213,46 @@ onMounted(() => {
                 class="w-screen 3xl:w-lg 2xl:w-md lg: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" :key="currentEventID" @close="() => { router.push('/calendar'); }"
-                    @reload="loadEvents()" @load="calendarRef.getApi().updateSize()" @edit="(val) => { dialogRef.openDialog(null, 'edit', val) }">
+                    @reload="loadEvents()" @load="calendarRef.getApi().updateSize()"
+                    @edit="(val) => { dialogRef.openDialog(null, 'edit', val) }">
                 </ViewCalendarEvent>
             </aside>
         </div>
     </div>
 </template>
 
-<style scoped>
-/* Firefox */
-.scrollbar-themed {
-    scrollbar-width: thin;
-    scrollbar-color: #555 #1f1f1f;
-    padding-right: 6px;
-}
-
-/* Chrome, Edge, Safari */
-.scrollbar-themed::-webkit-scrollbar {
-    width: 10px;
-    /* slightly wider to allow padding look */
-}
-
-.scrollbar-themed::-webkit-scrollbar-track {
-    background: #1f1f1f;
-    margin-left: 6px;
-    /* ❗ adds space between content + scrollbar */
-}
-
-.scrollbar-themed::-webkit-scrollbar-thumb {
-    background: #555;
-    border-radius: 9999px;
-}
-
-.scrollbar-themed::-webkit-scrollbar-thumb:hover {
-    background: #777;
-}
-</style>
-
 <style scoped>
 /* ---------- Optional container "card" around the calendar ---------- */
+/* Ensure the calendar fills the container properly */
 :global(.fc) {
     height: 100% !important;
+    --fc-border-color: var(--color-border);
+    --fc-button-bg-color: transparent;
+    --fc-button-border-color: var(--color-border);
+    --fc-button-hover-bg-color: var(--color-muted);
+}
+
+:global(.fc-theme-standard .fc-scrollgrid) {
+    border-radius: 8px;
+    overflow: hidden;
+    /* Rounds the corners of the grid */
+    border: 1px solid var(--color-border);
+}
+
+:global(.fc-daygrid-day-frame) {
+    display: flex;
+    flex-direction: column;
+    padding: 4px;
+}
+
+:global(.fc .fc-scroller-harness) {
+    background: transparent;
+}
+
+
+:global(.fc-daygrid-day-events) {
+    flex-grow: 1;
+    /* Pushes events to take up available space */
 }
 
 :global(.ev-pill.is-cancelled) {
@@ -344,6 +345,9 @@ onMounted(() => {
     text-decoration: none;
 }
 
+:global(#app > div > div.flex-1.min-h-0 > div > div > div > div.fc.fc-media-screen.fc-direction-ltr.fc-theme-standard > div.fc-view-harness.fc-view-harness-passive > div > table > thead > tr > th) {
+    background-color: transparent;
+}
 :global(.fc .fc-daygrid-day-top) {
     padding: 8px 8px 0 8px;
 }

ui/src/pages/memberList.vue

@@ -1,98 +1,311 @@
 <script setup lang="ts">
-import {
-    Table,
-    TableBody,
-    TableCaption,
-    TableCell,
-    TableHead,
-    TableHeader,
-    TableRow,
-} from "@/components/ui/table"
-import {
-    DropdownMenu,
-    DropdownMenuContent,
-    DropdownMenuItem,
-    DropdownMenuTrigger,
-} from "@/components/ui/dropdown-menu"
-import {
-    Dialog,
-    DialogContent,
-    DialogDescription,
-    DialogFooter,
-    DialogHeader,
-    DialogTitle,
-    DialogTrigger,
-} from "@/components/ui/dialog"
-import Badge from "@/components/ui/badge/Badge.vue";
-import { computed, ref } from "vue";
-import { Member, getMembers } from "@/api/member";
+import { ref, computed, onMounted, watch } from "vue";
 import { useRouter } from 'vue-router';
-import { Ellipsis } from "lucide-vue-next";
+import {
+    Ellipsis, Search, Trash2, UserX,
+    X,
+} from "lucide-vue-next";
+import {
+    Pagination,
+    PaginationContent,
+    PaginationEllipsis,
+    PaginationItem,
+    PaginationNext,
+    PaginationPrevious,
+} from '@/components/ui/pagination'
+
+// API & Types
+import { getMembersFiltered } from "@/api/member";
+import { getUnits } from "@/api/units";
+import type { Member } from "@shared/types/member";
+import { MemberState } from "@shared/types/member";
+import type { Unit } from "@shared/types/units";
+import type { pagination as PaginationType } from "@shared/types/pagination";
+
+// UI Components
+import { Table, TableBody, TableCell, TableHead, TableHeader, TableRow } from "@/components/ui/table";
+import { DropdownMenu, DropdownMenuContent, DropdownMenuItem, DropdownMenuTrigger } from "@/components/ui/dropdown-menu";
+import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '@/components/ui/select';
+import { Button } from "@/components/ui/button";
+import Badge from "@/components/ui/badge/Badge.vue";
 import Input from "@/components/ui/input/Input.vue";
-import LoaForm from "@/components/loa/loaForm.vue";
+import Spinner from "@/components/ui/spinner/Spinner.vue";
+import DischargeMember from "@/components/members/DischargeMember.vue";
+import MemberCard from "@/components/members/MemberCard.vue";
 
-const members = ref<Member[]>([]);
+// --- State ---
 const router = useRouter();
-
-const fetchMembers = async () => {
-    members.value = await getMembers();
-};
-
-function viewMember(id) {
-    router.push(`/member/${id}`)
-}
-
-fetchMembers();
-
-const searchVal = ref<string>("");
-const searchedMembers = computed(() => {
-    return members.value.filter(member => member.member_name.toLowerCase().includes(searchVal.value.toLowerCase()));
+const members = ref<Member[]>([]);
+const units = ref<Unit[]>([]);
+const isLoaded = ref(false);
+const pagination = ref<PaginationType>({
+    page: 1,
+    pageSize: 15,
+    total: 0,
+    totalPages: 0,
 });
 
+const filters = ref<{ search: string; status: "all" | MemberState; unitId: string }>({
+    search: "",
+    status: MemberState.Member,
+    unitId: "all"
+});
+
+// Pagination State
+const pageNum = ref(1);
+const pageSize = ref(15);
+const pageSizeOptions = [10, 15, 30];
+
+const MEMBER_STATUSES = Object.values(MemberState);
+
+// --- Methods ---
+const fetchMembers = async () => {
+    isLoaded.value = false;
+    try {
+        const result = await getMembersFiltered({
+            page: pageNum.value,
+            pageSize: pageSize.value,
+            search: filters.value.search || undefined,
+            status: filters.value.status,
+            unitId: filters.value.unitId,
+        });
+        members.value = result.data;
+        pagination.value = result.pagination;
+    } catch (error) {
+        console.error('Failed to fetch members:', error);
+        members.value = [];
+    } finally {
+        isLoaded.value = true;
+    }
+};
+
+const fetchUnits = async () => {
+    try {
+        units.value = await getUnits();
+    } catch (error) {
+        console.error('Failed to fetch units:', error);
+    }
+};
+
+const navigateToMember = (id: string | number) => router.push(`/member/${id}`);
+
+const setPage = (num: number) => {
+    pageNum.value = num;
+};
+
+const setPageSize = (size: number) => {
+    pageSize.value = size;
+    pageNum.value = 1;
+};
+
+// --- Computed ---
+const paginatedMembers = computed(() => members.value);
+const totalItems = computed(() => pagination.value.total);
+
+let debounceTimer: ReturnType<typeof setTimeout> | null = null;
+// Watch pagination (Immediate)
+watch([pageNum, pageSize], () => {
+    if (debounceTimer) clearTimeout(debounceTimer);
+    fetchMembers();
+});
+
+// Watch filters (Debounced)
+watch(filters, () => {
+    if (debounceTimer) clearTimeout(debounceTimer);
+    debounceTimer = setTimeout(() => {
+        fetchMembers();
+    }, 300);
+}, { deep: true });
+
+function clearFilters() {
+    filters.value = {
+        search: "",
+        status: "all",
+        unitId: "all"
+    }
+}
+
+
+onMounted(() => {
+    fetchUnits();
+    fetchMembers();
+});
+
+//discharge form logic
+const isDischargeOpen = ref(false)
+const targetMember = ref(null)
+
+function openDischargeModal(member) {
+    targetMember.value = member
+    isDischargeOpen.value = true
+}
+
+function handleDischargeSuccess(data) {
+    fetchMembers();
+}
 </script>
 
 <template>
-
-    <!-- table menu -->
-    <div class="w-4xl mx-auto">
-        <div class="flex justify-between mb-4">
-            <Input v-model="searchVal" placeholder="search..."></Input>
+    <div>
+        <DischargeMember v-model:open="isDischargeOpen" :member="targetMember" @discharged="handleDischargeSuccess">
+        </DischargeMember>
+        <div class="mx-auto max-w-7xl w-full py-10 px-4">
+            <div class="flex flex-col gap-2">
+                <div class="flex flex-col md:flex-row md:items-center justify-between gap-4">
+                    <div class="space-y-0.5">
+                        <h1 class="text-2xl font-bold tracking-tight text-foreground">Member Management</h1>
+                        <p class="text-muted-foreground text-sm">Directory of all personnel and unit assignments.</p>
+                    </div>
+                </div>
+                <div
+                    class="flex flex-col gap-4 sm:flex-row sm:items-center justify-between border-y border-border/40 py-3">
+                    <div class="flex items-center gap-2">
+                        <Select v-model="filters.status">
+                            <SelectTrigger
+                                class="h-8 w-fit min-w-[110px] border-none bg-muted/50 hover:bg-muted transition-colors text-xs capitalize">
+                                <SelectValue placeholder="Status" />
+                            </SelectTrigger>
+                            <SelectContent>
+                                <SelectItem value="all">All Statuses</SelectItem>
+                                <SelectItem v-for="s in MEMBER_STATUSES" :key="s" :value="s">
+                                    <span class="capitalize">{{ s }}</span>
+                                </SelectItem>
+                            </SelectContent>
+                        </Select>
+                        <Select v-model="filters.unitId">
+                            <SelectTrigger
+                                class="h-8 w-fit min-w-[110px] border-none bg-muted/50 hover:bg-muted transition-colors text-xs">
+                                <SelectValue placeholder="Unit" />
+                            </SelectTrigger>
+                            <SelectContent>
+                                <SelectItem value="all">All Units</SelectItem>
+                                <SelectItem v-for="u in units" :key="u.id" :value="u.name">
+                                    {{ u.name }}
+                                </SelectItem>
+                            </SelectContent>
+                        </Select>
+                        <div v-if="filters.status !== 'all' || filters.unitId !== 'all'"
+                            class="h-4 w-[1px] bg-border mx-1" />
+                        <Button v-if="filters.status !== MemberState.Member || filters.unitId !== 'all'" variant="ghost" size="sm"
+                            class="h-8 px-2 text-xs text-muted-foreground"
+                            @click="filters.status = MemberState.Member; filters.unitId = 'all'">
+                            Clear Filters
+                        </Button>
+                    </div>
+                    <div class="flex items-center gap-2">
+                        <div class="relative w-full sm:w-[260px]">
+                            <Search
+                                class="absolute left-3 top-1/2 -translate-y-1/2 h-3.5 w-3.5 text-muted-foreground/50" />
+                            <Input v-model="filters.search" placeholder="Search members..."
+                                class="h-8 pl-9 pr-8 bg-background text-xs focus-visible:ring-1" />
+                            <button v-if="filters.search" @click="filters.search = ''"
+                                class="absolute right-2.5 top-1/2 -translate-y-1/2 text-muted-foreground/60 hover:text-foreground transition-colors">
+                                <X class="size-3.5" />
+                            </button>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="min-h-[500px]">
+                <Table>
+                    <TableHeader>
+                        <TableRow class="hover:bg-transparent border-b">
+                            <TableHead class="w-[200px]">Member</TableHead>
+                            <TableHead>Rank</TableHead>
+                            <TableHead>Unit</TableHead>
+                            <TableHead>Status</TableHead>
+                            <TableHead></TableHead>
+                            <TableHead class="text-right">Actions</TableHead>
+                        </TableRow>
+                    </TableHeader>
+                    <TableBody>
+                        <template v-if="isLoaded">
+                            <TableRow v-for="member in paginatedMembers" :key="member.member_id"
+                                class="group cursor-pointer hover:bg-muted/30 transition-colors">
+                                <TableCell class="font-medium">
+                                    <MemberCard :member-id="member.member_id"></MemberCard>
+                                </TableCell>
+                                <!-- <TableCell class="font-medium py-4">{{ member.displayName || member.member_name }}</TableCell> -->
+                                <TableCell>{{ member.rank }}</TableCell>
+                                <TableCell>{{ member.unit }}</TableCell>
+                                <TableCell>
+                                    <Badge variant="outline" class="capitalize font-normal">{{ member.status }}</Badge>
+                                </TableCell>
+                                <TableCell>
+                                    <Badge v-if="member.loa_until" variant="secondary"
+                                        class="bg-yellow-500/10 text-yellow-600 border-none">On LOA</Badge>
+                                </TableCell>
+                                <TableCell class="text-right" @click.stop>
+                                    <DropdownMenu>
+                                        <DropdownMenuTrigger as-child>
+                                            <Button variant="ghost" size="icon" class="hover:bg-muted">
+                                                <Ellipsis class="size-5" />
+                                            </Button>
+                                        </DropdownMenuTrigger>
+                                        <DropdownMenuContent align="end" class="w-48">
+                                            <!-- <DropdownMenuItem @click="navigateToMember(member.member_id)">
+                                                View Profile
+                                            </DropdownMenuItem> -->
+                                            <DropdownMenuItem @click="openDischargeModal(member)"
+                                                class="text-destructive focus:bg-destructive focus:text-destructive-foreground font-medium">
+                                                Discharge Member
+                                            </DropdownMenuItem>
+                                        </DropdownMenuContent>
+                                    </DropdownMenu>
+                                </TableCell>
+                            </TableRow>
+                            <TableRow v-if="paginatedMembers.length === 0" class="hover:bg-transparent">
+                                <TableCell colspan="6" class="h-64 text-center">
+                                    <div class="flex flex-col items-center justify-center gap-2 text-muted-foreground">
+                                        <UserX class="size-10 opacity-20 mb-2" />
+                                        <p class="font-medium">No results found</p>
+                                        <p class="text-xs">Try adjusting your filters or search query.</p>
+                                    </div>
+                                </TableCell>
+                            </TableRow>
+                        </template>
+                        <TableRow v-else>
+                            <TableCell colspan="6" class="h-64 text-center">
+                                <div class="flex flex-col items-center justify-center gap-4 text-muted-foreground">
+                                    <Spinner class="size-8" />
+                                </div>
+                            </TableCell>
+                        </TableRow>
+                    </TableBody>
+                </Table>
+            </div>
+            <div class="mt-8 flex flex-col sm:flex-row items-center justify-between gap-4 border-t pt-6">
+                <div class="flex items-center gap-3 text-sm">
+                    <p class="text-muted-foreground text-nowrap">Items per page:</p>
+                    <div class="flex bg-muted/50 p-1 rounded-md">
+                        <button v-for="size in pageSizeOptions" :key="size" @click="setPageSize(size)"
+                            class="px-3 py-1 rounded transition-all text-xs"
+                            :class="pageSize === size ? 'bg-background shadow-sm font-bold' : 'hover:text-foreground opacity-60'">
+                            {{ size }}
+                        </button>
+                    </div>
+                </div>
+                <Pagination v-if="totalItems > 0" :total="totalItems" :items-per-page="pageSize" :page="pageNum"
+                    :sibling-count="1" :show-edges="true" @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 === pageNum">
+                                <Button variant="ghost" size="sm" :class="{ 'bg-muted': pageNum === item.value }"
+                                    @click="setPage(item.value)">
+                                    {{ item.value }}
+                                </Button>
+                            </PaginationItem>
+                            <PaginationEllipsis v-else-if="item.type === 'ellipsis'" :key="`ellipsis-${index}`" />
+                        </template>
+                        <PaginationNext />
+                    </PaginationContent>
+                </Pagination>
+                <p class="text-xs text-muted-foreground w-[100px] text-right">
+                    Total: {{ totalItems }}
+                </p>
+            </div>
         </div>
-        <Table>
-            <TableHeader>
-                <TableRow>
-                    <TableHead class="w-[100px]">
-                        Member
-                    </TableHead>
-                    <TableHead>Rank</TableHead>
-                    <TableHead>Unit</TableHead>
-                    <TableHead>Status</TableHead>
-                </TableRow>
-            </TableHeader>
-            <TableBody>
-                <TableRow v-for="member in searchedMembers" :key="member.member_id"
-                    :onClick="() => { viewMember(member.member_id) }" class="cursor-pointer">
-                    <TableCell class="font-medium">
-                        {{ member.member_name }}
-                    </TableCell>
-                    <TableCell>{{ member.rank }}</TableCell>
-                    <TableCell>{{ member.unit }}</TableCell>
-                    <TableCell>{{ member.status }}</TableCell>
-                    <TableCell><Badge v-if="member.on_loa">On LOA</Badge></TableCell>
-                    <TableCell @click.stop="" class="text-right">
-                        <DropdownMenu>
-                            <DropdownMenuTrigger class="cursor-pointer">
-                                <Ellipsis></Ellipsis>
-                            </DropdownMenuTrigger>
-                            <DropdownMenuContent>
-                                <DropdownMenuItem>Change Rank</DropdownMenuItem>
-                                <DropdownMenuItem>Transfer</DropdownMenuItem>
-                                <DropdownMenuItem :variant="'destructive'">Retire</DropdownMenuItem>
-                            </DropdownMenuContent>
-                        </DropdownMenu>
-                    </TableCell>
-                </TableRow>
-            </TableBody>
-        </Table>
     </div>
 </template>

ui/src/router/index.js

@@ -13,7 +13,6 @@ const router = createRouter({
     { path: '/', component: () => import('@/pages/Homepage.vue') },
 
     // MEMBER ROUTES
-    { path: '/members', component: () => import('@/pages/memberList.vue'), meta: { requiresAuth: true, memberOnly: true } },
     { path: '/loa', component: () => import('@/pages/SubmitLOA.vue'), meta: { requiresAuth: true, memberOnly: true } },
     { path: '/profile', component: () => import('@/pages/MyProfile.vue'), meta: { requiresAuth: true } },
 
@@ -39,7 +38,8 @@ const router = createRouter({
         { path: 'applications/:id', component: () => import('@/pages/Application.vue') },
         { path: 'loa', component: () => import('@/pages/ManageLOA.vue') },
         { path: 'roles', component: () => import('@/pages/ManageRoles.vue') },
-        { path: 'roles/:id', component: () => import('@/pages/ManageRoles.vue') }
+        { path: 'roles/:id', component: () => import('@/pages/ManageRoles.vue') },
+        { path: 'members', component: () => import('@/pages/memberList.vue') },
       ]
     },