Merge branch 'main' of https://gitea.iceberg-gaming.com/17th-Ranger-Battalion-ORG/milsim-site-v4

Reviewed-on: #189

.gitea/workflows/deploy-dev.yaml

@@ -1,11 +1,11 @@
-name: Continuous Integration
+name: Testing Site CD
 on:
   push:
     branches:
       - main
 
 jobs:
-  Deploy:
+  deploy-testing-cd:
     name: Update Development
     runs-on: ubuntu-latest
     container:
@@ -40,14 +40,20 @@ jobs:
       - name: Token Copy
         run: |
           cd /var/www/html/milsim-site-v4
-          cp /workspace/17th-Ranger-Battalion-ORG/milsim-site-v4/.git/config .git/config
+          cp ${{ gitea.workspace }}/.git/config .git/config
           chown nginx:nginx .git/config
 
       - name: Update Application Code
         run: |
           cd /var/www/html/milsim-site-v4
+          version=`git log -1 --format=%H`
+          echo "Current Revision: $version"
+          echo "Updating to: ${{ github.sha }}"
           sudo -u nginx git reset --hard
+          sudo -u nginx git fetch --tags
           sudo -u nginx git pull origin main
+          new_version=`git log -1 --format=%H`
+          echo "Successfully updated to: $new_version"
 
       - name: Update Shared Dependencies and Fix Permissions
         run: |
@@ -83,6 +89,11 @@ jobs:
           sed -i "s/APPLICATION_VERSION=.*/APPLICATION_VERSION=$version/" .env
           chown -R nginx:nginx .
 
+      - name: Run Database Migrations
+        run: |
+          cd /var/www/html/milsim-site-v4/api
+          sudo -u nginx npx db-migrate up -e prod
+
       - name: Reset File Permissions
         run: |
           sudo chown -R nginx:nginx /var/www/html/milsim-site-v4

.gitea/workflows/deploy-prod.yaml

@@ -1,11 +1,11 @@
-name: Continuous Deployment
+name: Live Site CD
 on:
   push:
     tags:
       - '*'
 
 jobs:
-  Deploy:
+  deploy-live-cd:
     name: Update Deployment
     runs-on: ubuntu-latest
     container:
@@ -40,7 +40,7 @@ jobs:
       - name: Token Copy
         run: |
           cd /var/www/html/milsim-site-v4
-          cp /workspace/17th-Ranger-Battalion-ORG/milsim-site-v4/.git/config .git/config
+          cp ${{ gitea.workspace }}/.git/config .git/config
           chown nginx:nginx .git/config
 
       - name: Update Application Code
@@ -89,6 +89,11 @@ jobs:
           sed -i "s/APPLICATION_VERSION=.*/APPLICATION_VERSION=$version/" .env
           chown -R nginx:nginx .
 
+      - name: Run Database Migrations
+        run: |
+          cd /var/www/html/milsim-site-v4/api
+          sudo -u nginx npx db-migrate up -e prod
+
       - name: Reset File Permissions
         run: |
           sudo chown -R nginx:nginx /var/www/html/milsim-site-v4

.gitea/workflows/pull-request.yaml

@@ -0,0 +1,58 @@
+name: Pull Request CI
+on:
+ pull_request:
+  branches: 
+    - main
+  types: 
+    - opened
+    - synchronize
+    - reopened
+
+jobs:
+  build:
+    name: Merge Check
+    runs-on: ubuntu-latest
+    container:
+    steps:
+      - name: Update Node Environment
+        uses: actions/setup-node@v6
+        with:
+          node-version: 20.19
+
+      - name: Verify Local Environment
+        run: |
+          which npm
+          npm -v
+          which node
+          node -v
+
+      - name: Checkout
+        uses: actions/checkout@v5
+        with:
+          fetch-depth: 0
+          ref: 'main'
+
+      - name: Install Shared Dependencies
+        run: |
+          cd ${{ gitea.workspace }}/shared
+          npm install
+
+      - name: Install UI Dependencies
+        run: |
+          cd ${{ gitea.workspace }}/ui
+          npm install
+
+      - name: Install API Dependencies
+        run: |
+          cd ${{ gitea.workspace }}/api
+          npm install
+
+      - name: Build UI
+        run: |
+          cd ${{ gitea.workspace }}/ui
+          npm run build
+
+      - name: Build API
+        run: |
+          cd ${{ gitea.workspace }}/api
+          npm run build

.gitignore

@@ -32,3 +32,5 @@ coverage
 *.sql
 .env
 *.db
+
+db_data

api/.gitignore

@@ -1 +1,3 @@
 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/20260204140912-state-history-suspensions.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', '20260204140912-state-history-suspensions-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', '20260204140912-state-history-suspensions-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/20260212052346-state-reason-detailed.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', '20260212052346-state-reason-detailed-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', '20260212052346-state-reason-detailed-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,5 @@
+/* Replace with your SQL commands */
+
+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/migrations/sqls/20260204140912-state-history-suspensions-down.sql

@@ -0,0 +1,14 @@
+/* Replace with your SQL commands */
+UPDATE members m
+    JOIN account_states s ON m.state_id = s.id
+SET m.state_legacy = s.name;
+
+ALTER TABLE members DROP FOREIGN KEY fk_members_state_id,
+    DROP INDEX idx_members_state_id,
+    DROP COLUMN state_id;
+
+ALTER TABLE members
+    RENAME COLUMN state_legacy TO state;
+    
+DROP TABLE IF EXISTS member_state_history;
+DROP TABLE IF EXISTS account_states;

api/migrations/sqls/20260204140912-state-history-suspensions-up.sql

@@ -0,0 +1,57 @@
+/* Replace with your SQL commands */
+CREATE TABLE IF NOT EXISTS account_states (
+    id INT AUTO_INCREMENT PRIMARY KEY,
+    name VARCHAR(50) NOT NULL,
+    created_at DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    updated_at DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+    UNIQUE KEY uq_account_states_name (name)
+);
+INSERT IGNORE INTO account_states (name)
+VALUES ('guest'),
+    ('applicant'),
+    ('member'),
+    ('retired'),
+    ('discharged'),
+    ('suspended'),
+    ('banned'),
+    ('denied');
+ALTER TABLE members
+    RENAME COLUMN state TO state_legacy;
+ALTER TABLE members
+ADD COLUMN state INT NOT NULL DEFAULT 1,
+    ADD INDEX idx_members_state (state),
+    ADD CONSTRAINT fk_members_state_id FOREIGN KEY (state) REFERENCES account_states(id);
+CREATE TABLE IF NOT EXISTS member_state_history (
+    id INT AUTO_INCREMENT PRIMARY KEY,
+    member_id INT NOT NULL,
+    state_id INT NOT NULL,
+    reason VARCHAR(255),
+    created_by_id INT,
+    start_date DATE,
+    end_date DATE,
+    created_at DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    updated_at DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+    INDEX idx_member_state_history_member_id (member_id),
+    CONSTRAINT fk_member_state_history_member FOREIGN KEY (member_id) REFERENCES members(id),
+    CONSTRAINT fk_member_state_type FOREIGN KEY (state_id) REFERENCES account_states(id),
+    CONSTRAINT fk_member_state_history_created_by FOREIGN KEY (created_by_id) REFERENCES members(id)
+);
+-- Convert member states to new system
+UPDATE members m
+    JOIN account_states s ON m.state_legacy = s.name
+SET m.state = s.id;
+
+-- Initial history population
+INSERT INTO member_state_history (
+        member_id,
+        state_id,
+        reason,
+        start_date,
+        created_at
+    )
+SELECT id,
+    state,
+    'history start',
+    CURDATE(),
+    NOW()
+FROM members;

api/migrations/sqls/20260212052346-state-reason-detailed-down.sql

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

api/migrations/sqls/20260212052346-state-reason-detailed-up.sql

@@ -0,0 +1,3 @@
+/* Replace with your SQL commands */
+
+ALTER TABLE member_state_history ADD reason_detailed TEXT;

api/package.json

@@ -9,26 +9,33 @@
   "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/applications.ts

