Added mod requests to the navbar

Reviewed-on: #195

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

.gitea/workflows/deploy-prod.yaml

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

.gitea/workflows/pull-request.yaml

@@ -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/.env.example

@@ -21,7 +21,13 @@ CLIENT_URL= # This is whatever URL the client web app is served on
 CLIENT_DOMAIN= #whatever.com
 APPLICATION_VERSION= # Should match release tag
 APPLICATION_ENVIRONMENT= # dev / prod
-CONFIG_ID= # configures 
+CONFIG_ID= # config version 
+
+# webhooks/integrations
+DISCORD_APPLICATIONS_WEBHOOK=
+
+# Logger
+LOG_DEPTH= # normal / verbose / profiling
 
 # Glitchtip
 GLITCHTIP_DSN=

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/20260212165353-audit-log.js

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

api/migrations/20260222232949-discussion-posts.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', '20260222232949-discussion-posts-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', '20260222232949-discussion-posts-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/migrations/sqls/20260212165353-audit-log-down.sql

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

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

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

api/migrations/sqls/20260222232949-discussion-posts-down.sql

@@ -0,0 +1,3 @@
+/* Replace with your SQL commands */
+DROP TABLE discussion_posts;
+DROP TABLE discussion_comments;

api/migrations/sqls/20260222232949-discussion-posts-up.sql

@@ -0,0 +1,34 @@
+/* Replace with your SQL commands */
+CREATE TABLE discussion_posts (
+    id INT PRIMARY KEY AUTO_INCREMENT,
+    type VARCHAR(50) NOT NULL,
+    poster_id INT NOT NULL,
+    title VARCHAR(100) NOT NULL,
+    content JSON NOT NULL,
+    created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
+    updated_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+    is_deleted BOOLEAN DEFAULT FALSE,
+    is_locked BOOLEAN DEFAULT FALSE,
+    is_open BOOLEAN GENERATED ALWAYS AS (
+        NOT is_deleted
+        AND NOT is_locked
+    ) STORED,
+    FOREIGN KEY (poster_id) REFERENCES members(id) ON DELETE CASCADE
+);
+CREATE TABLE discussion_comments (
+    id INT PRIMARY KEY AUTO_INCREMENT,
+    post_id INT NOT NULL,
+    poster_id INT NOT NULL,
+    content TEXT NOT NULL,
+    created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
+    updated_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+    is_deleted BOOLEAN DEFAULT FALSE,
+    FOREIGN KEY (post_id) REFERENCES discussion_posts(id) ON DELETE CASCADE,
+    FOREIGN KEY (poster_id) REFERENCES members(id) ON DELETE CASCADE
+);
+CREATE INDEX idx_discussion_posts_title ON discussion_posts(title);
+CREATE INDEX idx_discussion_posts_type ON discussion_posts(type);
+CREATE INDEX idx_discussion_posts_poster_id ON discussion_posts(poster_id);
+CREATE INDEX idx_discussion_comments_post_id ON discussion_comments(post_id);
+CREATE INDEX idx_discussion_comments_poster_id ON discussion_comments(poster_id);
+CREATE INDEX idx_discussion_posts_is_open ON discussion_posts(is_open);

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",
-    "chalk": "^5.6.2",
+    "@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/db.ts

@@ -1,8 +1,5 @@
 // const mariadb = require('mariadb')
 import * as mariadb from 'mariadb';
-const dotenv = require('dotenv')
-dotenv.config();
-
 
 const pool = mariadb.createPool({
     host: process.env.DB_HOST,
@@ -12,7 +9,7 @@ const pool = mariadb.createPool({
     connectionLimit: 5,
     connectTimeout: 10000,        // give it more breathing room
     acquireTimeout: 15000,
-    database: process.env.DB_PASSWORD,
+    database: process.env.DB_DATABASE,
     ssl: false,
 });
 

api/src/index.ts

@@ -1,31 +1,41 @@
 import dotenv = require('dotenv');
-dotenv.config();
+dotenv.config({ quiet: true });
 
 import express = require('express');
 import cors = require('cors');
 import morgan = require('morgan');
+import { logger, LogHeader, LogPayload } from './services/logging/logger';
+
 const app = express()
-import chalk from 'chalk';
+
 app.use(morgan((tokens: morgan.TokenIndexer, req: express.Request, res: express.Response) => {
-  const status = Number(tokens.status(req, res));
 
-  // Colorize status code
+  const head: LogHeader = {
-  const statusColor = status >= 500 ? chalk.red
+    type: 'http',
-    : status >= 400 ? chalk.yellow
+    level: 'info',
-      : status >= 300 ? chalk.cyan
+    depth: 'normal',
-        : chalk.green;
+    timestamp: new Date().toISOString(),
+  }
 
-  return [
+  const payload: LogPayload = {
-    chalk.gray(`[${new Date().toISOString()}]`),
+    message: `${tokens.method(req, res)} ${tokens.url(req, res)}`,
-    chalk.blue.bold(tokens.method(req, res)),
+    // message: 'HTTP request completed',
-    tokens.url(req, res),
+    data: {
-    statusColor(status),
+      method: tokens.method(req, res),
-    chalk.magenta(tokens['response-time'](req, res) + ' ms'),
+      path: tokens.url(req, res),
-    chalk.yellow(`- User: ${req.user?.name ? `${req.user.name} (${req.user.id})` : 'Unauthenticated'}`),
+      status: Number(tokens.status(req, res)),
-  ].join(' ');
+      response_time_ms: Number(tokens['response-time'](req, res)),
+      user_id: req.user?.id,
+      user_name: req.user?.name,
+      user_agent: req.headers['user-agent'],
+    },
+  }
+
+  logger.log(head.level, head.type, payload.message, payload.data, head.depth)
+  return '';
 }, {
   skip: (req: express.Request) => {
-    return req.originalUrl === '/members/me';
+    return req.originalUrl === '/members/me' || req.originalUrl === '/ping';
   }
 }))
 
@@ -43,33 +53,43 @@ const port = process.env.SERVER_PORT;
 //glitchtip setup
 import sentry = require('@sentry/node');
 if (process.env.DISABLE_GLITCHTIP === "true") {
-  console.log("Glitchtip disabled")
+  logger.info('app', 'Glitchtip disabled', null, 'normal')
 } else {
   let dsn = process.env.GLITCHTIP_DSN;
   let release = process.env.APPLICATION_VERSION;
   let environment = process.env.APPLICATION_ENVIRONMENT;
-  console.log(release, environment)
   sentry.init({ dsn: dsn, release: release, environment: environment, integrations: [sentry.captureConsoleIntegration({ levels: ['error'] })] });
-  console.log("Glitchtip initialized");
+  logger.info('app', 'Glitchtip initialized', null, 'normal')
 }
 
 //session setup
 import path = require('path');
+// import session = require('express-session');
 import session = require('express-session');
 import passport = require('passport');
 const SQLiteStore = require('connect-sqlite3')(session);
 
-app.use(session({
+const cookieOptions: session.CookieOptions = {
+  httpOnly: true,
+  sameSite: 'lax',
+  domain: process.env.CLIENT_DOMAIN,
+  maxAge: 1000 * 60 * 60 * 24 * 30, //30 days
+}
+const sessionOptions: session.SessionOptions = {
   secret: 'whatever',
   resave: false,
   saveUninitialized: false,
   store: new SQLiteStore({ db: 'sessions.db', dir: './' }),
-  cookie: {
+  rolling: true,
-    httpOnly: true,
+  cookie: cookieOptions
-    sameSite: 'lax',
+}
-    domain: process.env.CLIENT_DOMAIN
+
-  }
+import { initializeDiscordIntegrations } from './services/integrations/discord';
-}));
+
+//event bus setup
+initializeDiscordIntegrations();
+
+app.use(session(sessionOptions));
 app.use(passport.authenticate('session'));
 
 // Mount route modules
@@ -83,6 +103,9 @@ import { roles, memberRoles } from './routes/roles';
 import { courseRouter, eventRouter } from './routes/course';
 import { calendarRouter } from './routes/calendar';
 import { docsRouter } from './routes/docs';
+import { units } from './routes/units';
+import { modRequestRouter } from './routes/modRequest'
+import { discussionRouter } from './routes/discussion';
 
 app.use('/application', applicationRouter);
 app.use('/ranks', ranks);
@@ -96,7 +119,10 @@ 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('/mod-request', modRequestRouter)
+app.use('/discussions', discussionRouter)
 app.use('/', authRouter)
 
 app.get('/ping', (req, res) => {
@@ -104,5 +130,5 @@ app.get('/ping', (req, res) => {
 });
 
 app.listen(port, () => {
-  console.log(`Example app listening on port ${port} `)
+  logger.info('app', `Example app listening on port ${port} `)
 })

api/src/routes/applications.ts

@@ -2,59 +2,100 @@ const express = require('express');
 const router = express.Router();
 
 import pool from '../db';
-import { approveApplication, createApplication, denyApplication, getAllMemberApplications, getApplicationByID, getApplicationComments, getApplicationList, getMemberApplication } from '../services/applicationService';
+import { approveApplication, createApplication, denyApplication, getAllMemberApplications, getApplicationByID, getApplicationComments, getApplicationList, getMemberApplication } from '../services/db/applicationService';
-import { setUserState } from '../services/memberService';
+import { setUserState } from '../services/db/memberService';
 import { MemberState } from '@app/shared/types/member';
-import { getRankByName, insertMemberRank } from '../services/rankService';
+import { getRankByName, insertMemberRank } from '../services/db/rankService';
 import { ApplicationFull, CommentRow } from "@app/shared/types/application"
-import { assignUserToStatus } from '../services/statusService';
+import { assignUserToStatus } from '../services/db/statusService';
 import { Request, response, Response } from 'express';
-import { getUserRoles } from '../services/rolesService';
+import { getUserRoles } from '../services/db/rolesService';
 import { requireLogin, requireRole } from '../middleware/auth';
+import { logger } from '../services/logging/logger';
+import { audit, AuditContext } from '../services/logging/auditLog';
+import { bus } from '../services/events/eventBus';
 
 //get CoC
 router.get('/coc', async (req: Request, res: Response) => {
-  const output = await fetch(`${process.env.DOC_HOST}/api/pages/714`, {
+  try {
-    headers: {
+    const response = await fetch(`${process.env.DOC_HOST}/api/pages/714`, {
-      Authorization: `Token ${process.env.DOC_TOKEN_ID}:${process.env.DOC_TOKEN_SECRET}`,
+      headers: {
-    }
+        Authorization: `Token ${process.env.DOC_TOKEN_ID}:${process.env.DOC_TOKEN_SECRET}`,
-  })
+      },
+    });
 
-  if (output.ok) {
+    if (!response.ok) {
-    const out = await output.json();
+      const text = await response.text();
+      logger.error('app', 'Failed to fetch LOA policy from Bookstack', {
+        status: response.status,
+        statusText: response.statusText,
+        body: text,
+      });
+      return res.sendStatus(500);
+    }
+
+    const out = await response.json();
     res.status(200).json(out.html);
-  } else {
+
-    console.error("Failed to fetch LOA policy from bookstack");
+  } catch (error) {
+    logger.error('app', 'Error fetching LOA policy from Bookstack', {
+      error: error instanceof Error ? error.message : String(error),
+    });
     res.sendStatus(500);
   }
-})
+});
 
 
 // POST /application
-router.post('/', [requireLogin], async (req, res) => {
+router.post('/', [requireLogin], async (req: Request, res: Response) => {
+  const memberID = req.user.id;
+  const App = req.body?.App || {};
+  const appVersion = 1;
+
   try {
-    const App = req.body?.App || {};
+    let appID = await createApplication(memberID, appVersion, JSON.stringify(App));
-    const memberID = req.user.id;
 
-    const appVersion = 1;
+    await setUserState(memberID, MemberState.Applicant, "Application Submitted", memberID);
-
-    await createApplication(memberID, appVersion, JSON.stringify(App))
-    await setUserState(memberID, MemberState.Applicant);
 
     res.sendStatus(201);
+
+    audit.application('created', { actorId: memberID, targetId: appID });
+
+    bus.emit("application.create", { application: appID, member_name: req.user.name, member_discord_id: req.user.discord_id || null })
+
+    logger.info('app', 'Application Posted', {
+      user: memberID,
+      app: appID
+    })
   } catch (err) {
-    console.error('Failed to create application: \n', err);
+    logger.error(
+      'app',
+      'Failed to create application',
+      {
+        memberID,
+        error: err instanceof Error ? err.message : String(err),
+        stack: err instanceof Error ? err.stack : undefined,
+      }
+    );
     res.status(500).json({ error: 'Failed to create application' });
   }
 });
 
+
 // GET /application/all
 router.get('/all', [requireLogin, requireRole("Recruiter")], async (req, res) => {
   try {
     const rows = await getApplicationList();
     res.status(200).json(rows);
   } catch (err) {
-    console.error(err);
+    logger.error(
+      'app',
+      'Failed to get applications',
+      {
+        error: err instanceof Error ? err.message : String(err),
+        stack: err instanceof Error ? err.stack : undefined,
+      }
+    );
     res.status(500);
   }
 });
@@ -68,8 +109,16 @@ router.get('/meList', async (req, res) => {
 
     return res.status(200).json(application);
   } catch (error) {
-    console.error('Failed to load applications: \n', error);
+    logger.error(
-    return res.status(500).json(error);
+      'app',
+      'Failed to get applications for user',
+      {
+        user: userID,
+        error: error instanceof Error ? error.message : String(error),
+        stack: error instanceof Error ? error.stack : undefined,
+      }
+    );
+    return res.status(500);
   }
 })
 
@@ -80,8 +129,10 @@ router.get('/me', [requireLogin], async (req, res) => {
   try {
     let application = await getMemberApplication(userID);
 
-    if (application === undefined)
+    if (application === undefined) {
       res.sendStatus(204);
+      return;
+    }
 
     const comments: CommentRow[] = await getApplicationComments(application.id);
 
@@ -92,12 +143,20 @@ router.get('/me', [requireLogin], async (req, res) => {
 
     return res.status(200).json(output);
   } catch (error) {
-    console.error('Failed to load application:', error);
+    logger.error(
+      'app',
+      'Failed to load application',
+      {
+        user: userID,
+        error: error instanceof Error ? error.message : String(error),
+        stack: error instanceof Error ? error.stack : undefined,
+      }
+    );
     return res.status(500).json(error);
   }
 })
 
-// GET /application/:id
+// GET /me/:id
 router.get('/me/:id', [requireLogin], async (req: Request, res: Response) => {
   let appID = Number(req.params.id);
   let member = req.user.id;
@@ -117,9 +176,18 @@ router.get('/me/:id', [requireLogin], async (req: Request, res: Response) => {
     }
     return res.status(200).json(output);
   }
-  catch (err) {
+  catch (error) {
-    console.error('Query failed:', err);
+    logger.error(
-    return res.status(500).json({ error: 'Failed to load application' });
+      'app',
+      'Failed to load application',
+      {
+        application: appID,
+        user: member,
+        error: error instanceof Error ? error.message : String(error),
+        stack: error instanceof Error ? error.stack : undefined,
+      }
+    );
+    return res.status(500);
   }
 });
 
@@ -141,9 +209,17 @@ router.get('/:id', [requireLogin, requireRole("Recruiter")], async (req: Request
     }
     return res.status(200).json(output);
   }
-  catch (err) {
+  catch (error) {
-    console.error('Query failed:', err);
+    logger.error(
-    return res.status(500).json({ error: 'Failed to load application' });
+      'app',
+      'Failed to load application',
+      {
+        application: appID,
+        error: error instanceof Error ? error.message : String(error),
+        stack: error instanceof Error ? error.stack : undefined,
+      }
+    );
+    return res.status(500);
   }
 });
 
@@ -152,19 +228,46 @@ 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);
+    var con = await pool.getConnection();
-    await approveApplication(appID, approved_by);
+
+    con.beginTransaction();
+
+    await approveApplication(appID, approved_by, con);
 
     //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])
+    await con.query('CALL sp_accept_new_recruit_validation(?, ?, ?, ?)', [Number(process.env.CONFIG_ID), app.member_id, approved_by, approved_by])
+
+    con.commit();
+    logger.info('app', "Member application approved", {
+      application: app.id,
+      applicant: app.member_id,
+      approver: approved_by
+    })
+
+    audit.application('approved', { actorId: approved_by, targetId: appID }, { applicantId: app.member_id });
 
     res.sendStatus(200);
-  } catch (err) {
+  } catch (error) {
-    console.error('Approve failed:', err);
+
+    con.rollback();
+
+    logger.error(
+      'app',
+      'Failed to approve application',
+      {
+        application: appID,
+        error: error instanceof Error ? error.message : String(error),
+        stack: error instanceof Error ? error.stack : undefined,
+      }
+    );
     res.status(500).json({ error: 'Failed to approve application' });
+  } finally {
+    if (con) con.release();
   }
 });
 
@@ -176,17 +279,32 @@ 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,
+      applicant: app.member_id,
+      approver: approver
+    })
+    audit.application('denied', { actorId: approver, targetId: appID }, { applicantId: app.member_id });
     res.sendStatus(200);