@@ -54,7 +54,7 @@ router.post('/', [requireLogin], async (req: Request, res: Response) => {
   try {
     let appID = await createApplication(memberID, appVersion, JSON.stringify(App));
 
-    await setUserState(memberID, MemberState.Applicant);
+    await setUserState(memberID, MemberState.Applicant, "Application Submitted", memberID);
 
     res.sendStatus(201);
 
@@ -225,15 +225,29 @@ router.post('/approve/:id', [requireLogin, requireRole("Recruiter")], async (req
   const appID = Number(req.params.id);
   const approved_by = req.user.id;
 
+  const app = await getApplicationByID(appID);
+
   try {
-    const app = await getApplicationByID(appID);
-    await approveApplication(appID, approved_by);
+    console.log("HELLO MFS")
+    var con = await pool.getConnection();
+    console.log("START")
+
+    con.beginTransaction();
+    console.log("APPROVE")
+
+    await approveApplication(appID, approved_by, con);
+    console.log("STATE")
 
     //update user profile
-    await setUserState(app.member_id, MemberState.Member);
+    await setUserState(app.member_id, MemberState.Member, "Application Accepted", approved_by, con);
 
-    await pool.query('CALL sp_accept_new_recruit_validation(?, ?, ?, ?)', [Number(process.env.CONFIG_ID), app.member_id, approved_by, approved_by])
+    console.log("SP")
 
+    await con.query('CALL sp_accept_new_recruit_validation(?, ?, ?, ?)', [Number(process.env.CONFIG_ID), app.member_id, approved_by, approved_by])
+
+    console.log("COMMIT")
+
+    con.commit();
     logger.info('app', "Member application approved", {
       application: app.id,
       applicant: app.member_id,
@@ -241,6 +255,9 @@ router.post('/approve/:id', [requireLogin, requireRole("Recruiter")], async (req
     })
     res.sendStatus(200);
   } catch (error) {
+
+    con.rollback();
+
     logger.error(
       'app',
       'Failed to approve application',
@@ -251,6 +268,8 @@ router.post('/approve/:id', [requireLogin, requireRole("Recruiter")], async (req
       }
     );
     res.status(500).json({ error: 'Failed to approve application' });
+  } finally {
+    if (con) con.release();
   }
 });
 
@@ -262,7 +281,7 @@ router.post('/deny/:id', [requireLogin, requireRole("Recruiter")], async (req: R
   try {
     const app = await getApplicationByID(appID);
     await denyApplication(appID, approver);
-    await setUserState(app.member_id, MemberState.Denied);
+    await setUserState(app.member_id, MemberState.Denied, "Application Denied", approver);
 
     logger.info('app', "Member application approved", {
       application: app.id,
@@ -403,7 +422,7 @@ VALUES(?, ?, ?, 1);`
 router.post('/restart', async (req: Request, res: Response) => {
   const user = req.user.id;
   try {
-    await setUserState(user, MemberState.Guest);
+    await setUserState(user, MemberState.Guest, "Restarted Application", user);
 
     logger.info('app', "Member restarted application", {
       user: user

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;
+}
+
+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, getLastNonSuspendedState } 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,71 @@ 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();
+        let author = req.user.id;
+
+        con.beginTransaction();
+
+        var data: Discharge = req.body;
+        setUserState(data.userID, MemberState.Discharged, "Member Discharged", author, con, data.reason);
+        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,
+        })
+        res.sendStatus(500);
+    } finally {
+        if (con)
+            con.release();
+    }
+});
+
+//suspend member
+router.post('/suspend', [requireLogin, requireMemberState(MemberState.Member), requireRole("17th Administrator")], async (req: Request, res: Response) => {
+    let author = req.user.id;
+    let target = Number(req.query.target);
+    try {
+        await setUserState(target, MemberState.Suspended, "Member Suspended", author, null);
+        res.sendStatus(200);
+    } catch (error) {
+        logger.error('app', 'Failed to suspend user', {
+            target: target,
+            caller: req.user.id,
+            error: error instanceof Error ? error.message : String(error),
+            stack: error instanceof Error ? error.stack : undefined,
+        })
+        res.sendStatus(500);
+    }
+})
+
+//unsuspend member
+router.post('/unsuspend', [requireLogin, requireMemberState(MemberState.Member), requireRole("17th Administrator")], async (req: Request, res: Response) => {
+    let author = req.user.id;
+    let target = Number(req.query.target);
+    try {
+        let prevState = await getLastNonSuspendedState(target);
+        await setUserState(target, prevState, "Member Suspension Removed", author, null);
+        res.sendStatus(200);
+    } catch (error) {
+        logger.error('app', 'Failed to suspend user', {
+            target: target,
+            caller: req.user.id,
+            error: error instanceof Error ? error.message : String(error),
+            stack: error instanceof Error ? error.stack : undefined,
+        })
+        res.sendStatus(500);
+    }
+})
 
 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/applicationService.ts

@@ -1,6 +1,8 @@
 import { ApplicationListRow, ApplicationRow, CommentRow } from "@app/shared/types/application";
 import pool from "../../db";
 import { error } from "console";
+import * as mariadb from 'mariadb';
+
 
 /**
  * Create an application in the db
@@ -72,7 +74,7 @@ export async function getAllMemberApplications(memberID: number): Promise<Applic
 }
 
 
-export async function approveApplication(id: number, approver: number) {
+export async function approveApplication(id: number, approver: number, con: mariadb.Connection | mariadb.Pool = pool) {
   const sql = `
       UPDATE applications
          SET approved_at = NOW(), approved_by = ?
@@ -81,7 +83,7 @@ export async function approveApplication(id: number, approver: number) {
         AND denied_at IS NULL
       `;
 
-  const result = await pool.execute(sql, [approver, id]);
+  const result = await con.query(sql, [approver, id]);
   if (result.affectedRows == 1) {
     return
   } else {

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,114 +1,280 @@
 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 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;
+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,
+            member_state: row.member_state
+        }));
+
+        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 setUserState(userID: number, state: MemberState) {
-  const sql = `UPDATE members
-        SET state = ?
-        WHERE id = ?;`;
-  return await pool.query(sql, [state, 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;
+}
+
+export async function setUserState(userID: number, state: MemberState, reason: string, creatorID: number, externalCon?: mariadb.PoolConnection, details: string = "", endPrevious: boolean = true, createHistory: boolean = true) {
+    const isInternalConn = !externalCon;
+    if (isInternalConn)
+        var con = await pool.getConnection();
+    else
+        var con = externalCon;
+
+    try {
+        if (isInternalConn) await con.beginTransaction();
+
+        if (endPrevious)
+            await endLatestMemberState(userID, con);
+
+        const sql = `UPDATE members SET state = ? WHERE id = ?;`;
+        await con.query(sql, [state, userID]);
+
+        if (createHistory) {
+            const insertHistorySql = `INSERT INTO member_state_history
+                (member_id, state_id, reason, created_by_id, start_date, end_date, reason_detailed)
+                VALUES (?, ?, ?, ?, NOW(), NULL, ?);`;
+            await con.query(insertHistorySql, [userID, state, reason, creatorID, details]);
+        }
+
+        if (isInternalConn) await con.commit();
+    } catch (error) {
+        if (isInternalConn) {
+            await con.rollback();
+        }
+        logger.error('app', 'Error setting user state', error);
+        throw error;
+    } finally {
+        memberCache.Invalidate(userID);
+        if (isInternalConn && con) con.release();
+    }
 }
 
 export async function getUserState(user: number): Promise<MemberState> {
-  let out = await pool.query(`SELECT state FROM members WHERE id = ?`, [user]);
-  return (out[0].state as MemberState);
+    let out = await pool.query(`SELECT state FROM members WHERE id = ?`, [user]);
+    return (out[0].state as MemberState);
 }
 
 export async function getMemberSettings(id: number): Promise<memberSettings> {
-  const sql = `SELECT * FROM view_member_settings WHERE id = ?`;
-  let out: memberSettings[] = await pool.query(sql, [id]);
+    const sql = `SELECT * FROM view_member_settings WHERE id = ?`;
+    let out: memberSettings[] = await pool.query(sql, [id]);
 
-  if (out.length != 1)
-    throw new Error("Could not get user settings");
+    if (out.length != 1)
+        throw new Error("Could not get user settings");
 
-  return out[0];
+    return out[0];
 }
 
 export async function setUserSettings(id: number, settings: memberSettings) {
-  const sql = `UPDATE view_member_settings SET
+    const sql = `UPDATE view_member_settings SET
                 displayName = ?
                 WHERE id = ?;`;
-  let result = await pool.query(sql, [settings.displayName, id])
+    let result = await pool.query(sql, [settings.displayName, id])
 }
 
 export async function getMembersLite(ids: number[]): Promise<MemberLight[]> {
-  const sql = `SELECT m.member_id AS id,
+    const sql = `SELECT m.member_id AS id,
                   m.member_name AS username,
                   m.displayName,
                   u.color
               FROM view_member_rank_unit_status_latest m
                   LEFT JOIN units u ON u.name = m.unit
               WHERE member_id IN (?);`;
-  const res: MemberLight[] = await pool.query(sql, [ids]);
-  return res;
+    const res: MemberLight[] = await pool.query(sql, [ids]);
+    return res;
 }
 
 export async function getAllMembersLite(): Promise<MemberLight[]> {
-  const sql = `SELECT m.member_id AS id,
+    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;
+    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
+    const sql = `
+    SELECT 
+        m.*,
+        (
+            SELECT COALESCE(JSON_ARRAYAGG(JSON_OBJECT(
+                'id', r.id,
+                'name', r.name,
+                'color', r.color,
+                'description', r.description
+            )), JSON_ARRAY())
+            FROM members_roles mr
+            JOIN roles r ON mr.role_id = r.id
+            WHERE mr.member_id = m.member_id
+        ) 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;
+    WHERE m.member_id IN (?);
   `;
 
-  const rows: any[] = await pool.query(sql, [ids]);
+    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,
-    };
+    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[] = row.roles;
 
-    // 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 };
-  });
+        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]);
-  return res.length > 0 ? res[0].id : null;
+    const sql = `SELECT id FROM members WHERE discord_id = ?;`
+    let res = await pool.query(sql, [id]);
+    return res.length > 0 ? res[0].id : null;
+}
+
+export async function endLatestMemberState(memberID: number, con: mariadb.Pool | mariadb.Connection = pool) {
+    const sql = `UPDATE member_state_history
+                SET end_date = NOW(),
+                    updated_at = NOW()
+                WHERE id = (
+                        SELECT id
+                        FROM (
+                                SELECT id
+                                FROM member_state_history
+                                WHERE member_id = ?
+                                    AND end_date IS NULL
+                                ORDER BY start_date DESC,
+                                    created_at DESC
+                                LIMIT 1
+                            ) AS x
+                    );`;
+
+    try {
+        let res = await con.query(sql, [memberID]);
+        console.log(res);
+        return;
+    } catch (error) {
+        logger.error('app', 'Error ending latest member state', {
+            error: error instanceof Error ? error.message : String(error),
+        });
+        throw error;
+    }
+    // let res = await pool.query(sql, [memberID]);
+    // console.log(res);
+}
+
+export async function getLastNonSuspendedState(memberID: number): Promise<MemberState> {
+    try {
+        const sql = `SELECT state_id 
+                        FROM member_state_history 
+                        WHERE member_id = ? 
+                        AND state_id != ? 
+                        ORDER BY start_date DESC, id DESC
+                        LIMIT 1;`
+        const res = await pool.query(sql, [memberID, MemberState.Suspended]);
+        console.log(res as MemberState[])
+        if (res.length)
+            return res[0].state_id as MemberState;
+    } catch (error) {
+        logger.error('app', 'Error ending latest member state', {
+            error: error instanceof Error ? error.message : String(error),
+        });
+    }
 }

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(
@@ -106,3 +107,13 @@ export async function getPromotionsOnDay(day: Date): Promise<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,17 +1,22 @@
 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",
-    Member = "member",
-    Retired = "retired",
-    Banned = "banned",
-    Denied = "denied"
+    Guest = 1,
+    Applicant = 2,
+    Member = 3,
+    Retired = 4,
+    Discharged = 5,
+    Suspended = 6,
+    Banned = 7,
+    Denied = 8
 }
 
 export type Member = {
@@ -25,6 +30,7 @@ export type Member = {
     status: string | null;
     status_date: string | null;
     loa_until?: Date;
+    member_state?: MemberState;
 };
 
 export interface MemberLight {

shared/types/units.ts

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

ui/package-lock.json

@@ -35,7 +35,8 @@
         "@types/node": "^24.2.1",
         "@vitejs/plugin-vue": "^6.0.1",
         "vite": "^7.0.6",
-        "vite-plugin-vue-devtools": "^8.0.0"
+        "vite-plugin-vue-devtools": "^8.0.0",
+        "vue-tsc": "^3.2.4"
       },
       "engines": {
         "node": "^20.19.0 || >=22.12.0"
@@ -1884,6 +1885,35 @@
         "vue": "^3.2.25"
       }
     },
+    "node_modules/@volar/language-core": {
+      "version": "2.4.27",
+      "resolved": "https://registry.npmjs.org/@volar/language-core/-/language-core-2.4.27.tgz",
+      "integrity": "sha512-DjmjBWZ4tJKxfNC1F6HyYERNHPYS7L7OPFyCrestykNdUZMFYzI9WTyvwPcaNaHlrEUwESHYsfEw3isInncZxQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@volar/source-map": "2.4.27"
+      }
+    },
+    "node_modules/@volar/source-map": {
+      "version": "2.4.27",
+      "resolved": "https://registry.npmjs.org/@volar/source-map/-/source-map-2.4.27.tgz",
+      "integrity": "sha512-ynlcBReMgOZj2i6po+qVswtDUeeBRCTgDurjMGShbm8WYZgJ0PA4RmtebBJ0BCYol1qPv3GQF6jK7C9qoVc7lg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@volar/typescript": {
+      "version": "2.4.27",
+      "resolved": "https://registry.npmjs.org/@volar/typescript/-/typescript-2.4.27.tgz",
+      "integrity": "sha512-eWaYCcl/uAPInSK2Lze6IqVWaBu/itVqR5InXcHXFyles4zO++Mglt3oxdgj75BDcv1Knr9Y93nowS8U3wqhxg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@volar/language-core": "2.4.27",
+        "path-browserify": "^1.0.1",
+        "vscode-uri": "^3.0.8"
+      }
+    },
     "node_modules/@vue/babel-helper-vue-transform-on": {
       "version": "1.5.0",
       "resolved": "https://registry.npmjs.org/@vue/babel-helper-vue-transform-on/-/babel-helper-vue-transform-on-1.5.0.tgz",
@@ -2083,6 +2113,22 @@
         "rfdc": "^1.4.1"
       }
     },
+    "node_modules/@vue/language-core": {
+      "version": "3.2.4",
+      "resolved": "https://registry.npmjs.org/@vue/language-core/-/language-core-3.2.4.tgz",
+      "integrity": "sha512-bqBGuSG4KZM45KKTXzGtoCl9cWju5jsaBKaJJe3h5hRAAWpZUuj5G+L+eI01sPIkm4H6setKRlw7E85wLdDNew==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@volar/language-core": "2.4.27",
+        "@vue/compiler-dom": "^3.5.0",
+        "@vue/shared": "^3.5.0",
+        "alien-signals": "^3.0.0",
+        "muggle-string": "^0.4.1",
+        "path-browserify": "^1.0.1",
+        "picomatch": "^4.0.2"
+      }
+    },
     "node_modules/@vue/reactivity": {
       "version": "3.5.18",
       "resolved": "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.5.18.tgz",
@@ -2171,6 +2217,13 @@
         "vue": "^3.5.0"
       }
     },
+    "node_modules/alien-signals": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/alien-signals/-/alien-signals-3.1.2.tgz",
+      "integrity": "sha512-d9dYqZTS90WLiU0I5c6DHj/HcKkF8ZyGN3G5x8wSbslulz70KOxaqCT0hQCo9KOyhVqzqGojvNdJXoTumZOtcw==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/ansis": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/ansis/-/ansis-4.1.0.tgz",
@@ -3123,6 +3176,13 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/muggle-string": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/muggle-string/-/muggle-string-0.4.1.tgz",
+      "integrity": "sha512-VNTrAak/KhO2i8dqqnqnAHOa3cYBwXEZe9h+D5h/1ZqFSTEFHdM65lR7RoIqq3tBBYavsOXV84NoHXZ0AkPyqQ==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/nanoid": {
       "version": "3.3.11",
       "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.11.tgz",
@@ -3216,6 +3276,13 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/path-browserify": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-1.0.1.tgz",
+      "integrity": "sha512-b7uo2UCUOYZcnF/3ID0lulOJi/bafxa1xPe7ZPsammBSpjSWQkjNxlt635YGS2MiR9GjvuXCtz2emr3jbsz98g==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/path-key": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
@@ -3646,6 +3713,21 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/typescript": {
+      "version": "5.9.3",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.9.3.tgz",
+      "integrity": "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==",
+      "devOptional": true,
+      "license": "Apache-2.0",
+      "peer": true,
+      "bin": {
+        "tsc": "bin/tsc",
+        "tsserver": "bin/tsserver"
+      },
+      "engines": {
+        "node": ">=14.17"
+      }
+    },
     "node_modules/undici-types": {
       "version": "7.10.0",
       "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.10.0.tgz",
@@ -3932,6 +4014,13 @@
         "vite": "^3.0.0-0 || ^4.0.0-0 || ^5.0.0-0 || ^6.0.0-0 || ^7.0.0-0"
       }
     },
+    "node_modules/vscode-uri": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/vscode-uri/-/vscode-uri-3.1.0.tgz",
+      "integrity": "sha512-/BpdSx+yCQGnCvecbyXdxHDkuk55/G3xwnC0GqY4gmQ3j+A+g8kzzgB4Nk/SINjqn6+waqw3EgbVF2QKExkRxQ==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/vue": {
       "version": "3.5.18",
       "resolved": "https://registry.npmjs.org/vue/-/vue-3.5.18.tgz",
@@ -3974,6 +4063,23 @@
       "integrity": "sha512-sGhTPMuXqZ1rVOk32RylztWkfXTRhuS7vgAKv0zjqk8gbsHkJ7xfFf+jbySxt7tWObEJwyKaHMikV/WGDiQm8g==",
       "license": "MIT"
     },
+    "node_modules/vue-tsc": {
+      "version": "3.2.4",
+      "resolved": "https://registry.npmjs.org/vue-tsc/-/vue-tsc-3.2.4.tgz",
+      "integrity": "sha512-xj3YCvSLNDKt1iF9OcImWHhmYcihVu9p4b9s4PGR/qp6yhW+tZJaypGxHScRyOrdnHvaOeF+YkZOdKwbgGvp5g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@volar/typescript": "2.4.27",
+        "@vue/language-core": "3.2.4"
+      },
+      "bin": {
+        "vue-tsc": "bin/vue-tsc.js"
+      },
+      "peerDependencies": {
+        "typescript": ">=5.0.0"
+      }
+    },
     "node_modules/which": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",