-  } catch (err) {
+  } catch (error) {
-    console.error('Approve failed:', err);
+    logger.error(
+      'app',
+      'Failed to deny application',
+      {
+        application: appID,
+        error: error instanceof Error ? error.message : String(error),
+        stack: error instanceof Error ? error.stack : undefined,
+      }
+    );
     res.status(500).json({ error: 'Failed to deny application' });
   }
 });
 
 // POST /application/:id/comment
 router.post('/:id/comment', [requireLogin], async (req: Request, res: Response) => {
-  const appID = req.params.id;
+  const appID = Number(req.params.id);
   const data = req.body.message;
   const user = req.user;
 
@@ -217,10 +335,27 @@ VALUES(?, ?, ?);`
           INNER JOIN members AS member ON member.id = app.poster_id
         WHERE app.id = ?; `;
     const comment = await conn.query(getSQL, [result.insertId])
+
+    audit.record('application', 'comment_added', { actorId: user.id, targetId: appID }, { commentId: Number(result.insertId) });
+
+    logger.info('app', "Application comment posted", {
+      application: appID,
+      poster: user.id,
+      comment: Number(result.insertId),
+    })
+
     res.status(201).json(comment[0]);
 
-  } catch (err) {
+  } catch (error) {
-    console.error('Comment failed:', err);
+    logger.error(
+      'app',
+      'Failed to post comment',
+      {
+        application: appID,
+        error: error instanceof Error ? error.message : String(error),
+        stack: error instanceof Error ? error.stack : undefined,
+      }
+    );
     res.status(500).json({ error: 'Could not post comment' });
   } finally {
     conn.release();
@@ -229,7 +364,7 @@ VALUES(?, ?, ?);`
 
 // POST /application/:id/comment
 router.post('/:id/adminComment', [requireLogin, requireRole("Recruiter")], async (req: Request, res: Response) => {
-  const appID = req.params.id;
+  const appID = Number(req.params.id);
   const data = req.body.message;
   const user = req.user;
 
@@ -261,10 +396,24 @@ VALUES(?, ?, ?, 1);`
           INNER JOIN members AS member ON member.id = app.poster_id
         WHERE app.id = ?; `;
     const comment = await conn.query(getSQL, [result.insertId])
-    res.status(201).json(comment[0]);
+    audit.record('application', 'comment_added', { actorId: user.id, targetId: appID }, { commentId: result.insertId });
+    logger.info('app', "Admin application comment posted", {
+      application: appID,
+      poster: user.id,
+      comment: result.insertId,
+    })
 
-  } catch (err) {
+    res.status(201).json(comment[0]);
-    console.error('Comment failed:', err);
+  } catch (error) {
+    logger.error(
+      'app',
+      'Failed to post comment',
+      {
+        application: appID,
+        error: error instanceof Error ? error.message : String(error),
+        stack: error instanceof Error ? error.stack : undefined,
+      }
+    );
     res.status(500).json({ error: 'Could not post comment' });
   } finally {
     conn.release();
@@ -274,10 +423,24 @@ 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);
+
+    audit.application('restarted', { actorId: user, targetId: user });
+    logger.info('app', "Member restarted application", {
+      user: user
+    })
+
     res.sendStatus(200);
   } catch (error) {
-    console.error('Comment failed:', error);
+    logger.error(
+      'app',
+      'Failed to restart application',
+      {
+        user: user,
+        error: error instanceof Error ? error.message : String(error),
+        stack: error instanceof Error ? error.stack : undefined,
+      }
+    );
     res.status(500).json({ error: 'Could not rester application' });
   }
 })

api/src/routes/auth.ts

@@ -1,7 +1,5 @@
 const passport = require('passport');
 const OpenIDConnectStrategy = require('passport-openidconnect');
-const dotenv = require('dotenv');
-dotenv.config();
 
 const express = require('express');
 const { param } = require('./applications');
@@ -9,95 +7,164 @@ const router = express.Router();
 import { Role } from '@app/shared/types/roles';
 import pool from '../db';
 import { requireLogin } from '../middleware/auth';
-import { getUserRoles } from '../services/rolesService';
+import { getUserRoles } from '../services/db/rolesService';
-import { getUserState, mapDiscordtoID } from '../services/memberService';
+import { getUserState, mapDiscordtoID } from '../services/db/memberService';
 import { MemberState } from '@app/shared/types/member';
 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({
+const devLogin = (req: any, res: any, next: any) => {
-    issuer: process.env.AUTH_ISSUER,
+    // The object here must match what your 'verify' function returns: { memberId }
-    authorizationURL: process.env.AUTH_DOMAIN + '/authorize/',
+    const devUser = { memberId: 1 }; // Hardcoded ID
-    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) {
 
-    // console.log('--- OIDC verify() called ---');
+    req.logIn(devUser, (err: any) => {
-    // console.log('issuer:', issuer);
+        if (err) return next(err);
-    // console.log('sub:', sub);
+        const redirectTo = req.session.redirectTo || process.env.CLIENT_URL;
-    // // console.log('discord:', discord);
+        delete req.session.redirectTo;
-    // console.log('profile:', profile);
+        return res.redirect(redirectTo);
-    // console.log('jwt: ', parseJwt(jwtClaims));
+    });
-    // console.log('params:', params);
+};
 
+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) {
 
-    try {
+        // console.log('--- OIDC verify() called ---');
-        var con = await pool.getConnection();
+        // 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;
 
-        await con.beginTransaction();
+        try {
+            con = await pool.getConnection();
 
-        //lookup existing user
+            await con.beginTransaction();
-        const existing = await con.query(`SELECT id FROM members WHERE authentik_issuer = ? AND authentik_sub = ? LIMIT 1;`, [issuer, sub]);
-        let memberId: number;
-        //if member exists
-        if (existing.length > 0) {
-            memberId = existing[0].id;
-        } else {
-            //otherwise: create account
-            const jwt = parseJwt(jwtClaims);
-            const discordID = jwt.discord.id as number;
 
-            //check if account is available to claim
+            //lookup existing user
-            memberId = await mapDiscordtoID(discordID);
+            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,
+                });
 
-            if (memberId === null) {
-                // create new account
-                const username = sub.username;
-                const result = await con.query(
-                    `INSERT INTO members (name, authentik_sub, authentik_issuer) VALUES (?, ?, ?)`,
-                    [username, sub, issuer]
-                )
-                memberId = Number(result.insertId);
             } else {
-                // claim existing account
+                //otherwise: create account mode
-                const result = await con.query(
+                const jwt = parseJwt(jwtClaims);
-                    `UPDATE members SET authentik_sub = ?, authentik_issuer = ? WHERE id = ?;`,
+                const discordID = jwt.discord?.id as number;
-                    [sub, issuer, memberId]
+
-                )
+                //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.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),
+                    });
+                }
+            }
+            return cb(error);
+        } finally {
+            if (con) con.release();
         }
-
+    }));
-        await con.query(`UPDATE members SET last_login = ? WHERE id = ?`, [toDateTime(new Date()), memberId])
+}
-
-        await con.commit();
-        return cb(null, { memberId });
-    } catch (error) {
-        await con.rollback();
-        return cb(error);
-    } finally {
-        con.release();
-    }
-}));
 
 router.get('/login', (req, res, next) => {
-    // Store redirect target in session if provided
+    req.session.redirectTo = req.query.redirect as string;
-    req.session.redirectTo = req.query.redirect;
 
-    next();
+    const strategy = process.env.AUTH_MODE === 'mock' ? 'mock' : 'oidc';
-}, passport.authenticate('openidconnect'));
 
+    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);
 
@@ -114,12 +181,35 @@ router.get('/callback', (req, res, next) => {
 
 router.get('/logout', [requireLogin], function (req, res, next) {
     req.logout(function (err) {
+
         if (err) { return next(err); }
-        var params = {
+
-            client_id: process.env.AUTH_CLIENT_ID,
+        req.session.destroy((err) => {
-            returnTo: process.env.CLIENT_URL
+            if (err) { return next(err); }
-        };
+
-        res.redirect(process.env.AUTH_END_SESSION_URI + '?' + querystring.stringify(params));
+            res.clearCookie('connect.sid', {
+                path: '/',
+                domain: process.env.CLIENT_DOMAIN,
+                httpOnly: true,
+                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
+            };
+
+            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 || '/');
+            }
+        })
     });
 });
 
@@ -130,25 +220,94 @@ passport.serializeUser(function (user, cb) {
 });
 
 passport.deserializeUser(function (user, cb) {
+    const start = performance.now();
+    const timings: Record<string, number> = {};
+
     process.nextTick(async function () {
-
         const memberID = user.memberId as number;
+        let con;
 
-
-        var userData: { id: number, name: string, roles: Role[], state: MemberState };
         try {
-            var con = await pool.getConnection();
+            //cache lookup
-            let userResults = await con.query(`SELECT id, name FROM members WHERE id = ?;`, [memberID])
+            let t = performance.now();
-            userData = userResults[0];
+            const cachedData: UserData | undefined = userCache.Get(memberID);
-            let userRoles = await getUserRoles(memberID);
+            timings.cache_lookup = performance.now() - t;
-            userData.roles = userRoles || [];
+
+            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;
+
+            t = performance.now();
+            const userResults = await con.query(
+                `SELECT id, name, discord_id FROM members WHERE id = ?;`,
+                [memberID]
+            );
+            timings.memberQuery = performance.now() - t;
+
+            const userData: UserData = userResults[0];
+
+            t = performance.now();
+            userData.roles = await getUserRoles(memberID) || [];
+            timings.roles = performance.now() - t;
+
+            t = performance.now();
             userData.state = await getUserState(memberID);
+            timings.state = performance.now() - t;
+
+            t = performance.now();
+            userCache.Set(userData.id, userData);
+            timings.cache_set = performance.now() - t;
+
+            timings.total = performance.now() - start;
+
+            logger.info(
+                'profiling',
+                'passport.deserializeUser (db load)',
+                {
+                    memberId: memberID,
+                    cache_hit: false,
+                    source: 'db',
+                    total_ms: timings.total,
+                    breakdown_ms: timings,
+                },
+                'profiling'
+            );
+
+            return cb(null, userData);
+
         } catch (error) {
-            console.error(error)
+            logger.error(
+                'profiling',
+                'passport.deserializeUser failed',
+                {
+                    memberId: memberID,
+                    error: error instanceof Error ? error.message : String(error),
+                }
+            );
+            return cb(error);
         } finally {
-            con.release();
+            if (con) con.release();
         }
-        return cb(null, userData);
     });
 });
 
@@ -158,6 +317,7 @@ declare global {
             user: {
                 id: number;
                 name: string;
+                discord_id: string;
                 roles: Role[];
                 state: MemberState;
             };
@@ -165,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/calendar.ts

@@ -1,8 +1,10 @@
 import { Request, Response } from "express";
-import { createEvent, getEventAttendance, getEventDetails, getShortEventsInRange, setAttendanceStatus, setEventCancelled, updateEvent } from "../services/calendarService";
+import { createEvent, getEventAttendance, getEventDetails, getShortEventsInRange, setAttendanceStatus, setEventCancelled, updateEvent } from "../services/db/calendarService";
 import { CalendarAttendance, CalendarEvent } from "@app/shared/types/calendar";
 import { requireLogin, requireMemberState, requireRole } from "../middleware/auth";
 import { MemberState } from "@app/shared/types/member";
+import { logger } from "../services/logging/logger";
+import { audit } from "../services/logging/auditLog";
 
 const express = require('express');
 const r = express.Router();
@@ -28,7 +30,14 @@ r.get('/', async (req, res) => {
 
         res.status(200).json(events);
     } catch (error) {
-        console.error('Error fetching calendar events:', error);
+        logger.error(
+            'app',
+            'Failed to get calendar events',
+            {
+                error: error instanceof Error ? error.message : String(error),
+                stack: error instanceof Error ? error.stack : undefined,
+            }
+        );
         res.status(500).send('Error fetching calendar events');
     }
 });
@@ -38,22 +47,50 @@ r.get('/upcoming', async (req, res) => {
 })
 
 r.post('/:id/cancel', [requireLogin, requireMemberState(MemberState.Member)], async (req: Request, res: Response) => {
+    let member = req.user.id;
     try {
         const eventID = Number(req.params.id);
-        setEventCancelled(eventID, true);
+        await setEventCancelled(eventID, true);
+
+        audit.calendar('cancelled', { actorId: member, targetId: eventID });
+        logger.info('app', 'Calendar event cancelled', {
+            event: eventID,
+            user: req.user.id
+        })
         res.sendStatus(200);
     } catch (error) {
-        console.error('Error setting cancel status:', error);
+        logger.error(
+            'app',
+            'Failed to get cancel calendar event',
+            {
+                error: error instanceof Error ? error.message : String(error),
+                stack: error instanceof Error ? error.stack : undefined,
+            }
+        );
         res.status(500).send('Error setting cancel status');
     }
 })
 r.post('/:id/uncancel', [requireLogin, requireMemberState(MemberState.Member)], async (req: Request, res: Response) => {
+    let member = req.user.id;
     try {
         const eventID = Number(req.params.id);
         setEventCancelled(eventID, false);
+
+        audit.calendar('un-cancelled', { actorId: member, targetId: eventID });
+        logger.info('app', 'Calendar event un-cancelled', {
+            event: eventID,
+            user: req.user.id
+        })
         res.sendStatus(200);
     } catch (error) {
-        console.error('Error setting cancel status:', error);
+        logger.error(
+            'app',
+            'Failed to uncancel calendar event',
+            {
+                error: error instanceof Error ? error.message : String(error),
+                stack: error instanceof Error ? error.stack : undefined,
+            }
+        );
         res.status(500).send('Error setting cancel status');
     }
 })
@@ -64,13 +101,29 @@ r.post('/:id/attendance', [requireLogin, requireMemberState(MemberState.Member)]
         let member = req.user.id;
         let event = Number(req.params.id);
         let state = req.query.state as CalendarAttendance;
-        setAttendanceStatus(member, event, state);
+        await setAttendanceStatus(member, event, state);
+
+        audit.calendar('attendance_set', { actorId: member, targetId: event }, { attendanceState: state });
+        logger.info('app', 'Member set calendar event attendance', {
+            event: event,
+            user: req.user.id,
+            state: state
+        })
+
         res.sendStatus(200);
     } catch (error) {
-        console.error('Failed to set attendance:', error);
+        logger.error(
+            'app',
+            'Failed to set attendance',
+            {
+                error: error instanceof Error ? error.message : String(error),
+                stack: error instanceof Error ? error.stack : undefined,
+            }
+        );
         res.status(500).json(error);
     }
 })
+
 //get event details
 r.get('/:id', async (req: Request, res: Response) => {
     try {
@@ -79,9 +132,16 @@ r.get('/:id', async (req: Request, res: Response) => {
         let details: CalendarEvent = await getEventDetails(eventID);
         details.eventSignups = await getEventAttendance(eventID);
         res.status(200).json(details);
-    } catch (err) {
+    } catch (error) {
-        console.error('Insert failed:', err);
+        logger.error(
-        res.status(500).json(err);
+            'app',
+            'Failed to get calendar event details',
+            {
+                error: error instanceof Error ? error.message : String(error),
+                stack: error instanceof Error ? error.stack : undefined,
+            }
+        );
+        res.status(500);
     }
 })
 
@@ -94,23 +154,51 @@ r.post('/', [requireLogin, requireMemberState(MemberState.Member)], async (req:
         event.creator_id = member;
         event.start = new Date(event.start);
         event.end = new Date(event.end);
-        createEvent(event);
+        let eventID = await createEvent(event);
+        audit.calendar('event_created', { actorId: member, targetId: eventID });
+        logger.info('app', 'Calendar event posted', {
+            event: event.id,
+            user: req.user.id
+        })
+
         res.sendStatus(200);
     } catch (error) {
-        console.error('Failed to create event:', error);
+        logger.error(
+            'app',
+            'Failed to create calendar event',
+            {
+                error: error instanceof Error ? error.message : String(error),
+                stack: error instanceof Error ? error.stack : undefined,
+            }
+        );
         res.status(500).json(error);
     }
 })
 
 r.put('/', [requireLogin, requireMemberState(MemberState.Member)], async (req: Request, res: Response) => {
+    let member = req.user.id;
     try {
         let event: CalendarEvent = req.body;
         event.start = new Date(event.start);
         event.end = new Date(event.end);
         updateEvent(event);
+
+        audit.calendar('event_updated', { actorId: member, targetId: event.id });
+        logger.info('app', 'Calendar event updated', {
+            event: event.id,
+            user: req.user.id
+        })
+
         res.sendStatus(200);
     } catch (error) {
-        console.error('Failed to update event:', error);
+        logger.error(
+            'app',
+            'Failed to update calendar event',
+            {
+                error: error instanceof Error ? error.message : String(error),
+                stack: error instanceof Error ? error.stack : undefined,
+            }
+        );
         res.status(500).json(error);
     }
 })

api/src/routes/course.ts

@@ -1,8 +1,10 @@
 import { CourseAttendee, CourseEventDetails } from "@app/shared/types/course";
-import { getAllCourses, getCourseEventAttendees, getCourseEventDetails, getCourseEventRoles, getCourseEvents, insertCourseEvent } from "../services/CourseSerivce";
+import { getAllCourses, getCourseEventAttendees, getCourseEventDetails, getCourseEventRoles, getCourseEvents, insertCourseEvent } from "../services/db/CourseSerivce";
 import { Request, Response, Router } from "express";
 import { requireLogin, requireMemberState } from "../middleware/auth";
 import { MemberState } from "@app/shared/types/member";
+import { logger } from "../services/logging/logger";
+import { audit } from "../services/logging/auditLog";
 
 const cr = Router();
 const er = Router();
@@ -16,9 +18,16 @@ cr.get('/', async (req, res) => {
     try {
         const courses = await getAllCourses();
         res.status(200).json(courses);
-    } catch (err) {
+    } catch (error) {
-        console.error('failed to fetch courses', err);
+        logger.error(
-        res.status(500).json('failed to fetch courses\n' + err);
+            'app',
+            'Failed to fetch courses',
+            {
+                error: error instanceof Error ? error.message : String(error),
+                stack: error instanceof Error ? error.stack : undefined,
+            }
+        );
+        res.status(500).json('failed to fetch courses');
     }
 })
 
@@ -26,12 +35,20 @@ cr.get('/roles', async (req, res) => {
     try {
         const roles = await getCourseEventRoles();
         res.status(200).json(roles);
-    } catch (err) {
+    } catch (error) {
-        console.error('failed to fetch course roles', err);
+        logger.error(
-        res.status(500).json('failed to fetch course roles\n' + err);
+            'app',
+            'Failed to fetch course roles',
+            {
+                error: error instanceof Error ? error.message : String(error),
+                stack: error instanceof Error ? error.stack : undefined,
+            }
+        );
+        res.status(500).json('failed to fetch course roles');
     }
 })
 
+//get event list
 er.get('/', async (req: Request, res: Response) => {
     try {
         const allowedSorts = new Map([
@@ -55,7 +72,14 @@ er.get('/', async (req: Request, res: Response) => {
         let events = await getCourseEvents(sortDir, search, page, pageSize);
         res.status(200).json(events);
     } catch (error) {
-        console.error('failed to fetch reports', error);
+        logger.error(
+            'app',
+            'Failed to fetch course events',
+            {
+                error: error instanceof Error ? error.message : String(error),
+                stack: error instanceof Error ? error.stack : undefined,
+            }
+        );
         res.status(500).json(error);
     }
 });
@@ -65,7 +89,14 @@ er.get('/:id', async (req: Request, res: Response) => {
         let out = await getCourseEventDetails(Number(req.params.id));
         res.status(200).json(out);
     } catch (error) {
-        console.error('failed to fetch report', error);
+        logger.error(
+            'app',
+            'Failed to fetch course event',
+            {
+                error: error instanceof Error ? error.message : String(error),
+                stack: error instanceof Error ? error.stack : undefined,
+            }
+        );
         res.status(500).json(error);
     }
 });
@@ -74,9 +105,16 @@ er.get('/attendees/:id', async (req: Request, res: Response) => {
     try {
         const attendees: CourseAttendee[] = await getCourseEventAttendees(Number(req.params.id));
         res.status(200).json(attendees);
-    } catch (err) {
+    } catch (error) {
-        console.error('failed to fetch attendees', err);
+        logger.error(
-        res.status(500).json("failed to fetch attendees\n" + err);
+            'app',
+            'Failed to fetch course event attendees',
+            {
+                error: error instanceof Error ? error.message : String(error),
+                stack: error instanceof Error ? error.stack : undefined,
+            }
+        );
+        res.status(500).json("failed to fetch attendees");
     }
 })
 
@@ -87,9 +125,20 @@ er.post('/', async (req: Request, res: Response) => {
         data.created_by = posterID;
         data.event_date = new Date(data.event_date);
         const id = await insertCourseEvent(data);
+
+        audit.course('report_created', { actorId: posterID, targetId: id });
+        logger.info('app', 'Training report posted', { user: posterID, report: id })
         res.status(201).json(id);
     } catch (error) {
-        console.error('failed to post training', error);
+        logger.error(
+            'app',
+            'Failed to post training report',
+            {
+                user: posterID,
+                error: error instanceof Error ? error.message : String(error),
+                stack: error instanceof Error ? error.stack : undefined,
+            }
+        );
         res.status(500).json("failed to post training\n" + error)
     }
 })

api/src/routes/discussion.ts

@@ -0,0 +1,49 @@
+const express = require('express');
+const router = express.Router();
+
+import { Request, Response } from 'express';
+import { requireLogin, requireMemberState, requireRole } from '../middleware/auth';
+import { logger } from '../services/logging/logger';
+import { audit } from '../services/logging/auditLog';
+import { MemberState } from '@app/shared/types/member';
+import { createDiscussion, getAllDiscussions, getDiscussionById, getPostComments, postComment } from '../services/db/discussionService';
+import { ModRequest } from '@app/shared/schemas/modRequest';
+import { DiscussionComment } from '@app/shared/types/discussion';
+
+router.use(requireLogin);
+router.use(requireMemberState(MemberState.Member));
+
+router.post('/comment', async (req: Request, res: Response) => {
+    try {
+        let comment = req.body as DiscussionComment;
+
+        if (!comment.content || comment.content.trim() === '') {
+            return res.status(400).json({ error: 'Comment content cannot be empty' });
+        }
+
+        let rowID = await postComment(comment, req.user.id);
+        audit.discussion('comment_posted', { actorId: req.user.id, targetId: rowID }, { parent: comment.post_id })
+        res.sendStatus(201);
+    } catch (error) {
+        logger.error('app', "Failed to post comments", error);
+        res.sendStatus(500);
+    }
+});
+
+router.get('/:postId/comments', async (req: Request, res: Response) => {
+    try {
+        const postId = parseInt(req.params.postId);
+        const comments = await getPostComments(postId);
+        res.json(comments);
+    } catch (error) {
+        logger.error('app', "Failed to fetch comments", error);
+        res.sendStatus(500);
+    }
+});
+
+router.delete('/comment/:id', async (req: Request, res: Response) => {
+
+})
+
+
+export const discussionRouter = router;

api/src/routes/docs.ts

@@ -3,22 +3,55 @@ const router = express.Router();
 
 import { Request, Response } from 'express';
 import { requireLogin } from '../middleware/auth';
+import { logger } from '../services/logging/logger';
 
+// GET /welcome
 router.get('/welcome', [requireLogin], async (req: Request, res: Response) => {
-    const output = await fetch(`${process.env.DOC_HOST}/api/pages/717`, {
+    const t0 = performance.now(); // optional profiling start
-        headers: {
-            Authorization: `Token ${process.env.DOC_TOKEN_ID}:${process.env.DOC_TOKEN_SECRET}`,
-        }
-    })
 
-    if (output.ok) {
+    try {
-        const out = await output.json();
+        const response = await fetch(`${process.env.DOC_HOST}/api/pages/717`, {
+            headers: {
+                Authorization: `Token ${process.env.DOC_TOKEN_ID}:${process.env.DOC_TOKEN_SECRET}`,
+            },
+        });
+
+        if (!response.ok) {
+            const text = await response.text();
+            logger.error('app', 'Failed to fetch welcome page from Bookstack', {
+                status: response.status,
+                statusText: response.statusText,
+                body: text,
+                userId: req.user?.id,
+            });
+            return res.sendStatus(500);
+        }
+
+        const out = await response.json();
         res.status(200).json(out.html);
-    } else {
+
-        console.error("Failed to fetch LOA policy from bookstack");
+        // optional profiling log
+        const duration = performance.now() - t0;
+        logger.info(
+            'profiling',
+            'GET /welcome completed',
+            {
+                userId: req.user?.id,
+                total_ms: duration,
+            },
+            'profiling'
+        );
+
+    } catch (error) {
+        logger.error('app', 'Error fetching welcome page from Bookstack', {
+            error: error instanceof Error ? error.message : String(error),
+            stack: error instanceof Error ? error.stack : undefined,
+            userId: req.user?.id,
+        });
         res.sendStatus(500);
     }
-})
+});
+
 
 
 export const docsRouter = router;

api/src/routes/loa.ts

@@ -3,9 +3,11 @@ const router = express.Router();
 
 import { Request, Response } from 'express';
 import pool from '../db';
-import { closeLOA, createNewLOA, getAllLOA, getLOAbyID, getLoaTypes, getUserLOA, setLOAExtension } from '../services/loaService';
+import { closeLOA, createNewLOA, getAllLOA, getLOAbyID, getLoaTypes, getUserLOA, setLOAExtension } from '../services/db/loaService';
 import { LOARequest } from '@app/shared/types/loa';
 import { requireLogin, requireRole } from '../middleware/auth';
+import { logger } from '../services/logging/logger';
+import { audit } from '../services/logging/auditLog';
 
 router.use(requireLogin);
 
@@ -17,25 +19,43 @@ router.post("/", async (req: Request, res: Response) => {
     LOARequest.filed_date = new Date();
 
     try {
-        await createNewLOA(LOARequest);
+        let loaID = await createNewLOA(LOARequest);
+
+        audit.leaveOfAbsence('created', { actorId: req.user.id, targetId: loaID })
+        logger.info('app', 'LOA Posted', { poster: req.user.id, user: LOARequest.member_id })
         res.sendStatus(201);
     } catch (error) {
-        console.error(error);
+        logger.error(
+            'app',
+            'Failed to post LOA',
+            {
+                error: error instanceof Error ? error.message : String(error),
+                stack: error instanceof Error ? error.stack : undefined,
+            }
+        );
         res.status(500).send(error);
     }
 });
 
 //admin posts LOA
-router.post("/admin", [requireRole("17th Administrator")], async (req: Request, res: Response) => {
+router.post("/admin", [requireRole(['17th Administrator', '17th HQ', '17th Command'])], async (req: Request, res: Response) => {
     let LOARequest = req.body as LOARequest;
     LOARequest.created_by = req.user.id;
     LOARequest.filed_date = new Date();
     try {
-        await createNewLOA(LOARequest);
+        let loaID = await createNewLOA(LOARequest);
+        audit.leaveOfAbsence('admin_created', { actorId: req.user.id, targetId: loaID }, { for: LOARequest.member_id })
+        logger.info('app', 'LOA Posted', { poster: req.user.id, user: LOARequest.member_id })
         res.sendStatus(201);
     } catch (error) {
-        console.error(error);
+        logger.error(
-        res.status(500).send(error);
+            'app',
+            'Failed to post LOA',
+            {
+                error: error instanceof Error ? error.message : String(error),
+                stack: error instanceof Error ? error.stack : undefined,
+            }
+        ); res.status(500).send(error);
     }
 });
 
@@ -46,7 +66,14 @@ router.get("/me", async (req: Request, res: Response) => {
         const result = await getUserLOA(user);
         res.status(200).json(result)
     } catch (error) {
-        console.error(error);
+        logger.error(
+            'app',
+            'Failed to get user current LOA',
+            {
+                error: error instanceof Error ? error.message : String(error),
+                stack: error instanceof Error ? error.stack : undefined,
+            }
+        );
         res.status(500).send(error);
     }
 })
@@ -62,19 +89,33 @@ router.get("/history", async (req: Request, res: Response) => {
         const result = await getUserLOA(user, page, pageSize);
         res.status(200).json(result)
     } catch (error) {
-        console.error(error);
+        logger.error(
+            'app',
+            'Failed to get user LOA history',
+            {
+                error: error instanceof Error ? error.message : String(error),
+                stack: error instanceof Error ? error.stack : undefined,
+            }
+        );
         res.status(500).send(error);
     }
 })
 
-router.get('/all', [requireRole("17th Administrator")], async (req: Request, res: Response) => {
+router.get('/all', [requireRole(['17th Administrator', '17th HQ', '17th Command'])], async (req: Request, res: Response) => {
     try {
         const page = Number(req.query.page) || undefined;
         const pageSize = Number(req.query.pageSize) || undefined;
         const result = await getAllLOA(page, pageSize);
         res.status(200).json(result)
     } catch (error) {
-        console.error(error);
+        logger.error(
+            'app',
+            'Failed to get full LOA history',
+            {
+                error: error instanceof Error ? error.message : String(error),
+                stack: error instanceof Error ? error.stack : undefined,
+            }
+        );
         res.status(500).send(error);
     }
 })
@@ -84,8 +125,15 @@ router.get('/types', async (req: Request, res: Response) => {
         let out = await getLoaTypes();
         res.status(200).json(out);
     } catch (error) {
+        logger.error(
+            'app',
+            'Failed to get LOA types',
+            {
+                error: error instanceof Error ? error.message : String(error),
+                stack: error instanceof Error ? error.stack : undefined,
+            }
+        );
         res.status(500).json(error);
-        console.error(error);
     }
 })
 
@@ -99,27 +147,92 @@ router.post('/cancel/:id', async (req: Request, res: Response) => {
         }
 
         await closeLOA(Number(req.params.id), closer);
+
+        audit.leaveOfAbsence('ended', { actorId: req.user.id, targetId: id });
+        logger.info('app', 'LOA Closed', { closed_by: closer, LOA: id })
+
         res.sendStatus(200);
     } catch (error) {
-        console.error(error);
+        logger.error(
+            'app',
+            'Failed to cancel LOA',
+            {
+                error: error instanceof Error ? error.message : String(error),
+                stack: error instanceof Error ? error.stack : undefined,
+            }
+        );
         res.status(500).json(error);
     }
 })
 
 //TODO: enforce admin only
-router.post('/adminCancel/:id', [requireRole("17th Administrator")], async (req: Request, res: Response) => {
+router.post('/adminCancel/:id', [requireRole(['17th Administrator', '17th HQ', '17th Command'])], async (req: Request, res: Response) => {
     let closer = req.user.id;
     try {
         await closeLOA(Number(req.params.id), closer);
+
+        audit.leaveOfAbsence('admin_ended', { actorId: req.user.id, targetId: Number(req.params.id) });
+        logger.info('app', 'LOA Closed', { closed_by: closer, LOA: req.params.id })
+
         res.sendStatus(200);
     } catch (error) {
-        console.error(error);
+        logger.error(
+            'app',
+            'Failed to cancel LOA',
+            {
+                error: error instanceof Error ? error.message : String(error),
+                stack: error instanceof Error ? error.stack : undefined,
+            }
+        );
         res.status(500).json(error);
     }
 })
 
-// TODO: Enforce admin only
+// extend LOA
-router.post('/extend/:id', [requireRole("17th Administrator")], async (req: Request, res: Response) => {
+router.post('/extend/:id', async (req: Request, res: Response) => {
+    const to: Date = req.body.to;
+
+    const member = req.user.id;
+
+    let LOA = await getLOAbyID(Number(req.params.id));
+    if (!LOA) {
+        return res.status(404).send("LOA not found");
+    }
+
+    if (LOA.member_id !== member) {
+        return res.status(403).send("You do not have permission to extend this LOA");
+    }
+
+    if (LOA.extended_till !== null) {
+        return res.status(409).send("You must contact the administration team to extend your LOA again");
+    }
+
+    if (!to) {
+        return res.status(400).send("Extension length is required");
+    }
+
+    try {
+        await setLOAExtension(Number(req.params.id), to);
+
+        audit.leaveOfAbsence('extended', { actorId: req.user.id, targetId: Number(req.params.id) });
+        logger.info('app', 'LOA Extended', { extended_by: req.user.id, LOA: req.params.id })
+
+        res.sendStatus(200);
+    } catch (error) {
+        logger.error(
+            'app',
+            'Failed to extend LOA',
+            {
+                error: error instanceof Error ? error.message : String(error),
+                stack: error instanceof Error ? error.stack : undefined,
+            }
+        );
+        res.status(500).json(error);
+    }
+})
+
+// admin extend LOA
+router.post('/extendAdmin/:id', [requireRole(['17th Administrator', '17th HQ', '17th Command'])], async (req: Request, res: Response) => {
     const to: Date = req.body.to;
 
     if (!to) {
@@ -128,27 +241,73 @@ router.post('/extend/:id', [requireRole("17th Administrator")], async (req: Requ
 
     try {
         await setLOAExtension(Number(req.params.id), to);
+
+        audit.leaveOfAbsence('extended', { actorId: req.user.id, targetId: Number(req.params.id) });
+        logger.info('app', 'LOA Extended', { extended_by: req.user.id, LOA: req.params.id })
+
         res.sendStatus(200);
     } catch (error) {
-        console.error(error)
+        logger.error(
+            'app',
+            'Failed to extend LOA',
+            {
+                error: error instanceof Error ? error.message : String(error),
+                stack: error instanceof Error ? error.stack : undefined,
+            }
+        );
         res.status(500).json(error);
     }
 })
 
+// GET /policy
 router.get('/policy', async (req: Request, res: Response) => {
-    const output = await fetch(`${process.env.DOC_HOST}/api/pages/42`, {
+    const t0 = performance.now();
-        headers: {
-            Authorization: `Token ${process.env.DOC_TOKEN_ID}:${process.env.DOC_TOKEN_SECRET}`,
-        }
-    })
 
-    if (output.ok) {
+    try {
-        const out = await output.json();
+        const response = await fetch(`${process.env.DOC_HOST}/api/pages/42`, {
+            headers: {
+                Authorization: `Token ${process.env.DOC_TOKEN_ID}:${process.env.DOC_TOKEN_SECRET}`,
+            },
+        });
+
+        if (!response.ok) {
+            const text = await response.text();
+
+            logger.error('app', 'Failed to fetch policy page from Bookstack', {
+                pageId: 42,
+                status: response.status,
+                statusText: response.statusText,
+                body: text,
+                userId: req.user?.id,
+            });
+
+            return res.sendStatus(500);
+        }
+
+        const out = await response.json();
         res.status(200).json(out.html);
-    } else {
+
-        console.error("Failed to fetch LOA policy from bookstack");
+        logger.info(
+            'profiling',
+            'GET /policy completed',
+            {
+                pageId: 42,
+                total_ms: performance.now() - t0,
+            },
+            'profiling'
+        );
+
+    } catch (error) {
+        logger.error('app', 'Error fetching policy page from Bookstack', {
+            pageId: 42,
+            error: error instanceof Error ? error.message : String(error),
+            stack: error instanceof Error ? error.stack : undefined,
+            userId: req.user?.id,
+        });
+
         res.sendStatus(500);
     }
-})
+});
+
 
 export const loaRouter = router;

api/src/routes/members.ts

@@ -4,10 +4,18 @@ const router = express.Router();
 import { Request, Response } from 'express';
 import pool from '../db';
 import { requireLogin, requireMemberState, requireRole } from '../middleware/auth';
-import { getUserActiveLOA } from '../services/loaService';
+import { getUserActiveLOA } from '../services/db/loaService';
-import { getAllMembersLite, getMemberSettings, getMembersFull, getMembersLite, getUserData, getUserState, setUserSettings } from '../services/memberService';
+import { getAllMembersLite, getMemberSettings, getMembersFull, getMembersLite, getUserData, getUserState, setUserSettings, getFilteredMembers, setUserState, getLastNonSuspendedState } from '../services/db/memberService';
-import { getUserRoles } from '../services/rolesService';
+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';
+import { audit } from '../services/logging/auditLog';
 
 //get all users
 router.get('/', [requireLogin, requireMemberState(MemberState.Member)], async (req, res) => {
@@ -26,29 +34,90 @@ router.get('/', [requireLogin, requireMemberState(MemberState.Member)], async (r
             END AS on_loa
             FROM view_member_rank_unit_status_latest v;`);
         return res.status(200).json(result);
-    } catch (err) {
+    } catch (error) {
-        console.error('Error fetching users:', err);
+        logger.error(
+            'app',
+            'Failed to get all users',
+            {
+                error: error instanceof Error ? error.message : String(error),
+                stack: error instanceof Error ? error.stack : undefined,
+            }
+        );
         return res.status(500).json({ error: 'Failed to fetch users' });
     }
 });
 