ui/package.json

@@ -39,6 +39,7 @@
     "@types/node": "^24.2.1",
     "@vitejs/plugin-vue": "^6.0.1",
     "vite": "^7.0.6",
-    "vite-plugin-vue-devtools": "^8.0.0"
+    "vite-plugin-vue-devtools": "^8.0.0",
+    "vue-tsc": "^3.2.4"
   }
 }

ui/src/App.vue

@@ -1,25 +1,27 @@
-<script setup>
-import { RouterView } from 'vue-router';
-import Button from './components/ui/button/Button.vue';
-import { useUserStore } from './stores/user';
-import Alert from './components/ui/alert/Alert.vue';
-import AlertDescription from './components/ui/alert/AlertDescription.vue';
-import Navbar from './components/Navigation/Navbar.vue';
-import { cancelLOA } from './api/loa';
+<script setup lang="ts">
+  import { RouterView } from 'vue-router';
+  import Button from './components/ui/button/Button.vue';
+  import { useUserStore } from './stores/user';
+  import Alert from './components/ui/alert/Alert.vue';
+  import AlertDescription from './components/ui/alert/AlertDescription.vue';
+  import Navbar from './components/Navigation/Navbar.vue';
+  import { cancelLOA } from './api/loa';
 
-const userStore = useUserStore();
+  const userStore = useUserStore();
 