-router.get('/me', [requireLogin], async (req, res) => {
+router.get('/filtered', [requireLogin, requireMemberState(MemberState.Member)], async (req, res) => {
-    if (req.user === undefined)
+    try {
-        return res.sendStatus(401)
+        // 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);
+
+    const routeStart = performance.now();
+    const timings: Record<string, number> = {};
 
     try {
-        const memData = await getUserData(req.user.id);
+        let t;
-        const LOAData = await getUserActiveLOA(req.user.id);
+
-        const memState = await getUserState(req.user.id);
+        t = performance.now();
-        const roleData = await getUserRoles(req.user.id);
+        const memData = await getUserData(req.user.id);
+        timings.member = performance.now() - t;
+
+        t = performance.now();
+        const LOAData = await getUserActiveLOA(req.user.id);
+        timings.loa = performance.now() - t;
+
+        t = performance.now();
+        const memState = await getUserState(req.user.id);
+        timings.state = performance.now() - t;
+
+        t = performance.now();
+        const roleData = await getUserRoles(req.user.id);
+        timings.roles = performance.now() - t;
+
+        const userDataFull: myData = {
+            member: memData,
+            LOAs: LOAData,
+            roles: roleData,
+            state: memState,
+        };
 
-        const userDataFull: myData = { member: memData, LOAs: LOAData, roles: roleData, state: memState };
         res.status(200).json(userDataFull);
+
+        logger.info('profiling', 'GET /members/me completed', {
+            userId: req.user.id,
+            total_ms: performance.now() - routeStart,
+            breakdown_ms: timings,
+        }, 'profiling');
+
     } catch (error) {
-        console.error('Error fetching user data:', error);
+        logger.error('profiling', 'GET /members/me failed', {
+            userId: req.user?.id,
+            error: error instanceof Error ? error.message : String(error),
+        });
+
         return res.status(500).json({ error: 'Failed to fetch user data' });
     }
-})
+});
+
 
 router.get('/settings', [requireLogin], async (req: Request, res: Response) => {
     try {
@@ -56,7 +125,14 @@ router.get('/settings', [requireLogin], async (req: Request, res: Response) => {
         let output = await getMemberSettings(user);
         res.status(200).json(output);
     } catch (error) {
-        console.error(error);
+        logger.error(
+            'app',
+            'Failed to get member settings',
+            {
+                error: error instanceof Error ? error.message : String(error),
+                stack: error instanceof Error ? error.stack : undefined,
+            }
+        );
         res.status(500).json(error);
     }
 })
@@ -66,19 +142,35 @@ router.put('/settings', [requireLogin], async (req: Request, res: Response) => {
         let user = req.user.id;
         let settings: memberSettings = req.body;
         await setUserSettings(user, settings);
+        logger.info('app', 'User updated profile settings', { user: user })
         res.sendStatus(200);
     } catch (error) {
-        console.error(error);
+        logger.error(
-        res.status(500).json(error);
+            'app',
+            'Failed to update user settings',
+            {
+                error: error instanceof Error ? error.message : String(error),
+                stack: error instanceof Error ? error.stack : undefined,
+            }
+        ); res.status(500).json(error);
     }
 })
 
 router.get('/lite', [requireLogin], async (req: Request, res: Response) => {
     try {
-        let out = await getAllMembersLite();
+        let activeOnly = Boolean(req.query.active);
+        console.log(activeOnly);
+        let out = await getAllMembersLite(activeOnly);
         res.status(200).json(out);
     } catch (error) {
-        console.error(error);
+        logger.error(
+            'app',
+            'Failed to get lite users',
+            {
+                error: error instanceof Error ? error.message : String(error),
+                stack: error instanceof Error ? error.stack : undefined,
+            }
+        );
         res.status(500).json(error);
     }
 })
@@ -89,7 +181,14 @@ router.post('/lite/bulk', async (req: Request, res: Response) => {
         let out = await getMembersLite(ids);
         res.status(200).json(out);
     } catch (error) {
-        console.error(error);
+        logger.error(
+            'app',
+            'Failed to get batch lite users',
+            {
+                error: error instanceof Error ? error.message : String(error),
+                stack: error instanceof Error ? error.stack : undefined,
+            }
+        );
         res.status(500).json(error);
     }
 })
@@ -101,22 +200,36 @@ router.post('/full/bulk', async (req: Request, res: Response) => {
         let out = await getMembersFull(ids);
         res.status(200).json(out);
     } catch (error) {
-        console.error(error);
+        logger.error(
-        res.status(500).json(error);
+            'app',
+            'Failed to get batch full users',
+            {
+                error: error instanceof Error ? error.message : String(error),
+                stack: error instanceof Error ? error.stack : undefined,
+            }
+        ); res.status(500).json(error);
     }
 })
 
 router.get('/:id', [requireLogin], async (req, res) => {
+    const userId = req.params.id;
+
     try {
-        const userId = req.params.id;
         const result = await pool.query('SELECT * FROM view_member_rank_unit_status_latest WHERE id = $1;', [userId]);
         if (result.rows.length === 0) {
             return res.status(404).json({ error: 'User not found' });
         }
         return res.status(200).json(result.rows[0]);
-    } catch (err) {
+    } catch (error) {
-        console.error('Error fetching user:', err);
+        logger.error(
-        return res.status(500).json({ error: 'Failed to fetch user' });
+            'app',
+            'Failed to get user',
+            {
+                user: userId,
+                error: error instanceof Error ? error.message : String(error),
+                stack: error instanceof Error ? error.stack : undefined,
+            }
+        ); return res.status(500).json({ error: 'Failed to fetch user' });
     }
 });
 
@@ -126,5 +239,79 @@ 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);
+
+
+        audit.member('discharged', { actorId: req.user.id, targetId: data.userID }, { reason: data.reason });
+
+        res.sendStatus(200);
+    } catch (error) {
+        logger.error('app', 'Failed to discharge user', {
+            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);
+
+        audit.member('suspension_added', { actorId: author, targetId: target });
+
+        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);
+        audit.member('suspension_removed', { actorId: author, targetId: target });
+
+        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/modRequest.ts

@@ -0,0 +1,65 @@
+const express = require('express');
+const router = express.Router();
+
+import { Request, Response } from 'express';
+import { requireLogin, requireMemberState, requireRole } from '../middleware/auth';
+import { logger } from '../services/logging/logger';
+import { audit } from '../services/logging/auditLog';
+import { MemberState } from '@app/shared/types/member';
+import { createDiscussion, getAllDiscussions, getDiscussionById } from '../services/db/discussionService';
+import { ModRequest } from '@app/shared/schemas/modRequest';
+
+router.use(requireLogin);
+router.use(requireMemberState(MemberState.Member));
+
+router.get('/', async (req: Request, res: Response) => {
+    try {
+        const page = parseInt(req.query.page as string) || 1;
+        const pageSize = parseInt(req.query.pageSize as string) || 10;
+        const search = parseInt(req.query.search as string) || null;
+
+        const result = await getAllDiscussions<ModRequest>('mod_request', page, pageSize);
+
+        return res.json(result);
+    } catch (error) {
+        console.error('Error fetching mod requests:', error);
+        res.status(500).json({ error: 'Internal Server Error' });
+    }
+});
+
+// GET a single mod request by ID
+router.get('/:id', async (req: Request, res: Response) => {
+    try {
+        const id = parseInt(req.params.id, 10);
+        if (isNaN(id)) {
+            return res.status(400).json({ error: 'Invalid ID' });
+        }
+
+        const discussion = await getDiscussionById<ModRequest>(id);
+        if (!discussion) {
+            return res.status(404).json({ error: 'Mod request not found' });
+        }
+
+        return res.json(discussion);
+    } catch (error) {
+        console.error('Error fetching mod request by id:', error);
+        res.status(500).json({ error: 'Internal Server Error' });
+    }
+});
+
+router.post('/', async (req: Request, res: Response) => {
+    try {
+        let author = req.user.id;
+        let data = req.body as ModRequest;
+
+        let postID = await createDiscussion<ModRequest>('mod_request', author, data.mod_title, data);
+        logger.info('app', 'Mod request posted', {});
+        audit.discussion('created', { actorId: author, targetId: postID }, { type: "mod_request" });
+        return res.status(200).send(postID);
+    } catch (error) {
+        console.error('Error posting a mod request:', error);
+        res.status(500).json({ error: 'Internal Server Error' });
+    }
+})
+
+export const modRequestRouter = router;

api/src/routes/ranks.ts

@@ -1,8 +1,11 @@
 import { MemberState } from "@app/shared/types/member";
 import { requireLogin, requireMemberState, requireRole } from "../middleware/auth";
-import { getAllRanks, insertMemberRank } from "../services/rankService";
+import { batchInsertMemberRank, getAllRanks, getPromotionHistorySummary, getPromotionsOnDay, insertMemberRank } from "../services/db/rankService";
+import { BatchPromotion, BatchPromotionMember } from '@app/shared/schemas/promotionSchema'
 
 import express = require('express');
+import { logger } from "../services/logging/logger";
+import { audit } from "../services/logging/auditLog";
 const r = express.Router();
 const ur = express.Router();
 
@@ -11,26 +14,83 @@ r.use(requireLogin)
 ur.use(requireLogin)
 
 //insert a new latest rank for a user
-ur.post('/', [requireRole(["17th Command", "17th Administrator", "17th HQ"]), requireMemberState(MemberState.Member)], async (req, res) => {
+ur.post('/', [requireRole(["17th Command", "17th Administrator", "17th HQ"]), requireMemberState(MemberState.Member)], async (req: express.Request, res: express.Response) => {
-    3
     try {
-        const change = req.body?.change;
+        const change = req.body.promotions as BatchPromotionMember[];
-        await insertMemberRank(change.member_id, change.rank_id, change.date);
+        const approver = req.body.approver as number;
+        const author = req.user.id;
+        if (!change) res.sendStatus(400);
 
+        await batchInsertMemberRank(change, author, approver);
+
+        audit.member('update_rank', { actorId: author, targetId: null }, { changes: change.length });
+        logger.info('app', 'Promotion batch submitted', { author: author })
         res.sendStatus(201);
-    } catch (err) {
+    } catch (error) {
-        console.error('Insert failed:', err);
+        logger.error(
+            'app',
+            'Failed to post rank change',
+            {
+                error: error instanceof Error ? error.message : String(error),
+                stack: error instanceof Error ? error.stack : undefined,
+            }
+        );
         res.status(500).json({ error: 'Failed to update ranks' });
     }
 });
 
+ur.get('/', async (req: express.Request, res: express.Response) => {
+    try {
+        const promos = await getPromotionHistorySummary();
+        res.status(200).json(promos);
+    } catch (error) {
+        logger.error(
+            'app',
+            'Failed to get rank change history',
+            {
+                error: error instanceof Error ? error.message : String(error),
+                stack: error instanceof Error ? error.stack : undefined,
+            }
+        );
+        res.sendStatus(500);
+    }
+});
+
+ur.get('/:day', async (req: express.Request, res: express.Response) => {
+    try {
+        if (!req.params.day) res.sendStatus(400);
+
+        var day = new Date(req.params.day)
+        const promos = await getPromotionsOnDay(day);
+        res.status(200).json(promos);
+    } catch (error) {
+        logger.error(
+            'app',
+            'Failed to get rank change history on day',
+            {
+                day: day,
+                error: error instanceof Error ? error.message : String(error),
+                stack: error instanceof Error ? error.stack : undefined,
+            }
+        );
+        res.sendStatus(500);
+    }
+})
+
 //get all ranks
 r.get('/', async (req, res) => {
     try {
         const ranks = await getAllRanks();
         res.json(ranks);
-    } catch (err) {
+    } catch (error) {
-        console.error(err);
+        logger.error(
+            'app',
+            'Failed to get all ranks',
+            {
+                error: error instanceof Error ? error.message : String(error),
+                stack: error instanceof Error ? error.stack : undefined,
+            }
+        );
         res.status(500).json({ error: 'Internal server error' });
     }
 });

api/src/routes/roles.ts

@@ -5,84 +5,138 @@ const ur = express.Router();
 import { MemberState } from '@app/shared/types/member';
 import pool from '../db';
 import { requireLogin, requireMemberState, requireRole } from '../middleware/auth';
-import { assignUserGroup, createGroup } from '../services/rolesService';
+import { assignUserGroup, createGroup, getAllRoles, getRole, getUsersWithRole } from '../services/db/rolesService';
+import { Request, Response } from 'express';
+import { logger } from '../services/logging/logger';
+import { audit } from '../services/logging/auditLog';
 
 r.use(requireLogin)
 ur.use(requireLogin)
 
 //manually assign a member to a group
-ur.post('/', [requireMemberState(MemberState.Member), requireRole("17th Administrator")], async (req, res) => {
+ur.post('/', [requireMemberState(MemberState.Member), requireRole("17th Administrator")], async (req: Request, res) => {
+    const body = req.body;
+
     try {
-        const body = req.body;
 
-        assignUserGroup(body.member_id, body.role_id);
+        await assignUserGroup(body.member_id, body.role_id);
 
+        logger.info('app', 'User assigned role', { user: body.member_id, role: body.role_id, assigner: req.user.id })
         res.sendStatus(201);
-    } catch (err) {
+        audit.roles('add_member', { actorId: req.user.id, targetId: body.role_id }, { member: body.member_id, role: body.role_id });
-        console.error('Insert failed:', err);
+
+    } catch (error) {
+        if (error?.code === 'ER_DUP_ENTRY') {
+            return res.status(400).json({
+                error: 'Member already has this role',
+            });
+        }
+
+        logger.error(
+            'app',
+            'Failed to assign role',
+            {
+                user: body.member_id,
+                role: body.role_id,
+                assigner: req.user.id,
+                error: error instanceof Error ? error.message : String(error),
+                stack: error instanceof Error ? error.stack : undefined,
+            }
+        );
         res.status(500).json({ error: 'Failed to add to group' });
     }
 });
 
 //manually remove member from group
-ur.delete('/', [requireMemberState(MemberState.Member), requireRole("17th Administrator")], async (req, res) => {
+ur.delete('/', [requireMemberState(MemberState.Member), requireRole("17th Administrator")], async (req: Request, res: Response) => {
+    const body = req.body;
+
     try {
-        const body = req.body;
 
         const sql = 'DELETE FROM members_roles WHERE member_id = ? AND role_id = ?'
         await pool.query(sql, [body.member_id, body.role_id])
 
+        logger.info('app', 'User removed role', { user: body.member_id, role: body.role_id, assigner: req.user.id })
+        audit.roles('remove_member', { actorId: req.user.id, targetId: body.role_id }, { member: body.member_id, role: body.role_id });
+
         res.sendStatus(200);
     }
-    catch (err) {
+    catch (error) {
-        console.error("delete failed: ", err)
+        logger.error(
+            'app',
+            'Failed to remove role',
+            {
+                user: body.member_id,
+                role: body.role_id,
+                assigner: req.user.id,
+                error: error instanceof Error ? error.message : String(error),
+                stack: error instanceof Error ? error.stack : undefined,
+            }
+        );
         res.status(500).json({ error: 'Failed to remove from group' });
-
     }
 })
 
 //get all roles
 r.get('/', [requireMemberState(MemberState.Member)], async (req, res) => {
     try {
-        var con = await pool.getConnection();
+        const roles = await getAllRoles();
 
-        // Get all roles
+        res.status(200).json(roles);
-        const roles = await con.query('SELECT * FROM roles;');
+    } catch (error) {
-
+        logger.error(
-        // Get all members for each role
+            'app',
-        const membersRoles = await con.query(`
+            'Failed to get all roles',
-            SELECT mr.role_id, v.*
+            {
-            FROM members_roles mr
+                error: error instanceof Error ? error.message : String(error),
-            JOIN view_member_rank_unit_status_latest v ON mr.member_id = v.member_id
+                stack: error instanceof Error ? error.stack : undefined,
-            `);
+            }
-
+        );
-
+        res.sendStatus(500);
-        // Group members by role_id
-        const roleIdToMembers = {};
-        for (const row of membersRoles) {
-            if (!roleIdToMembers[row.role_id]) roleIdToMembers[row.role_id] = [];
-            // Remove role_id from member object
-            const { role_id, ...member } = row;
-            roleIdToMembers[role_id].push(member);
-        }
-
-        // Attach members to each role
-        const result = roles.map(role => ({
-            ...role,
-            members: roleIdToMembers[role.id] || []
-        }));
-
-        res.json(result);
-    } catch (err) {
-        console.error(err);
-        res.status(500).json({ error: 'Internal server error' });
-    } finally {
-        con.release();
     }
 });
 
+r.get('/:id/members', [requireMemberState(MemberState.Member)], async (req: Request, res: Response) => {
+    try {
+        const members = await getUsersWithRole(Number(req.params.id));
+        res.status(200).json(members);
+    } catch (error) {
+        logger.error(
+            'app',
+            'Failed to get role members',
+            {
+                role: req.params.id,
+                error: error instanceof Error ? error.message : String(error),
+                stack: error instanceof Error ? error.stack : undefined,
+            }
+        );
+        res.sendStatus(500);
+    }
+})
+
+
+r.get('/:id', [requireMemberState(MemberState.Member)], async (req: Request, res: Response) => {
+    try {
+        const role = await getRole(Number(req.params.id));
+        res.status(200).json(role);
+    } catch (error) {
+        logger.error(
+            'app',
+            'Failed to get role members',
+            {
+                role: req.params.id,
+                error: error instanceof Error ? error.message : String(error),
+                stack: error instanceof Error ? error.stack : undefined,
+            }
+        );
+        res.sendStatus(500);
+    }
+})
+
+
+
 //create a new role
-r.post('/', [requireMemberState(MemberState.Member), requireRole("17th Administrator")], async (req, res) => {
+r.post('/', [requireMemberState(MemberState.Member), requireRole("dev")], async (req, res) => {
     try {
         const { name, color, description } = req.body;
         if (!name || !color) {
@@ -94,7 +148,8 @@ r.post('/', [requireMemberState(MemberState.Member), requireRole("17th Administr
             return res.status(400).json({ error: 'Color must be a valid hex color (#ffffff)' });
         }
 
-        await createGroup(name, color, description);
+        let out = await createGroup(name, color, description);
+        audit.roles('create', { actorId: req.user.id, targetId: out.id });
 
         res.sendStatus(201);
     } catch (err) {
@@ -103,12 +158,15 @@ r.post('/', [requireMemberState(MemberState.Member), requireRole("17th Administr
     }
 })
 
-r.delete('/:id', [requireMemberState(MemberState.Member), requireRole("17th Administrator")], async (req, res) => {
+r.delete('/:id', [requireMemberState(MemberState.Member), requireRole("dev")], async (req, res) => {
     try {
         const id = req.params.id;
 
         const sql = 'DELETE FROM roles WHERE id = ?';
         const res = await pool.query(sql, [id]);
+
+        audit.roles('delete', { actorId: req.user.id, targetId: id });
+
         res.sendStatus(200);
     } catch (error) {
         console.error(error);

api/src/routes/statuses.ts

@@ -4,6 +4,7 @@ const memberStatusR = express.Router();
 
 import pool from '../db';
 import { requireLogin } from '../middleware/auth';
+import { logger } from '../services/logging/logger';
 
 statusR.use(requireLogin);
 memberStatusR.use(requireLogin);
@@ -38,9 +39,16 @@ statusR.get('/', async (req, res) => {
     try {
         const result = await pool.query('SELECT * FROM statuses;');
         res.json(result);
-    } catch (err) {
+    } catch (error) {
-        console.error(err);
+        logger.error(
-        res.status(500).json({ error: 'Internal server error' });
+            'app',
+            'Failed to get all statuses',
+            {
+                error: error instanceof Error ? error.message : String(error),
+                stack: error instanceof Error ? error.stack : undefined,
+            }
+        );
+        res.sendStatus(500);
     }
 });
 

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/CourseSerivce.ts

@@ -1,4 +1,4 @@
-import pool from "../db"
+import pool from "../../db"
 import { Course, CourseAttendee, CourseAttendeeRole, CourseEventDetails, CourseEventSummary, RawAttendeeRow } from "@app/shared/types/course"
 import { PagedData } from "@app/shared/types/pagination";
 import { toDateTime } from "@app/shared/utils/time";
@@ -83,8 +83,10 @@ export async function insertCourseEvent(event: CourseEventDetails): Promise<numb
     try {
         var con = await pool.getConnection();
 
+        let course: Course = await getCourseByID(event.course_id);
+
         await con.beginTransaction();
-        const res = await con.query("INSERT INTO course_events (course_id, event_date, remarks, created_by) VALUES (?, ?, ?, ?);", [event.course_id, toDateTime(event.event_date), event.remarks, event.created_by]);
+        const res = await con.query("INSERT INTO course_events (course_id, event_date, remarks, created_by, hasBookwork, hasQual) VALUES (?, ?, ?, ?, ?, ?);", [event.course_id, toDateTime(event.event_date), event.remarks, event.created_by, course.hasBookwork, course.hasQual]);
         var eventID: number = res.insertId;
 
         for (const attendee of event.attendees) {

api/src/services/db/applicationService.ts

@@ -1,11 +1,22 @@
 import { ApplicationListRow, ApplicationRow, CommentRow } from "@app/shared/types/application";
-import pool from "../db";
+import pool from "../../db";
 import { error } from "console";
+import * as mariadb from 'mariadb';
 
-export async function createApplication(memberID: number, appVersion: number, app: string) {
+
+/**
+ * Create an application in the db
+ * @param memberID 
+ * @param appVersion 
+ * @param app 
+ * @returns ID of the created application
+ */
+export async function createApplication(memberID: number, appVersion: number, app: string): Promise<number> {
   const sql = `INSERT INTO applications (member_id, app_version, app_data) VALUES (?, ?, ?);`;
   const params = [memberID, appVersion, JSON.stringify(app)]
-  return await pool.query(sql, params);
+
+  let result = await pool.query(sql, params);
+  return Number(result.insertId);
 }
 
 export async function getMemberApplication(memberID: number): Promise<ApplicationRow> {
@@ -63,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 = ?
@@ -72,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/calendarService.ts

@@ -1,4 +1,4 @@
-import pool from '../db';
+import pool from '../../db';
 import { CalendarEventShort, CalendarSignup, CalendarEvent, CalendarAttendance } from "@app/shared/types/calendar"
 import { toDateTime } from "@app/shared/utils/time"
 
@@ -19,7 +19,8 @@ export async function createEvent(eventObject: Omit<CalendarEvent, 'id' | 'creat
     ];
 
     const result = await pool.query(sql, params);
-    return { id: result.insertId, ...eventObject };
+    let id = Number(result.insertId);
+    return id;
 }
 
 export async function updateEvent(eventObject: CalendarEvent) {

api/src/services/db/discussionService.ts

@@ -0,0 +1,150 @@
+import { toDateTime } from "@app/shared/utils/time";
+import pool from "../../db";
+import { LOARequest, LOAType } from '@app/shared/types/loa'
+import { PagedData } from '@app/shared/types/pagination'
+import { DiscussionPost } from '@app/shared/types/discussion';
+import { DiscussionComment } from '@app/shared/types/discussion';
+
+/**
+ * Retrieves all discussion posts with pagination and optional type filtering.
+ * @template T - The type of content stored in discussion posts
+ * @param {string} [type] - Optional type filter to retrieve only posts of a specific type
+ * @param {number} [page=1] - The page number for pagination (1-indexed)
+ * @param {number} [pageSize=10] - The number of posts per page
+ * @returns {Promise<PagedData<DiscussionPost<T>>>} A promise that resolves to paginated discussion posts with metadata
+ * @throws {Error} If the database query fails
+ */
+export async function getAllDiscussions<T>(type?: string, page = 1, pageSize = 10, search?: string): Promise<PagedData<DiscussionPost<T>>> {
+    const offset = (page - 1) * pageSize;
+    const params: any[] = [];
+
+    // Base query parts
+    let whereClause = "WHERE is_deleted = FALSE";
+    if (type) {
+        whereClause += " AND type = ?";
+        params.push(type);
+    }
+
+    const sql = `
+        SELECT 
+            p.*, 
+            m.name as poster_name
+        FROM discussion_posts AS p
+        LEFT JOIN members m ON p.poster_id = m.id
+        ${whereClause}
+        ORDER BY 
+            p.is_open DESC,      -- Show active/unlocked threads first
+            p.created_at DESC    -- Then show newest first
+        LIMIT ? OFFSET ?;
+    `;
+
+    // Add pagination params to the end
+    params.push(pageSize, offset);
+
+    // Execute queries
+    const posts: DiscussionPost<T>[] = await pool.query(sql, params) as DiscussionPost<T>[];
+
+    // Get count for the specific types
+    const countSql = `SELECT COUNT(*) as count FROM discussion_posts ${whereClause}`;
+    const countResult = await pool.query(countSql, type ? [type] : []);
+    const totalCount = Number(countResult[0].count);
+
+    const totalPages = Math.ceil(totalCount / pageSize);
+
+    return {
+        data: posts,
+        pagination: {
+            page,
+            pageSize,
+            total: totalCount,
+            totalPages
+        }
+    };
+}
+
+/**
+ * Creates a new discussion post.
+ * @template T - The type of content for the discussion post
+ * @param {string} type - The type/category of the discussion post
+ * @param {number} authorID - The ID of the member creating the post
+ * @param {postTitle} string - The title of the discussion post
+ * @param {T} data - The content data to be stored in the post
+ * @returns {Promise<Number>} A promise that resolves to the ID of the newly created post
+ * @throws {Error} If the database insertion fails
+ */
+export async function createDiscussion<T>(type: string, authorID: number, postTitle: string, data: T): Promise<number> {
+    const sql = `
+        INSERT INTO discussion_posts (type, poster_id, title, content)
+        VALUES (?, ?, ?, ?)
+    `;
+
+    console.log(data);
+    const result = await pool.query(sql, [
+        type,
+        authorID,
+        postTitle,
+        JSON.stringify(data)
+    ]);
+
+    console.log(result);
+    return Number(result.insertId);
+}
+
+/**
+ * Retrieve a single discussion post by its ID.
+ * @template T - type of the content stored in the post (e.g. ModRequest)
+ * @param {number} id - The id of the discussion post to fetch
+ * @returns {Promise<DiscussionPost<T> | null>} The discussion post or null if not found
+ */
+export async function getDiscussionById<T>(id: number): Promise<DiscussionPost<T> | null> {
+    // Get the post
+    const postSql = `
+        SELECT 
+            p.*, 
+            m.name as poster_name
+        FROM discussion_posts AS p
+        LEFT JOIN members m ON p.poster_id = m.id
+        WHERE p.id = ?
+        LIMIT 1;
+    `;
+    const postResults = (await pool.query(postSql, [id])) as DiscussionPost<T>[];
+    if (postResults.length === 0) {
+        return null;
+    }
+    const post = postResults[0];
+
+    // Get comments for the post
+    const commentSql = `
+        SELECT 
+            c.*
+        FROM discussion_comments AS c
+        WHERE c.post_id = ?
+        AND c.is_deleted = FALSE
+        ORDER BY c.created_at ASC;
+    `;
+    const comments = (await pool.query(commentSql, [id])) as DiscussionComment[];
+
+    // Attach comments to post
+    post.comments = comments;
+
+    return post;
+}
+
+export async function getPostComments(postID: number): Promise<DiscussionComment[]> {
+    let comments = await pool.query("SELECT * FROM discussion_comments WHERE post_id = ?", [postID]);
+    return comments;
+}
+
+export async function postComment(commentData: DiscussionComment, poster: number) {
+    const sql = `
+    INSERT INTO discussion_comments (post_id, poster_id, content) VALUES (?, ?, ?);
+    `;
+
+    const result = await pool.query(sql, [commentData.post_id, poster, commentData.content]);
+
+    if (!result.affectedRows || result.affectedRows !== 1) {
+        throw new Error('Failed to insert comment: expected 1 row to be inserted');
+    }
+    
+    return Number(result.insertId);
+}

api/src/services/db/loaService.ts

@@ -1,5 +1,5 @@
 import { toDateTime } from "@app/shared/utils/time";
-import pool from "../db";
+import pool from "../../db";
 import { LOARequest, LOAType } from '@app/shared/types/loa'
 import { PagedData } from '@app/shared/types/pagination'
 
@@ -69,17 +69,18 @@ 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;
 }
 
-export async function createNewLOA(data: LOARequest) {
+export async function createNewLOA(data: LOARequest): Promise<number> {
     const sql = `INSERT INTO leave_of_absences 
                 (member_id, filed_date, start_date, end_date, type_id, reason) 
              VALUES (?, ?, ?, ?, ?, ?)`;
-    await pool.query(sql, [data.member_id, toDateTime(data.filed_date), toDateTime(data.start_date), toDateTime(data.end_date), data.type_id, data.reason])
+    let out = await pool.query(sql, [data.member_id, toDateTime(data.filed_date), toDateTime(data.start_date), toDateTime(data.end_date), data.type_id, data.reason])
-    return;
+
+    return Number(out.insertId);
 }
 
 export async function closeLOA(id: number, closer: number) {

api/src/services/db/memberService.ts

@@ -0,0 +1,282 @@
+import { Role } from "@app/shared/types/roles";
+import pool from "../../db";
+import { Member, MemberCardDetails, MemberLight, memberSettings, MemberState, PaginatedMembers } from '@app/shared/types/member'
+import { logger } from "../logging/logger";
+import { memberCache } from "../../routes/auth";
+import * as mariadb from 'mariadb';
+
+export async function getFilteredMembers(
+    page: number = 1,
+    pageSize: number = 15,
+    search?: string,
+    status?: string,
+    unitId?: string
+): Promise<PaginatedMembers> {
+    try {
+        const offset = (page - 1) * pageSize;
+        const whereClauses: string[] = [];
+        const params: any[] = [];
+
+        if (status && status !== 'all') {
+            whereClauses.push(`m.state = ?`);
+            params.push(status);
+        }
+
+        if (search) {
+            whereClauses.push(`v.member_name LIKE ?`);
+            params.push(`%${search}%`);
+        }
+
+        if (unitId && unitId !== 'all') {
+            whereClauses.push(`v.unit = ?`);
+            params.push(unitId);
+        }
+
+        const whereClause = whereClauses.length > 0
+            ? ` WHERE ${whereClauses.join(' AND ')}`
+            : '';
+
+        // COUNT QUERY
+        const countQuery = `SELECT COUNT(*) as total FROM view_member_rank_unit_status_latest v INNER JOIN members m ON v.member_id = m.id ${whereClause}`;
+        const [countResults]: any[] = await pool.query(countQuery, params);
+        const total = Number(countResults?.total) || 0;
+
+        // DATA QUERY
+        const dataQuery = `
+      SELECT 
+        v.*,
+        CASE 
+          WHEN EXISTS (
+            SELECT 1 FROM leave_of_absences l 
+            WHERE l.member_id = v.member_id 
+              AND l.deleted = 0 
+              AND UTC_TIMESTAMP() BETWEEN l.start_date AND l.end_date
+          ) THEN 1 ELSE 0 
+        END AS on_loa
+      FROM view_member_rank_unit_status_latest v
+      INNER JOIN members m ON v.member_id = m.id
+      ${whereClause} -- Added back correctly
+      ORDER BY v.member_name ASC
+      LIMIT ? OFFSET ?
+    `;
+
+        const rows: any[] = await pool.query(dataQuery, [...params, pageSize, offset]);
+
+        // Map rows to Member type
+        const members: Member[] = rows.map(row => ({
+            member_id: Number(row.member_id),
+            member_name: row.member_name,
+            displayName: row.displayName,
+            rank: row.rank,
+            rank_date: row.rank_date,
+            unit: row.unit,
+            unit_date: row.unit_date,
+            status: row.status,
+            status_date: row.status_date,
+            loa_until: row.loa_until ? new Date(row.loa_until) : undefined,
+            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 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);
+}
+
+export async function getMemberSettings(id: number): Promise<memberSettings> {
+    const sql = `SELECT * FROM view_member_settings WHERE id = ?`;
+    let out: memberSettings[] = await pool.query(sql, [id]);
+
+    if (out.length != 1)
+        throw new Error("Could not get user settings");
+
+    return out[0];
+}
+
+export async function setUserSettings(id: number, settings: memberSettings) {
+    const sql = `UPDATE view_member_settings SET
+                displayName = ?
+                WHERE id = ?;`;
+    let result = await pool.query(sql, [settings.displayName, id])
+}
+
+export async function getMembersLite(ids: number[]): Promise<MemberLight[]> {
+    const sql = `SELECT m.member_id AS id,
+                  m.member_name AS username,
+                  m.displayName,
+                  u.color
+              FROM view_member_rank_unit_status_latest m
+                  LEFT JOIN units u ON u.name = m.unit
+              WHERE member_id IN (?);`;
+    const res: MemberLight[] = await pool.query(sql, [ids]);
+    return res;
+}
+
+export async function getAllMembersLite(activeOnly: boolean): Promise<MemberLight[]> {
+
+    const filter = activeOnly ? `\nWHERE member_state = ${MemberState.Member}` : ''
+    const sql = `SELECT m.member_id AS id,
+                  m.member_name AS username,
+                  m.displayName,
+                  u.color
+              FROM view_member_rank_unit_status_latest m
+                  LEFT JOIN units u ON u.name = m.unit ${filter};`;
+    console.log(sql);
+    const res: MemberLight[] = await pool.query(sql);
+    return res;
+}
+
+export async function getMembersFull(ids: number[]): Promise<MemberCardDetails[]> {
+    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
+    WHERE m.member_id IN (?);
+  `;
+
+    const rows: any[] = await pool.query(sql, [ids]);
+
+    return rows.map(row => {
+        const member: Member = {
+            member_id: row.member_id,
+            member_name: row.member_name,
+            displayName: row.displayName,
+            rank: row.rank,
+            rank_date: row.rank_date,
+            unit: row.unit,
+            unit_date: row.unit_date,
+            status: row.status,
+            status_date: row.status_date,
+            loa_until: row.loa_until ? new Date(row.loa_until) : undefined,
+        };
+        // roles comes as array of strings; parse each one
+        const roles: Role[] = row.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;
+}
+
+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

@@ -0,0 +1,119 @@
+import { BatchPromotion, BatchPromotionMember } from "@app/shared/schemas/promotionSchema";
+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(
+        'SELECT id, name, short_name, sort_id FROM ranks;'
+    );
+    return rows;
+}
+
+export async function getRankByName(name: string) {
+    const rows = await pool.query(`SELECT id, name, short_name, sort_id FROM ranks WHERE name = ?`, [name]);
+
+    if (rows.length === 0)
+        throw new Error("Could not find rank: " + name);
+
+    return rows[0];
+}
+
+export async function insertMemberRank(member_id: number, rank_id: number, date: Date): Promise<void>;
+export async function insertMemberRank(member_id: number, rank_id: number): Promise<void>;
+
+export async function insertMemberRank(member_id: number, rank_id: number, date?: Date): Promise<void> {
+    const sql = date
+        ? `INSERT INTO members_ranks (member_id, rank_id, start_date) VALUES (?, ?, ?);`
+        : `INSERT INTO members_ranks (member_id, rank_id, start_date) VALUES (?, ?, NOW());`;
+
+    const params = date
+        ? [member_id, rank_id, date]
+        : [member_id, rank_id];
+
+    await pool.query(sql, params);
+}
+
+
+export async function batchInsertMemberRank(promos: BatchPromotionMember[], author: number, approver: number) {
+    try {
+        var con = await pool.getConnection();
+        promos.forEach(p => {
+            con.query(`CALL sp_update_member_rank(?, ?, ?, ?, ?, ?)`, [p.member_id, p.rank_id, approver, author, "Rank Change", toDateIgnoreZone(new Date(p.start_date))])
+        });
+
+        con.commit();
+        return
+    } catch (error) {
+        throw error; //pass it up
+    } finally {
+        con.release();
+    }
+}
+
+export async function getPromotionHistorySummary(page: number = 1, pageSize: number = 15): Promise<PagedData<PromotionSummary>> {
+
+    const offset = (page - 1) * pageSize;
+
+    let sql = `SELECT
+                    DATE(start_date) AS entry_day
+                FROM
+                    members_ranks
+                WHERE reason = 'Rank Change'
+                GROUP BY
+                    entry_day
+                ORDER BY
+                    entry_day DESC
+                LIMIT ? OFFSET ?;`
+
+    let promoList: PromotionSummary[] = await pool.query(sql, [pageSize, offset]) as PromotionSummary[];
+
+    let rowCount = Number((await pool.query(`SELECT
+                                                COUNT(*) AS total_grouped_days_count
+                                            FROM
+                                                (
+                                                    SELECT DISTINCT DATE(start_date)
+                                                    FROM members_ranks
+                                                    WHERE reason = 'Rank Change'
+                                                ) AS grouped_days;`))[0]);
+
+    let pageCount = rowCount / pageSize;
+
+    let output: PagedData<PromotionSummary> = { data: promoList, pagination: { page: page, pageSize: pageSize, total: rowCount, totalPages: pageCount } }
+    return output;
+}
+
+export async function getPromotionsOnDay(day: Date): Promise<PromotionDetails[]> {
+
+    const dayString = toDateTime(day);
+
+    // SQL query to fetch all records from members_unit for the specified day
+    let sql = `
+        SELECT 
+            mr.id AS promo_id,
+            mr.member_id,
+            mr.created_by_id,
+            mr.authorized_by_id,
+            r.short_name
+        FROM members_ranks AS mr
+            LEFT JOIN ranks AS r ON r.id = mr.rank_id
+        WHERE DATE(mr.start_date) = ? && mr.reason = 'Rank Change'
+        ORDER BY mr.start_date ASC;
+    `;
+
+    let batchPromotion = await pool.query(sql, [dayString]) as PromotionDetails[];
+
+    return batchPromotion;
+}
+
+export async function cancelLatestRank(userID: number, con: mariadb.Pool | mariadb.Connection = pool): Promise<boolean> {
+    try {
+        let sql = `CALL sp_end_member_rank(?,NOW())`;
+        con.query(sql, [userID]);
+        return true;
+    } catch (error) {
+        throw error;
+    }
+}

api/src/services/db/rolesService.ts

@@ -0,0 +1,65 @@
+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) {
+    try {
+        const sql = `INSERT INTO members_roles (member_id, role_id) VALUES (?, ?);`;
+        const params = [userID, roleID];
+
+        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) {
+    const sql = `INSERT INTO roles (name, color, description) VALUES (?, ?, ?)`;
+    const params = [name, color, description];
+
+    const result = await pool.query(sql, params);
+    return { id: result.insertId, name, color, description };
+}
+
+export async function getUserRoles(userID: number): Promise<Role[]> {
+    const sql = `SELECT r.id, r.name
+        FROM members_roles mr
+        INNER JOIN roles r ON mr.role_id = r.id
+        WHERE mr.member_id = ?;`;
+
+    return await pool.query(sql, [userID]);
+}
+
+export async function getRole(id: number): Promise<Role> {
+    let res = await pool.query(`SELECT * FROM roles WHERE id = ?`, [id])
+    return res[0] as Role;
+}
+
+export async function getAllRoles(): Promise<RoleSummary> {
+    return await pool.query(`SELECT id, name, color FROM roles`);
+}
+
+export async function getUsersWithRole(roleId: number): Promise<MemberLight[]> {
+    const out = await pool.query(
+        `
+    SELECT
+      m.member_id   AS id,
+      m.member_name AS username,
+      m.displayName,
+      u.color
+    FROM members_roles mr
+    JOIN view_member_rank_unit_status_latest m
+      ON m.member_id = mr.member_id
+    LEFT JOIN units u
+      ON u.name = m.unit
+    WHERE mr.role_id = ?
+    `,
+        [roleId]
+    )
+
+    return out as MemberLight[]
+}

api/src/services/db/statusService.ts

@@ -1,4 +1,4 @@
-import pool from "../db"
+import pool from "../../db"
 
 export async function assignUserToStatus(userID: number, statusID: number) {
     const sql = `INSERT INTO members_statuses (member_id, status_id, start_date) VALUES (?, ?, NOW())`

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;
+    }
+}

api/src/services/events/eventBus.ts

@@ -0,0 +1,56 @@
+import { randomUUID } from "crypto";
+import { logger } from "../logging/logger";
+
+interface Event {
+    id: string
+    type: string
+    occurredAt: string
+    payload?: Record<string, any>
+}
+
+type EventHandler = (event: Event) => void | Promise<void>;
+
+class EventBus {
+    private handlers: Map<string, EventHandler[]> = new Map();
+
+    /**
+     * Register event listener
+     * @param type 
+     * @param handler 
+     */
+    on(type: string, handler: EventHandler) {
+        const handlers = this.handlers.get(type) ?? [];
+        handlers.push(handler);
+        this.handlers.set(type, handlers);
+    }
+
+    /**
+     * Emit event of given type
+     * @param type
+     * @param payload 
+     */
+    async emit(type: string, payload?: Record<string, any>) {
+        const event: Event = {
+            id: randomUUID(),
+            type,
+            occurredAt: new Date().toISOString(),
+            payload
+        }
+
+        const handlers = this.handlers.get(type) ?? []
+
+        for (const h of handlers) {
+            try {
+                await h(event)
+            } catch (error) {
+                logger.error('app', 'Event handler failed', {
+                    type: event.type,
+                    id: event.id,
+                    error: error instanceof Error ? error.message : String(error),
+                })
+            }
+        }
+    }
+}
+
+export const bus = new EventBus();

api/src/services/integrations/discord.ts

@@ -0,0 +1,39 @@
+import { bus } from "../events/eventBus";
+import { logger } from "../logging/logger";
+
+export function initializeDiscordIntegrations() {
+    bus.on('application.create', async (event) => {
+
+        if (!process.env.DISCORD_APPLICATIONS_WEBHOOK) {
+            logger.error("app", 'Discord Applications Webhook is not defined')
+            return;
+        }
+
+        let applicantName = event.payload.member_discord_id || event.payload.member_name;
+        if (event.payload.member_discord_id) {
+            applicantName = `<@${event.payload.member_discord_id}>`;
+        }
+        const link = `${process.env.CLIENT_URL}/administration/applications/${event.payload.application}`;
+
+        const embed = {
+            title: "Application Posted",
+            description: `[View Application](${link})`,
+            color: 0x00ff00, // optional: green color
+            timestamp: new Date().toISOString(), // <-- Discord expects ISO8601
+            fields: [
+                {
+                    name: "Submitted By",
+                    value: applicantName,
+                    inline: false,
+                },
+            ],
+        };
+
+        // send to Discord webhook
+        await fetch(process.env.DISCORD_APPLICATIONS_WEBHOOK!, {
+            method: 'POST',
+            headers: { 'Content-Type': 'application/json' },
+            body: JSON.stringify({ embeds: [embed] }),
+        });
+    });
+}

api/src/services/logging/auditLog.ts

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

api/src/services/logging/logger.ts

@@ -0,0 +1,72 @@
+export type LogLevel = 'debug' | 'info' | 'warn' | 'error';
+export type LogDepth = 'normal' | 'verbose' | 'profiling';
+export type LogType = 'http' | 'app' | 'auth' | 'profiling' | 'audit';
+
+export interface LogHeader {
+    timestamp: string;
+    level: LogLevel;
+    depth: LogDepth;
+    type: LogType; // 'http', 'app', 'db', etc.
+    user_id?: number;
+}
+
+export interface LogPayload {
+    message?: string;              // short human-friendly description
+    data?: Record<string, any>;    // type-specific rich data
+}
+
+// Environment defaults
+const CURRENT_DEPTH: LogDepth = (process.env.LOG_DEPTH as LogDepth) || 'normal';
+
+const DEPTH_ORDER: Record<LogDepth, number> = { normal: 0, verbose: 1, profiling: 2 };
+
+function shouldLog(depth: LogDepth) {
+    let should = DEPTH_ORDER[depth] <= DEPTH_ORDER[CURRENT_DEPTH]
+    return should;
+}
+
+function emitLog(header: LogHeader, payload: LogPayload = {}) {
+    if (!shouldLog(header.depth)) return;
+
+    const logLine = { ...header, ...payload };
+
+    if (header.level === 'error')
+        console.error(JSON.stringify(logLine))
+    else
+        console.log(JSON.stringify(logLine));
+}
+
+export const logger = {
+    log(level: LogLevel, type: LogType, message: string, data?: Record<string, any>, depth: LogDepth = 'normal', context?: Partial<LogHeader>) {
+        const header: LogHeader = {
+            timestamp: new Date().toISOString(),
+            level,
+            depth,
+            type,
+            ...context,
+        };
+
+        const payload: LogPayload = {
+            message,
+            data,
+        };
+
+        emitLog(header, payload);
+    },
+
+    info(type: LogType, message: string, data?: Record<string, any>, depth: LogDepth = 'normal', context?: Partial<LogHeader>) {
+        this.log('info', type, message, data, depth, context);
+    },
+
+    debug(type: LogType, message: string, data?: Record<string, any>, depth: LogDepth = 'normal', context?: Partial<LogHeader>) {
+        this.log('debug', type, message, data, depth, context);
+    },
+
+    warn(type: LogType, message: string, data?: Record<string, any>, depth: LogDepth = 'normal', context?: Partial<LogHeader>) {
+        this.log('warn', type, message, data, depth, context);
+    },
+
+    error(type: LogType, message: string, data?: Record<string, any>, depth: LogDepth = 'normal', context?: Partial<LogHeader>) {
+        this.log('error', type, message, data, depth, context);
+    },
+}

api/src/services/memberService.ts

@@ -1,73 +0,0 @@
-import pool from "../db";
-import { Member, MemberLight, memberSettings, MemberState } from '@app/shared/types/member'
-
-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) {
-  const sql = `UPDATE members
-        SET state = ?
-        WHERE id = ?;`;
-  return await pool.query(sql, [state, userID]);
-}
-
-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);
-}
-
-export async function getMemberSettings(id: number): Promise<memberSettings> {
-  const sql = `SELECT * FROM view_member_settings WHERE id = ?`;
-  let out: memberSettings[] = await pool.query(sql, [id]);
-
-  if (out.length != 1)
-    throw new Error("Could not get user settings");
-
-  return out[0];
-}
-
-export async function setUserSettings(id: number, settings: memberSettings) {
-  const sql = `UPDATE view_member_settings SET
-                displayName = ?
-                WHERE id = ?;`;
-  let result = await pool.query(sql, [settings.displayName, id])
-}
-
-export async function getMembersLite(ids: number[]): Promise<MemberLight[]> {
-  const sql = `SELECT m.member_id AS id,
-                  m.member_name AS username,
-                  m.displayName,
-                  u.color
-              FROM view_member_rank_unit_status_latest m
-                  LEFT JOIN units u ON u.name = m.unit
-              WHERE member_id IN (?);`;
-  const res: MemberLight[] = await pool.query(sql, [ids]);
-  return res;
-}
-
-export async function getAllMembersLite(): Promise<MemberLight[]> {
-  const sql = `SELECT m.member_id AS id,
-                  m.member_name AS username,
-                  m.displayName,
-                  u.color
-              FROM view_member_rank_unit_status_latest m
-                  LEFT JOIN units u ON u.name = m.unit;`;
-
-  const res: MemberLight[] = await pool.query(sql);
-  return res;
-}
-
-export async function getMembersFull(ids: number[]): Promise<Member[]> {
-  const sql = `SELECT * FROM view_member_rank_unit_status_latest WHERE member_id IN (?);`;
-  const res: Member[] = await pool.query(sql, [ids]);
-  return res;
-}
-
-export async function mapDiscordtoID(id: number): Promise<number | null> {
-  const sql = `SELECT id FROM members WHERE discord_id = ?;`
-  let res = await pool.query(sql, [id]);
-  return res.length > 0 ? res[0].id : null;
-}

api/src/services/rankService.ts

@@ -1,32 +0,0 @@
-import pool from "../db";
-
-export async function getAllRanks() {
-    const rows = await pool.query(
-        'SELECT id, name, short_name, sort_id FROM ranks;'
-    );
-    return rows;
-}
-
-export async function getRankByName(name: string) {
-    const rows = await pool.query(`SELECT id, name, short_name, sort_id FROM ranks WHERE name = ?`, [name]);
-
-    if (rows.length === 0)
-        throw new Error("Could not find rank: " + name);
-
-    return rows[0];
-}
-
-export async function insertMemberRank(member_id: number, rank_id: number, date: Date): Promise<void>;
-export async function insertMemberRank(member_id: number, rank_id: number): Promise<void>;
-
-export async function insertMemberRank(member_id: number, rank_id: number, date?: Date): Promise<void> {
-    const sql = date
-        ? `INSERT INTO members_ranks (member_id, rank_id, start_date) VALUES (?, ?, ?);`
-        : `INSERT INTO members_ranks (member_id, rank_id, start_date) VALUES (?, ?, NOW());`;
-
-    const params = date
-        ? [member_id, rank_id, date]
-        : [member_id, rank_id];
-
-    await pool.query(sql, params);
-}

api/src/services/rolesService.ts

@@ -1,27 +0,0 @@
-import pool from '../db';
-import { Role } from '@app/shared/types/roles'
-
-export async function assignUserGroup(userID: number, roleID: number) {
-
-    const sql = `INSERT INTO members_roles (member_id, role_id) VALUES (?, ?);`;
-    const params = [userID, roleID];
-
-    return await pool.query(sql, params);
-}
-
-export async function createGroup(name: string, color: string, description: string) {
-    const sql = `INSERT INTO roles (name, color, description) VALUES (?, ?, ?)`;
-    const params = [name, color, description];
-
-    const result = await pool.query(sql, params);
-    return { id: result.insertId, name, color, description };
-}
-
-export async function getUserRoles(userID: number): Promise<Role[]> {
-    const sql = `SELECT r.id, r.name
-        FROM members_roles mr
-        INNER JOIN roles r ON mr.role_id = r.id
-        WHERE mr.member_id = ?;`;
-
-    return await pool.query(sql, [userID]);
-}

api/tsconfig.json

@@ -7,6 +7,7 @@
       "node",
       "express"
     ],
+    "sourceMap": true,
     "paths": {
       "@app/shared/*": ["../shared/*"]
     }

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/schemas/modRequest.ts

@@ -0,0 +1,24 @@
+import { z } from 'zod';
+
+export const ModRequestSchema = z.object({
+    // Basic Info
+    mod_title: z.string().min(1),
+    description: z.string().min(1),
+    mod_link: z.string().min(1),
+
+    // Consolidated Testing
+    confirmed_tested: z.boolean().refine(val => val === true, {
+        message: "You must confirm that you have tested this mod before submitting"
+    }),
+
+    // Vetting
+    reason: z.string().min(1),
+
+    // Compatibility & Technical
+    detrimental_effects: z.string().min(1),
+    keybind_conflicts: z.string(),
+
+    special_considerations: z.string().optional()
+});
+
+export type ModRequest = z.infer<typeof ModRequestSchema>;

shared/schemas/promotionSchema.ts

@@ -0,0 +1,32 @@
+import { z } from "zod";
+
+export const batchPromotionMemberSchema = z.object({
+    member_id: z.number({ invalid_type_error: "Must select a member" }).int().positive(),
+    rank_id: z.number({ invalid_type_error: "Must select a rank" }).int().positive(),
+    start_date: z.string().refine((val) => !isNaN(Date.parse(val)), {
+        message: "Must be a valid date",
+    }),
+});
+
+export const batchPromotionSchema = z.object({
+    promotions: z.array(batchPromotionMemberSchema, { message: "At least one promotion is required" }).nonempty({ message: "At least one promotion is required" }),
+    approver: z.number({ invalid_type_error: "Must select a member" }).int().positive()
+})
+    .superRefine((data, ctx) => {
+        // optional: check for duplicate member_ids
+        const memberCounts = new Map<number, number>();
+        data.promotions.forEach((p, index) => {
+            memberCounts.set(p.member_id, (memberCounts.get(p.member_id) ?? 0) + 1);
+            if (memberCounts.get(p.member_id)! > 1) {
+                ctx.addIssue({
+                    code: z.ZodIssueCode.custom,
+                    path: ["promotions", index, "member_id"],
+                    message: "Duplicate member in batch is not allowed",
+                });
+            }
+        });
+    });
+
+
+export type BatchPromotion = z.infer<typeof batchPromotionSchema>;
+export type BatchPromotionMember = z.infer<typeof batchPromotionMemberSchema>;

shared/types/discussion.ts

@@ -0,0 +1,24 @@
+export interface DiscussionPost<T = any> {
+    id: number;
+    type: string;
+    poster_id: number;
+    poster_name?: string;
+    title: string;
+    content: T;
+    created_at: Date;
+    updated_at: Date;
+    is_deleted: boolean;
+    is_locked: boolean;
+    is_open: boolean;
+    comments?: DiscussionComment[];
+}
+
+export interface DiscussionComment {
+    id?: number;
+    post_id: number;
+    poster_id?: number;
+    content: string;
+    created_at?: Date;
+    updated_at?: Date;
+    is_deleted?: boolean;
+}

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",
+    Guest = 1,
-    Applicant = "applicant",
+    Applicant = 2,
-    Member = "member",
+    Member = 3,
-    Retired = "retired",
+    Retired = 4,
-    Banned = "banned",
+    Discharged = 5,
-    Denied = "denied"
+    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 {
@@ -34,6 +40,11 @@ export interface MemberLight {
     color: string
 }
 
+export interface MemberCardDetails {
+    member: Member;
+    roles: Role[];
+}
+
 export interface myData {
     member: Member;
     LOAs: LOARequest[];

shared/types/rank.ts

@@ -0,0 +1,19 @@
+export type Rank = {
+  id: number
+  name: string
+  short_name: string
+  category: string
+  sortOrder: number
+}
+
+export interface PromotionSummary {
+  entry_day: Date;
+}
+
+export interface PromotionDetails {
+  promo_id: number;
+  member_id: number;
+  short_name: string;
+  created_by_id: number;
+  authorized_by_id: number;
+}

shared/types/roles.ts

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

shared/types/units.ts

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

shared/utils/time.ts

@@ -3,12 +3,34 @@ export function toDateTime(date: Date): string {
         date = new Date(date);
     }
     // This produces a CST-local time because server runs in CST
-    const year   = date.getFullYear();
+    const year = date.getFullYear();
-    const month  = (date.getMonth() + 1).toString().padStart(2, "0");
+    const month = (date.getMonth() + 1).toString().padStart(2, "0");
-    const day    = date.getDate().toString().padStart(2, "0");
+    const day = date.getDate().toString().padStart(2, "0");
-    const hour   = date.getHours().toString().padStart(2, "0");
+    const hour = date.getHours().toString().padStart(2, "0");
     const minute = date.getMinutes().toString().padStart(2, "0");
     const second = date.getSeconds().toString().padStart(2, "0");
 
     return `${year}-${month}-${day} ${hour}:${minute}:${second}`;
 }
+
+export function toDateIgnoreZone(date: Date): string {
+    if (typeof date === 'string') {
+        date = new Date(date);
+    }
+    return date.toISOString().split('T')[0];
+}
+
+export function toDate(date: Date): string {
+    if (typeof date === 'string') {
+        date = new Date(date);
+    }
+    console.log(date);
+    // This produces a CST-local date because server runs in CST
+    const year = date.getFullYear();
+    const month = (date.getMonth() + 1).toString().padStart(2, "0");
+    const day = date.getDate().toString().padStart(2, "0");
+    let out = `${year}-${month}-${day}`;
+
+    console.log(out);
+    return out;
+}

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,24 +1,27 @@
-<script setup>
+<script setup lang="ts">
-import { RouterView } from 'vue-router';
+  import { RouterView } from 'vue-router';
-import Button from './components/ui/button/Button.vue';
+  import Button from './components/ui/button/Button.vue';
-import { useUserStore } from './stores/user';
+  import { useUserStore } from './stores/user';
-import Alert from './components/ui/alert/Alert.vue';
+  import Alert from './components/ui/alert/Alert.vue';
-import AlertDescription from './components/ui/alert/AlertDescription.vue';
+  import AlertDescription from './components/ui/alert/AlertDescription.vue';
-import Navbar from './components/Navigation/Navbar.vue';
+  import Navbar from './components/Navigation/Navbar.vue';
-import { cancelLOA } from './api/loa';
+  import { cancelLOA } from './api/loa';
 
-const userStore = useUserStore();
+  const userStore = useUserStore();
 
-function formatDate(dateStr) {
+  function formatDate(dateStr) {
-  if (!dateStr) return "";
+    if (!dateStr) return "";
-  return new Date(dateStr).toLocaleDateString("en-US", {
+    return new Date(dateStr).toLocaleDateString("en-US", {
-    year: "numeric",
+      year: "numeric",
-    month: "short",
+      month: "short",
-    day: "numeric",
+      day: "numeric",
-  });
+    });
-}
+  }
 
-const environment = import.meta.env.VITE_ENVIRONMENT;
+  //@ts-ignore
+  const environment = import.meta.env.VITE_ENVIRONMENT;
+  //@ts-ignore
+  const version = import.meta.env.VITE_APPLICATION_VERSION;
 </script>
 
 <template>
@@ -28,15 +31,22 @@ const environment = import.meta.env.VITE_ENVIRONMENT;
       background-position: center;">
     <div class="sticky top-0 bg-background z-50">
       <Navbar class="flex"></Navbar>
-      <Alert v-if="environment == 'dev'" class="m-2 mx-auto w-5xl" variant="info">
+      <Alert v-if="environment == 'dev'" class="m-2 mx-auto max-w-5xl" variant="info">
-        <AlertDescription class="flex flex-row items-center text-nowrap gap-5 mx-auto">
+        <AlertDescription class="flex flex-row items-center text-wrap gap-5 mx-auto">
-          <p>This is a development build of the application. Some features will be unavailable or unstable.</p>
+          <p>Development environment (v{{ version }}). Features may be incomplete or unavailable.</p>
         </AlertDescription>
       </Alert>
-      <Alert v-if="userStore.user?.LOAs?.[0]" class="m-2 mx-auto w-5xl" variant="info">
+      <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 ||
+          <p
-            userStore.user?.LOAs?.[0].end_date) }}</strong></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>
@@ -47,5 +57,3 @@ const environment = import.meta.env.VITE_ENVIRONMENT;
     <RouterView class="flex-1 min-h-0"></RouterView>
   </div>
 </template>
-
-<style scoped></style>

ui/src/api/discussion.ts

@@ -0,0 +1,36 @@
+import { DiscussionComment } from "@shared/types/discussion";
+
+//@ts-expect-error
+const addr = import.meta.env.VITE_APIHOST;
+
+export async function postComment(comment: DiscussionComment) {
+    const res = await fetch(`${addr}/discussions/comment`, {
+        method: "POST",
+        headers: {
+            "Content-Type": "application/json",
+        },
+        body: JSON.stringify(comment),
+        credentials: 'include',
+    });
+
+    if (res.ok) {
+        return;
+    } else {
+        throw new Error("Failed to submit LOA");
+    }
+}
+
+export async function getPostComments(postId: number): Promise<DiscussionComment[]> {
+    const res = await fetch(`${addr}/discussions/${postId}/comments`, {
+        method: "GET",
+        headers: {
+            "Content-Type": "application/json",
+        },
+        credentials: 'include',
+    });
+    if (!res.ok) {
+        throw new Error("Failed to fetch comments");
+    }
+    return res.json();
+}
+

ui/src/api/loa.ts

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

ui/src/api/member.ts

@@ -1,4 +1,5 @@
-import { memberSettings, Member, MemberLight } 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'
@@ -38,8 +66,8 @@ export async function setMemberSettings(settings: memberSettings) {
     return;
 }
 
-export async function getAllLightMembers(): Promise<MemberLight[]> {
+export async function getAllLightMembers(activeOnly: boolean = true): Promise<MemberLight[]> {
-    const response = await fetch(`${addr}/members/lite`, {
+    const response = await fetch(`${addr}/members/lite${activeOnly ? '?active=true' : '?active=false'}`, {
         credentials: 'include',
         headers: {
             "Content-Type": "application/json",
@@ -71,7 +99,7 @@ export async function getLightMembers(ids: number[]): Promise<MemberLight[]> {
     return response.json();
 }
 
-export async function getFullMembers(ids: number[]): Promise<Member[]> {
+export async function getFullMembers(ids: number[]): Promise<MemberCardDetails[]> {
 
     if (ids.length === 0) return [];
 
@@ -88,3 +116,45 @@ export async function getFullMembers(ids: number[]): Promise<Member[]> {
     }
     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/modRequests.ts

@@ -0,0 +1,72 @@
+import { ModRequest } from "@shared/schemas/modRequest";
+import { DiscussionPost } from "@shared/types/discussion";
+import { PagedData } from "@shared/types/pagination";
+
+//@ts-expect-error
+const addr = import.meta.env.VITE_APIHOST;
+
+export async function getModRequests(page?: number, pageSize?: number): Promise<PagedData<DiscussionPost<ModRequest>>> {
+    const params = new URLSearchParams();
+
+    if (page !== undefined) {
+        params.set("page", page.toString());
+    }
+
+    if (pageSize !== undefined) {
+        params.set("pageSize", pageSize.toString());
+    }
+
+    return fetch(`${addr}/mod-request?${params}`, {
+        method: "GET",
+        headers: {
+            "Content-Type": "application/json",
+        },
+        credentials: 'include',
+    }).then((res) => {
+        if (res.ok) {
+            return res.json();
+        } else {
+            return [];
+        }
+    });
+}
+
+/**
+ * Posts a new mod request to the server
+ * @param data Form data
+ * @returns Numerical ID of the new post
+ */
+export async function postModRequest(data: ModRequest): Promise<Number> {
+    return fetch(`${addr}/mod-request`, {
+        method: "POST",
+        headers: {
+            "Content-Type": "application/json",
+        },
+        credentials: 'include',
+        body: JSON.stringify(data)
+    }).then((res) => {
+        if (res.ok) {
+            return res.text().then((id) => Number(id));
+        } else {
+            throw new Error("Failed to post mod request");
+        }
+    });
+}
+
+/**
+ * Retrieve a single mod request by its discussion post ID
+ * @param id numeric post id
+ */
+export async function getModRequest(id: number): Promise<DiscussionPost<ModRequest>> {
+    const res = await fetch(`${addr}/mod-request/${id}`, {
+        method: 'GET',
+        headers: {
+            'Content-Type': 'application/json',
+        },
+        credentials: 'include',
+    });
+    if (!res.ok) {
+        throw new Error(`Failed to fetch mod request ${id}`);
+    }
+    return res.json();
+}

ui/src/api/rank.ts

@@ -1,38 +1,73 @@
-export type Rank = {
+import { BatchPromotion, BatchPromotionMember } from '@shared/schemas/promotionSchema';
-  id: number
+import { PagedData } from '@shared/types/pagination';
-  name: string
+import { PromotionDetails, PromotionSummary, Rank } from '@shared/types/rank'
-  short_name: string
-  sortOrder: number
-}
 
 //  @ts-ignore
 const addr = import.meta.env.VITE_APIHOST;
 
-export async function getRanks(): Promise<Rank[]> {
+export async function getAllRanks(): Promise<Rank[]> {
-  const res = await fetch(`${addr}/ranks`)
+    const res = await fetch(`${addr}/ranks`, {
-
+        credentials: 'include'
-  if (res.ok) {
+    })
-    return res.json()
-  } else {
-    console.error("Something went wrong approving the application")
-  }
 
+    if (res.ok) {
+        return res.json()
+    } else {
+        console.error("Something went wrong approving the application")
+    }
 }
 
-// Placeholder: submit a rank change
+export async function submitRankChange(promo: BatchPromotion) {
-export async function submitRankChange(member_id: number, rank_id: number, date: string): Promise<{ ok: boolean }> {
+    const res = await fetch(`${addr}/memberRanks`, {
-  const res = await fetch(`${addr}/memberRanks`, {
+        method: "POST",
-    method: "POST",
+        headers: {
-    headers: {
+            "Content-Type": "application/json",
-      "Content-Type": "application/json",
+        },
-    },
+        credentials: 'include',
-    body: JSON.stringify({ change: { member_id, rank_id, date } }),
+        body: JSON.stringify(promo),
-  })
+    })
 
-  if (res.ok) {
+    if (res.ok) {
-    return { ok: true }
+        return
-  } else {
+    } else {
-    console.error("Failed to submit rank change")
+        throw new Error("Failed to submit rank change: Server error");
-    return { ok: false }
+    }
-  }
+}
+
+export async function getPromoHistory(page?: number, pageSize?: number): Promise<PagedData<PromotionSummary>> {
+    const params = new URLSearchParams();
+
+    if (page !== undefined) {
+        params.set("page", page.toString());
+    }
+
+    if (pageSize !== undefined) {
+        params.set("pageSize", pageSize.toString());
+    }
+
+    return fetch(`${addr}/memberRanks?${params}`, {
+        method: "GET",
+        headers: {
+            "Content-Type": "application/json",
+        },
+        credentials: 'include',
+    }).then((res) => {
+        if (res.ok) {
+            return res.json();
+        } else {
+            return [];
+        }
+    });
+}
+
+export async function getPromotionsOnDay(day: Date): Promise<PromotionDetails[]> {
+    const res = await fetch(`${addr}/memberRanks/${day.toISOString()}`, {
+        credentials: 'include',
+    })
+
+    if (res.ok) {
+        return await res.json();
+    } else {
+        throw new Error("Failed to submit rank change: Server error");
+    }
 }

ui/src/api/roles.ts

@@ -1,10 +1,5 @@
-export type Role = {
+import { Member, MemberLight } from "@shared/types/member";
-    id: number;
+import { Role } from "@shared/types/roles";
-    name: string;
-    color: string;
-    description: string | null;
-    members: any[];
-};
 
 //  @ts-ignore
 const addr = import.meta.env.VITE_APIHOST;
@@ -22,6 +17,30 @@ export async function getRoles(): Promise<Role[]> {
     }
 }
 
+export async function getRoleDetails(id: number): Promise<Role> {
+    const res = await fetch(`${addr}/roles/${id}`, {
+        credentials: 'include',
+    })
+
+    if (res.ok) {
+        return res.json() as Promise<Role>;
+    } else {
+        throw new Error("Could not load role");
+    }
+}
+
+export async function getRoleMembers(id: number): Promise<MemberLight[]> {
+    const res = await fetch(`${addr}/roles/${id}/members`, {
+        credentials: 'include',
+    })
+
+    if (res.ok) {
+        return res.json();
+    } else {
+        throw new Error("Could not load members");
+    }
+}
+
 export async function createRole(name: string, color: string, description: string | null): Promise<Role | null> {
     const res = await fetch(`${addr}/roles`, {
         method: "POST",

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

@@ -1,45 +1,46 @@
 <script setup lang="ts">
-import { RouterLink } from 'vue-router';
+    import { RouterLink } from 'vue-router';
-import Separator from '../ui/separator/Separator.vue';
+    import Separator from '../ui/separator/Separator.vue';
-import { Popover, PopoverContent, PopoverTrigger } from '../ui/popover';
+    import { Popover, PopoverContent, PopoverTrigger } from '../ui/popover';
-import {
+    import {
-    DropdownMenu,
+        DropdownMenu,
-    DropdownMenuContent,
+        DropdownMenuContent,
-    DropdownMenuItem,
+        DropdownMenuItem,
-    DropdownMenuTrigger,
+        DropdownMenuTrigger,
-} from '../ui/dropdown-menu';
+    } from '../ui/dropdown-menu';
-import { useUserStore } from '@/stores/user';
+    import { useUserStore } from '@/stores/user';
-import Button from '../ui/button/Button.vue';
+    import Button from '../ui/button/Button.vue';
-import NavigationMenu from '../ui/navigation-menu/NavigationMenu.vue';
+    import NavigationMenu from '../ui/navigation-menu/NavigationMenu.vue';
-import NavigationMenuList from '../ui/navigation-menu/NavigationMenuList.vue';
+    import NavigationMenuList from '../ui/navigation-menu/NavigationMenuList.vue';
-import NavigationMenuItem from '../ui/navigation-menu/NavigationMenuItem.vue';
+    import NavigationMenuItem from '../ui/navigation-menu/NavigationMenuItem.vue';
-import NavigationMenuLink from '../ui/navigation-menu/NavigationMenuLink.vue';
+    import NavigationMenuLink from '../ui/navigation-menu/NavigationMenuLink.vue';
-import NavigationMenuTrigger from '../ui/navigation-menu/NavigationMenuTrigger.vue';
+    import NavigationMenuTrigger from '../ui/navigation-menu/NavigationMenuTrigger.vue';
-import NavigationMenuContent from '../ui/navigation-menu/NavigationMenuContent.vue';
+    import NavigationMenuContent from '../ui/navigation-menu/NavigationMenuContent.vue';
-import { navigationMenuTriggerStyle } from '../ui/navigation-menu/'
+    import { navigationMenuTriggerStyle } from '../ui/navigation-menu/'
-import { useAuth } from '@/composables/useAuth';
+    import { useAuth } from '@/composables/useAuth';
-import { ArrowUpRight, CircleArrowOutUpRight } from 'lucide-vue-next';
+    import { ArrowUpRight, CircleArrowOutUpRight } from 'lucide-vue-next';
-import DropdownMenuGroup from '../ui/dropdown-menu/DropdownMenuGroup.vue';
+    import DropdownMenuGroup from '../ui/dropdown-menu/DropdownMenuGroup.vue';
-import DropdownMenuSeparator from '../ui/dropdown-menu/DropdownMenuSeparator.vue';
+    import DropdownMenuSeparator from '../ui/dropdown-menu/DropdownMenuSeparator.vue';
+    import { MemberState } from '@shared/types/member';
 
-const userStore = useUserStore();
+    const userStore = useUserStore();
-const auth = useAuth();
+    const auth = useAuth();
 
-//@ts-ignore
+    //@ts-ignore
-const APIHOST = import.meta.env.VITE_APIHOST;
+    const APIHOST = import.meta.env.VITE_APIHOST;
-//@ts-ignore
+    //@ts-ignore
-const DOCHOST = import.meta.env.VITE_DOCHOST;
+    const DOCHOST = import.meta.env.VITE_DOCHOST;
 
-async function logout() {
+    async function logout() {
-    userStore.user = null;
+        userStore.user = null;
-    window.location.href = APIHOST + "/logout";
+        window.location.href = APIHOST + "/logout";
-}
+    }
 
-function blurAfter() {
+    function blurAfter() {
-    requestAnimationFrame(() => {
+        requestAnimationFrame(() => {
-        (document.activeElement as HTMLElement)?.blur();
+            (document.activeElement as HTMLElement)?.blur();
-    });
+        });
-}
+    }
 </script>
 
 <template>
@@ -51,7 +52,8 @@ 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">
 
@@ -100,6 +102,19 @@ function blurAfter() {
                                 </NavigationMenuContent>
                             </NavigationMenuItem>
 
+                            <!-- Discussions (Dropdown) -->
+                            <NavigationMenuItem class="bg-none !focus:bg-none !active:bg-none">
+                                <NavigationMenuTrigger>Discussions</NavigationMenuTrigger>
+                                <NavigationMenuContent
+                                    class="grid gap-1 p-2 text-left [&_a]:w-full [&_a]:block [&_a]:whitespace-nowrap *:bg-transparent">
+                                    <NavigationMenuLink as-child :class="navigationMenuTriggerStyle()">
+                                        <RouterLink to="/discussions/mod-requests" @click="blurAfter">
+                                            Mod Requests
+                                        </RouterLink>
+                                    </NavigationMenuLink>
+                                </NavigationMenuContent>
+                            </NavigationMenuItem>
+
                             <!-- Administration (Dropdown) -->
                             <NavigationMenuItem
                                 v-if="auth.hasAnyRole(['17th Administrator', '17th HQ', '17th Command', 'Recruiter'])">
@@ -123,13 +138,13 @@ function blurAfter() {
                                         </RouterLink>
                                     </NavigationMenuLink>
 
-                                    <!-- <NavigationMenuLink
+                                    <NavigationMenuLink
                                         v-if="auth.hasAnyRole(['17th Administrator', '17th HQ', '17th Command'])"
                                         as-child :class="navigationMenuTriggerStyle()">
-                                        <RouterLink to="/administration/transfer" @click="blurAfter">
+                                        <RouterLink to="/administration/rankChange" @click="blurAfter">
-                                            Transfer Requests
+                                            Promotions
                                         </RouterLink>
-                                    </NavigationMenuLink> -->
+                                    </NavigationMenuLink>
 
                                     <NavigationMenuLink v-if="auth.hasRole('Recruiter')" as-child
                                         :class="navigationMenuTriggerStyle()">
@@ -138,6 +153,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 +167,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,
+  Field,
-  FormDescription,
+  FieldContent,
-  FormField,
+  FieldDescription,
-  FormItem,
+  FieldGroup,
-  FormLabel,
+  FieldLabel,
-  FormMessage,
+} from '@/components/ui/field'
-} from '@/components/ui/form'
+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';
@@ -33,7 +33,7 @@ const regexB = /^https?:\/\/steamcommunity\.com\/profiles\/\d+\/?$/;
 const formSchema = toTypedSchema(z.object({
   dob: z.string().refine(v => v, { message: "A date of birth is required." }),
   name: z.string().nonempty(),
-  playtime: z.preprocess((v) => (v === "" ? undefined : String(v)),z.string({ required_error: "Required" }).regex(/^\d+(\.\d+)?$/, "Must be a number").transform(Number).refine((n) => n >= 0, "Cannot be less than 0")),
+  playtime: z.preprocess((v) => (v === "" ? undefined : String(v)), z.string({ required_error: "Required" }).regex(/^\d+(\.\d+)?$/, "Must be a number").transform(Number).refine((n) => n >= 0, "Cannot be less than 0")),
   hobbies: z.string().nonempty(),
   military: z.boolean(),
   communities: z.string().nonempty(),
@@ -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,221 +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);
+
+  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"
+  <form v-if="initialValues" @submit.prevent="submitForm" class="space-y-6">
-    class="space-y-6">
     <!-- Age -->
-    <FormField name="dob" v-slot="{ value, handleChange }">
+    <VeeField name="dob" v-slot="{ field, errors }">
-      <FormItem>
+      <Field>
-        <FormLabel>What is your date of birth?</FormLabel>
+        <FieldLabel>What is your date of birth?</FieldLabel>
-        <FormControl>
+        <FieldContent>
-          <DateInput :model-value="(value as string) ?? ''" :disabled="readOnly" @update:model-value="handleChange" />
+          <div class="flex items-center gap-10">
-        </FormControl>
+            <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>
+      </Field>
-    </FormField>
+    </VeeField>
 
     <!-- Name -->
-    <FormField name="name" v-slot="{ value, handleChange }">
+    <VeeField name="name" v-slot="{ field, errors }">
-      <FormItem>
+      <Field>
-        <FormLabel>What name will you be going by within the community?</FormLabel>
+        <FieldLabel>What name will you be going by within the community?</FieldLabel>
-        <FormDescription>This name must be consistent across platforms.</FormDescription>
+        <FieldDescription>This name must be consistent across platforms.</FieldDescription>
-        <FormControl>
+        <FieldContent>
-          <Input :model-value="value" @update:model-value="handleChange" :disabled="readOnly" />
+          <Input :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>
+      </Field>
-    </FormField>
+    </VeeField>
 
     <!-- Playtime -->
-    <FormField name="playtime" v-slot="{ value, handleChange }">
+    <VeeField name="playtime" v-slot="{ field, errors }">
-      <FormItem>
+      <Field>
-        <FormLabel>How long have you played Arma 3 for (in hours)?</FormLabel>
+        <FieldLabel>How long have you played Arma 3 for (in hours)?</FieldLabel>
-        <FormControl>
+        <FieldContent>
-          <Input type="number" :model-value="value" @update:model-value="handleChange" :disabled="readOnly" />
+          <Input type="number" :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>
+      </Field>
-    </FormField>
+    </VeeField>
 
     <!-- Hobbies -->
-    <FormField name="hobbies" v-slot="{ value, handleChange }">
+    <VeeField name="hobbies" v-slot="{ field, errors }">
-      <FormItem>
+      <Field>
-        <FormLabel>What hobbies do you like to participate in outside of gaming?</FormLabel>
+        <FieldLabel>What hobbies do you like to participate in outside of gaming?</FieldLabel>
-        <FormControl>
+        <FieldContent>
-          <Textarea rows="4" class="resize-none" :model-value="value" @update:model-value="handleChange"
+          <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>
+      </Field>
-    </FormField>
+    </VeeField>
 
     <!-- Military (boolean) -->
-    <FormField name="military" v-slot="{ value, handleChange }">
+    <VeeField name="military" v-slot="{ field, errors }">
-      <FormItem>
+      <Field>
-        <FormLabel>Have you ever served in the military?</FormLabel>
+        <FieldLabel>Have you ever served in the military?</FieldLabel>
-        <FormControl>
+        <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>
+      </Field>
-    </FormField>
+    </VeeField>
 
     <!-- Other communities (freeform) -->
-    <FormField name="communities" v-slot="{ value, handleChange }">
+    <VeeField name="communities" v-slot="{ field, errors }">
-      <FormItem>
+      <Field>
-        <FormLabel>Are you a part of any other communities? If so, which ones? If none, type "No"</FormLabel>
+        <FieldLabel>Are you a part of any other communities? If so, which ones? If none, type "No"</FieldLabel>
-        <FormControl>
+        <FieldContent>
-          <Input :model-value="value" @update:model-value="handleChange" :disabled="readOnly" />
+          <Input :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>
+      </Field>
-    </FormField>
+    </VeeField>
 
     <!-- Why join -->
-    <FormField name="joinReason" v-slot="{ value, handleChange }">
+    <VeeField name="joinReason" v-slot="{ field, errors }">
-      <FormItem>
+      <Field>
-        <FormLabel>Why do you want to join our community?</FormLabel>
+        <FieldLabel>Why do you want to join our community?</FieldLabel>
-        <FormControl>
+        <FieldContent>
-          <Textarea rows="4" class="resize-none" :model-value="value" @update:model-value="handleChange"
+          <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>
+      </Field>
-    </FormField>
+    </VeeField>
 
     <!-- Attraction to milsim -->
-    <FormField name="milsimAttraction" v-slot="{ value, handleChange }">
+    <VeeField name="milsimAttraction" v-slot="{ field, errors }">
-      <FormItem>
+      <Field>
-        <FormLabel>What attracts you to the Arma 3 milsim playstyle?</FormLabel>
+        <FieldLabel>What attracts you to the Arma 3 milsim playstyle?</FieldLabel>
-        <FormControl>
+        <FieldContent>
-          <Textarea rows="4" class="resize-none" :model-value="value" @update:model-value="handleChange"
+          <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>
+      </Field>
-    </FormField>
+    </VeeField>
 
     <!-- Referral (freeform) -->
-    <FormField name="referral" v-slot="{ value, handleChange }">
+    <VeeField name="referral" v-slot="{ field, errors }">
-      <FormItem>
+      <Field>
-        <FormLabel>Where did you hear about us? (If another member, who?)</FormLabel>
+        <FieldLabel>Where did you hear about us? (If another member, who?)</FieldLabel>
-        <FormControl>
+        <FieldContent>
-          <Input placeholder="e.g., Reddit / Member: Alice" :model-value="value" @update:model-value="handleChange"
+          <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>
+      </Field>
-    </FormField>
+    </VeeField>
 
     <!-- Steam profile -->
-    <FormField name="steamProfile" v-slot="{ value, handleChange }">
+    <VeeField name="steamProfile" v-slot="{ field, errors }">
-      <FormItem>
+      <Field>
-        <FormLabel>Steam profile link</FormLabel>
+        <FieldLabel>Steam profile link</FieldLabel>
-        <FormDescription>
+        <FieldDescription>
           Format: <code>https://steamcommunity.com/id/USER/</code> or
           <code>https://steamcommunity.com/profiles/STEAMID64/</code>
-        </FormDescription>
+        </FieldDescription>
-        <FormControl>
+        <FieldContent>
-          <Input type="url" placeholder="https://steamcommunity.com/profiles/7656119..." :model-value="value"
+          <Input type="url" placeholder="https://steamcommunity.com/profiles/7656119..." :model-value="field.value"
-            @update:model-value="handleChange" :disabled="readOnly" />
+            @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>
+      </Field>
-    </FormField>
+    </VeeField>
 
     <!-- Timezone -->
-    <FormField name="timezone" v-slot="{ value, handleChange }">
+    <VeeField name="timezone" v-slot="{ field, errors }">
-      <FormItem>
+      <Field>
-        <FormLabel>What time zone are you in?</FormLabel>
+        <FieldLabel>What time zone are you in?</FieldLabel>
-        <FormControl>
+        <FieldContent>
-          <Input placeholder="e.g., AEST, EST, UTC+10" :model-value="value" @update:model-value="handleChange"
+          <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>
+      </Field>
-    </FormField>
+    </VeeField>
 
     <!-- Attendance (boolean) -->
-    <FormField name="canAttendSaturday" v-slot="{ value, handleChange }">
+    <VeeField name="canAttendSaturday" v-slot="{ field, errors }">
-      <FormItem>
+      <Field>
-        <FormLabel>Are you able to attend weekly operations Saturdays @ 7pm CST?</FormLabel>
+        <FieldLabel>Are you able to attend weekly operations Saturdays @ 7pm CST?</FieldLabel>
-        <FormControl>
+        <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>
+      </Field>
-    </FormField>
+    </VeeField>
 
     <!-- Interests / Playstyle (freeform) -->
-    <FormField name="interests" v-slot="{ value, handleChange }">
+    <VeeField name="interests" v-slot="{ field, errors }">
-      <FormItem>
+      <Field>
-        <FormLabel>Which playstyles interest you?</FormLabel>
+        <FieldLabel>Which playstyles interest you?</FieldLabel>
-        <FormControl>
+        <FieldContent>
-          <Input placeholder="e.g., Rifleman; Medic; Pilot" :model-value="value" @update:model-value="handleChange"
+          <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>
+      </Field>
-    </FormField>
+    </VeeField>
 
     <!-- Code of Conduct (boolean, field name kept as-is) -->
-    <FormField name="acknowledgeRules" v-slot="{ value, handleChange }">
+    <VeeField name="acknowledgeRules" v-slot="{ field, errors }">
-      <FormItem>
+      <Field>
-        <FormLabel>Community Code of Conduct</FormLabel>
+        <FieldLabel>Community Code of Conduct</FieldLabel>
-        <FormControl>
+        <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>
+      </Field>
-    </FormField>
+    </VeeField>
 
     <div class="pt-2" v-if="!readOnly">
       <Button type="submit" :disabled="readOnly">Submit Application</Button>
@@ -334,5 +362,5 @@ watch(() => showCoC.value, async () => {
       </DialogContent>
     </Dialog>
 
-  </Form>
+  </form>
 </template>

ui/src/components/calendar/ViewCalendarEvent.vue

@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import type { CalendarEvent, CalendarSignup } from '@shared/types/calendar'
-import { CircleAlert, Clock4, EllipsisVertical, MapPin, User, X } from 'lucide-vue-next';
+import { CircleAlert, Clock4, EllipsisVertical, Link, MapPin, User, X } from 'lucide-vue-next';
 import { computed, ref, watch } from 'vue';
 import ButtonGroup from '../ui/button-group/ButtonGroup.vue';
 import Button from '../ui/button/Button.vue';
@@ -14,6 +14,8 @@ import DropdownMenuItem from '../ui/dropdown-menu/DropdownMenuItem.vue';
 import { Calendar } from 'lucide-vue-next';
 import MemberCard from '../members/MemberCard.vue';
 import Spinner from '../ui/spinner/Spinner.vue';
+import { CopyLink } from '@/lib/copyLink';
+import { MemberState } from '@shared/types/member';
 
 const route = useRoute();
 
@@ -30,9 +32,14 @@ watch(
     { immediate: true }
 );
 
+watch(loaded, (value) => {
+    if (value) emit('load');
+});
+
 const emit = defineEmits<{
     (e: 'close'): void
     (e: 'reload'): void
+    (e: 'load'): void
     (e: 'edit', event: CalendarEvent): void
 }>()
 
@@ -80,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;
 });
@@ -178,17 +185,20 @@ defineExpose({ forceReload })
 <template>
     <div v-if="loaded">
         <!-- Header -->
-        <div class="flex items-center justify-between gap-3 border-b px-4 py-3 h-14">
+        <div class="flex items-center justify-between gap-3 border-b border-border px-4 py-3 ">
-            <h2 class="text-lg font-semibold break-all">
+            <h2 class="text-lg font-semibold break-after-all">
                 {{ activeEvent?.name || 'Event' }}
             </h2>
-            <div class="flex gap-4 items-center">
+            <div class="flex gap-2 items-center">
                 <DropdownMenu v-if="canEditEvent">
                     <DropdownMenuTrigger>
-                        <button
+                        <Button variant="ghost" size="icon">
+                            <EllipsisVertical class="size-5" />
+                        </Button>
+                        <!-- <button
                             class="inline-flex flex-none size-8 items-center justify-center cursor-pointer rounded-md hover:bg-muted/40 transition">
                             <EllipsisVertical class="size-6" />
-                        </button>
+                        </button> -->
                     </DropdownMenuTrigger>
                     <DropdownMenuContent>
                         <DropdownMenuItem @click="emit('edit', activeEvent)">
@@ -202,11 +212,17 @@ defineExpose({ forceReload })
                         </DropdownMenuItem>
                     </DropdownMenuContent>
                 </DropdownMenu>
-                <button
+                <Button variant="ghost" size="icon" @click="CopyLink()">
-                    class="inline-flex flex-none size-8 items-center justify-center rounded-md border hover:bg-muted/40 transition cursor-pointer"
+                    <Link class="size-4" />
+                </Button>
+                <Button variant="ghost" size="icon" @click="emit('close')">
+                    <X class="size-5" />
+                </Button>
+                <!-- <button
+                    class="inline-flex flex-none size-8 items-center justify-center rounded-md border hover:bg-muted transition cursor-pointer"
                     aria-label="Close" @click="emit('close')">
                     <X class="size-4" />
-                </button>
+                </button> -->
             </div>
         </div>
         <!-- Body -->
@@ -216,15 +232,15 @@ 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">
+                <ButtonGroup class="flex w-full justify-center">
-                    <Button variant="outline"
+                    <Button variant="outline" class="flex-1"
                         :class="myAttendance?.status === CalendarAttendance.Attending ? 'border-2 border-primary text-primary' : ''"
                         @click="setAttendance(CalendarAttendance.Attending)">Going</Button>
-                    <Button variant="outline"
+                    <Button variant="outline" class="flex-1"
                         :class="myAttendance?.status === CalendarAttendance.Maybe ? 'border-2 !border-l-2 border-primary text-primary' : ''"
                         @click="setAttendance(CalendarAttendance.Maybe)">Maybe</Button>
-                    <Button variant="outline"
+                    <Button variant="outline" class="flex-1"
                         :class="myAttendance?.status === CalendarAttendance.NotAttending ? 'border-2 !border-l-2 border-primary text-primary' : ''"
                         @click="setAttendance(CalendarAttendance.NotAttending)">Declined</Button>
                 </ButtonGroup>
@@ -249,7 +265,7 @@ defineExpose({ forceReload })
             <!-- Description -->
             <section class="space-y-2 w-full">
                 <p class="text-lg font-semibold">Description</p>
-                <p class="border bg-muted/50 px-3 py-2 rounded-lg min-h-24 my-2 whitespace-pre-line">
+                <p class="border border-border bg-muted/50 px-3 py-2 rounded-lg min-h-24 my-2 whitespace-pre-line">
                     {{ activeEvent.description }}
                 </p>
             </section>
@@ -263,8 +279,8 @@ defineExpose({ forceReload })
                         <p>Declined <span class="ml-1">{{ attendanceStatusSummary.notAttending }}</span></p>
                     </div> -->
                 </div>
-                <div class="flex flex-col border bg-muted/50 rounded-lg min-h-24 my-2">
+                <div class="flex flex-col border border-border bg-muted/50 rounded-lg min-h-24 my-2">
-                    <div class="flex w-full pt-2 border-b *:w-full *:text-center *:pb-1 *:cursor-pointer">
+                    <div class="flex w-full pt-2 border-b border-border *:w-full *:text-center *:pb-1 *:cursor-pointer">
                         <label :class="attendanceTab === 'Alpha' ? 'border-b-3 border-foreground' : 'mb-[2px]'"
                             @click="attendanceTab = 'Alpha'">Alpha {{ attendanceCountsByGroup.Alpha }}</label>
                         <label :class="attendanceTab === 'Echo' ? 'border-b-3 border-foreground' : 'mb-[2px]'"
@@ -273,14 +289,14 @@ defineExpose({ forceReload })
                             @click="attendanceTab = 'Other'">Other {{ attendanceCountsByGroup.Other }}</label>
                     </div>
                     <div class="pb-1 min-h-48">
-                        <div class="grid grid-cols-2 font-semibold text-muted-foreground border-b py-1 px-3 mb-2">
+                        <div class="grid grid-cols-2 font-semibold text-muted-foreground border-b border-border py-1 px-3 mb-2">
                             <p>Name</p>
                             <p class="text-right">Status</p>
                         </div>
 
                         <div v-for="person in attendanceList" :key="person.member_id"
-                            class="grid grid-cols-2 py-1 *:px-3 hover:bg-muted">
+                            class="grid grid-cols-3 py-1 *:px-3 hover:bg-muted">
-                            <div>
+                            <div class="col-span-2">
                                 <MemberCard :member-id="person.member_id"></MemberCard>
                             </div>
                             <p :class="statusColor(person.status)" class="text-right">
@@ -292,13 +308,14 @@ defineExpose({ forceReload })
             </section>
         </div>
     </div>
-    <div v-else class="flex justify-center h-full items-center">
+    <div v-else class="relative flex justify-center items-center h-full">
-        <button
+        <!-- Close button (top-right) -->
-            class="absolute top-4 right-4 inline-flex flex-none size-8 items-center justify-center rounded-md border hover:bg-muted/40 transition cursor-pointer z-50"
+        <Button variant="ghost" size="icon" class="absolute top-2 right-2" @click="emit('close')">
-            aria-label="Close" @click="emit('close')">
+            <X class="size-5" />
-            <X class="size-4" />
+        </Button>
-        </button>
 
-        <Spinner class="size-8"></Spinner>
+        <!-- Spinner (centered) -->
+        <Spinner class="size-8" />
     </div>
+
 </template>

ui/src/components/discussion/CommentForm.vue

@@ -0,0 +1,42 @@
+<script setup lang="ts">
+    import { ref } from 'vue';
+    import Textarea from '../ui/textarea/Textarea.vue';
+    import Button from '../ui/button/Button.vue';
+    import { postComment } from '@/api/discussion';
+    import { DiscussionComment } from '@shared/types/discussion';
+
+    const props = defineProps<{
+        parentId: number,
+    }>();
+
+    const emit = defineEmits(['commentPosted']);
+    const commentText = ref('');
+    const error = ref('');
+
+    async function submitComment(e: Event) {
+        e.preventDefault();
+        error.value = '';
+        if (!commentText.value.trim()) {
+            error.value = 'Comment cannot be empty';
+            return;
+        }
+        let newComment: DiscussionComment = { post_id: props.parentId, content: commentText.value.trim() };
+        await postComment(newComment);
+        emit('commentPosted');
+        commentText.value = '';
+    }
+</script>
+
+<template>
+    <form @submit="submitComment">
+        <div class="mb-2">
+            <label class="block font-medium mb-1">Add a comment</label>
+            <Textarea rows="3" class="bg-neutral-800 resize-none w-full" v-model="commentText"
+                placeholder="Add a comment…" />
+            <div class="h-4 text-red-500 text-sm mt-1" v-if="error">{{ error }}</div>
+        </div>
+        <div class="mt-2 flex justify-end">
+            <Button type="submit" :disabled="!commentText.trim()">Post Comment</Button>
+        </div>
+    </form>
+</template>

ui/src/components/discussion/CommentThread.vue

@@ -0,0 +1,40 @@
+<script setup lang="ts">
+
+    import { DiscussionComment } from '@shared/types/discussion';
+    import DiscussionCommentView from './DiscussionCommentView.vue';
+    import CommentForm from './CommentForm.vue';
+    import { ref } from 'process';
+    import { getPostComments } from '@/api/discussion';
+
+    const props = defineProps<{
+        parentId: number,
+        comments: DiscussionComment[]
+    }>()
+
+    const emit = defineEmits<{
+        (e: 'commentsUpdated', comments: DiscussionComment[]): void
+    }>()
+
+    async function onCommentPosted() {
+        const res = await getPostComments(props.parentId);
+        console.log(res);
+        // tell parent to update state
+        emit('commentsUpdated', res);
+    }
+</script>
+
+<template>
+    <div class="mt-10 *:my-5">
+        <h3 class="text-xl font-semibold">Discussion</h3>
+        <div class="comment-thread">
+            <div class="comments-list flex flex-col gap-5">
+                <div v-for="comment in comments" :key="comment.id" class="comment">
+                    <DiscussionCommentView :comment="comment"></DiscussionCommentView>
+                </div>
+            </div>
+
+            <CommentForm :parent-id="props.parentId" @commentPosted="onCommentPosted" />
+        </div>
+
+    </div>
+</template>

ui/src/components/discussion/DiscussionCommentView.vue

@@ -0,0 +1,26 @@
+<script setup lang="ts">
+    import { DiscussionComment } from '@shared/types/discussion';
+    import MemberCard from '../members/MemberCard.vue';
+
+    const props = defineProps<{
+        comment: DiscussionComment;
+    }>();
+</script>
+
+
+<template>
+    <div class="rounded-md border border-neutral-800 p-3 space-y-5">
+        <!-- Comment header -->
+        <div class="flex justify-between">
+            <MemberCard :member-id="comment.poster_id"></MemberCard>
+            <p class="text-muted-foreground">{{ new Date(comment.created_at).toLocaleString("EN-us", {
+                year: "numeric",
+                month: "long",
+                day: "numeric",
+                hour: "2-digit",
+                minute: "2-digit"
+            }) }}</p>
+        </div>
+        <p>{{ comment.content }}</p>
+    </div>
+</template>

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/loa/loaList.vue

@@ -1,136 +1,141 @@
 <script setup lang="ts">
-import {
+    import {
-    Table,
+        Table,
-    TableBody,
+        TableBody,
-    TableCaption,
+        TableCaption,
-    TableCell,
+        TableCell,
-    TableHead,
+        TableHead,
-    TableHeader,
+        TableHeader,
-    TableRow,
+        TableRow,
-} from "@/components/ui/table"
+    } from "@/components/ui/table"
-import { Badge } from '@/components/ui/badge'
+    import { Badge } from '@/components/ui/badge'
-import {
+    import {
-    DropdownMenu,
+        DropdownMenu,
-    DropdownMenuContent,
+        DropdownMenuContent,
-    DropdownMenuItem,
+        DropdownMenuItem,
-    DropdownMenuTrigger,
+        DropdownMenuTrigger,
-} from "@/components/ui/dropdown-menu"
+    } from "@/components/ui/dropdown-menu"
-import { ChevronDown, ChevronUp, Ellipsis, X } from "lucide-vue-next";
+    import { ChevronDown, ChevronUp, Ellipsis, X } from "lucide-vue-next";
-import { cancelLOA, extendLOA, getAllLOAs, getMyLOAs } from "@/api/loa";
+    import { adminExtendLOA, cancelLOA, extendLOA, getAllLOAs, getMyLOAs } from "@/api/loa";
-import { onMounted, ref, computed } from "vue";
+    import { onMounted, ref, computed } from "vue";
-import { LOARequest } from "@shared/types/loa";
+    import { LOARequest } from "@shared/types/loa";
-import Dialog from "../ui/dialog/Dialog.vue";
+    import Dialog from "../ui/dialog/Dialog.vue";
-import DialogTrigger from "../ui/dialog/DialogTrigger.vue";
+    import DialogTrigger from "../ui/dialog/DialogTrigger.vue";
-import DialogContent from "../ui/dialog/DialogContent.vue";
+    import DialogContent from "../ui/dialog/DialogContent.vue";
-import DialogHeader from "../ui/dialog/DialogHeader.vue";
+    import DialogHeader from "../ui/dialog/DialogHeader.vue";
-import DialogTitle from "../ui/dialog/DialogTitle.vue";
+    import DialogTitle from "../ui/dialog/DialogTitle.vue";
-import DialogDescription from "../ui/dialog/DialogDescription.vue";
+    import DialogDescription from "../ui/dialog/DialogDescription.vue";
-import Button from "../ui/button/Button.vue";
+    import Button from "../ui/button/Button.vue";
-import Calendar from "../ui/calendar/Calendar.vue";
+    import Calendar from "../ui/calendar/Calendar.vue";
-import {
+    import {
-    CalendarDate,
+        CalendarDate,
-    getLocalTimeZone,
+        getLocalTimeZone,
-} from "@internationalized/date"
+    } from "@internationalized/date"
-import { el } from "@fullcalendar/core/internal-common";
+    import { el } from "@fullcalendar/core/internal-common";
-import MemberCard from "../members/MemberCard.vue";
+    import MemberCard from "../members/MemberCard.vue";
-import {
+    import {
-    Pagination,
+        Pagination,
-    PaginationContent,
+        PaginationContent,
-    PaginationEllipsis,
+        PaginationEllipsis,
-    PaginationItem,
+        PaginationItem,
-    PaginationNext,
+        PaginationNext,
-    PaginationPrevious,
+        PaginationPrevious,
-} from '@/components/ui/pagination'
+    } from '@/components/ui/pagination'
-import { pagination } from "@shared/types/pagination";
+    import { pagination } from "@shared/types/pagination";
 
-const props = defineProps<{
+    const props = defineProps<{
-    adminMode?: boolean
+        adminMode?: boolean
-}>()
+    }>()
 
-const LOAList = ref<LOARequest[]>([]);
+    const LOAList = ref<LOARequest[]>([]);
 
-onMounted(async () => {
+    onMounted(async () => {
-    await loadLOAs();
+        await loadLOAs();
-});
-
-async function loadLOAs() {
-    if (props.adminMode) {
-        let result = await getAllLOAs(pageNum.value, pageSize.value);
-        LOAList.value = result.data;
-        pageData.value = result.pagination;
-    } else {
-        let result = await getMyLOAs(pageNum.value, pageSize.value);
-        LOAList.value = result.data;
-        pageData.value = result.pagination;
-    }
-}
-
-function formatDate(date: Date): string {
-    if (!date) return "";
-    date = typeof date === 'string' ? new Date(date) : date;
-    return date.toLocaleDateString("en-US", {
-        year: "numeric",
-        month: "short",
-        day: "numeric",
     });
-}
 
-function loaStatus(loa: LOARequest): "Upcoming" | "Active" | "Overdue" | "Closed" {
+    async function loadLOAs() {
-    if (loa.closed) return "Closed";
+        if (props.adminMode) {
+            let result = await getAllLOAs(pageNum.value, pageSize.value);
+            LOAList.value = result.data;
+            pageData.value = result.pagination;
+        } else {
+            let result = await getMyLOAs(pageNum.value, pageSize.value);
+            LOAList.value = result.data;
+            pageData.value = result.pagination;
+        }
+    }
 
-    const now = new Date();
+    function formatDate(date: Date): string {
-    const start = new Date(loa.start_date);
+        if (!date) return "";
-    const end = new Date(loa.end_date);
+        date = typeof date === 'string' ? new Date(date) : date;
+        return date.toLocaleDateString("en-US", {
+            year: "numeric",
+            month: "short",
+            day: "numeric",
+        });
+    }
 
-    if (now < start) return "Upcoming";
+    function loaStatus(loa: LOARequest): "Upcoming" | "Active" | "Extended" | "Overdue" | "Closed" {
-    if (now >= start && now <= end) return "Active";
+        if (loa.closed) return "Closed";
-    if (now > end) return "Overdue";
 
-    return "Overdue"; // fallback
+        const now = new Date();
-}
+        const start = new Date(loa.start_date);
+        const end = new Date(loa.end_date);
+        const extension = new Date(loa.extended_till);
 
-async function cancelAndReload(id: number) {
+        if (now < start) return "Upcoming";
-    await cancelLOA(id, props.adminMode);
+        if (now >= start && (now <= end)) return "Active";
-    await loadLOAs();
+        if (now >= start && (now <= extension)) return "Extended";
-}
+        if (now > loa.extended_till || end) return "Overdue";
 
-const isExtending = ref(false);
+        return "Overdue"; // fallback
-const targetLOA = ref<LOARequest | null>(null);
+    }
-const extendTo = ref<CalendarDate | null>(null);
 
-const targetEnd = computed(() => { return targetLOA.value.extended_till ? targetLOA.value.extended_till : targetLOA.value.end_date })
+    async function cancelAndReload(id: number) {
+        await cancelLOA(id, props.adminMode);
+        await loadLOAs();
+    }
 
-function toCalendarDate(date: Date): CalendarDate {
+    const isExtending = ref(false);
-    if (typeof date === 'string')
+    const targetLOA = ref<LOARequest | null>(null);
-        date = new Date(date);
+    const extendTo = ref<CalendarDate | null>(null);
-    return new CalendarDate(date.getFullYear(), date.getMonth() + 1, date.getDate())
-}
 
-async function commitExtend() {
+    const targetEnd = computed(() => { return targetLOA.value.extended_till ? targetLOA.value.extended_till : targetLOA.value.end_date })
-    await extendLOA(targetLOA.value.id, extendTo.value.toDate(getLocalTimeZone()));
+    function toCalendarDate(date: Date): CalendarDate {
-    isExtending.value = false;
+        if (typeof date === 'string')
-    await loadLOAs();
+            date = new Date(date);
-}
+        return new CalendarDate(date.getFullYear(), date.getMonth() + 1, date.getDate())
+    }
 
-const expanded = ref<number | null>(null);
+    async function commitExtend() {
-const hoverID = ref<number | null>(null);
+        if (props.adminMode) {
+            await adminExtendLOA(targetLOA.value.id, extendTo.value.toDate(getLocalTimeZone()));
+        } else {
+            await extendLOA(targetLOA.value.id, extendTo.value.toDate(getLocalTimeZone()));
+        }
+        isExtending.value = false;
+        await loadLOAs();
+    }
 
-const pageNum = ref<number>(1);
+    const expanded = ref<number | null>(null);
-const pageData = ref<pagination>();
+    const hoverID = ref<number | null>(null);
 
-const pageSize = ref<number>(15)
+    const pageNum = ref<number>(1);
-const pageSizeOptions = [10, 15, 30]
+    const pageData = ref<pagination>();
 
-function setPageSize(size: number) {
+    const pageSize = ref<number>(15)
-    pageSize.value = size
+    const pageSizeOptions = [10, 15, 30]
-    pageNum.value = 1;
-    loadLOAs();
-}
 
-function setPage(pagenum: number) {
+    function setPageSize(size: number) {
-    pageNum.value = pagenum;
+        pageSize.value = size
-    loadLOAs();
+        pageNum.value = 1;
-}
+        loadLOAs();
+    }
+
+    function setPage(pagenum: number) {
+        pageNum.value = pagenum;
+        loadLOAs();
+    }
 </script>
 
 <template>
@@ -143,7 +148,7 @@ function setPage(pagenum: number) {
                 <div class="flex gap-5">
                     <Calendar v-model="extendTo" class="rounded-md border shadow-sm w-min" layout="month-and-year"
                         :min-value="toCalendarDate(targetEnd)"
-                        :max-value="toCalendarDate(targetEnd).add({ years: 1 })" />
+                        :max-value="props.adminMode ? toCalendarDate(targetEnd).add({ years: 1 }) : toCalendarDate(targetEnd).add({ months: 1 })" />
                     <div class="flex flex-col w-full gap-3 px-2">
                         <p>Quick Options</p>
                         <Button variant="outline" @click="extendTo = toCalendarDate(targetEnd).add({ days: 7 })">1
@@ -191,20 +196,22 @@ function setPage(pagenum: number) {
                             <TableCell>
                                 <Badge v-if="loaStatus(post) === 'Upcoming'" class="bg-blue-400">Upcoming</Badge>
                                 <Badge v-else-if="loaStatus(post) === 'Active'" class="bg-green-500">Active</Badge>
+                                <Badge v-else-if="loaStatus(post) === 'Extended'" class="bg-green-500">Extended</Badge>
                                 <Badge v-else-if="loaStatus(post) === 'Overdue'" class="bg-yellow-400">Overdue</Badge>
                                 <Badge v-else class="bg-gray-400">Ended</Badge>
                             </TableCell>
                             <TableCell @click.stop="" class="text-right">
                                 <DropdownMenu>
                                     <DropdownMenuTrigger class="cursor-pointer">
-                                        <Button variant="ghost">
+                                        <Button variant="ghost" size="icon">
                                             <Ellipsis class="size-6"></Ellipsis>
                                         </Button>
                                     </DropdownMenuTrigger>
                                     <DropdownMenuContent>
-                                        <DropdownMenuItem v-if="!post.closed && props.adminMode"
+                                        <DropdownMenuItem v-if="!post.closed"
+                                            :disabled="post.extended_till !== null && !props.adminMode"
                                             @click="isExtending = true; targetLOA = post">
-                                            Extend
+                                             {{ (post.extended_till !== null && !props.adminMode) ? 'Extend (Already Extended)' : 'Extend' }}
                                         </DropdownMenuItem>
                                         <DropdownMenuItem v-if="!post.closed" :variant="'destructive'"
                                             @click="cancelAndReload(post.id)">{{ loaStatus(post) === 'Upcoming' ?
@@ -220,10 +227,11 @@ function setPage(pagenum: number) {
                                 </DropdownMenu>
                             </TableCell>
                             <TableCell>
-                                <Button v-if="expanded === post.id" @click.stop="expanded = null" variant="ghost">
+                                <Button v-if="expanded === post.id" @click.stop="expanded = null" size="icon"
+                                    variant="ghost">
                                     <ChevronUp class="size-6" />
                                 </Button>
-                                <Button v-else @click.stop="expanded = post.id" variant="ghost">
+                                <Button v-else @click.stop="expanded = post.id" size="icon" variant="ghost">
                                     <ChevronDown class="size-6" />
                                 </Button>
                             </TableCell>
@@ -231,21 +239,47 @@ function setPage(pagenum: number) {
                         <TableRow v-if="expanded === post.id" @mouseenter="hoverID = post.id"
                             @mouseleave="hoverID = null" :class="{ 'bg-muted/50 border-t-0': hoverID === post.id }">
                             <TableCell :colspan="8" class="p-0">
-                                <div class="w-full p-3 mb-6 space-y-3">
+                                <div class="w-full p-4 mb-6 space-y-4">
-                                    <div class="flex justify-between items-start gap-4">
-                                        <div class="flex-1">
-                                            <!-- Title -->
-                                            <p class="text-md font-semibold text-foreground">
-                                                Reason
-                                            </p>
 
-                                            <!-- Content -->
+                                    <!-- Dates -->
-                                            <p
+                                    <div class="grid grid-cols-3 gap-4 text-sm">
-                                                class="mt-1 text-md whitespace-pre-wrap leading-relaxed text-muted-foreground">
+                                        <div>
-                                                {{ post.reason }}
+                                            <p class="text-muted-foreground">Start</p>
+                                            <p class="font-medium">
+                                                {{ formatDate(post.start_date) }}
+                                            </p>
+                                        </div>
+
+                                        <div>
+                                            <p class="text-muted-foreground">Original end</p>
+                                            <p class="font-medium">
+                                                {{ formatDate(post.end_date) }}
+                                            </p>
+                                        </div>
+
+                                        <div class="">
+                                            <p class="text-muted-foreground">Extended to</p>
+                                            <p class="font-medium text-foreground">
+                                                {{ post.extended_till ? formatDate(post.extended_till) : 'N/A' }}
                                             </p>
                                         </div>
                                     </div>
+
+                                    <!-- Reason -->
+                                    <div class="space-y-2">
+                                        <div class="flex items-center gap-2">
+                                            <h4 class="text-sm font-semibold text-foreground">
+                                                Reason
+                                            </h4>
+                                            <Separator class="flex-1" />
+                                        </div>
+
+                                        <div
+                                            class="rounded-lg border bg-muted/40 px-4 py-3 text-sm leading-relaxed whitespace-pre-wrap text-muted-foreground">
+                                            {{ post.reason || 'No reason provided.' }}
+                                        </div>
+                                    </div>
+
                                 </div>
                             </TableCell>
                         </TableRow>

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/members/MemberCard.vue

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

ui/src/components/modRequests/ModRequestForm.vue

@@ -0,0 +1,241 @@
+<script setup lang="ts">
+    import { ModRequestSchema } from '@shared/schemas/modRequest'
+    import { useForm, Field as VeeField } from 'vee-validate'
+    import { toTypedSchema } from '@vee-validate/zod'
+    import { ref } from 'vue'
+    import Button from '@/components/ui/button/Button.vue'
+    import Field from '@/components/ui/field/Field.vue'
+    import FieldLabel from '@/components/ui/field/FieldLabel.vue'
+    import FieldError from '@/components/ui/field/FieldError.vue'
+    import FieldDescription from '@/components/ui/field/FieldDescription.vue'
+    import Input from '@/components/ui/input/Input.vue'
+    import Textarea from '@/components/ui/textarea/Textarea.vue'
+    import Checkbox from '@/components/ui/checkbox/Checkbox.vue'
+    import { Card, CardContent, CardDescription, CardHeader, CardTitle } from '@/components/ui/card'
+    import { Separator } from '@/components/ui/separator'
+    import { X } from 'lucide-vue-next'
+    import { postModRequest } from '@/api/modRequests'
+
+    const { handleSubmit, resetForm, errors } = useForm({
+        validationSchema: toTypedSchema(ModRequestSchema),
+        validateOnMount: false,
+        initialValues: {
+            mod_title: '',
+            description: '',
+            mod_link: '',
+            confirmed_tested: false,
+            reason: '',
+            detrimental_effects: '',
+            keybind_conflicts: '',
+            special_considerations: '',
+        },
+    })
+
+    const submitting = ref(false)
+    const emit = defineEmits(['submit', 'close'])
+
+    const submitForm = handleSubmit(async (values) => {
+        if (submitting.value) return
+        submitting.value = true
+        try {
+            await postModRequest(values);
+            emit('submit', values)
+        } catch (err) {
+            console.error('Error submitting mod request:', err)
+        } finally {
+            submitting.value = false
+        }
+    })
+</script>
+
+<template>
+    <Card class="border-0 shadow-sm">
+        <CardHeader>
+            <div class="flex items-start justify-between">
+                <div class="flex-1">
+                    <CardTitle>New Mod Request</CardTitle>
+                    <CardDescription>Share details about the mod you'd like to see added to our server</CardDescription>
+                </div>
+                <Button type="button" variant="ghost" @click="emit('close')"
+                    class="text-muted-foreground hover:text-foreground -mt-1 -mr-2">
+                    Back to posts <X></X>
+                </Button>
+            </div>
+        </CardHeader>
+
+        <Separator class="mb-0" />
+
+        <CardContent>
+            <form @submit.prevent="submitForm" class="space-y-8">
+                <!-- SECTION: Basic Mod Information -->
+                <div class="space-y-5">
+                    <div class="space-y-1">
+                        <h3 class="font-semibold text-sm text-foreground">Mod Information</h3>
+                        <p class="text-xs text-muted-foreground">Core details about the mod</p>
+                    </div>
+
+                    <div class="space-y-5">
+                        <!-- Title -->
+                        <VeeField name="mod_title" v-slot="{ field, errors: e }">
+                            <Field :data-invalid="!!e.length">
+                                <FieldLabel class="text-sm font-medium">Mod Title</FieldLabel>
+                                <Input v-bind="field" placeholder="Name of the mod" rows="4" class="resize-none mt-2" />
+                                <div class="h-4">
+                                    <FieldError v-if="e.length" :errors="e" />
+                                </div>
+                            </Field>
+                        </VeeField>
+
+                        <!-- Description -->
+                        <VeeField name="description" v-slot="{ field, errors: e }">
+                            <Field :data-invalid="!!e.length">
+                                <FieldLabel class="text-sm font-medium">What is this mod?</FieldLabel>
+                                <FieldDescription class="text-xs">Brief overview of the mod and its main functionality
+                                </FieldDescription>
+                                <Textarea v-bind="field" placeholder="Describe what this mod does..." rows="4"
+                                    class="resize-none mt-2" />
+                                <div class="h-4">
+                                    <FieldError v-if="e.length" :errors="e" />
+                                </div>
+                            </Field>
+                        </VeeField>
+
+                        <!-- Mod Link -->
+                        <VeeField name="mod_link" v-slot="{ field, errors: e }">
+                            <Field :data-invalid="!!e.length">
+                                <FieldLabel class="text-sm font-medium">Mod Link</FieldLabel>
+                                <FieldDescription class="text-xs">Where can this mod be found?</FieldDescription>
+                                <Input v-bind="field" placeholder="https://..." class="mt-2" />
+                                <div class="h-4">
+                                    <FieldError v-if="e.length" :errors="e" />
+                                </div>
+                            </Field>
+                        </VeeField>
+
+                        <!-- Reason -->
+                        <VeeField name="reason" v-slot="{ field, errors: e }">
+                            <Field :data-invalid="!!e.length">
+                                <FieldLabel class="text-sm font-medium">Why add this mod?</FieldLabel>
+                                <FieldDescription class="text-xs">What benefits does this mod bring to our community and
+                                    why should we consider it?
+                                </FieldDescription>
+                                <Textarea v-bind="field" placeholder="Share your thoughts..." rows="3"
+                                    class="resize-none mt-2" />
+                                <div class="h-4">
+                                    <FieldError v-if="e.length" :errors="e" />
+                                </div>
+                            </Field>
+                        </VeeField>
+                    </div>
+                </div>
+
+                <Separator />
+
+                <!-- SECTION: Testing & Verification -->
+                <div class="space-y-5">
+                    <div class="space-y-1">
+                        <h3 class="font-semibold text-sm text-foreground">Testing & Verification</h3>
+                        <p class="text-xs text-muted-foreground">Your experience with this mod</p>
+                    </div>
+
+                    <div class="space-y-5">
+                        <!-- Confirmed Tested -->
+                        <VeeField name="confirmed_tested" v-slot="{ field, errors: e }">
+                            <Field :data-invalid="!!e.length">
+                                <div class="flex items-center gap-3 p-3 rounded-md bg-muted/30 border border-border/50">
+                                    <Checkbox :model-value="field.value" @update:model-value="field.onChange"
+                                        class="hover:cursor-pointer" />
+                                    <div class="flex-1">
+                                        <FieldLabel class="font-medium text-md cursor-pointer">Testing & Stability
+                                            Confirmation
+                                        </FieldLabel>
+                                        <FieldDescription class="text-sm">I confirm that I have personally tested this
+                                            mod and to the best of my ability have verified that it functions as
+                                            described without
+                                            causing game-breaking bugs,
+                                            critical stability issues, or unintended performance degradation.
+                                        </FieldDescription>
+                                    </div>
+                                </div>
+                                <div class="h-4">
+                                    <FieldError v-if="e.length" :errors="e" />
+                                </div>
+                            </Field>
+                        </VeeField>
+                    </div>
+                </div>
+
+                <Separator />
+
+                <!-- SECTION: Compatibility -->
+                <div class="space-y-5">
+                    <div class="space-y-1">
+                        <h3 class="font-semibold text-sm text-foreground">Compatibility & Conflicts</h3>
+                        <p class="text-xs text-muted-foreground">How does it work with our current setup?</p>
+                    </div>
+
+                    <div class="space-y-5">
+                        <!-- Detrimental Effects -->
+                        <VeeField name="detrimental_effects" v-slot="{ field, errors: e }">
+                            <Field :data-invalid="!!e.length">
+                                <FieldLabel class="text-sm font-medium">Potential Issues</FieldLabel>
+                                <FieldDescription class="text-xs">Any negative impacts or concerns you noticed (Keybind
+                                    conflicts sould be noted in the dedicated section)?
+                                </FieldDescription>
+                                <Textarea v-bind="field" placeholder="List any issues... (leave blank if none)" rows="3"
+                                    class="resize-none mt-2" />
+                                <div class="h-4">
+                                    <FieldError v-if="e.length" :errors="e" />
+                                </div>
+                            </Field>
+                        </VeeField>
+
+                        <!-- Keybind Conflicts -->
+                        <VeeField name="keybind_conflicts" v-slot="{ field, errors: e }">
+                            <Field :data-invalid="!!e.length">
+                                <FieldLabel class="text-sm font-medium">Keybind Conflicts</FieldLabel>
+                                <FieldDescription class="text-xs">Identify any controls that conflict with the existing
+                                    modpack along with resolutions for those conflicts.
+                                </FieldDescription>
+                                <Textarea v-bind="field"
+                                    placeholder='List specific conflicts and resolutions here, or type "None" if there are no conflicts.'
+                                    rows="3" class="resize-none mt-2" />
+                                <div class="h-4">
+                                    <FieldError v-if="e.length" :errors="e" />
+                                </div>
+                            </Field>
+                        </VeeField>
+                    </div>
+                </div>
+
+                <Separator />
+
+                <!-- SECTION: Additional Notes -->
+                <div class="space-y-5">
+                    <div class="space-y-5">
+                        <!-- Special Considerations -->
+                        <VeeField name="special_considerations" v-slot="{ field, errors: e }">
+                            <Field :data-invalid="!!e.length">
+                                <FieldLabel class="text-sm font-medium">Additional Information</FieldLabel>
+                                <FieldDescription class="text-xs">Anything else we should know?</FieldDescription>
+                                <Textarea v-bind="field" placeholder="Add any other important notes... (optional)"
+                                    rows="4" class="resize-none mt-2" />
+                                <div class="h-4">
+                                    <FieldError v-if="e.length" :errors="e" />
+                                </div>
+                            </Field>
+                        </VeeField>
+                    </div>
+                </div>
+
+                <!-- Action Buttons -->
+                <div class="flex gap-2 justify-end pt-4">
+                    <Button type="button" variant="outline" @click="resetForm">Clear</Button>
+                    <Button type="submit" :disabled="submitting">
+                        {{ submitting ? 'Submitting...' : 'Submit Request' }}
+                    </Button>
+                </div>
+            </form>
+        </CardContent>
+    </Card>
+</template>

ui/src/components/modRequests/ModRequestList.vue

@@ -0,0 +1,125 @@
+<script setup lang="ts">
+    import { ref, onMounted } from 'vue';
+    import type { DiscussionPost } from '@shared/types/discussion';
+    import type { ModRequest } from '@shared/schemas/modRequest';
+    import type { PagedData, pagination } from '@shared/types/pagination';
+    import {
+        Table,
+        TableBody,
+        TableCell,
+        TableHead,
+        TableHeader,
+        TableRow,
+    } from '@/components/ui/table';
+    import Badge from '@/components/ui/badge/Badge.vue';
+    import { getModRequests } from '@/api/modRequests';
+    import Pagination from '../ui/pagination/Pagination.vue';
+    import PaginationContent from '../ui/pagination/PaginationContent.vue';
+    import PaginationPrevious from '../ui/pagination/PaginationPrevious.vue';
+    import PaginationItem from '../ui/pagination/PaginationItem.vue';
+    import PaginationEllipsis from '../ui/pagination/PaginationEllipsis.vue';
+    import PaginationNext from '../ui/pagination/PaginationNext.vue';
+    import { Lock } from 'lucide-vue-next';
+
+    const requests = ref<DiscussionPost<ModRequest>[]>([]);
+    const loading = ref(true);
+
+    async function loadRequests() {
+        loading.value = true;
+        try {
+            const response = await getModRequests(pageNum.value, pageSize.value);
+
+            requests.value = response.data;
+            pageData.value = response.pagination;
+        } catch (error) {
+            console.error("Failed to load requests:", error);
+        } finally {
+            loading.value = false;
+        }
+    }
+
+    onMounted(() => {
+        loadRequests();
+    });
+
+    const pageNum = ref<number>(1);
+    const pageData = ref<pagination>();
+
+    const pageSize = ref<number>(15)
+    const pageSizeOptions = [10, 15, 30]
+
+    function setPageSize(size: number) {
+        pageSize.value = size;
+        pageNum.value = 1;
+        loadRequests();
+    }
+
+    function setPage(pagenum: number) {
+        pageNum.value = pagenum;
+        loadRequests();
+    }
+
+</script>
+
+<template>
+    <div class="mod-request-list">
+        <Table v-if="!loading">
+            <TableHeader>
+                <TableRow>
+                    <TableHead class="w-1/2">Title</TableHead>
+                    <TableHead class="w-1/4">Creator</TableHead>
+                    <TableHead class="w-1/4">Date</TableHead>
+                    <TableHead class="w-1/5 text-right">Status</TableHead>
+                </TableRow>
+            </TableHeader>
+            <TableBody>
+                <TableRow v-for="post in requests" :key="post.id"
+                    class="hover:bg-muted/50 cursor-pointer transition-colors"
+                    @click="$router.push(`/discussions/mod-requests/${post.id}`)">
+                    <TableCell class="font-medium">{{ post.title }}</TableCell>
+                    <TableCell>{{ post.poster_name }}</TableCell>
+                    <TableCell class="text-muted-foreground">{{ new Date(post.created_at).toLocaleDateString() }}
+                    </TableCell>
+                    <TableCell class="text-right">
+                        <Badge :variant="post.is_open ? 'secondary' : 'outline'">
+                            {{ post.is_open ? 'Open' : 'Locked' }}
+                            <Lock v-if="!post.is_open" />
+                        </Badge>
+                    </TableCell>
+                </TableRow>
+            </TableBody>
+        </Table>
+        <div v-else class="flex items-center justify-center py-12">
+            <p class="text-muted-foreground">Loading requests...</p>
+        </div>
+        <div class="mt-5 flex justify-between">
+            <div></div>
+            <Pagination v-slot="{ page }" :items-per-page="pageData?.pageSize || 10" :total="pageData?.total || 10"
+                :default-page="2" :page="pageNum" @update:page="setPage">
+                <PaginationContent v-slot="{ items }">
+                    <PaginationPrevious />
+                    <template v-for="(item, index) in items" :key="index">
+                        <PaginationItem v-if="item.type === 'page'" :value="item.value"
+                            :is-active="item.value === page">
+                            {{ item.value }}
+                        </PaginationItem>
+                    </template>
+                    <PaginationEllipsis :index="4" />
+                    <PaginationNext />
+                </PaginationContent>
+            </Pagination>
+            <div class="flex items-center gap-3 text-sm">
+                <p class="text-muted-foreground text-nowrap">Per page:</p>
+
+                <button v-for="size in pageSizeOptions" :key="size" @click="setPageSize(size)"
+                    class="px-2 py-1 rounded transition-colors" :class="{
+                        'bg-muted font-semibold': pageSize === size,
+                        'hover:bg-muted/50': pageSize !== size
+                    }">
+                    {{ size }}
+                </button>
+            </div>
+        </div>
+
+    </div>
+</template>

ui/src/components/modRequests/ViewModRequest.vue

@@ -0,0 +1,106 @@
+<script setup lang="ts">
+    import { ref, onMounted } from 'vue';
+    import { useRoute, useRouter } from 'vue-router';
+    import type { DiscussionPost } from '@shared/types/discussion';
+    import type { ModRequest } from '@shared/schemas/modRequest';
+    import { getModRequest } from '@/api/modRequests';
+    import Button from '@/components/ui/button/Button.vue';
+    import Badge from '@/components/ui/badge/Badge.vue';
+    import CommentThread from '../discussion/CommentThread.vue';
+
+    const route = useRoute();
+    const router = useRouter();
+
+    const post = ref<DiscussionPost<ModRequest> | null>(null);
+    const loading = ref(true);
+    const error = ref<string | null>(null);
+
+    async function loadPost() {
+        loading.value = true;
+        error.value = null;
+        try {
+            const id = Number(route.params.id);
+            if (isNaN(id)) {
+                error.value = 'Invalid request ID';
+                return;
+            }
+            post.value = await getModRequest(id);
+        } catch (err: any) {
+            console.error('Failed to fetch mod request', err);
+            error.value = 'Failed to load mod request';
+        } finally {
+            loading.value = false;
+        }
+    }
+
+    onMounted(() => {
+        loadPost();
+    });
+</script>
+
+<template>
+    <div class="max-w-[80rem] mt-5 mx-auto px-2 lg:px-20 w-full">
+        <div class="mb-8 flex items-center justify-between">
+            <div>
+                <h1 class="scroll-m-20 text-3xl font-semibold tracking-tight mb-2">Mod Request: {{ post?.title }}</h1>
+                <p class="text-muted-foreground" v-if="post">
+                    Requested by {{ post.poster_name || 'Unknown' }} on {{ new
+                        Date(post.created_at).toLocaleDateString() }}
+                </p>
+            </div>
+            <Button variant="outline" @click="router.push('/discussions/mod-requests')">
+                Back to posts
+            </Button>
+        </div>
+
+        <div v-if="loading" class="flex items-center justify-center py-12">
+            <p class="text-muted-foreground">Loading...</p>
+        </div>
+        <div v-else-if="error" class="text-red-500">{{ error }}</div>
+        <div v-else-if="post" class="space-y-6">
+            <div class="flex items-center gap-3">
+                <Badge :variant="post.is_open ? 'secondary' : 'outline'">
+                    {{ post.is_open ? 'Open' : 'Locked' }}
+                </Badge>
+            </div>
+            <div class="border rounded-lg p-6 bg-muted/50">
+                <h2 class="text-2xl font-semibold mb-2">{{ post.content.mod_title }}</h2>
+                <p class="text-sm text-muted-foreground mb-4"><a :href="post.content.mod_link" target="_blank"
+                        class="text-primary underline">{{ post.content.mod_link }}</a></p>
+                <div class="space-y-4">
+                    <div>
+                        <h3 class="font-medium">Description</h3>
+                        <p>{{ post.content.description }}</p>
+                    </div>
+                    <div>
+                        <h3 class="font-medium">Reason</h3>
+                        <p>{{ post.content.reason }}</p>
+                    </div>
+                    <div>
+                        <h3 class="font-medium">Tested?</h3>
+                        <p>{{ post.content.confirmed_tested ? 'Yes' : 'No' }}</p>
+                    </div>
+                    <div>
+                        <h3 class="font-medium">Detrimental Effects</h3>
+                        <p>{{ post.content.detrimental_effects }}</p>
+                    </div>
+                    <div>
+                        <h3 class="font-medium">Keybind Conflicts</h3>
+                        <p>{{ post.content.keybind_conflicts || 'None' }}</p>
+                    </div>
+                    <div v-if="post.content.special_considerations">
+                        <h3 class="font-medium">Additional Notes</h3>
+                        <p>{{ post.content.special_considerations }}</p>
+                    </div>
+                </div>
+            </div>
+
+            <!-- discussion placeholder -->
+            <CommentThread :parent-id="post.id" :comments="post.comments" @comments-updated="post.comments = $event" />
+
+        </div>
+        <div v-else>
+            <p class="text-muted-foreground">Unable to locate this mod request.</p>
+        </div>
+    </div>
+</template>

ui/src/components/promotions/promotionForm.vue

@@ -0,0 +1,318 @@
+<script setup lang="ts">
+import { batchPromotionSchema } from '@shared/schemas/promotionSchema';
+import { useForm, Field as VeeField, FieldArray as VeeFieldArray } from 'vee-validate';
+import { toTypedSchema } from '@vee-validate/zod';
+import FieldSet from '../ui/field/FieldSet.vue';
+import FieldLegend from '../ui/field/FieldLegend.vue';
+import FieldDescription from '../ui/field/FieldDescription.vue';
+import FieldGroup from '../ui/field/FieldGroup.vue';
+import Combobox from '../ui/combobox/Combobox.vue';
+import ComboboxAnchor from '../ui/combobox/ComboboxAnchor.vue';
+import ComboboxInput from '../ui/combobox/ComboboxInput.vue';
+import ComboboxList from '../ui/combobox/ComboboxList.vue';
+import ComboboxEmpty from '../ui/combobox/ComboboxEmpty.vue';
+import ComboboxGroup from '../ui/combobox/ComboboxGroup.vue';
+import ComboboxItem from '../ui/combobox/ComboboxItem.vue';
+import ComboboxItemIndicator from '../ui/combobox/ComboboxItemIndicator.vue';
+import { computed, onMounted, ref } from 'vue';
+import { MemberLight } from '@shared/types/member';
+import { Check, Plus, X } from 'lucide-vue-next';
+import Button from '../ui/button/Button.vue';
+import FieldError from '../ui/field/FieldError.vue';
+import { getAllLightMembers } from '@/api/member';
+import { Rank } from '@shared/types/rank';
+import { getAllRanks, submitRankChange } from '@/api/rank';
+import { error } from 'console';
+import Input from '../ui/input/Input.vue';
+import Field from '../ui/field/Field.vue';
+
+const { handleSubmit, errors, values, resetForm, setFieldValue, submitCount } = useForm({
+    validationSchema: toTypedSchema(batchPromotionSchema),
+    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())
+            await submitRankChange(output);
+            formSubmitted.value = true;
+            emit("submitted");
+        } catch (error) {
+            submitError.value = error;
+            console.error(error);
+        } finally {
+            submitting.value = false;
+        }
+    }
+);
+
+const emit = defineEmits<{
+    submitted: [void]
+}>();
+
+const submitError = ref<string>(null);
+const formSubmitted = ref(false);
+
+const allmembers = ref<MemberLight[]>([]);
+const allRanks = ref<Rank[]>([]);
+
+const memberById = computed(() => {
+    const map = new Map<number, MemberLight>();
+    for (const m of allmembers.value) {
+        map.set(m.id, m);
+    }
+    return map;
+});
+
+const rankById = computed(() => {
+    const map = new Map<number, Rank>();
+    for (const r of allRanks.value) {
+        map.set(r.id, r);
+    }
+    return map;
+});
+
+const memberSearch = ref('');
+const rankSearch = ref('');
+
+const filteredMembers = computed(() => {
+    const q = memberSearch?.value?.toLowerCase() ?? ""
+    const results: MemberLight[] = []
+
+    for (const m of allmembers.value ?? []) {
+        if (!q || (m.displayName || m.username).toLowerCase().includes(q)) {
+            results.push(m)
+            if (results.length >= 50) break
+        }
+    }
+
+    return results
+})
+
+const filteredRanks = computed(() =>
+    filterRanks(rankSearch.value)
+);
+
+function filterRanks(query: string): Rank[] {
+    if (!query) return allRanks.value;
+
+    const q = query.toLowerCase();
+    return allRanks.value.filter(r =>
+        r.name.toLowerCase().includes(q) ||
+        r.short_name.toLowerCase().includes(q)
+    );
+}
+
+onMounted(async () => {
+    allmembers.value = await getAllLightMembers()
+    allRanks.value = await getAllRanks();
+})
+
+function setAllToday() {
+    const today = () => {
+        const d = new Date()
+        const year = d.getFullYear()
+        const month = String(d.getMonth() + 1).padStart(2, '0')
+        const day = String(d.getDate()).padStart(2, '0')
+
+        return `${year}-${month}-${day}`
+    }
+
+    values.promotions?.forEach((_, index) => {
+        // @ts-ignore
+        setFieldValue(`promotions[${index}].start_date`, today())
+    })
+}
+</script>
+
+<template>
+    <div class="w-xl">
+        <form v-if="!formSubmitted" id="trainingForm" @submit.prevent="submitForm"
+            class="w-full min-w-0 flex flex-col gap-4">
+            <div>
+                <FieldLegend class="scroll-m-20 text-2xl font-semibold tracking-tight">
+                    Promotion Form
+                </FieldLegend>
+            </div>
+            <VeeFieldArray name="promotions" v-slot="{ fields, push, remove }">
+                <FieldSet class="w-full min-w-0">
+                    <div class="flex flex-col gap-2">
+                        <!-- TABLE SHELL -->
+                        <div class="">
+                            <FieldGroup class="">
+                                <!-- HEADER -->
+                                <div class="grid grid-cols-[200px_200px_150px_1fr_auto]
+                           gap-3 px-1 -mb-4
+                           text-sm font-medium text-muted-foreground">
+                                    <div>Member</div>
+                                    <div>Rank</div>
+                                    <div class="flex justify-between">
+                                        <p>Date</p><button @click.prevent.stop="setAllToday"
+                                            class="cursor-pointer border-1 rounded-full px-3 hover:bg-secondary hover:border-accent">Today</button>
+                                    </div>
+                                    <div></div>
+                                    <div></div>
+                                </div>
+                                <!-- BODY -->
+                                <div class="flex flex-col gap-2">
+                                    <div v-for="(row, index) in fields" :key="row.key" class="grid grid-cols-[200px_200px_150px_1fr_auto]
+                             gap-3 items-start">
+                                        <!-- Member -->
+                                        <VeeField :name="`promotions[${index}].member_id`" v-slot="{ field, errors }">
+                                            <div class="flex flex-col min-w-0">
+                                                <Combobox :model-value="field.value"
+                                                    @update:model-value="field.onChange" :ignore-filter="true">
+                                                    <ComboboxAnchor>
+                                                        <ComboboxInput class="w-full pl-3" placeholder="Search members…"
+                                                            :display-value="id =>
+                                                                memberById.get(id)?.displayName ||
+                                                                memberById.get(id)?.username
+                                                                " @input="memberSearch = $event.target.value" />
+                                                    </ComboboxAnchor>
+                                                    <ComboboxList>
+                                                        <ComboboxEmpty>No results</ComboboxEmpty>
+                                                        <ComboboxGroup>
+                                                            <div
+                                                                class="max-h-80 overflow-y-auto min-w-[12rem] scrollbar-themed">
+                                                                <ComboboxItem v-for="member in filteredMembers"
+                                                                    :key="member.id" :value="member.id">
+                                                                    {{ member.displayName || member.username }}
+                                                                    <ComboboxItemIndicator>
+                                                                        <Check />
+                                                                    </ComboboxItemIndicator>
+                                                                </ComboboxItem>
+                                                            </div>
+                                                        </ComboboxGroup>
+                                                    </ComboboxList>
+                                                </Combobox>
+                                                <div class="h-5">
+                                                    <FieldError v-if="errors.length" :errors="errors" />
+                                                </div>
+                                            </div>
+                                        </VeeField>
+                                        <!-- Rank -->
+                                        <VeeField :name="`promotions[${index}].rank_id`" v-slot="{ field, errors }">
+                                            <div class="flex flex-col min-w-0">
+                                                <Combobox :model-value="field.value"
+                                                    @update:model-value="field.onChange" :ignore-filter="true">
+                                                    <ComboboxAnchor>
+                                                        <ComboboxInput class="w-full pl-3" placeholder="Select rank…"
+                                                            :display-value="id => rankById.get(id)?.name"
+                                                            @input="rankSearch = $event.target.value" />
+                                                    </ComboboxAnchor>
+                                                    <ComboboxList>
+                                                        <ComboboxEmpty>No results</ComboboxEmpty>
+                                                        <ComboboxGroup>
+                                                            <div
+                                                                class="max-h-80 overflow-y-auto min-w-[12rem] scrollbar-themed">
+                                                                <ComboboxItem v-for="rank in filteredRanks"
+                                                                    :key="rank.id" :value="rank.id">
+                                                                    {{ rank.name }}
+                                                                    <ComboboxItemIndicator>
+                                                                        <Check />
+                                                                    </ComboboxItemIndicator>
+                                                                </ComboboxItem>
+                                                            </div>
+                                                        </ComboboxGroup>
+                                                    </ComboboxList>
+                                                </Combobox>
+                                                <div class="h-5">
+                                                    <FieldError v-if="errors.length" :errors="errors" />
+                                                </div>
+                                            </div>
+                                        </VeeField>
+                                        <!-- Date -->
+                                        <VeeField :name="`promotions[${index}].start_date`" v-slot="{ field, errors }">
+                                            <Field>
+                                                <div>
+                                                    <Input type="date" v-bind="field" />
+                                                    <div class="h-5">
+                                                        <FieldError v-if="errors.length" :errors="errors" />
+                                                    </div>
+                                                </div>
+                                            </Field>
+                                        </VeeField>
+                                        <!-- Remove -->
+                                        <div class="flex justify-end">
+                                            <Button type="button" variant="ghost" size="icon" @click="remove(index)">
+                                                <X />
+                                            </Button>
+                                        </div>
+                                    </div>
+                                </div>
+                            </FieldGroup>
+                        </div>
+                        <Button type="button" @click="push({})" class="w-full" variant="outline">
+                            <Plus /> Member
+                        </Button>
+                    </div>
+                </FieldSet>
+            </VeeFieldArray>
+            <div class="flex justify-between items-start">
+                <VeeField name="approver" v-slot="{ field, errors }">
+                    <div class="flex flex-col min-w-0 gap-2">
+                        <p>Approved By</p>
+                        <Combobox :model-value="field.value" @update:model-value="field.onChange" :ignore-filter="true">
+                            <ComboboxAnchor>
+                                <ComboboxInput class="w-full pl-3" placeholder="Search members…" :display-value="id =>
+                                    memberById.get(id)?.displayName ||
+                                    memberById.get(id)?.username
+                                    " @input="memberSearch = $event.target.value" />
+                            </ComboboxAnchor>
+                            <ComboboxList>
+                                <ComboboxEmpty>No results</ComboboxEmpty>
+                                <ComboboxGroup>
+                                    <div class="max-h-80 overflow-y-auto min-w-[12rem] scrollbar-themed">
+                                        <ComboboxItem v-for="member in filteredMembers" :key="member.id"
+                                            :value="member.id">
+                                            {{ member.displayName || member.username }}
+                                            <ComboboxItemIndicator>
+                                                <Check />
+                                            </ComboboxItemIndicator>
+                                        </ComboboxItem>
+                                    </div>
+                                </ComboboxGroup>
+                            </ComboboxList>
+                        </Combobox>
+                        <div class="h-5">
+                            <FieldError v-if="errors.length" :errors="errors" />
+                        </div>
+                    </div>
+                </VeeField>
+                <div class="flex flex-col items-end gap-2">
+                    <div class="h-6" />
+                    <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'"
+                            class="text-sm text-red-500">
+                            {{ errors.promotions }}
+                        </p>
+                    </div>
+                </div>
+            </div>
+        </form>
+        <div v-else>
+            <div class="flex flex-col max-w-sm justify-center gap-4 py-24 mx-auto">
+                <div class="text-left">
+                    <h2 class="text-2xl font-semibold mb-2">Successfully Submitted</h2>
+                    <p class="text-muted-foreground">Your promotions have been recorded.</p>
+                </div>
+                <Button @click="() => { formSubmitted = false; resetForm(); }" variant="secondary">
+                    Submit Another
+                </Button>
+            </div>
+        </div>
+    </div>
+</template>

ui/src/components/promotions/promotionList.vue

@@ -0,0 +1,160 @@
+<script setup lang="ts">
+import { pagination } from '@shared/types/pagination';
+import { PromotionSummary } from '@shared/types/rank';
+import { onMounted, ref } from 'vue';
+import {
+    Pagination,
+    PaginationContent,
+    PaginationEllipsis,
+    PaginationItem,
+    PaginationNext,
+    PaginationPrevious,
+} from '@/components/ui/pagination'
+import {
+    Table,
+    TableBody,
+    TableCaption,
+    TableCell,
+    TableHead,
+    TableHeader,
+    TableRow,
+} from "@/components/ui/table"
+import { ChevronDown, ChevronUp } from 'lucide-vue-next';
+import Button from '../ui/button/Button.vue';
+import { getPromoHistory } from '@/api/rank';
+import Spinner from '../ui/spinner/Spinner.vue';
+import PromotionListDay from './promotionListDay.vue';
+
+
+const loading = ref(true);
+const batchList = ref<PromotionSummary[]>();
+
+onMounted(async () => {
+    await loadHistory();
+    loading.value = false;
+})
+
+async function loadHistory() {
+    let d = await getPromoHistory(pageNum.value, pageSize.value);
+    batchList.value = d.data;
+    pageData.value = d.pagination;
+}
+
+function refresh() {
+    loadHistory();
+    promoDayDetails.value?.[0].loadData();
+}
+
+defineExpose({
+    refresh
+})
+
+const promoDayDetails = ref<InstanceType<typeof PromotionListDay>[]>(null)
+
+const expanded = ref<number | null>(null);
+const hoverID = ref<number | null>(null);
+
+const pageNum = ref<number>(1);
+const pageData = ref<pagination>();
+
+const pageSize = ref<number>(15)
+const pageSizeOptions = [10, 15, 30]
+
+function setPageSize(size: number) {
+    pageSize.value = size
+    pageNum.value = 1;
+    loadHistory();
+}
+
+function setPage(pagenum: number) {
+    pageNum.value = pagenum;
+    loadHistory();
+}
+
+function formatDate(date: Date): string {
+    if (!date) return "";
+    date = typeof date === 'string' ? new Date(date) : date;
+    return date.toLocaleDateString("en-US", {
+        year: "numeric",
+        month: "short",
+        day: "numeric",
+    });
+}
+</script>
+<template>
+    <div class="flex flex-col max-w-7xl w-full">
+        <div class="w-full mx-auto">
+            <Table>
+                <TableHeader>
+                    <TableRow>
+                        <TableHead>Date</TableHead>
+                        <TableHead></TableHead>
+                    </TableRow>
+                </TableHeader>
+                <TableBody>
+                    <template v-for="(batch, index) in batchList" :key="index">
+                        <TableRow class="hover:bg-muted/50 cursor-pointer" @click="expanded = index"
+                            @mouseenter="hoverID = index" @mouseleave="hoverID = null" :class="{
+                                'border-b-0': expanded === index,
+                                'bg-muted/50': hoverID === index
+                            }">
+                            <TableCell class="font-medium">
+                                {{ formatDate(new Date(batch.entry_day)) }}
+                            </TableCell>
+                            <TableCell class="text-right">
+                                <Button v-if="expanded === index" @click.stop="expanded = null" size="icon"
+                                    variant="ghost">
+                                    <ChevronUp class="size-6" />
+                                </Button>
+                                <Button v-else @click.stop="expanded = index" size="icon" variant="ghost">
+                                    <ChevronDown class="size-6" />
+                                </Button>
+                            </TableCell>
+                        </TableRow>
+                        <TableRow v-if="expanded === index" @mouseenter="hoverID = index" @mouseleave="hoverID = null"
+                            :class="{ 'bg-muted/50 border-t-0': hoverID === index }">
+                            <TableCell :colspan="8" class="p-0">
+                                <div class="w-full p-2 mb-6 space-y-3">
+                                    <PromotionListDay ref="promoDayDetails" :date="new Date(batch.entry_day)">
+                                    </PromotionListDay>
+                                </div>
+                            </TableCell>
+                        </TableRow>
+
+                    </template>
+                </TableBody>
+            </Table>
+            <div v-if="loading" class="w-full flex mx-auto justify-center my-15">
+                <Spinner class="size-7"></Spinner>
+            </div>
+            <div class="mt-5 flex justify-between mb-20">
+                <div></div>
+                <Pagination v-slot="{ page }" :items-per-page="pageData?.pageSize || 10" :total="pageData?.total || 10"
+                    :default-page="2" :page="pageNum" @update:page="setPage">
+                    <PaginationContent v-slot="{ items }">
+                        <PaginationPrevious />
+                        <template v-for="(item, index) in items" :key="index">
+                            <PaginationItem v-if="item.type === 'page'" :value="item.value"
+                                :is-active="item.value === page">
+                                {{ item.value }}
+                            </PaginationItem>
+                        </template>
+                        <PaginationEllipsis :index="4" />
+                        <PaginationNext />
+                    </PaginationContent>
+                </Pagination>
+                <div class="flex items-center gap-3 text-sm">
+                    <p class="text-muted-foreground text-nowrap">Per page:</p>
+
+                    <button v-for="size in pageSizeOptions" :key="size" @click="setPageSize(size)"
+                        class="px-2 py-1 rounded transition-colors" :class="{
+                            'bg-muted font-semibold': pageSize === size,
+                            'hover:bg-muted/50': pageSize !== size
+                        }">
+                        {{ size }}
+                    </button>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>