-function formatDate(dateStr) {
-  if (!dateStr) return "";
-  return new Date(dateStr).toLocaleDateString("en-US", {
-    year: "numeric",
-    month: "short",
-    day: "numeric",
-  });
-}
+  function formatDate(dateStr) {
+    if (!dateStr) return "";
+    return new Date(dateStr).toLocaleDateString("en-US", {
+      year: "numeric",
+      month: "short",
+      day: "numeric",
+    });
+  }
 
-const environment = import.meta.env.VITE_ENVIRONMENT;
-const version = import.meta.env.VITE_APPLICATION_VERSION;
+  //@ts-ignore
+  const environment = import.meta.env.VITE_ENVIRONMENT;
+  //@ts-ignore
+  const version = import.meta.env.VITE_APPLICATION_VERSION;
 </script>
 
 <template>
@@ -36,8 +38,15 @@ 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>
@@ -48,5 +57,3 @@ const version = import.meta.env.VITE_APPLICATION_VERSION;
     <RouterView class="flex-1 min-h-0"></RouterView>
   </div>
 </template>
-
-<style scoped></style>

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, MemberState } 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 | MemberState;
+    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', String(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'
@@ -88,3 +116,45 @@ export async function getFullMembers(ids: number[]): Promise<MemberCardDetails[]
     }
     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;
+}
+
+export async function suspendMember(memberID: number): Promise<boolean> {
+    const response = await fetch(`${addr}/members/suspend?target=${memberID}`, {
+        credentials: 'include',
+        method: 'POST',
+    });
+    if (!response.ok) {
+        throw new Error("Failed to discharge member");
+    }
+    return true;
+}
+
+export async function unsuspendMember(memberID: number): Promise<boolean> {
+    const response = await fetch(`${addr}/members/unsuspend?target=${memberID}`, {
+        credentials: 'include',
+        method: 'POST',
+    });
+    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

@@ -21,6 +21,7 @@ import { useAuth } from '@/composables/useAuth';
 import { ArrowUpRight, CircleArrowOutUpRight } from 'lucide-vue-next';
 import DropdownMenuGroup from '../ui/dropdown-menu/DropdownMenuGroup.vue';
 import DropdownMenuSeparator from '../ui/dropdown-menu/DropdownMenuSeparator.vue';
+import { MemberState } from '@shared/types/member';
 
 const userStore = useUserStore();
 const auth = useAuth();
@@ -51,7 +52,7 @@ function blurAfter() {
                     <img src="/17RBN_Logo.png" class="w-10 h-10 object-contain"></img>
                 </RouterLink>
                 <!-- Member navigation -->
-                <div v-if="auth.accountStatus.value == 'member'" class="h-15 flex items-center justify-center">
+                <div v-if="auth.accountStatus.value == MemberState.Member" class="h-15 flex items-center justify-center">
                     <NavigationMenu>
                         <NavigationMenuList class="gap-3">
 
@@ -138,6 +139,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 +153,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/application/ApplicationForm.vue

@@ -1,18 +1,18 @@
 <script setup lang="ts">
 import Button from '@/components/ui/button/Button.vue';
 import Checkbox from '@/components/ui/checkbox/Checkbox.vue';
+import { useForm, Field as VeeField } from 'vee-validate';
 import {
-  FormControl,
-  FormDescription,
-  FormField,
-  FormItem,
-  FormLabel,
-  FormMessage,
-} from '@/components/ui/form'
+  Field,
+  FieldContent,
+  FieldDescription,
+  FieldGroup,
+  FieldLabel,
+} from '@/components/ui/field'
+import FieldError from '@/components/ui/field/FieldError.vue';
 import Input from '@/components/ui/input/Input.vue';
 import Textarea from '@/components/ui/textarea/Textarea.vue';
 import { toTypedSchema } from '@vee-validate/zod';
-import { Form } from 'vee-validate';
 import { nextTick, onMounted, ref, watch } from 'vue';
 import * as z from 'zod';
 import DateInput from '../form/DateInput.vue';
@@ -58,13 +58,22 @@ const fallbackInitials = {
 
 const props = defineProps<{
   readOnly: boolean,
-  data: ApplicationData,
+  data: ApplicationData | null,
 }>()
 
 const emit = defineEmits(['submit']);
 
 const initialValues = ref<Record<string, unknown> | null>(null);
 
+const { handleSubmit, resetForm, values } = useForm({
+  validationSchema: formSchema,
+  validateOnMount: false,
+});
+
+const submitForm = handleSubmit(async (val) => {
+  await onSubmit(val);
+});
+
 async function onSubmit(val: any) {
   emit('submit', val);
 }
@@ -80,6 +89,9 @@ onMounted(async () => {
     initialValues.value = { ...fallbackInitials };
   }
 
+  // apply the initial values to the vee-validate form
+  resetForm({ values: initialValues.value });
+
   // CoCbox.value.innerHTML = await getCoC()
   CoCString.value = await getCoC();
 })
@@ -103,235 +115,237 @@ function enforceExternalLinks() {
 }
 
 watch(() => showCoC.value, async () => {
-  if (showCoC) {
+  if (showCoC.value) {
     await nextTick(); // wait for v-html to update
     enforceExternalLinks();
   }
 });
 
 function convertToAge(dob: string) {
+
+  if (dob === undefined) return "";
   const [month, day, year] = dob.split('/').map(Number);
 
   let dobDate = new Date(year, month - 1, day);
 
-  return Math.floor(
+  let out = Math.floor(
     (Date.now() - dobDate.getTime()) / (1000 * 60 * 60 * 24 * 365.2425)
   );
 
+  return Number.isNaN(out) ? "" : out;
 }
 
 </script>
 
 <template>
-  <Form v-if="initialValues" :validation-schema="formSchema" :initial-values="initialValues" @submit="onSubmit"
-    class="space-y-6">
+  <form v-if="initialValues" @submit.prevent="submitForm" class="space-y-6">
     <!-- Age -->
-    <FormField name="dob" v-slot="{ value, handleChange }">
-      <FormItem>
-        <FormLabel>What is your date of birth?</FormLabel>
-        <FormControl>
-          <template class="flex items-center gap-10">
-            <DateInput :model-value="(value as string) ?? ''" :disabled="readOnly" @update:model-value="handleChange" />
-            <p class="text-muted-foreground">Age: {{ convertToAge(value) }}</p>
-          </template>
-        </FormControl>
+    <VeeField name="dob" v-slot="{ field, errors }">
+      <Field>
+        <FieldLabel>What is your date of birth?</FieldLabel>
+        <FieldContent>
+          <div class="flex items-center gap-10">
+            <DateInput :model-value="(field.value as string) ?? ''" :disabled="readOnly" @update:model-value="field.onChange" />
+            <p v-if="props.readOnly" class="text-muted-foreground">Age: {{ convertToAge(field.value) }}</p>
+          </div>
+        </FieldContent>
         <div class="h-4">
-          <FormMessage class="text-destructive" />
+          <FieldError v-if="errors.length" :errors="errors" />
         </div>
-      </FormItem>
-    </FormField>
+      </Field>
+    </VeeField>
 
     <!-- Name -->
-    <FormField name="name" v-slot="{ value, handleChange }">
-      <FormItem>
-        <FormLabel>What name will you be going by within the community?</FormLabel>
-        <FormDescription>This name must be consistent across platforms.</FormDescription>
-        <FormControl>
-          <Input :model-value="value" @update:model-value="handleChange" :disabled="readOnly" />
-        </FormControl>
+    <VeeField name="name" v-slot="{ field, errors }">
+      <Field>
+        <FieldLabel>What name will you be going by within the community?</FieldLabel>
+        <FieldDescription>This name must be consistent across platforms.</FieldDescription>
+        <FieldContent>
+          <Input :model-value="field.value" @update:model-value="field.onChange" :disabled="readOnly" />
+        </FieldContent>
         <div class="h-4">
-          <FormMessage class="text-destructive" />
+          <FieldError v-if="errors.length" :errors="errors" />
         </div>
-      </FormItem>
-    </FormField>
+      </Field>
+    </VeeField>
 
     <!-- Playtime -->
-    <FormField name="playtime" v-slot="{ value, handleChange }">
-      <FormItem>
-        <FormLabel>How long have you played Arma 3 for (in hours)?</FormLabel>
-        <FormControl>
-          <Input type="number" :model-value="value" @update:model-value="handleChange" :disabled="readOnly" />
-        </FormControl>
+    <VeeField name="playtime" v-slot="{ field, errors }">
+      <Field>
+        <FieldLabel>How long have you played Arma 3 for (in hours)?</FieldLabel>
+        <FieldContent>
+          <Input type="number" :model-value="field.value" @update:model-value="field.onChange" :disabled="readOnly" />
+        </FieldContent>
         <div class="h-4">
-          <FormMessage class="text-destructive" />
+          <FieldError v-if="errors.length" :errors="errors" />
         </div>
-      </FormItem>
-    </FormField>
+      </Field>
+    </VeeField>
 
     <!-- Hobbies -->
-    <FormField name="hobbies" v-slot="{ value, handleChange }">
-      <FormItem>
-        <FormLabel>What hobbies do you like to participate in outside of gaming?</FormLabel>
-        <FormControl>
-          <Textarea rows="4" class="resize-none" :model-value="value" @update:model-value="handleChange"
+    <VeeField name="hobbies" v-slot="{ field, errors }">
+      <Field>
+        <FieldLabel>What hobbies do you like to participate in outside of gaming?</FieldLabel>
+        <FieldContent>
+          <Textarea rows="4" class="resize-none" :model-value="field.value" @update:model-value="field.onChange"
             :disabled="readOnly" />
-        </FormControl>
+        </FieldContent>
         <div class="h-4">
-          <FormMessage class="text-destructive" />
+          <FieldError v-if="errors.length" :errors="errors" />
         </div>
-      </FormItem>
-    </FormField>
+      </Field>
+    </VeeField>
 
     <!-- Military (boolean) -->
-    <FormField name="military" v-slot="{ value, handleChange }">
-      <FormItem>
-        <FormLabel>Have you ever served in the military?</FormLabel>
-        <FormControl>
+    <VeeField name="military" v-slot="{ field, errors }">
+      <Field>
+        <FieldLabel>Have you ever served in the military?</FieldLabel>
+        <FieldContent>
           <div class="flex items-center gap-2">
-            <Checkbox :model-value="value" @update:model-value="handleChange" :disabled="readOnly" />
+            <Checkbox :model-value="field.value" @update:model-value="field.onChange" :disabled="readOnly" />
             <span>Yes (checked) / No (unchecked)</span>
           </div>
-        </FormControl>
+        </FieldContent>
         <div class="h-4">
-          <FormMessage class="text-destructive" />
+          <FieldError v-if="errors.length" :errors="errors" />
         </div>
-      </FormItem>
-    </FormField>
+      </Field>
+    </VeeField>
 
     <!-- Other communities (freeform) -->
-    <FormField name="communities" v-slot="{ value, handleChange }">
-      <FormItem>
-        <FormLabel>Are you a part of any other communities? If so, which ones? If none, type "No"</FormLabel>
-        <FormControl>
-          <Input :model-value="value" @update:model-value="handleChange" :disabled="readOnly" />
-        </FormControl>
+    <VeeField name="communities" v-slot="{ field, errors }">
+      <Field>
+        <FieldLabel>Are you a part of any other communities? If so, which ones? If none, type "No"</FieldLabel>
+        <FieldContent>
+          <Input :model-value="field.value" @update:model-value="field.onChange" :disabled="readOnly" />
+        </FieldContent>
         <div class="h-4">
-          <FormMessage class="text-destructive" />
+          <FieldError v-if="errors.length" :errors="errors" />
         </div>
-      </FormItem>
-    </FormField>
+      </Field>
+    </VeeField>
 
     <!-- Why join -->
-    <FormField name="joinReason" v-slot="{ value, handleChange }">
-      <FormItem>
-        <FormLabel>Why do you want to join our community?</FormLabel>
-        <FormControl>
-          <Textarea rows="4" class="resize-none" :model-value="value" @update:model-value="handleChange"
+    <VeeField name="joinReason" v-slot="{ field, errors }">
+      <Field>
+        <FieldLabel>Why do you want to join our community?</FieldLabel>
+        <FieldContent>
+          <Textarea rows="4" class="resize-none" :model-value="field.value" @update:model-value="field.onChange"
             :disabled="readOnly" />
-        </FormControl>
+        </FieldContent>
         <div class="h-4">
-          <FormMessage class="text-destructive" />
+          <FieldError v-if="errors.length" :errors="errors" />
         </div>
-      </FormItem>
-    </FormField>
+      </Field>
+    </VeeField>
 
     <!-- Attraction to milsim -->
-    <FormField name="milsimAttraction" v-slot="{ value, handleChange }">
-      <FormItem>
-        <FormLabel>What attracts you to the Arma 3 milsim playstyle?</FormLabel>
-        <FormControl>
-          <Textarea rows="4" class="resize-none" :model-value="value" @update:model-value="handleChange"
+    <VeeField name="milsimAttraction" v-slot="{ field, errors }">
+      <Field>
+        <FieldLabel>What attracts you to the Arma 3 milsim playstyle?</FieldLabel>
+        <FieldContent>
+          <Textarea rows="4" class="resize-none" :model-value="field.value" @update:model-value="field.onChange"
             :disabled="readOnly" />
-        </FormControl>
+        </FieldContent>
         <div class="h-4">
-          <FormMessage class="text-destructive" />
+          <FieldError v-if="errors.length" :errors="errors" />
         </div>
-      </FormItem>
-    </FormField>
+      </Field>
+    </VeeField>
 
     <!-- Referral (freeform) -->
-    <FormField name="referral" v-slot="{ value, handleChange }">
-      <FormItem>
-        <FormLabel>Where did you hear about us? (If another member, who?)</FormLabel>
-        <FormControl>
-          <Input placeholder="e.g., Reddit / Member: Alice" :model-value="value" @update:model-value="handleChange"
+    <VeeField name="referral" v-slot="{ field, errors }">
+      <Field>
+        <FieldLabel>Where did you hear about us? (If another member, who?)</FieldLabel>
+        <FieldContent>
+          <Input placeholder="e.g., Reddit / Member: Alice" :model-value="field.value" @update:model-value="field.onChange"
             :disabled="readOnly" />
-        </FormControl>
+        </FieldContent>
         <div class="h-4">
-          <FormMessage class="text-destructive" />
+          <FieldError v-if="errors.length" :errors="errors" />
         </div>
-      </FormItem>
-    </FormField>
+      </Field>
+    </VeeField>
 
     <!-- Steam profile -->
-    <FormField name="steamProfile" v-slot="{ value, handleChange }">
-      <FormItem>
-        <FormLabel>Steam profile link</FormLabel>
-        <FormDescription>
+    <VeeField name="steamProfile" v-slot="{ field, errors }">
+      <Field>
+        <FieldLabel>Steam profile link</FieldLabel>
+        <FieldDescription>
           Format: <code>https://steamcommunity.com/id/USER/</code> or
           <code>https://steamcommunity.com/profiles/STEAMID64/</code>
-        </FormDescription>
-        <FormControl>
-          <Input type="url" placeholder="https://steamcommunity.com/profiles/7656119..." :model-value="value"
-            @update:model-value="handleChange" :disabled="readOnly" />
-        </FormControl>
+        </FieldDescription>
+        <FieldContent>
+          <Input type="url" placeholder="https://steamcommunity.com/profiles/7656119..." :model-value="field.value"
+            @update:model-value="field.onChange" :disabled="readOnly" />
+        </FieldContent>
         <div class="h-4">
-          <FormMessage class="text-destructive" />
+          <FieldError v-if="errors.length" :errors="errors" />
         </div>
-      </FormItem>
-    </FormField>
+      </Field>
+    </VeeField>
 
     <!-- Timezone -->
-    <FormField name="timezone" v-slot="{ value, handleChange }">
-      <FormItem>
-        <FormLabel>What time zone are you in?</FormLabel>
-        <FormControl>
-          <Input placeholder="e.g., AEST, EST, UTC+10" :model-value="value" @update:model-value="handleChange"
+    <VeeField name="timezone" v-slot="{ field, errors }">
+      <Field>
+        <FieldLabel>What time zone are you in?</FieldLabel>
+        <FieldContent>
+          <Input placeholder="e.g., AEST, EST, UTC+10" :model-value="field.value" @update:model-value="field.onChange"
             :disabled="readOnly" />
-        </FormControl>
+        </FieldContent>
         <div class="h-4">
-          <FormMessage class="text-destructive" />
+          <FieldError v-if="errors.length" :errors="errors" />
         </div>
-      </FormItem>
-    </FormField>
+      </Field>
+    </VeeField>
 
     <!-- Attendance (boolean) -->
-    <FormField name="canAttendSaturday" v-slot="{ value, handleChange }">
-      <FormItem>
-        <FormLabel>Are you able to attend weekly operations Saturdays @ 7pm CST?</FormLabel>
-        <FormControl>
+    <VeeField name="canAttendSaturday" v-slot="{ field, errors }">
+      <Field>
+        <FieldLabel>Are you able to attend weekly operations Saturdays @ 7pm CST?</FieldLabel>
+        <FieldContent>
           <div class="flex items-center gap-2">
-            <Checkbox :model-value="value ?? false" @update:model-value="handleChange" :disabled="readOnly" />
+            <Checkbox :model-value="field.value ?? false" @update:model-value="field.onChange" :disabled="readOnly" />
             <span>Yes (checked) / No (unchecked)</span>
           </div>
-        </FormControl>
+        </FieldContent>
         <div class="h-4">
-          <FormMessage class="text-destructive" />
+          <FieldError v-if="errors.length" :errors="errors" />
         </div>
-      </FormItem>
-    </FormField>
+      </Field>
+    </VeeField>
 
     <!-- Interests / Playstyle (freeform) -->
-    <FormField name="interests" v-slot="{ value, handleChange }">
-      <FormItem>
-        <FormLabel>Which playstyles interest you?</FormLabel>
-        <FormControl>
-          <Input placeholder="e.g., Rifleman; Medic; Pilot" :model-value="value" @update:model-value="handleChange"
+    <VeeField name="interests" v-slot="{ field, errors }">
+      <Field>
+        <FieldLabel>Which playstyles interest you?</FieldLabel>
+        <FieldContent>
+          <Input placeholder="e.g., Rifleman; Medic; Pilot" :model-value="field.value" @update:model-value="field.onChange"
             :disabled="readOnly" />
-        </FormControl>
+        </FieldContent>
         <div class="h-4">
-          <FormMessage class="text-destructive" />
+          <FieldError v-if="errors.length" :errors="errors" />
         </div>
-      </FormItem>
-    </FormField>
+      </Field>
+    </VeeField>
 
     <!-- Code of Conduct (boolean, field name kept as-is) -->
-    <FormField name="acknowledgeRules" v-slot="{ value, handleChange }">
-      <FormItem>
-        <FormLabel>Community Code of Conduct</FormLabel>
-        <FormControl>
+    <VeeField name="acknowledgeRules" v-slot="{ field, errors }">
+      <Field>
+        <FieldLabel>Community Code of Conduct</FieldLabel>
+        <FieldContent>
           <div class="flex items-center gap-2">
-            <Checkbox :model-value="value" @update:model-value="handleChange" :disabled="readOnly" />
+            <Checkbox :model-value="field.value" @update:model-value="field.onChange" :disabled="readOnly" />
             <span>By checking this box, you accept the <Button variant="link" class="p-0 h-min"
                 @click.prevent.stop="showCoC = true">Code of
                 Conduct</Button>.</span>
           </div>
-        </FormControl>
+        </FieldContent>
         <div class="h-4">
-          <FormMessage class="text-destructive" />
+          <FieldError v-if="errors.length" :errors="errors" />
         </div>
-      </FormItem>
-    </FormField>
+      </Field>
+    </VeeField>
 
     <div class="pt-2" v-if="!readOnly">
       <Button type="submit" :disabled="readOnly">Submit Application</Button>
@@ -348,5 +362,5 @@ function convertToAge(dob: string) {
       </DialogContent>
     </Dialog>
 
-  </Form>
+  </form>
 </template>

ui/src/components/calendar/ViewCalendarEvent.vue

@@ -15,6 +15,7 @@ import { Calendar } from 'lucide-vue-next';
 import MemberCard from '../members/MemberCard.vue';
 import Spinner from '../ui/spinner/Spinner.vue';
 import { CopyLink } from '@/lib/copyLink';
+import { MemberState } from '@shared/types/member';
 
 const route = useRoute();
 
@@ -86,7 +87,7 @@ async function setAttendance(state: CalendarAttendance) {
 
 const canEditEvent = computed(() => {
     if (!userStore.isLoggedIn) return false;
-    if (userStore.state !== 'member') return false;
+    if (userStore.state !== MemberState.Member) return false;
     if (userStore.user.member.member_id == activeEvent.value.creator_id)
         return true;
 });
@@ -231,7 +232,7 @@ defineExpose({ forceReload })
                     <CircleAlert></CircleAlert> This event has been cancelled
                 </div>
             </section>
-            <section v-if="isPast && userStore.state === 'member'" class="w-full">
+            <section v-if="isPast && userStore.state === MemberState.Member" class="w-full">
                 <ButtonGroup class="flex w-full justify-center">
                     <Button variant="outline" class="flex-1"
                         :class="myAttendance?.status === CalendarAttendance.Attending ? 'border-2 border-primary text-primary' : ''"

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/main.js

@@ -10,14 +10,9 @@ import FormInput from './components/form/FormInput.vue'
 
 import * as Sentry from "@sentry/vue";
 
-
-
-
 const app = createApp(App)
-
-
-
-app.use(createPinia())
+const pinia = createPinia()
+app.use(pinia)
 app.use(router)
 
 if (import.meta.env.VITE_DISABLE_GLITCHTIP === "true") {
@@ -38,7 +33,7 @@ if (import.meta.env.VITE_DISABLE_GLITCHTIP === "true") {
     });
 }
 
-app.component("FormInput", FormInput)
-app.component("FormCheckbox", FormCheckbox)
+// app.component("FormInput", FormInput)
+// app.component("FormCheckbox", FormCheckbox)
 
 app.mount('#app')

ui/src/pages/Calendar.vue

@@ -11,6 +11,8 @@ 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'
+import { MemberState } from '@shared/types/member'
 
 const monthLabels = [
     'January', 'February', 'March', 'April', 'May', 'June',
@@ -49,14 +51,14 @@ 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;
+    if (userStore.state !== MemberState.Member) return;
     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 +72,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 +159,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 -->
@@ -196,7 +199,7 @@ onMounted(() => {
                                 @click="goToday">
                                 Today
                             </button>
-                            <button v-if="userStore.isLoggedIn && userStore.state === 'member'"
+                            <button v-if="userStore.isLoggedIn && userStore.state === MemberState.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" />
@@ -211,47 +214,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 +346,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/Homepage.vue

@@ -2,6 +2,7 @@
 import { getWelcomeMessage } from '@/api/docs';
 import { Button } from '@/components/ui/button'
 import { useUserStore } from '@/stores/user'
+import { MemberState } from '@shared/types/member';
 import { onMounted, ref } from 'vue';
 import { useRouter } from 'vue-router'
 
@@ -14,7 +15,7 @@ function goToApplication() {
 }
 
 onMounted(async () => {
-    if (user.state == 'member') {
+    if (user.state == MemberState.Member) {
         let policy = await getWelcomeMessage() as any;
         welcomeRef.value.innerHTML = policy;
     }
@@ -25,7 +26,7 @@ const welcomeRef = ref<HTMLElement>(null);
 
 <template>
     <div>
-        <div v-if="user.state == 'member'" class="mt-10">
+        <div v-if="user.state == MemberState.Member" class="mt-10">
             <div ref="welcomeRef" class="bookstack-container">
                 <!-- bookstack -->
             </div>

ui/src/pages/Join.vue

@@ -1,90 +1,93 @@
 <script setup lang="ts">
-import ApplicationForm from '@/components/application/ApplicationForm.vue';
-import Button from '@/components/ui/button/Button.vue';
-import {
-    Stepper,
-    StepperDescription,
-    StepperIndicator,
-    StepperItem,
-    StepperSeparator,
-    StepperTitle,
-    StepperTrigger,
-} from '@/components/ui/stepper'
-import { useUserStore } from '@/stores/user';
-import { Check, Circle, Dot, Users, X } from 'lucide-vue-next'
-import { computed, ref } from 'vue';
-import Application from './Application.vue';
-import { restartApplication } from '@/api/application';
+    import ApplicationForm from '@/components/application/ApplicationForm.vue';
+    import Button from '@/components/ui/button/Button.vue';
+    import {
+        Stepper,
+        StepperDescription,
+        StepperIndicator,
+        StepperItem,
+        StepperSeparator,
+        StepperTitle,
+        StepperTrigger,
+    } from '@/components/ui/stepper'
+    import { useUserStore } from '@/stores/user';
+    import { Check, Circle, Dot, Users, X } from 'lucide-vue-next'
+    import { computed, ref } from 'vue';
+    import Application from './Application.vue';
+    import { restartApplication } from '@/api/application';
+    import { MemberState } from '@shared/types/member';
 
-function goToLogin() {
-    const redirectUrl = encodeURIComponent(window.location.origin + '/join')
-    //@ts-ignore
-    const addr = import.meta.env.VITE_APIHOST;
-    window.location.href = `${addr}/login?redirect=${redirectUrl}`;
-}
-
-let userStore = useUserStore();
-
-const steps = computed(() => {
-    const isDenied = userStore.state === 'denied'
-
-    return [
-        {
-            step: 1,
-            title: 'Create account',
-            description: 'Begin by setting up your account',
-        },
-        {
-            step: 2,
-            title: 'Submit application',
-            description: 'Provide a few details about yourself',
-        },
-        {
-            step: 3,
-            title: 'Application review',
-            description: 'Our team will review your submission',
-        },
-        {
-            step: 4,
-            title: isDenied ? 'Application denied' : 'Acceptance',
-            description: isDenied
-                ? 'Your application was not approved'
-                : 'Get started with the 17th Rangers',
-        },
-    ]
-})
-
-const currentStep = computed<number>(() => {
-    if (!userStore.isLoggedIn)
-        return 1;
-    switch (userStore.state) {
-        case "guest":
-            return 2;
-            break;
-        case "applicant":
-            return 3;
-            break;
-        case "member":
-            return 5;
-            break;
-        case "denied":
-            return 5;
-            break;
-        case "retired":
-            return 5;
-            break;
+    function goToLogin() {
+        const redirectUrl = encodeURIComponent(window.location.origin + '/join')
+        //@ts-ignore
+        const addr = import.meta.env.VITE_APIHOST;
+        window.location.href = `${addr}/login?redirect=${redirectUrl}`;
     }
-})
 
-const finalPanel = ref<'app' | 'message'>('message');
+    let userStore = useUserStore();
 
-const reloadKey = ref(0);
+    const steps = computed(() => {
+        const isDenied = userStore.state === MemberState.Denied
 
-async function restartApp() {
-    await restartApplication();
-    await userStore.loadUser();
-    reloadKey.value++;
-}
+        return [
+            {
+                step: 1,
+                title: 'Create account',
+                description: 'Begin by setting up your account',
+            },
+            {
+                step: 2,
+                title: 'Submit application',
+                description: 'Provide a few details about yourself',
+            },
+            {
+                step: 3,
+                title: 'Application review',
+                description: 'Our team will review your submission',
+            },
+            {
+                step: 4,
+                title: isDenied ? 'Application denied' : 'Acceptance',
+                description: isDenied
+                    ? 'Your application was not approved'
+                    : 'Get started with the 17th Rangers',
+            },
+        ]
+    })
+
+    const currentStep = computed<number>(() => {
+        if (!userStore.isLoggedIn)
+            return 1;
+        switch (userStore.state) {
+            case MemberState.Guest:
+                return 2;
+                break;
+            case MemberState.Applicant:
+                return 3;
+                break;
+            case MemberState.Member:
+                return 5;
+                break;
+            case MemberState.Denied:
+                return 5;
+                break;
+            case MemberState.Retired:
+                return 5;
+            case MemberState.Discharged:
+                return 5;
+                break;
+        }
+    })
+
+    const finalPanel = ref<'app' | 'message'>('message');
+
+    const reloadKey = ref(0);
+
+    async function restartApp() {
+        await restartApplication();
+        await userStore.loadUser();
+        reloadKey.value++;
+    }
 </script>
 
 <template>
@@ -104,7 +107,8 @@ async function restartApp() {
                                 size="icon" class="z-10 rounded-full shrink-0"
                                 :class="[state === 'active' && 'ring-2 ring-ring ring-offset-2 ring-offset-background']">
                                 <template v-if="state === 'completed'">
-                                    <X v-if="step.step === 4 && userStore.state === 'denied'" class="size-5" />
+                                    <X v-if="step.step === 4 && userStore.state === MemberState.Denied"
+                                        class="size-5" />
                                     <Check v-else class="size-5" />
                                 </template>
                                 <Circle v-if="state === 'active'" />
@@ -160,7 +164,7 @@ async function restartApp() {
                 </div>
                 <div v-if="finalPanel === 'message'">
                     <!-- Accepted message -->
-                    <div v-if="userStore.state === 'member'">
+                    <div v-if="userStore.state === MemberState.Member">
                         <h1 class="text-3xl sm:text-4xl font-bold mb-4 text-left">
                             Welcome to the 17th Ranger Battalion
                         </h1>
@@ -232,7 +236,7 @@ async function restartApp() {
                         </div>
                     </div>
                     <!-- Denied message -->
-                    <div v-else-if="userStore.state === 'denied'">
+                    <div v-else-if="userStore.state === MemberState.Denied">
                         <div class="w-full max-w-2xl flex flex-col gap-8">
                             <h1 class="text-3xl sm:text-4xl font-bold text-left">
                                 Application Not Approved
@@ -263,7 +267,8 @@ async function restartApp() {
                             <Button class="w-min" @click="restartApp">New Application</Button>
                         </div>
                     </div>
-                    <div v-else-if="userStore.state === 'retired'">
+                    <div
+                        v-else-if="userStore.state === MemberState.Discharged || userStore.state === MemberState.Retired">
                         <div class="w-full max-w-2xl flex flex-col gap-8">
                             <h1 class="text-3xl sm:text-4xl font-bold text-left">
                                 You have retired from the 17th Ranger Battalion

ui/src/pages/memberList.vue

@@ -1,98 +1,335 @@
 <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 { useRouter } from 'vue-router';
-import { Ellipsis } from "lucide-vue-next";
-import Input from "@/components/ui/input/Input.vue";
-import LoaForm from "@/components/loa/loaForm.vue";
+    import { ref, computed, onMounted, watch } from "vue";
+    import { useRouter } from 'vue-router';
+    import {
+        Ellipsis, Search, Trash2, UserX,
+        X,
+    } from "lucide-vue-next";
+    import {
+        Pagination,
+        PaginationContent,
+        PaginationEllipsis,
+        PaginationItem,
+        PaginationNext,
+        PaginationPrevious,
+    } from '@/components/ui/pagination'
 
-const members = ref<Member[]>([]);
-const router = useRouter();
+    // API & Types
+    import { getMembersFiltered, suspendMember, unsuspendMember } 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";
 
-const fetchMembers = async () => {
-    members.value = await getMembers();
-};
+    // 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 Spinner from "@/components/ui/spinner/Spinner.vue";
+    import DischargeMember from "@/components/members/DischargeMember.vue";
+    import MemberCard from "@/components/members/MemberCard.vue";
 
-function viewMember(id) {
-    router.push(`/member/${id}`)
-}
+    // --- State ---
+    const router = useRouter();
+    const members = ref<Member[]>([]);
+    const units = ref<Unit[]>([]);
+    const isLoaded = ref(false);
+    const pagination = ref<PaginationType>({
+        page: 1,
+        pageSize: 15,
+        total: 0,
+        totalPages: 0,
+    });
 
-fetchMembers();
+    const filters = ref<{ search: string; status: "all" | MemberState; unitId: string }>({
+        search: "",
+        status: MemberState.Member,
+        unitId: "all"
+    });
 
-const searchVal = ref<string>("");
-const searchedMembers = computed(() => {
-    return members.value.filter(member => member.member_name.toLowerCase().includes(searchVal.value.toLowerCase()));
-});
+    // Pagination State
+    const pageNum = ref(1);
+    const pageSize = ref(15);
+    const pageSizeOptions = [10, 15, 30];
 
+    const MEMBER_STATUSES = Object.entries(MemberState)
+        .filter(([key, value]) => isNaN(Number(key)))
+        .map(([label, id]) => ({
+            label,
+            id: id as number // Casting back to number for your SQL logic
+        }));
+
+    // --- 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(() => {
+            setPage(1); //reset page number when filters change to avoid that one annoying bug eagle keeps finding
+            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: Member) {
+        targetMember.value = member
+        isDischargeOpen.value = true
+    }
+
+    async function onSuspend(member: Member) {
+        await suspendMember(member.member_id);
+        await fetchMembers();
+    }
+
+    async function onUnsuspend(member: Member) {
+        await unsuspendMember(member.member_id);
+        await fetchMembers();
+    }
+
+    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.id" :value="s.id">
+                                    <span class="capitalize">{{ s.label }}</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>State</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">{{ MemberState[member.member_state] }}</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>
+                                            <DropdownMenuItem v-if="member.member_state !== MemberState.Suspended" @click="onSuspend(member)"
+                                                class="text-destructive focus:bg-destructive focus:text-destructive-foreground font-medium">
+                                                Suspend Member
+                                            </DropdownMenuItem>
+                                            <DropdownMenuItem v-else @click="onUnsuspend(member)"
+                                                class="text-destructive focus:bg-destructive focus:text-destructive-foreground font-medium">
+                                                Remove Suspension
+                                            </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.ts

@@ -1,4 +1,5 @@
 import { useUserStore } from '@/stores/user'
+import { MemberState } from '@shared/types/member';
 import { createRouter, createWebHistory } from 'vue-router'
 
 const router = createRouter({
@@ -13,7 +14,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 +39,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') },
       ]
     },
 
@@ -48,6 +49,7 @@ const router = createRouter({
   ]
 })
 
+//@ts-ignore
 const addr = import.meta.env.VITE_APIHOST;
 
 
@@ -69,12 +71,12 @@ router.beforeEach(async (to) => {
 
 
   // Must be a member
-  if (to.meta.memberOnly && user.state !== 'member') {
+  if (to.meta.memberOnly && user.state !== MemberState.Member) {
     return '/unauthorized'
   }
 
   // Must have specific role
-  if (to.meta.roles && !user.hasRole('Dev') && !user.hasAnyRole(to.meta.roles)) {
+  if (to.meta.roles && !user.hasRole('Dev') && !user.hasAnyRole(to.meta.roles as string[])) {
     return '/unauthorized'
   }
 })

ui/src/stores/user.ts

@@ -1,7 +1,7 @@
 import { ref, computed, watch } from 'vue'
 import { defineStore } from 'pinia'
 import { useRoute, useRouter } from 'vue-router'
-import { myData } from '@shared/types/member'
+import { MemberState, myData } from '@shared/types/member'
 
 
 const POLL_INTERVAL = 10_000
@@ -10,7 +10,7 @@ export const useUserStore = defineStore('user', () => {
     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 state = computed<MemberState | undefined>(() => user.value?.state || undefined);
     const isLoggedIn = computed(() => user.value !== null)
     const displayName = computed(() => user.value?.member.displayName || user.value?.member.member_name)
 
@@ -38,6 +38,7 @@ export const useUserStore = defineStore('user', () => {
         return requiredRoles.some(r => roles.value.has(r))
     }
 
+    //watcher to kick you off a page if your perms are revoked
     const route = useRoute();
     const router = useRouter();
     watch(user, (newUser) => {
@@ -46,7 +47,7 @@ export const useUserStore = defineStore('user', () => {
         const currentRoute = route.meta
 
         // Member-only route
-        if (currentRoute.memberOnly && state.value !== 'member') {
+        if (currentRoute.memberOnly && state.value !== MemberState.Member) {
             router.replace('/unauthorized')
             return
         }