Added systems to handle banned users

.gitea/workflows/cd-deploy.yaml

@@ -1,11 +1,11 @@
-name: Live Site CD
+name: Continuous Deployment
 on:
   push:
     tags:
       - '*'
 
 jobs:
-  deploy-live-cd:
+  Deploy:
     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 ${{ gitea.workspace }}/.git/config .git/config
+          cp /workspace/17th-Ranger-Battalion-ORG/milsim-site-v4/.git/config .git/config
           chown nginx:nginx .git/config
 
       - name: Update Application Code
@@ -89,12 +89,6 @@ 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/ci-deploy.yaml

@@ -1,11 +1,11 @@
-name: Testing Site CD
+name: Continuous Integration
 on:
   push:
     branches:
       - main
 
 jobs:
-  deploy-testing-cd:
+  Deploy:
     name: Update Development
     runs-on: ubuntu-latest
     container:
@@ -40,20 +40,14 @@ jobs:
       - name: Token Copy
         run: |
           cd /var/www/html/milsim-site-v4
-          cp ${{ gitea.workspace }}/.git/config .git/config
+          cp /workspace/17th-Ranger-Battalion-ORG/milsim-site-v4/.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: |
@@ -89,12 +83,6 @@ 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

@@ -1,58 +0,0 @@
-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

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

api/.env.example

@@ -21,13 +21,7 @@ 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= # config version 
+CONFIG_ID= # configures 
-
-# webhooks/integrations
-DISCORD_APPLICATIONS_WEBHOOK=
-
-# Logger
-LOG_DEPTH= # normal / verbose / profiling
 
 # Glitchtip
 GLITCHTIP_DSN=

api/.gitignore

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

api/database.json

@@ -1,20 +0,0 @@
-{
-    "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

@@ -1,53 +0,0 @@
-'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

@@ -1,53 +0,0 @@
-'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

@@ -1,53 +0,0 @@
-'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

@@ -1,53 +0,0 @@
-'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

@@ -1,53 +0,0 @@
-'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/sqls/20260201154439-initial-down.sql

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

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

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

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

@@ -1,5 +0,0 @@
-/* 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

@@ -1,14 +0,0 @@
-/* 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

@@ -1,57 +0,0 @@
-/* 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

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

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

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

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

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

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

@@ -1,17 +0,0 @@
-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/package.json

@@ -9,34 +9,27 @@
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
     "dev": "tsc && tsc-alias && node ./built/api/src/index.js",
-    "prod": "tsc && tsc-alias && node ./built/api/src/index.js",
+    "build": "tsc && tsc-alias"
-    "build": "tsc && tsc-alias",
-    "seed": "node ./scripts/seed.js"
   },
   "dependencies": {
-    "@rsol/hashmig": "^1.0.7",
     "@sentry/node": "^10.27.0",
-    "@types/express-session": "^1.18.2",
+    "chalk": "^5.6.2",
     "connect-sqlite3": "^0.9.16",
     "cors": "^2.8.5",
-    "db-migrate": "^0.11.14",
+    "dotenv": "^17.2.1",
-    "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

@@ -1,29 +0,0 @@
-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

@@ -1,33 +0,0 @@
-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,5 +1,8 @@
 // const mariadb = require('mariadb')
 import * as mariadb from 'mariadb';
+const dotenv = require('dotenv')
+dotenv.config();
+
 
 const pool = mariadb.createPool({
     host: process.env.DB_HOST,

api/src/index.ts

@@ -1,41 +1,31 @@
 import dotenv = require('dotenv');
-dotenv.config({ quiet: true });
+dotenv.config();
 
 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));
 
-  const head: LogHeader = {
+  // Colorize status code
-    type: 'http',
+  const statusColor = status >= 500 ? chalk.red
-    level: 'info',
+    : status >= 400 ? chalk.yellow
-    depth: 'normal',
+      : status >= 300 ? chalk.cyan
-    timestamp: new Date().toISOString(),
+        : chalk.green;
-  }
 
-  const payload: LogPayload = {
+  return [
-    message: `${tokens.method(req, res)} ${tokens.url(req, res)}`,
+    chalk.gray(`[${new Date().toISOString()}]`),
-    // message: 'HTTP request completed',
+    chalk.blue.bold(tokens.method(req, res)),
-    data: {
+    tokens.url(req, res),
-      method: tokens.method(req, res),
+    statusColor(status),
-      path: tokens.url(req, res),
+    chalk.magenta(tokens['response-time'](req, res) + ' ms'),
-      status: Number(tokens.status(req, res)),
+    chalk.yellow(`- User: ${req.user?.name ? `${req.user.name} (${req.user.id})` : 'Unauthenticated'}`),
-      response_time_ms: Number(tokens['response-time'](req, res)),
+  ].join(' ');
-      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' || req.originalUrl === '/ping';
+    return req.originalUrl === '/members/me';
   }
 }))
 
@@ -53,43 +43,33 @@ const port = process.env.SERVER_PORT;
 //glitchtip setup
 import sentry = require('@sentry/node');
 if (process.env.DISABLE_GLITCHTIP === "true") {
-  logger.info('app', 'Glitchtip disabled', null, 'normal')
+  console.log("Glitchtip disabled")
 } 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'] })] });
-  logger.info('app', 'Glitchtip initialized', null, 'normal')
+  console.log("Glitchtip initialized");
 }
 
 //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);
 
-const cookieOptions: session.CookieOptions = {
+app.use(session({
-  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: './' }),
-  rolling: true,
+  cookie: {
-  cookie: cookieOptions
+    httpOnly: true,
-}
+    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
@@ -103,7 +83,6 @@ import { roles, memberRoles } from './routes/roles';
 import { courseRouter, eventRouter } from './routes/course';
 import { calendarRouter } from './routes/calendar';
 import { docsRouter } from './routes/docs';
-import { memberUnits, units } from './routes/units';
 
 app.use('/application', applicationRouter);
 app.use('/ranks', ranks);
@@ -117,8 +96,6 @@ app.use('/memberRoles', memberRoles)
 app.use('/course', courseRouter)
 app.use('/courseEvent', eventRouter)
 app.use('/calendar', calendarRouter)
-app.use('/units', units)
-app.use('/memberUnits', memberUnits);
 app.use('/docs', docsRouter)
 app.use('/', authRouter)
 
@@ -127,5 +104,5 @@ app.get('/ping', (req, res) => {
 });
 
 app.listen(port, () => {
-  logger.info('app', `Example app listening on port ${port} `)
+  console.log(`Example app listening on port ${port} `)
 })

api/src/routes/applications.ts

@@ -2,100 +2,59 @@ const express = require('express');
 const router = express.Router();
 
 import pool from '../db';
-import { approveApplication, createApplication, denyApplication, getAllMemberApplications, getApplicationByID, getApplicationComments, getApplicationList, getMemberApplication } from '../services/db/applicationService';
+import { approveApplication, createApplication, denyApplication, getAllMemberApplications, getApplicationByID, getApplicationComments, getApplicationList, getMemberApplication } from '../services/applicationService';
-import { setUserState } from '../services/db/memberService';
+import { setUserState } from '../services/memberService';
 import { MemberState } from '@app/shared/types/member';
-import { getRankByName, insertMemberRank } from '../services/db/rankService';
+import { getRankByName, insertMemberRank } from '../services/rankService';
 import { ApplicationFull, CommentRow } from "@app/shared/types/application"
-import { assignUserToStatus } from '../services/db/statusService';
+import { assignUserToStatus } from '../services/statusService';
 import { Request, response, Response } from 'express';
-import { getUserRoles } from '../services/db/rolesService';
+import { getUserRoles } from '../services/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) => {
-  try {
+  const output = await fetch(`${process.env.DOC_HOST}/api/pages/714`, {
-    const response = await fetch(`${process.env.DOC_HOST}/api/pages/714`, {
+    headers: {
-      headers: {
+      Authorization: `Token ${process.env.DOC_TOKEN_ID}:${process.env.DOC_TOKEN_SECRET}`,
-        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 LOA policy from Bookstack', {
-        status: response.status,
-        statusText: response.statusText,
-        body: text,
-      });
-      return res.sendStatus(500);
     }
+  })
 
-    const out = await response.json();
+  if (output.ok) {
+    const out = await output.json();
     res.status(200).json(out.html);
-
+  } else {
-  } catch (error) {
+    console.error("Failed to fetch LOA policy from bookstack");
-    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: Request, res: Response) => {
+router.post('/', [requireLogin], async (req, res) => {
-  const memberID = req.user.id;
-  const App = req.body?.App || {};
-  const appVersion = 1;
-
   try {
-    let appID = await createApplication(memberID, appVersion, JSON.stringify(App));
+    const App = req.body?.App || {};
+    const memberID = req.user.id;
 
-    await setUserState(memberID, MemberState.Applicant, "Application Submitted", memberID);
+    const appVersion = 1;
+
+    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) {
-    logger.error(
+    console.error('Failed to create application: \n', err);
-      '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) {
-    logger.error(
+    console.error(err);
-      'app',
-      'Failed to get applications',
-      {
-        error: err instanceof Error ? err.message : String(err),
-        stack: err instanceof Error ? err.stack : undefined,
-      }
-    );
     res.status(500);
   }
 });
@@ -109,16 +68,8 @@ router.get('/meList', async (req, res) => {
 
     return res.status(200).json(application);
   } catch (error) {
-    logger.error(
+    console.error('Failed to load applications: \n', error);
-      'app',
+    return res.status(500).json(error);
-      '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);
   }
 })
 
@@ -129,10 +80,8 @@ 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);
 
@@ -143,20 +92,12 @@ router.get('/me', [requireLogin], async (req, res) => {
 
     return res.status(200).json(output);
   } catch (error) {
-    logger.error(
+    console.error('Failed to load application:', 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 /me/:id
+// GET /application/:id
 router.get('/me/:id', [requireLogin], async (req: Request, res: Response) => {
   let appID = Number(req.params.id);
   let member = req.user.id;
@@ -176,18 +117,9 @@ router.get('/me/:id', [requireLogin], async (req: Request, res: Response) => {
     }
     return res.status(200).json(output);
   }
-  catch (error) {
+  catch (err) {
-    logger.error(
+    console.error('Query failed:', err);
-      'app',
+    return res.status(500).json({ error: 'Failed to load application' });
-      '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);
   }
 });
 
@@ -209,17 +141,9 @@ router.get('/:id', [requireLogin, requireRole("Recruiter")], async (req: Request
     }
     return res.status(200).json(output);
   }
-  catch (error) {
+  catch (err) {
-    logger.error(
+    console.error('Query failed:', err);
-      'app',
+    return res.status(500).json({ error: 'Failed to load application' });
-      '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);
   }
 });
 
@@ -228,46 +152,19 @@ 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 {
-    var con = await pool.getConnection();
+    const app = await getApplicationByID(appID);
-
+    await approveApplication(appID, approved_by);
-    con.beginTransaction();
-
-    await approveApplication(appID, approved_by, con);
 
     //update user profile
-    await setUserState(app.member_id, MemberState.Member, "Application Accepted", approved_by, con);
+    await setUserState(app.member_id, MemberState.Member);
 
-    await con.query('CALL sp_accept_new_recruit_validation(?, ?, ?, ?)', [Number(process.env.CONFIG_ID), app.member_id, approved_by, approved_by])
+    await pool.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 (error) {
+  } catch (err) {
-
+    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();
   }
 });
 
@@ -279,32 +176,17 @@ 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, "Application Denied", approver);
+    await setUserState(app.member_id, MemberState.Denied);
-
-    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 (error) {
+  } catch (err) {
-    logger.error(
+    console.error('Approve failed:', err);
-      '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 = Number(req.params.id);
+  const appID = req.params.id;
   const data = req.body.message;
   const user = req.user;
 
@@ -335,27 +217,10 @@ 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 (error) {
+  } catch (err) {
-    logger.error(
+    console.error('Comment failed:', err);
-      '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();
@@ -364,7 +229,7 @@ VALUES(?, ?, ?);`
 
 // POST /application/:id/comment
 router.post('/:id/adminComment', [requireLogin, requireRole("Recruiter")], async (req: Request, res: Response) => {
-  const appID = Number(req.params.id);
+  const appID = req.params.id;
   const data = req.body.message;
   const user = req.user;
 
@@ -396,24 +261,10 @@ VALUES(?, ?, ?, 1);`
           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: result.insertId });
-    logger.info('app', "Admin application comment posted", {
-      application: appID,
-      poster: user.id,
-      comment: result.insertId,
-    })
-
     res.status(201).json(comment[0]);
-  } catch (error) {
+
-    logger.error(
+  } catch (err) {
-      'app',
+    console.error('Comment failed:', err);
-      '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();
@@ -423,24 +274,10 @@ VALUES(?, ?, ?, 1);`
 router.post('/restart', async (req: Request, res: Response) => {
   const user = req.user.id;
   try {
-    await setUserState(user, MemberState.Guest, "Restarted Application", user);
+    await setUserState(user, MemberState.Guest);
-
-    audit.application('restarted', { actorId: user, targetId: user });
-    logger.info('app', "Member restarted application", {
-      user: user
-    })
-
     res.sendStatus(200);
   } catch (error) {
-    logger.error(
+    console.error('Comment failed:', 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,5 +1,7 @@
 const passport = require('passport');
 const OpenIDConnectStrategy = require('passport-openidconnect');
+const dotenv = require('dotenv');
+dotenv.config();
 
 const express = require('express');
 const { param } = require('./applications');
@@ -7,164 +9,95 @@ const router = express.Router();
 import { Role } from '@app/shared/types/roles';
 import pool from '../db';
 import { requireLogin } from '../middleware/auth';
-import { getUserRoles } from '../services/db/rolesService';
+import { getUserRoles } from '../services/rolesService';
-import { getUserState, mapDiscordtoID } from '../services/db/memberService';
+import { getUserState, mapDiscordtoID } from '../services/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());
 }
 
-const devLogin = (req: any, res: any, next: any) => {
+passport.use(new OpenIDConnectStrategy({
-    // The object here must match what your 'verify' function returns: { memberId }
+    issuer: process.env.AUTH_ISSUER,
-    const devUser = { memberId: 1 }; // Hardcoded ID
+    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) {
 
-    req.logIn(devUser, (err: any) => {
+    // console.log('--- OIDC verify() called ---');
-        if (err) return next(err);
+    // console.log('issuer:', issuer);
-        const redirectTo = req.session.redirectTo || process.env.CLIENT_URL;
+    // console.log('sub:', sub);
-        delete req.session.redirectTo;
+    // // console.log('discord:', discord);
-        return res.redirect(redirectTo);
+    // console.log('profile:', profile);
-    });
+    // 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) {
 
-        // console.log('--- OIDC verify() called ---');
+    try {
-        // console.log('issuer:', issuer);
+        var con = await pool.getConnection();
-        // console.log('sub:', sub);
-        // // console.log('discord:', discord);
-        // console.log('profile:', profile);
-        // console.log('jwt: ', parseJwt(jwtClaims));
-        // console.log('params:', params);
-        let con;
 
-        try {
+        await con.beginTransaction();
-            con = await pool.getConnection();
 
-            await con.beginTransaction();
+        //lookup existing user
+        const existing = await con.query(`SELECT id FROM members WHERE authentik_issuer = ? AND authentik_sub = ? LIMIT 1;`, [issuer, sub]);
+        let memberId: 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;
 
-            //lookup existing user
+            //check if account is available to claim
-            const existing = await con.query(`SELECT id FROM members WHERE authentik_issuer = ? AND authentik_sub = ? LIMIT 1;`, [issuer, sub]);
+            memberId = await mapDiscordtoID(discordID);
-            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 {
-                //otherwise: create account mode
+                // claim existing account
-                const jwt = parseJwt(jwtClaims);
+                const result = await con.query(
-                const discordID = jwt.discord?.id as number;
+                    `UPDATE members SET authentik_sub = ?, authentik_issuer = ? WHERE id = ?;`,
-
+                    [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) => {
-    req.session.redirectTo = req.query.redirect as string;
+    // Store redirect target in session if provided
+    req.session.redirectTo = req.query.redirect;
 
-    const strategy = process.env.AUTH_MODE === 'mock' ? 'mock' : 'oidc';
+    next();
+}, 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('oidc', (err, user) => {
+    passport.authenticate('openidconnect', (err, user) => {
         if (err) return next(err);
         if (!user) return res.redirect(process.env.CLIENT_URL);
 
@@ -181,7 +114,6 @@ router.get('/callback', (req, res, next) => {
 
 router.get('/logout', [requireLogin], function (req, res, next) {
     req.logout(function (err) {
-
         if (err) { return next(err); }
 
         req.session.destroy((err) => {
@@ -194,21 +126,12 @@ router.get('/logout', [requireLogin], function (req, res, next) {
                 sameSite: 'lax'
             });
 
-            if (process.env.AUTH_MODE === 'mock') {
-                return res.redirect(process.env.CLIENT_URL || '/');
-            }
-
             var params = {
                 client_id: process.env.AUTH_CLIENT_ID,
                 returnTo: process.env.CLIENT_URL
             };
+            res.redirect(process.env.AUTH_END_SESSION_URI + '?' + querystring.stringify(params));
 
-            const endSessionUri = process.env.AUTH_END_SESSION_URI;
-            if (endSessionUri) {
-                return res.redirect(endSessionUri + '?' + querystring.stringify(params));
-            } else {
-                return res.redirect(process.env.CLIENT_URL || '/');
-            }
         })
     });
 });
@@ -220,94 +143,25 @@ 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 {
-            //cache lookup
+            var con = await pool.getConnection();
-            let t = performance.now();
+            let userResults = await con.query(`SELECT id, name FROM members WHERE id = ?;`, [memberID])
-            const cachedData: UserData | undefined = userCache.Get(memberID);
+            userData = userResults[0];
-            timings.cache_lookup = performance.now() - t;
+            let userRoles = await getUserRoles(memberID);
-
+            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) {
-            logger.error(
+            console.error(error)
-                'profiling',
-                'passport.deserializeUser failed',
-                {
-                    memberId: memberID,
-                    error: error instanceof Error ? error.message : String(error),
-                }
-            );
-            return cb(error);
         } finally {
-            if (con) con.release();
+            con.release();
         }
+        return cb(null, userData);
     });
 });
 
@@ -317,7 +171,6 @@ declare global {
             user: {
                 id: number;
                 name: string;
-                discord_id: string;
                 roles: Role[];
                 state: MemberState;
             };
@@ -325,15 +178,5 @@ 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 authRouter = router;
-export const memberCache = userCache;

api/src/routes/calendar.ts

@@ -1,10 +1,8 @@
 import { Request, Response } from "express";
-import { createEvent, getEventAttendance, getEventDetails, getShortEventsInRange, setAttendanceStatus, setEventCancelled, updateEvent } from "../services/db/calendarService";
+import { createEvent, getEventAttendance, getEventDetails, getShortEventsInRange, setAttendanceStatus, setEventCancelled, updateEvent } from "../services/calendarService";
 import { CalendarAttendance, CalendarEvent } from "@app/shared/types/calendar";
 import { requireLogin, requireMemberState, requireRole } from "../middleware/auth";
 import { MemberState } from "@app/shared/types/member";
-import { logger } from "../services/logging/logger";
-import { audit } from "../services/logging/auditLog";
 
 const express = require('express');
 const r = express.Router();
@@ -30,14 +28,7 @@ r.get('/', async (req, res) => {
 
         res.status(200).json(events);
     } catch (error) {
-        logger.error(
+        console.error('Error fetching calendar events:', 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');
     }
 });
@@ -47,50 +38,22 @@ 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);
-        await setEventCancelled(eventID, true);
+        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) {
-        logger.error(
+        console.error('Error setting cancel status:', 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) {
-        logger.error(
+        console.error('Error setting cancel status:', 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');
     }
 })
@@ -101,29 +64,13 @@ 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;
-        await setAttendanceStatus(member, event, state);
+        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) {
-        logger.error(
+        console.error('Failed to set attendance:', 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 {
@@ -132,16 +79,9 @@ 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 (error) {
+    } catch (err) {
-        logger.error(
+        console.error('Insert failed:', err);
-            'app',
+        res.status(500).json(err);
-            'Failed to get calendar event details',
-            {
-                error: error instanceof Error ? error.message : String(error),
-                stack: error instanceof Error ? error.stack : undefined,
-            }
-        );
-        res.status(500);
     }
 })
 
@@ -154,51 +94,23 @@ r.post('/', [requireLogin, requireMemberState(MemberState.Member)], async (req:
         event.creator_id = member;
         event.start = new Date(event.start);
         event.end = new Date(event.end);
-        let eventID = await createEvent(event);
+        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) {
-        logger.error(
+        console.error('Failed to create event:', 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) {
-        logger.error(
+        console.error('Failed to update event:', 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,10 +1,8 @@
 import { CourseAttendee, CourseEventDetails } from "@app/shared/types/course";
-import { getAllCourses, getCourseEventAttendees, getCourseEventDetails, getCourseEventRoles, getCourseEvents, insertCourseEvent } from "../services/db/CourseSerivce";
+import { getAllCourses, getCourseEventAttendees, getCourseEventDetails, getCourseEventRoles, getCourseEvents, insertCourseEvent } from "../services/CourseSerivce";
 import { Request, Response, Router } from "express";
 import { requireLogin, requireMemberState } from "../middleware/auth";
 import { MemberState } from "@app/shared/types/member";
-import { logger } from "../services/logging/logger";
-import { audit } from "../services/logging/auditLog";
 
 const cr = Router();
 const er = Router();
@@ -18,16 +16,9 @@ cr.get('/', async (req, res) => {
     try {
         const courses = await getAllCourses();
         res.status(200).json(courses);
-    } catch (error) {
+    } catch (err) {
-        logger.error(
+        console.error('failed to fetch courses', err);
-            'app',
+        res.status(500).json('failed to fetch courses\n' + err);
-            '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');
     }
 })
 
@@ -35,20 +26,12 @@ cr.get('/roles', async (req, res) => {
     try {
         const roles = await getCourseEventRoles();
         res.status(200).json(roles);
-    } catch (error) {
+    } catch (err) {
-        logger.error(
+        console.error('failed to fetch course roles', err);
-            'app',
+        res.status(500).json('failed to fetch course roles\n' + err);
-            '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([
@@ -72,14 +55,7 @@ er.get('/', async (req: Request, res: Response) => {
         let events = await getCourseEvents(sortDir, search, page, pageSize);
         res.status(200).json(events);
     } catch (error) {
-        logger.error(
+        console.error('failed to fetch reports', 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);
     }
 });
@@ -89,14 +65,7 @@ er.get('/:id', async (req: Request, res: Response) => {
         let out = await getCourseEventDetails(Number(req.params.id));
         res.status(200).json(out);
     } catch (error) {
-        logger.error(
+        console.error('failed to fetch report', 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);
     }
 });
@@ -105,16 +74,9 @@ 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 (error) {
+    } catch (err) {
-        logger.error(
+        console.error('failed to fetch attendees', err);
-            'app',
+        res.status(500).json("failed to fetch attendees\n" + err);
-            '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");
     }
 })
 
@@ -125,20 +87,9 @@ 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) {
-        logger.error(
+        console.error('failed to post training', 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/docs.ts

@@ -3,55 +3,22 @@ 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 t0 = performance.now(); // optional profiling start
+    const output = await fetch(`${process.env.DOC_HOST}/api/pages/717`, {
-
+        headers: {
-    try {
+            Authorization: `Token ${process.env.DOC_TOKEN_ID}:${process.env.DOC_TOKEN_SECRET}`,
-        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();
+    if (output.ok) {
+        const out = await output.json();
         res.status(200).json(out.html);
-
+    } else {
-        // optional profiling log
+        console.error("Failed to fetch LOA policy from bookstack");
-        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,11 +3,9 @@ const router = express.Router();
 
 import { Request, Response } from 'express';
 import pool from '../db';
-import { closeLOA, createNewLOA, getAllLOA, getLOAbyID, getLoaTypes, getUserLOA, setLOAExtension } from '../services/db/loaService';
+import { closeLOA, createNewLOA, getAllLOA, getLOAbyID, getLoaTypes, getUserLOA, setLOAExtension } from '../services/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);
 
@@ -19,43 +17,25 @@ router.post("/", async (req: Request, res: Response) => {
     LOARequest.filed_date = new Date();
 
     try {
-        let loaID = await createNewLOA(LOARequest);
+        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) {
-        logger.error(
+        console.error(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', '17th HQ', '17th Command'])], async (req: Request, res: Response) => {
+router.post("/admin", [requireRole("17th Administrator")], async (req: Request, res: Response) => {
     let LOARequest = req.body as LOARequest;
     LOARequest.created_by = req.user.id;
     LOARequest.filed_date = new Date();
     try {
-        let loaID = await createNewLOA(LOARequest);
+        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) {
-        logger.error(
+        console.error(error);
-            'app',
+        res.status(500).send(error);
-            'Failed to post LOA',
-            {
-                error: error instanceof Error ? error.message : String(error),
-                stack: error instanceof Error ? error.stack : undefined,
-            }
-        ); res.status(500).send(error);
     }
 });
 
@@ -66,14 +46,7 @@ router.get("/me", async (req: Request, res: Response) => {
         const result = await getUserLOA(user);
         res.status(200).json(result)
     } catch (error) {
-        logger.error(
+        console.error(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);
     }
 })
@@ -89,33 +62,19 @@ router.get("/history", async (req: Request, res: Response) => {
         const result = await getUserLOA(user, page, pageSize);
         res.status(200).json(result)
     } catch (error) {
-        logger.error(
+        console.error(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', '17th HQ', '17th Command'])], async (req: Request, res: Response) => {
+router.get('/all', [requireRole("17th Administrator")], 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) {
-        logger.error(
+        console.error(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);
     }
 })
@@ -125,15 +84,8 @@ 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);
     }
 })
 
@@ -147,92 +99,27 @@ 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) {
-        logger.error(
+        console.error(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', '17th HQ', '17th Command'])], async (req: Request, res: Response) => {
+router.post('/adminCancel/:id', [requireRole("17th Administrator")], async (req: Request, res: Response) => {
     let closer = req.user.id;
     try {
         await closeLOA(Number(req.params.id), closer);
-
-        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) {
-        logger.error(
+        console.error(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);
     }
 })
 
-// extend LOA
+// TODO: Enforce admin only
-router.post('/extend/:id', async (req: Request, res: Response) => {
+router.post('/extend/:id', [requireRole("17th Administrator")], async (req: Request, res: Response) => {
-    const to: Date = req.body.to;
-
-    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) {
@@ -241,73 +128,27 @@ router.post('/extendAdmin/:id', [requireRole(['17th Administrator', '17th HQ', '
 
     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(
+        console.error(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 t0 = performance.now();
+    const output = await fetch(`${process.env.DOC_HOST}/api/pages/42`, {
-
+        headers: {
-    try {
+            Authorization: `Token ${process.env.DOC_TOKEN_ID}:${process.env.DOC_TOKEN_SECRET}`,
-        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();
+    if (output.ok) {
+        const out = await output.json();
         res.status(200).json(out.html);
-
+    } else {
-        logger.info(
+        console.error("Failed to fetch LOA policy from bookstack");
-            '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,18 +4,10 @@ const router = express.Router();
 import { Request, Response } from 'express';
 import pool from '../db';
 import { requireLogin, requireMemberState, requireRole } from '../middleware/auth';
-import { getUserActiveLOA } from '../services/db/loaService';
+import { getUserActiveLOA } from '../services/loaService';
-import { getAllMembersLite, getMemberSettings, getMembersFull, getMembersLite, getUserData, getUserState, setUserSettings, getFilteredMembers, setUserState, getLastNonSuspendedState } from '../services/db/memberService';
+import { getAllMembersLite, getMemberSettings, getMembersFull, getMembersLite, getUserData, getUserState, setUserSettings } from '../services/memberService';
-import { getUserRoles, stripUserRoles } from '../services/db/rolesService';
+import { getUserRoles } from '../services/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) => {
@@ -34,90 +26,29 @@ 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 (error) {
+    } catch (err) {
-        logger.error(
+        console.error('Error fetching users:', err);
-            '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('/filtered', [requireLogin, requireMemberState(MemberState.Member)], async (req, res) => {
+router.get('/me', [requireLogin], async (req, res) => {
-    try {
+    if (req.user === undefined)
-        // Extract Query Parameters
+        return res.sendStatus(401)
-        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 {
-        let t;
-
-        t = performance.now();
         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) {
-        logger.error('profiling', 'GET /members/me failed', {
+        console.error('Error fetching user data:', error);
-            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 {
@@ -125,14 +56,7 @@ router.get('/settings', [requireLogin], async (req: Request, res: Response) => {
         let output = await getMemberSettings(user);
         res.status(200).json(output);
     } catch (error) {
-        logger.error(
+        console.error(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);
     }
 })
@@ -142,35 +66,19 @@ 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) {
-        logger.error(
+        console.error(error);
-            'app',
+        res.status(500).json(error);
-            '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 activeOnly = Boolean(req.query.active);
+        let out = await getAllMembersLite();
-        console.log(activeOnly);
-        let out = await getAllMembersLite(activeOnly);
         res.status(200).json(out);
     } catch (error) {
-        logger.error(
+        console.error(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);
     }
 })
@@ -181,14 +89,7 @@ router.post('/lite/bulk', async (req: Request, res: Response) => {
         let out = await getMembersLite(ids);
         res.status(200).json(out);
     } catch (error) {
-        logger.error(
+        console.error(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);
     }
 })
@@ -200,36 +101,22 @@ router.post('/full/bulk', async (req: Request, res: Response) => {
         let out = await getMembersFull(ids);
         res.status(200).json(out);
     } catch (error) {
-        logger.error(
+        console.error(error);
-            'app',
+        res.status(500).json(error);
-            '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 (error) {
+    } catch (err) {
-        logger.error(
+        console.error('Error fetching user:', err);
-            'app',
+        return res.status(500).json({ error: 'Failed to fetch user' });
-            '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' });
     }
 });
 
@@ -239,80 +126,5 @@ 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);
-        stripUserRoles(data.userID, con);
-        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/ranks.ts

@@ -1,11 +1,9 @@
 import { MemberState } from "@app/shared/types/member";
 import { requireLogin, requireMemberState, requireRole } from "../middleware/auth";
-import { batchInsertMemberRank, getAllRanks, getPromotionHistorySummary, getPromotionsOnDay, insertMemberRank } from "../services/db/rankService";
+import { batchInsertMemberRank, getAllRanks, getPromotionHistorySummary, getPromotionsOnDay, insertMemberRank } from "../services/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();
 
@@ -17,24 +15,14 @@ ur.use(requireLogin)
 ur.post('/', [requireRole(["17th Command", "17th Administrator", "17th HQ"]), requireMemberState(MemberState.Member)], async (req: express.Request, res: express.Response) => {
     try {
         const change = req.body.promotions as BatchPromotionMember[];
-        const approver = req.body.approver as number;
         const author = req.user.id;
         if (!change) res.sendStatus(400);
 
-        await batchInsertMemberRank(change, author, approver);
+        await batchInsertMemberRank(change, author);
 
-        audit.member('update_rank', { actorId: author, targetId: null }, { changes: change.length });
-        logger.info('app', 'Promotion batch submitted', { author: author })
         res.sendStatus(201);
-    } catch (error) {
+    } catch (err) {
-        logger.error(
+        console.error('Insert failed:', err);
-            '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' });
     }
 });
@@ -42,17 +30,11 @@ ur.post('/', [requireRole(["17th Command", "17th Administrator", "17th HQ"]), re
 ur.get('/', async (req: express.Request, res: express.Response) => {
     try {
         const promos = await getPromotionHistorySummary();
+        console.log(promos);
         res.status(200).json(promos);
-    } catch (error) {
+    } catch (err) {
-        logger.error(
+        console.error(err);
-            'app',
+        res.status(500).json({ error: 'Internal server error' });
-            'Failed to get rank change history',
-            {
-                error: error instanceof Error ? error.message : String(error),
-                stack: error instanceof Error ? error.stack : undefined,
-            }
-        );
-        res.sendStatus(500);
     }
 });
 
@@ -60,20 +42,13 @@ 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)
+        let day = new Date(req.params.day)
         const promos = await getPromotionsOnDay(day);
+        console.log(promos);
         res.status(200).json(promos);
-    } catch (error) {
+    } catch (err) {
-        logger.error(
+        console.error(err);
-            'app',
+        res.status(500).json({ error: 'Internal server error' });
-            '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);
     }
 })
 
@@ -82,15 +57,8 @@ r.get('/', async (req, res) => {
     try {
         const ranks = await getAllRanks();
         res.json(ranks);
-    } catch (error) {
+    } catch (err) {
-        logger.error(
+        console.error(err);
-            '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,138 +5,84 @@ 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, getAllRoles, getRole, getUsersWithRole } from '../services/db/rolesService';
+import { assignUserGroup, createGroup } from '../services/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: Request, res) => {
+ur.post('/', [requireMemberState(MemberState.Member), requireRole("17th Administrator")], async (req, res) => {
-    const body = req.body;
-
     try {
+        const body = req.body;
 
-        await assignUserGroup(body.member_id, body.role_id);
+        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);
-        audit.roles('add_member', { actorId: req.user.id, targetId: body.role_id }, { member: body.member_id, role: body.role_id });
+    } catch (err) {
-
+        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: Request, res: Response) => {
+ur.delete('/', [requireMemberState(MemberState.Member), requireRole("17th Administrator")], async (req, res) => {
-    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 (error) {
+    catch (err) {
-        logger.error(
+        console.error("delete failed: ", err)
-            '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 {
-        const roles = await getAllRoles();
+        var con = await pool.getConnection();
 
-        res.status(200).json(roles);
+        // Get all roles
-    } catch (error) {
+        const roles = await con.query('SELECT * FROM roles;');
-        logger.error(
+
-            'app',
+        // Get all members for each role
-            'Failed to get all roles',
+        const membersRoles = await con.query(`
-            {
+            SELECT mr.role_id, v.*
-                error: error instanceof Error ? error.message : String(error),
+            FROM members_roles mr
-                stack: error instanceof Error ? error.stack : undefined,
+            JOIN view_member_rank_unit_status_latest v ON mr.member_id = v.member_id
-            }
+            `);
-        );
+
-        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("dev")], async (req, res) => {
+r.post('/', [requireMemberState(MemberState.Member), requireRole("17th Administrator")], async (req, res) => {
     try {
         const { name, color, description } = req.body;
         if (!name || !color) {
@@ -148,8 +94,7 @@ r.post('/', [requireMemberState(MemberState.Member), requireRole("dev")], async
             return res.status(400).json({ error: 'Color must be a valid hex color (#ffffff)' });
         }
 
-        let out = await createGroup(name, color, description);
+        await createGroup(name, color, description);
-        audit.roles('create', { actorId: req.user.id, targetId: out.id });
 
         res.sendStatus(201);
     } catch (err) {
@@ -158,15 +103,12 @@ r.post('/', [requireMemberState(MemberState.Member), requireRole("dev")], async
     }
 })
 
-r.delete('/:id', [requireMemberState(MemberState.Member), requireRole("dev")], async (req, res) => {
+r.delete('/:id', [requireMemberState(MemberState.Member), requireRole("17th Administrator")], 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,7 +4,6 @@ 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);
@@ -39,16 +38,9 @@ statusR.get('/', async (req, res) => {
     try {
         const result = await pool.query('SELECT * FROM statuses;');
         res.json(result);
-    } catch (error) {
+    } catch (err) {
-        logger.error(
+        console.error(err);
-            'app',
+        res.status(500).json({ error: 'Internal server error' });
-            '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

@@ -1,73 +0,0 @@
-import express = require('express');
-const unitsRouter = express.Router();
-const memberUnitsRouter = express.Router();
-
-import { Request, Response } from 'express';
-
-import pool from '../db';
-import { requireLogin, requireMemberState, requireRole } from '../middleware/auth';
-import { logger } from '../services/logging/logger';
-import { Unit } from '@app/shared/types/units';
-import { MemberState } from '@app/shared/types/member';
-import { assignNewUnit } from '../services/db/unitService';
-import { audit } from '../services/logging/auditLog';
-import { forceInsertMemberRank, insertMemberRank } from '../services/db/rankService';
-
-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);
-    }
-});
-
-memberUnitsRouter.post('/admin', [requireMemberState(MemberState.Member), requireRole("17th Administrator")], async (req: Request, res: Response) => {
-    const memberId = Number(req.query.memberId);
-    const unitId = Number(req.query.unitId);
-    const rankId = Number(req.query.rankId);
-    const reason = req.query.reason as string;
-
-    try {
-
-        if (!memberId || !unitId) {
-            return res.status(400).json({ error: 'memberId and unitId query parameters are required' });
-        }
-
-        await assignNewUnit(memberId, unitId, req.user.id, req.user.id, reason);
-        await forceInsertMemberRank(memberId, rankId, req.user.id, req.user.id, reason);
-        logger.info('app', 'Member force assigned unit', {
-            member: memberId,
-            unit: unitId,
-            rank: rankId,
-            caller: req.user.id,
-        });
-        audit.member('update_unit', { actorId: req.user.id, targetId: memberId }, { unit: unitId, rank: rankId, reason: reason });
-
-        res.sendStatus(200);
-    } catch (error) {
-        logger.error('app', 'Failed to force assign unit', {
-            member: memberId,
-            unit: unitId,
-            caller: req.user.id,
-            error: error instanceof Error ? error.message : String(error),
-            stack: error instanceof Error ? error.stack : undefined,
-        })
-
-        res.sendStatus(500);
-    }
-});
-
-export const units = unitsRouter;
-export const memberUnits = memberUnitsRouter;

api/src/services/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,10 +83,8 @@ 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, hasBookwork, hasQual) VALUES (?, ?, ?, ?, ?, ?);", [event.course_id, toDateTime(event.event_date), event.remarks, event.created_by, course.hasBookwork, course.hasQual]);
+        const res = await con.query("INSERT INTO course_events (course_id, event_date, remarks, created_by) VALUES (?, ?, ?, ?);", [event.course_id, toDateTime(event.event_date), event.remarks, event.created_by]);
         var eventID: number = res.insertId;
 
         for (const attendee of event.attendees) {

api/src/services/applicationService.ts

@@ -1,22 +1,11 @@
 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> {
@@ -74,7 +63,7 @@ export async function getAllMemberApplications(memberID: number): Promise<Applic
 }
 
 
-export async function approveApplication(id: number, approver: number, con: mariadb.Connection | mariadb.Pool = pool) {
+export async function approveApplication(id: number, approver: number) {
   const sql = `
       UPDATE applications
          SET approved_at = NOW(), approved_by = ?
@@ -83,7 +72,7 @@ export async function approveApplication(id: number, approver: number, con: mari
         AND denied_at IS NULL
       `;
 
-  const result = await con.query(sql, [approver, id]);
+  const result = await pool.execute(sql, [approver, id]);
   if (result.affectedRows == 1) {
     return
   } else {

api/src/services/cache/cache.ts

@@ -1,19 +0,0 @@
-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/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,8 +19,7 @@ export async function createEvent(eventObject: Omit<CalendarEvent, 'id' | 'creat
     ];
 
     const result = await pool.query(sql, params);
-    let id = Number(result.insertId);
+    return { id: result.insertId, ...eventObject };
-    return id;
 }
 
 export async function updateEvent(eventObject: CalendarEvent) {

api/src/services/db/memberService.ts

@@ -1,285 +0,0 @@
-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[] =
-            typeof row.roles === "string"
-                ? JSON.parse(row.roles)
-                : 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/rolesService.ts

@@ -1,78 +0,0 @@
-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';
-import * as mariadb from 'mariadb';
-
-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[]
-}
-
-export async function stripUserRoles(userID: number, con: mariadb.Pool | mariadb.Connection = pool) {
-    try {
-        const out = await con.query(`DELETE FROM members_roles WHERE member_id = ?;`, [userID]);
-        return { success: true, affectedRows: out.affectedRows };
-    } catch (error) {
-        logger.error('app', 'Failed to strip user roles', error);
-        throw error;
-    } finally {
-        memberCache.Invalidate(userID);
-    }
-}

api/src/services/db/unitService.ts

@@ -1,22 +0,0 @@
-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;
-    }
-}
-
-export async function assignNewUnit(memberID: number, unitID: number, authorizedID: number, creatorID: number, reason: string) {
-    let sql = `CALL sp_update_member_unit(?, ?, ?, ?, ?, NOW())`;
-
-    const result = await pool.query(sql, [memberID, unitID, authorizedID, creatorID, reason]);
-    if (!result || result.affectedRows === 0) {
-        throw new Error('Record was not updated');
-    }
-}

api/src/services/events/eventBus.ts

@@ -1,56 +0,0 @@
-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

@@ -1,39 +0,0 @@
-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/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,18 +69,17 @@ export async function getUserActiveLOA(userId: number): Promise<LOARequest[]> {
             FROM leave_of_absences
             WHERE member_id = ?
             AND closed IS NULL
-            AND UTC_TIMESTAMP() > start_date;`
+            AND UTC_TIMESTAMP() BETWEEN start_date AND end_date;`
     const LOAData = await pool.query(sql, [userId]);
     return LOAData;
 }
 
-export async function createNewLOA(data: LOARequest): Promise<number> {
+export async function createNewLOA(data: LOARequest) {
     const sql = `INSERT INTO leave_of_absences 
                 (member_id, filed_date, start_date, end_date, type_id, reason) 
              VALUES (?, ?, ?, ?, ?, ?)`;
-    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])
+    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/logging/auditLog.ts

@@ -1,61 +0,0 @@
-import pool from "../../db";
-import { logger } from "./logger";
-
-export type AuditArea = 'member' | 'calendar' | 'roles' | 'auth' | 'leave_of_absence' | 'application' | 'course';
-
-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'| 'update_unit' | '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);
-    }
-}
-
-export const audit = new AuditLogger();

api/src/services/logging/logger.ts

@@ -1,72 +0,0 @@
-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

@@ -0,0 +1,73 @@
+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,9 +1,8 @@
 import { BatchPromotion, BatchPromotionMember } from "@app/shared/schemas/promotionSchema";
 import { PromotionDetails, PromotionSummary } from "@app/shared/types/rank"
-import pool from "../../db";
+import pool from "../db";
 import { PagedData } from "@app/shared/types/pagination";
-import { toDate, toDateIgnoreZone, toDateTime } from "@app/shared/utils/time";
+import { toDateTime } from "@app/shared/utils/time";
-import * as mariadb from 'mariadb';
 
 export async function getAllRanks() {
     const rows = await pool.query(
@@ -36,22 +35,13 @@ export async function insertMemberRank(member_id: number, rank_id: number, date?
     await pool.query(sql, params);
 }
 
-export async function forceInsertMemberRank(member_id: number, rank_id: number, authorized: number, creator: number, reason: string) {
-    const sql = `CALL sp_update_member_rank(?, ?, ?, ?, ?, NOW())`;
 
-    const result = await pool.query(sql, [member_id, rank_id, authorized, creator, reason]);
+export async function batchInsertMemberRank(promos: BatchPromotionMember[], author: number) {
-
-    if (!result || result.affectedRows === 0) {
-        throw new Error("Failed to update member rank");
-    }
-}
-
-
-export async function batchInsertMemberRank(promos: BatchPromotionMember[], author: number, approver: number) {
     try {
         var con = await pool.getConnection();
+        console.log(promos);
         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.query(`CALL sp_update_member_rank(?, ?, ?, ?, ?, ?)`, [p.member_id, p.rank_id, author, author, "Rank Change", toDateTime(new Date(p.start_date))])
         });
 
         con.commit();
@@ -80,7 +70,7 @@ export async function getPromotionHistorySummary(page: number = 1, pageSize: num
 
     let promoList: PromotionSummary[] = await pool.query(sql, [pageSize, offset]) as PromotionSummary[];
 
-    let rowCount = Number((await pool.query(`SELECT
+    let loaCount = Number((await pool.query(`SELECT
                                                 COUNT(*) AS total_grouped_days_count
                                             FROM
                                                 (
@@ -89,9 +79,10 @@ export async function getPromotionHistorySummary(page: number = 1, pageSize: num
                                                     WHERE reason = 'Rank Change'
                                                 ) AS grouped_days;`))[0]);
 
-    let pageCount = rowCount / pageSize;
+    console.log(loaCount);
+    let pageCount = loaCount / pageSize;
 
-    let output: PagedData<PromotionSummary> = { data: promoList, pagination: { page: page, pageSize: pageSize, total: rowCount, totalPages: pageCount } }
+    let output: PagedData<PromotionSummary> = { data: promoList, pagination: { page: page, pageSize: pageSize, total: loaCount, totalPages: pageCount } }
     return output;
 }
 
@@ -102,10 +93,8 @@ export async function getPromotionsOnDay(day: Date): Promise<PromotionDetails[]>
     // 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.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
@@ -116,14 +105,4 @@ export async function getPromotionsOnDay(day: Date): Promise<PromotionDetails[]>
     let batchPromotion = await pool.query(sql, [dayString]) as PromotionDetails[];
 
     return batchPromotion;
-}
-
-export async function cancelLatestRank(userID: number, con: mariadb.Pool | mariadb.Connection = pool): Promise<boolean> {
-    try {
-        let sql = `CALL sp_end_member_rank(?,NOW())`;
-        con.query(sql, [userID]);
-        return true;
-    } catch (error) {
-        throw error;
-    }
 }

api/src/services/rolesService.ts

@@ -0,0 +1,27 @@
+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/src/services/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/tsconfig.json

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

docker-compose.dev.yml

@@ -1,13 +0,0 @@
-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

@@ -1,54 +0,0 @@
-## 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

@@ -1,10 +0,0 @@
-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/promotionSchema.ts

@@ -10,7 +10,7 @@ export const batchPromotionMemberSchema = z.object({
 
 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

shared/types/member.ts

@@ -1,22 +1,17 @@
 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 = 1,
+    Guest = "guest",
-    Applicant = 2,
+    Applicant = "applicant",
-    Member = 3,
+    Member = "member",
-    Retired = 4,
+    Retired = "retired",
-    Discharged = 5,
+    Banned = "banned",
-    Suspended = 6,
+    Denied = "denied"
-    Banned = 7,
-    Denied = 8
 }
 
 export type Member = {
@@ -30,7 +25,6 @@ export type Member = {
     status: string | null;
     status_date: string | null;
     loa_until?: Date;
-    member_state?: MemberState;
 };
 
 export interface MemberLight {
@@ -40,11 +34,6 @@ export interface MemberLight {
     color: string
 }
 
-export interface MemberCardDetails {
-    member: Member;
-    roles: Role[];
-}
-
 export interface myData {
     member: Member;
     LOAs: LOARequest[];

shared/types/rank.ts

@@ -11,9 +11,7 @@ export interface PromotionSummary {
 }
 
 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,14 +1,6 @@
-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

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

shared/utils/time.ts

@@ -3,34 +3,12 @@ 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,8 +35,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"
       },
       "engines": {
         "node": "^20.19.0 || >=22.12.0"
@@ -1885,35 +1884,6 @@
         "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",
@@ -2113,22 +2083,6 @@
         "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",
@@ -2217,13 +2171,6 @@
         "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",
@@ -3176,13 +3123,6 @@
       "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",
@@ -3276,13 +3216,6 @@
         "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",
@@ -3713,21 +3646,6 @@
         "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",
@@ -4014,13 +3932,6 @@
         "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",
@@ -4063,23 +3974,6 @@
       "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,7 +39,6 @@
     "@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,27 +1,24 @@
-<script setup lang="ts">
+<script setup>
-  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",
-    });
+  });
-  }
+}
 
-  //@ts-ignore
+const environment = import.meta.env.VITE_ENVIRONMENT;
-  const environment = import.meta.env.VITE_ENVIRONMENT;
-  //@ts-ignore
-  const version = import.meta.env.VITE_APPLICATION_VERSION;
 </script>
 
 <template>
@@ -31,22 +28,15 @@
       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 max-w-5xl" variant="info">
+      <Alert v-if="environment == 'dev'" class="m-2 mx-auto w-5xl" variant="info">
-        <AlertDescription class="flex flex-row items-center text-wrap gap-5 mx-auto">
+        <AlertDescription class="flex flex-row items-center text-nowrap gap-5 mx-auto">
-          <p>Development environment (v{{ version }}). Features may be incomplete or unavailable.</p>
+          <p>This is a development build of the application. Some features will be unavailable or unstable.</p>
         </AlertDescription>
       </Alert>
-      <Alert v-if="userStore.user?.LOAs?.[0]" class="m-2 mx-auto max-w-5xl" variant="info">
+      <Alert v-if="userStore.user?.LOAs?.[0]" class="m-2 mx-auto w-5xl" variant="info">
         <AlertDescription class="flex flex-row items-center text-nowrap gap-5 mx-auto">
-          <p
+          <p>You are on LOA until <strong>{{ formatDate(userStore.user?.LOAs?.[0].extended_till ||
-            v-if="new Date(userStore.user?.LOAs?.[0].extended_till || userStore.user?.LOAs?.[0].end_date) > new Date()">
+            userStore.user?.LOAs?.[0].end_date) }}</strong></p>
-            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>
@@ -57,3 +47,5 @@
     <RouterView class="flex-1 min-h-0"></RouterView>
   </div>
 </template>
+
+<style scoped></style>

ui/src/api/loa.ts

@@ -169,23 +169,6 @@ export async function extendLOA(id: number, to: Date) {
         }
     });
 
-    if (res.ok) {
-        return
-    } else {
-        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 {

ui/src/api/member.ts

@@ -1,5 +1,4 @@
-import { Discharge } from "@shared/schemas/dischargeSchema";
+import { memberSettings, Member, MemberLight } from "@shared/types/member";
-import { memberSettings, Member, MemberLight, MemberCardDetails, PaginatedMembers, MemberState } from "@shared/types/member";
 
 //  @ts-ignore
 const addr = import.meta.env.VITE_APIHOST;
@@ -14,33 +13,6 @@ 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'
@@ -66,8 +38,8 @@ export async function setMemberSettings(settings: memberSettings) {
     return;
 }
 
-export async function getAllLightMembers(activeOnly: boolean = true): Promise<MemberLight[]> {
+export async function getAllLightMembers(): Promise<MemberLight[]> {
-    const response = await fetch(`${addr}/members/lite${activeOnly ? '?active=true' : '?active=false'}`, {
+    const response = await fetch(`${addr}/members/lite`, {
         credentials: 'include',
         headers: {
             "Content-Type": "application/json",
@@ -99,7 +71,7 @@ export async function getLightMembers(ids: number[]): Promise<MemberLight[]> {
     return response.json();
 }
 
-export async function getFullMembers(ids: number[]): Promise<MemberCardDetails[]> {
+export async function getFullMembers(ids: number[]): Promise<Member[]> {
 
     if (ids.length === 0) return [];
 
@@ -115,46 +87,4 @@ export async function getFullMembers(ids: number[]): Promise<MemberCardDetails[]
         throw new Error("Failed to fetch settings");
     }
     return response.json();
-}
-
-/**
- * Requests for the given member to be discharged
- * @param data discharge packet
- * @returns true on success
- */
-export async function dischargeMember(data: Discharge): Promise<boolean> {
-    const response = await fetch(`${addr}/members/discharge`, {
-        credentials: 'include',
-        method: 'POST',
-        headers: {
-            "Content-Type": "application/json",
-        },
-        body: JSON.stringify(data)
-    });
-    if (!response.ok) {
-        throw new Error("Failed to discharge member");
-    }
-    return true;
-}
-
-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/rank.ts

@@ -61,6 +61,7 @@ export async function getPromoHistory(page?: number, pageSize?: number): Promise
 }
 
 export async function getPromotionsOnDay(day: Date): Promise<PromotionDetails[]> {
+    console.log(day.toISOString());
     const res = await fetch(`${addr}/memberRanks/${day.toISOString()}`, {
         credentials: 'include',
     })

ui/src/api/roles.ts

@@ -1,5 +1,10 @@
-import { Member, MemberLight } from "@shared/types/member";
+export type Role = {
-import { Role } from "@shared/types/roles";
+    id: number;
+    name: string;
+    color: string;
+    description: string | null;
+    members: any[];
+};
 
 //  @ts-ignore
 const addr = import.meta.env.VITE_APIHOST;
@@ -17,30 +22,6 @@ 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

@@ -1,26 +0,0 @@
-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();
-}
-
-export async function adminAssignUnit(member: number, unit: number, rank: number, reason: string) {
-    const response = await fetch(`${addr}/memberUnits/admin?memberId=${member}&unitId=${unit}&rankId=${rank}&reason=${encodeURIComponent(reason)}`, {
-        method: 'POST',
-        credentials: 'include'
-    });
-    if (!response.ok) {
-        throw new Error("Failed to assign unit");
-    }
-    return;
-}

ui/src/components/Navigation/Navbar.vue

@@ -21,7 +21,6 @@ import { useAuth } from '@/composables/useAuth';
 import { ArrowUpRight, CircleArrowOutUpRight } from 'lucide-vue-next';
 import DropdownMenuGroup from '../ui/dropdown-menu/DropdownMenuGroup.vue';
 import DropdownMenuSeparator from '../ui/dropdown-menu/DropdownMenuSeparator.vue';
-import { MemberState } from '@shared/types/member';
 
 const userStore = useUserStore();
 const auth = useAuth();
@@ -52,7 +51,7 @@ function blurAfter() {
                     <img src="/17RBN_Logo.png" class="w-10 h-10 object-contain"></img>
                 </RouterLink>
                 <!-- Member navigation -->
-                <div v-if="auth.accountStatus.value == MemberState.Member" class="h-15 flex items-center justify-center">
+                <div v-if="auth.accountStatus.value == 'member'" class="h-15 flex items-center justify-center">
                     <NavigationMenu>
                         <NavigationMenuList class="gap-3">
 
@@ -124,13 +123,13 @@ function blurAfter() {
                                         </RouterLink>
                                     </NavigationMenuLink>
 
-                                    <NavigationMenuLink
+                                    <!-- <NavigationMenuLink
                                         v-if="auth.hasAnyRole(['17th Administrator', '17th HQ', '17th Command'])"
                                         as-child :class="navigationMenuTriggerStyle()">
-                                        <RouterLink to="/administration/rankChange" @click="blurAfter">
+                                        <RouterLink to="/administration/transfer" @click="blurAfter">
-                                            Promotions
+                                            Transfer Requests
                                         </RouterLink>
-                                    </NavigationMenuLink>
+                                    </NavigationMenuLink> -->
 
                                     <NavigationMenuLink v-if="auth.hasRole('Recruiter')" as-child
                                         :class="navigationMenuTriggerStyle()">
@@ -139,12 +138,6 @@ 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">
@@ -153,6 +146,13 @@ 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 {
-  Field,
+  FormControl,
-  FieldContent,
+  FormDescription,
-  FieldDescription,
+  FormField,
-  FieldGroup,
+  FormItem,
-  FieldLabel,
+  FormLabel,
-} from '@/components/ui/field'
+  FormMessage,
-import FieldError from '@/components/ui/field/FieldError.vue';
+} from '@/components/ui/form'
 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,22 +58,13 @@ const fallbackInitials = {
 
 const props = defineProps<{
   readOnly: boolean,
-  data: ApplicationData | null,
+  data: ApplicationData,
 }>()
 
 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);
 }
@@ -89,9 +80,6 @@ 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();
 })
@@ -115,237 +103,221 @@ function enforceExternalLinks() {
 }
 
 watch(() => showCoC.value, async () => {
-  if (showCoC.value) {
+  if (showCoC) {
     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" @submit.prevent="submitForm" class="space-y-6">
+  <Form v-if="initialValues" :validation-schema="formSchema" :initial-values="initialValues" @submit="onSubmit"
+    class="space-y-6">
     <!-- Age -->
-    <VeeField name="dob" v-slot="{ field, errors }">
+    <FormField name="dob" v-slot="{ value, handleChange }">
-      <Field>
+      <FormItem>
-        <FieldLabel>What is your date of birth?</FieldLabel>
+        <FormLabel>What is your date of birth?</FormLabel>
-        <FieldContent>
+        <FormControl>
-          <div class="flex items-center gap-10">
+          <DateInput :model-value="(value as string) ?? ''" :disabled="readOnly" @update:model-value="handleChange" />
-            <DateInput :model-value="(field.value as string) ?? ''" :disabled="readOnly" @update:model-value="field.onChange" />
+        </FormControl>
-            <p v-if="props.readOnly" class="text-muted-foreground">Age: {{ convertToAge(field.value) }}</p>
-          </div>
-        </FieldContent>
         <div class="h-4">
-          <FieldError v-if="errors.length" :errors="errors" />
+          <FormMessage class="text-destructive" />
         </div>
-      </Field>
+      </FormItem>
-    </VeeField>
+    </FormField>
 
     <!-- Name -->
-    <VeeField name="name" v-slot="{ field, errors }">
+    <FormField name="name" v-slot="{ value, handleChange }">
-      <Field>
+      <FormItem>
-        <FieldLabel>What name will you be going by within the community?</FieldLabel>
+        <FormLabel>What name will you be going by within the community?</FormLabel>
-        <FieldDescription>This name must be consistent across platforms.</FieldDescription>
+        <FormDescription>This name must be consistent across platforms.</FormDescription>
-        <FieldContent>
+        <FormControl>
-          <Input :model-value="field.value" @update:model-value="field.onChange" :disabled="readOnly" />
+          <Input :model-value="value" @update:model-value="handleChange" :disabled="readOnly" />
-        </FieldContent>
+        </FormControl>
         <div class="h-4">
-          <FieldError v-if="errors.length" :errors="errors" />
+          <FormMessage class="text-destructive" />
         </div>
-      </Field>
+      </FormItem>
-    </VeeField>
+    </FormField>
 
     <!-- Playtime -->
-    <VeeField name="playtime" v-slot="{ field, errors }">
+    <FormField name="playtime" v-slot="{ value, handleChange }">
-      <Field>
+      <FormItem>
-        <FieldLabel>How long have you played Arma 3 for (in hours)?</FieldLabel>
+        <FormLabel>How long have you played Arma 3 for (in hours)?</FormLabel>
-        <FieldContent>
+        <FormControl>
-          <Input type="number" :model-value="field.value" @update:model-value="field.onChange" :disabled="readOnly" />
+          <Input type="number" :model-value="value" @update:model-value="handleChange" :disabled="readOnly" />
-        </FieldContent>
+        </FormControl>
         <div class="h-4">
-          <FieldError v-if="errors.length" :errors="errors" />
+          <FormMessage class="text-destructive" />
         </div>
-      </Field>
+      </FormItem>
-    </VeeField>
+    </FormField>
 
     <!-- Hobbies -->
-    <VeeField name="hobbies" v-slot="{ field, errors }">
+    <FormField name="hobbies" v-slot="{ value, handleChange }">
-      <Field>
+      <FormItem>
-        <FieldLabel>What hobbies do you like to participate in outside of gaming?</FieldLabel>
+        <FormLabel>What hobbies do you like to participate in outside of gaming?</FormLabel>
-        <FieldContent>
+        <FormControl>
-          <Textarea rows="4" class="resize-none" :model-value="field.value" @update:model-value="field.onChange"
+          <Textarea rows="4" class="resize-none" :model-value="value" @update:model-value="handleChange"
             :disabled="readOnly" />
-        </FieldContent>
+        </FormControl>
         <div class="h-4">
-          <FieldError v-if="errors.length" :errors="errors" />
+          <FormMessage class="text-destructive" />
         </div>
-      </Field>
+      </FormItem>
-    </VeeField>
+    </FormField>
 
     <!-- Military (boolean) -->
-    <VeeField name="military" v-slot="{ field, errors }">
+    <FormField name="military" v-slot="{ value, handleChange }">
-      <Field>
+      <FormItem>
-        <FieldLabel>Have you ever served in the military?</FieldLabel>
+        <FormLabel>Have you ever served in the military?</FormLabel>
-        <FieldContent>
+        <FormControl>
           <div class="flex items-center gap-2">
-            <Checkbox :model-value="field.value" @update:model-value="field.onChange" :disabled="readOnly" />
+            <Checkbox :model-value="value" @update:model-value="handleChange" :disabled="readOnly" />
             <span>Yes (checked) / No (unchecked)</span>
           </div>
-        </FieldContent>
+        </FormControl>
         <div class="h-4">
-          <FieldError v-if="errors.length" :errors="errors" />
+          <FormMessage class="text-destructive" />
         </div>
-      </Field>
+      </FormItem>
-    </VeeField>
+    </FormField>
 
     <!-- Other communities (freeform) -->
-    <VeeField name="communities" v-slot="{ field, errors }">
+    <FormField name="communities" v-slot="{ value, handleChange }">
-      <Field>
+      <FormItem>
-        <FieldLabel>Are you a part of any other communities? If so, which ones? If none, type "No"</FieldLabel>
+        <FormLabel>Are you a part of any other communities? If so, which ones? If none, type "No"</FormLabel>
-        <FieldContent>
+        <FormControl>
-          <Input :model-value="field.value" @update:model-value="field.onChange" :disabled="readOnly" />
+          <Input :model-value="value" @update:model-value="handleChange" :disabled="readOnly" />
-        </FieldContent>
+        </FormControl>
         <div class="h-4">
-          <FieldError v-if="errors.length" :errors="errors" />
+          <FormMessage class="text-destructive" />
         </div>
-      </Field>
+      </FormItem>
-    </VeeField>
+    </FormField>
 
     <!-- Why join -->
-    <VeeField name="joinReason" v-slot="{ field, errors }">
+    <FormField name="joinReason" v-slot="{ value, handleChange }">
-      <Field>
+      <FormItem>
-        <FieldLabel>Why do you want to join our community?</FieldLabel>
+        <FormLabel>Why do you want to join our community?</FormLabel>
-        <FieldContent>
+        <FormControl>
-          <Textarea rows="4" class="resize-none" :model-value="field.value" @update:model-value="field.onChange"
+          <Textarea rows="4" class="resize-none" :model-value="value" @update:model-value="handleChange"
             :disabled="readOnly" />
-        </FieldContent>
+        </FormControl>
         <div class="h-4">
-          <FieldError v-if="errors.length" :errors="errors" />
+          <FormMessage class="text-destructive" />
         </div>
-      </Field>
+      </FormItem>
-    </VeeField>
+    </FormField>
 
     <!-- Attraction to milsim -->
-    <VeeField name="milsimAttraction" v-slot="{ field, errors }">
+    <FormField name="milsimAttraction" v-slot="{ value, handleChange }">
-      <Field>
+      <FormItem>
-        <FieldLabel>What attracts you to the Arma 3 milsim playstyle?</FieldLabel>
+        <FormLabel>What attracts you to the Arma 3 milsim playstyle?</FormLabel>
-        <FieldContent>
+        <FormControl>
-          <Textarea rows="4" class="resize-none" :model-value="field.value" @update:model-value="field.onChange"
+          <Textarea rows="4" class="resize-none" :model-value="value" @update:model-value="handleChange"
             :disabled="readOnly" />
-        </FieldContent>
+        </FormControl>
         <div class="h-4">
-          <FieldError v-if="errors.length" :errors="errors" />
+          <FormMessage class="text-destructive" />
         </div>
-      </Field>
+      </FormItem>
-    </VeeField>
+    </FormField>
 
     <!-- Referral (freeform) -->
-    <VeeField name="referral" v-slot="{ field, errors }">
+    <FormField name="referral" v-slot="{ value, handleChange }">
-      <Field>
+      <FormItem>
-        <FieldLabel>Where did you hear about us? (If another member, who?)</FieldLabel>
+        <FormLabel>Where did you hear about us? (If another member, who?)</FormLabel>
-        <FieldContent>
+        <FormControl>
-          <Input placeholder="e.g., Reddit / Member: Alice" :model-value="field.value" @update:model-value="field.onChange"
+          <Input placeholder="e.g., Reddit / Member: Alice" :model-value="value" @update:model-value="handleChange"
             :disabled="readOnly" />
-        </FieldContent>
+        </FormControl>
         <div class="h-4">
-          <FieldError v-if="errors.length" :errors="errors" />
+          <FormMessage class="text-destructive" />
         </div>
-      </Field>
+      </FormItem>
-    </VeeField>
+    </FormField>
 
     <!-- Steam profile -->
-    <VeeField name="steamProfile" v-slot="{ field, errors }">
+    <FormField name="steamProfile" v-slot="{ value, handleChange }">
-      <Field>
+      <FormItem>
-        <FieldLabel>Steam profile link</FieldLabel>
+        <FormLabel>Steam profile link</FormLabel>
-        <FieldDescription>
+        <FormDescription>
           Format: <code>https://steamcommunity.com/id/USER/</code> or
           <code>https://steamcommunity.com/profiles/STEAMID64/</code>
-        </FieldDescription>
+        </FormDescription>
-        <FieldContent>
+        <FormControl>
-          <Input type="url" placeholder="https://steamcommunity.com/profiles/7656119..." :model-value="field.value"
+          <Input type="url" placeholder="https://steamcommunity.com/profiles/7656119..." :model-value="value"
-            @update:model-value="field.onChange" :disabled="readOnly" />
+            @update:model-value="handleChange" :disabled="readOnly" />
-        </FieldContent>
+        </FormControl>
         <div class="h-4">
-          <FieldError v-if="errors.length" :errors="errors" />
+          <FormMessage class="text-destructive" />
         </div>
-      </Field>
+      </FormItem>
-    </VeeField>
+    </FormField>
 
     <!-- Timezone -->
-    <VeeField name="timezone" v-slot="{ field, errors }">
+    <FormField name="timezone" v-slot="{ value, handleChange }">
-      <Field>
+      <FormItem>
-        <FieldLabel>What time zone are you in?</FieldLabel>
+        <FormLabel>What time zone are you in?</FormLabel>
-        <FieldContent>
+        <FormControl>
-          <Input placeholder="e.g., AEST, EST, UTC+10" :model-value="field.value" @update:model-value="field.onChange"
+          <Input placeholder="e.g., AEST, EST, UTC+10" :model-value="value" @update:model-value="handleChange"
             :disabled="readOnly" />
-        </FieldContent>
+        </FormControl>
         <div class="h-4">
-          <FieldError v-if="errors.length" :errors="errors" />
+          <FormMessage class="text-destructive" />
         </div>
-      </Field>
+      </FormItem>
-    </VeeField>
+    </FormField>
 
     <!-- Attendance (boolean) -->
-    <VeeField name="canAttendSaturday" v-slot="{ field, errors }">
+    <FormField name="canAttendSaturday" v-slot="{ value, handleChange }">
-      <Field>
+      <FormItem>
-        <FieldLabel>Are you able to attend weekly operations Saturdays @ 7pm CST?</FieldLabel>
+        <FormLabel>Are you able to attend weekly operations Saturdays @ 7pm CST?</FormLabel>
-        <FieldContent>
+        <FormControl>
           <div class="flex items-center gap-2">
-            <Checkbox :model-value="field.value ?? false" @update:model-value="field.onChange" :disabled="readOnly" />
+            <Checkbox :model-value="value ?? false" @update:model-value="handleChange" :disabled="readOnly" />
             <span>Yes (checked) / No (unchecked)</span>
           </div>
-        </FieldContent>
+        </FormControl>
         <div class="h-4">
-          <FieldError v-if="errors.length" :errors="errors" />
+          <FormMessage class="text-destructive" />
         </div>
-      </Field>
+      </FormItem>
-    </VeeField>
+    </FormField>
 
     <!-- Interests / Playstyle (freeform) -->
-    <VeeField name="interests" v-slot="{ field, errors }">
+    <FormField name="interests" v-slot="{ value, handleChange }">
-      <Field>
+      <FormItem>
-        <FieldLabel>Which playstyles interest you?</FieldLabel>
+        <FormLabel>Which playstyles interest you?</FormLabel>
-        <FieldContent>
+        <FormControl>
-          <Input placeholder="e.g., Rifleman; Medic; Pilot" :model-value="field.value" @update:model-value="field.onChange"
+          <Input placeholder="e.g., Rifleman; Medic; Pilot" :model-value="value" @update:model-value="handleChange"
             :disabled="readOnly" />
-        </FieldContent>
+        </FormControl>
         <div class="h-4">
-          <FieldError v-if="errors.length" :errors="errors" />
+          <FormMessage class="text-destructive" />
         </div>
-      </Field>
+      </FormItem>
-    </VeeField>
+    </FormField>
 
     <!-- Code of Conduct (boolean, field name kept as-is) -->
-    <VeeField name="acknowledgeRules" v-slot="{ field, errors }">
+    <FormField name="acknowledgeRules" v-slot="{ value, handleChange }">
-      <Field>
+      <FormItem>
-        <FieldLabel>Community Code of Conduct</FieldLabel>
+        <FormLabel>Community Code of Conduct</FormLabel>
-        <FieldContent>
+        <FormControl>
           <div class="flex items-center gap-2">
-            <Checkbox :model-value="field.value" @update:model-value="field.onChange" :disabled="readOnly" />
+            <Checkbox :model-value="value" @update:model-value="handleChange" :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>
-        </FieldContent>
+        </FormControl>
         <div class="h-4">
-          <FieldError v-if="errors.length" :errors="errors" />
+          <FormMessage class="text-destructive" />
         </div>
-      </Field>
+      </FormItem>
-    </VeeField>
+    </FormField>
 
     <div class="pt-2" v-if="!readOnly">
       <Button type="submit" :disabled="readOnly">Submit Application</Button>
@@ -362,5 +334,5 @@ function convertToAge(dob: string) {
       </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, Link, MapPin, User, X } from 'lucide-vue-next';
+import { CircleAlert, Clock4, EllipsisVertical, 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,8 +14,6 @@ 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();
 
@@ -32,14 +30,9 @@ 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
 }>()
 
@@ -87,7 +80,7 @@ async function setAttendance(state: CalendarAttendance) {
 
 const canEditEvent = computed(() => {
     if (!userStore.isLoggedIn) return false;
-    if (userStore.state !== MemberState.Member) return false;
+    if (userStore.state !== 'member') return false;
     if (userStore.user.member.member_id == activeEvent.value.creator_id)
         return true;
 });
@@ -185,20 +178,17 @@ defineExpose({ forceReload })
 <template>
     <div v-if="loaded">
         <!-- Header -->
-        <div class="flex items-center justify-between gap-3 border-b border-border px-4 py-3 ">
+        <div class="flex items-center justify-between gap-3 border-b px-4 py-3 h-14">
-            <h2 class="text-lg font-semibold break-after-all">
+            <h2 class="text-lg font-semibold break-all">
                 {{ activeEvent?.name || 'Event' }}
             </h2>
-            <div class="flex gap-2 items-center">
+            <div class="flex gap-4 items-center">
                 <DropdownMenu v-if="canEditEvent">
                     <DropdownMenuTrigger>
-                        <Button variant="ghost" size="icon">
+                        <button
-                            <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)">
@@ -212,17 +202,11 @@ defineExpose({ forceReload })
                         </DropdownMenuItem>
                     </DropdownMenuContent>
                 </DropdownMenu>
-                <Button variant="ghost" size="icon" @click="CopyLink()">
+                <button
-                    <Link class="size-4" />
+                    class="inline-flex flex-none size-8 items-center justify-center rounded-md border hover:bg-muted/40 transition cursor-pointer"
-                </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 -->
@@ -232,15 +216,15 @@ defineExpose({ forceReload })
                     <CircleAlert></CircleAlert> This event has been cancelled
                 </div>
             </section>
-            <section v-if="isPast && userStore.state === MemberState.Member" class="w-full">
+            <section v-if="isPast && userStore.state === 'member'" class="w-full">
-                <ButtonGroup class="flex w-full justify-center">
+                <ButtonGroup class="flex w-full">
-                    <Button variant="outline" class="flex-1"
+                    <Button variant="outline"
                         :class="myAttendance?.status === CalendarAttendance.Attending ? 'border-2 border-primary text-primary' : ''"
                         @click="setAttendance(CalendarAttendance.Attending)">Going</Button>
-                    <Button variant="outline" class="flex-1"
+                    <Button variant="outline"
                         :class="myAttendance?.status === CalendarAttendance.Maybe ? 'border-2 !border-l-2 border-primary text-primary' : ''"
                         @click="setAttendance(CalendarAttendance.Maybe)">Maybe</Button>
-                    <Button variant="outline" class="flex-1"
+                    <Button variant="outline"
                         :class="myAttendance?.status === CalendarAttendance.NotAttending ? 'border-2 !border-l-2 border-primary text-primary' : ''"
                         @click="setAttendance(CalendarAttendance.NotAttending)">Declined</Button>
                 </ButtonGroup>
@@ -265,7 +249,7 @@ defineExpose({ forceReload })
             <!-- Description -->
             <section class="space-y-2 w-full">
                 <p class="text-lg font-semibold">Description</p>
-                <p class="border border-border bg-muted/50 px-3 py-2 rounded-lg min-h-24 my-2 whitespace-pre-line">
+                <p class="border bg-muted/50 px-3 py-2 rounded-lg min-h-24 my-2 whitespace-pre-line">
                     {{ activeEvent.description }}
                 </p>
             </section>
@@ -279,8 +263,8 @@ defineExpose({ forceReload })
                         <p>Declined <span class="ml-1">{{ attendanceStatusSummary.notAttending }}</span></p>
                     </div> -->
                 </div>
-                <div class="flex flex-col border border-border bg-muted/50 rounded-lg min-h-24 my-2">
+                <div class="flex flex-col border bg-muted/50 rounded-lg min-h-24 my-2">
-                    <div class="flex w-full pt-2 border-b border-border *:w-full *:text-center *:pb-1 *:cursor-pointer">
+                    <div class="flex w-full pt-2 border-b *: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]'"
@@ -289,14 +273,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 border-border py-1 px-3 mb-2">
+                        <div class="grid grid-cols-2 font-semibold text-muted-foreground border-b 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-3 py-1 *:px-3 hover:bg-muted">
+                            class="grid grid-cols-2 py-1 *:px-3 hover:bg-muted">
-                            <div class="col-span-2">
+                            <div>
                                 <MemberCard :member-id="person.member_id"></MemberCard>
                             </div>
                             <p :class="statusColor(person.status)" class="text-right">
@@ -308,14 +292,13 @@ defineExpose({ forceReload })
             </section>
         </div>
     </div>
-    <div v-else class="relative flex justify-center items-center h-full">
+    <div v-else class="flex justify-center h-full items-center">
-        <!-- Close button (top-right) -->
+        <button
-        <Button variant="ghost" size="icon" class="absolute top-2 right-2" @click="emit('close')">
+            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"
-            <X class="size-5" />
+            aria-label="Close" @click="emit('close')">
-        </Button>
+            <X class="size-4" />
+        </button>
 
-        <!-- Spinner (centered) -->
+        <Spinner class="size-8"></Spinner>
-        <Spinner class="size-8" />
     </div>
-
 </template>

ui/src/components/loa/loaForm.vue

@@ -66,19 +66,14 @@ 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,
@@ -93,7 +88,6 @@ const onSubmit = handleSubmit(async (values) => {
         userStore.loadUser();
     }
     formSubmitted.value = true;
-    submitting.value = false;
 })
 
 onMounted(async () => {
@@ -331,12 +325,7 @@ const filteredMembers = computed(() => {
                     </VeeField>
                 </div>
                 <div class="flex justify-end">
-                    <Button type="submit" :disabled="submitting" class="w-35">
+                    <Button type="submit">Submit</Button>
-                        <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,141 +1,136 @@
 <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 { adminExtendLOA, cancelLOA, extendLOA, getAllLOAs, getMyLOAs } from "@/api/loa";
+import { 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",
     });
+}
 
-    async function loadLOAs() {
+function loaStatus(loa: LOARequest): "Upcoming" | "Active" | "Overdue" | "Closed" {
-        if (props.adminMode) {
+    if (loa.closed) return "Closed";
-            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 {
+    const now = new Date();
-        if (!date) return "";
+    const start = new Date(loa.start_date);
-        date = typeof date === 'string' ? new Date(date) : date;
+    const end = new Date(loa.end_date);
-        return date.toLocaleDateString("en-US", {
-            year: "numeric",
-            month: "short",
-            day: "numeric",
-        });
-    }
 
-    function loaStatus(loa: LOARequest): "Upcoming" | "Active" | "Extended" | "Overdue" | "Closed" {
+    if (now < start) return "Upcoming";
-        if (loa.closed) return "Closed";
+    if (now >= start && now <= end) return "Active";
+    if (now > end) return "Overdue";
 
-        const now = new Date();
+    return "Overdue"; // fallback
-        const start = new Date(loa.start_date);
+}
-        const end = new Date(loa.end_date);
-        const extension = new Date(loa.extended_till);
 
-        if (now < start) return "Upcoming";
+async function cancelAndReload(id: number) {
-        if (now >= start && (now <= end)) return "Active";
+    await cancelLOA(id, props.adminMode);
-        if (now >= start && (now <= extension)) return "Extended";
+    await loadLOAs();
-        if (now > loa.extended_till || end) return "Overdue";
+}
 
-        return "Overdue"; // fallback
+const isExtending = ref(false);
-    }
+const targetLOA = ref<LOARequest | null>(null);
+const extendTo = ref<CalendarDate | null>(null);
 
-    async function cancelAndReload(id: number) {
+const targetEnd = computed(() => { return targetLOA.value.extended_till ? targetLOA.value.extended_till : targetLOA.value.end_date })
-        await cancelLOA(id, props.adminMode);
-        await loadLOAs();
-    }
 
-    const isExtending = ref(false);
+function toCalendarDate(date: Date): CalendarDate {
-    const targetLOA = ref<LOARequest | null>(null);
+    if (typeof date === 'string')
-    const extendTo = ref<CalendarDate | null>(null);
+        date = new Date(date);
+    return new CalendarDate(date.getFullYear(), date.getMonth() + 1, date.getDate())
+}
 
-    const targetEnd = computed(() => { return targetLOA.value.extended_till ? targetLOA.value.extended_till : targetLOA.value.end_date })
+async function commitExtend() {
-    function toCalendarDate(date: Date): CalendarDate {
+    await extendLOA(targetLOA.value.id, extendTo.value.toDate(getLocalTimeZone()));
-        if (typeof date === 'string')
+    isExtending.value = false;
-            date = new Date(date);
+    await loadLOAs();
-        return new CalendarDate(date.getFullYear(), date.getMonth() + 1, date.getDate())
+}
-    }
 
-    async function commitExtend() {
+const expanded = ref<number | null>(null);
-        if (props.adminMode) {
+const hoverID = ref<number | null>(null);
-            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 expanded = ref<number | null>(null);
+const pageNum = ref<number>(1);
-    const hoverID = ref<number | null>(null);
+const pageData = ref<pagination>();
 
-    const pageNum = ref<number>(1);
+const pageSize = ref<number>(15)
-    const pageData = ref<pagination>();
+const pageSizeOptions = [10, 15, 30]
 
-    const pageSize = ref<number>(15)
+function setPageSize(size: number) {
-    const pageSizeOptions = [10, 15, 30]
+    pageSize.value = size
+    pageNum.value = 1;
+    loadLOAs();
+}
 
-    function setPageSize(size: number) {
+function setPage(pagenum: number) {
-        pageSize.value = size
+    pageNum.value = pagenum;
-        pageNum.value = 1;
+    loadLOAs();
-        loadLOAs();
+}
-    }
-
-    function setPage(pagenum: number) {
-        pageNum.value = pagenum;
-        loadLOAs();
-    }
 </script>
 
 <template>
@@ -148,7 +143,7 @@
                 <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="props.adminMode ? toCalendarDate(targetEnd).add({ years: 1 }) : toCalendarDate(targetEnd).add({ months: 1 })" />
+                        :max-value="toCalendarDate(targetEnd).add({ years: 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
@@ -196,22 +191,20 @@
                             <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" size="icon">
+                                        <Button variant="ghost">
                                             <Ellipsis class="size-6"></Ellipsis>
                                         </Button>
                                     </DropdownMenuTrigger>
                                     <DropdownMenuContent>
-                                        <DropdownMenuItem v-if="!post.closed"
+                                        <DropdownMenuItem v-if="!post.closed && props.adminMode"
-                                            :disabled="post.extended_till !== null && !props.adminMode"
                                             @click="isExtending = true; targetLOA = post">
-                                             {{ (post.extended_till !== null && !props.adminMode) ? 'Extend (Already Extended)' : 'Extend' }}
+                                            Extend
                                         </DropdownMenuItem>
                                         <DropdownMenuItem v-if="!post.closed" :variant="'destructive'"
                                             @click="cancelAndReload(post.id)">{{ loaStatus(post) === 'Upcoming' ?
@@ -227,11 +220,10 @@
                                 </DropdownMenu>
                             </TableCell>
                             <TableCell>
-                                <Button v-if="expanded === post.id" @click.stop="expanded = null" size="icon"
+                                <Button v-if="expanded === post.id" @click.stop="expanded = null" variant="ghost">
-                                    variant="ghost">
                                     <ChevronUp class="size-6" />
                                 </Button>
-                                <Button v-else @click.stop="expanded = post.id" size="icon" variant="ghost">
+                                <Button v-else @click.stop="expanded = post.id" variant="ghost">
                                     <ChevronDown class="size-6" />
                                 </Button>
                             </TableCell>
@@ -239,47 +231,21 @@
                         <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-4 mb-6 space-y-4">
+                                <div class="w-full p-3 mb-6 space-y-3">
-
+                                    <div class="flex justify-between items-start gap-4">
-                                    <!-- Dates -->
+                                        <div class="flex-1">
-                                    <div class="grid grid-cols-3 gap-4 text-sm">
+                                            <!-- Title -->
-                                        <div>
+                                            <p class="text-md font-semibold text-foreground">
-                                            <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>
+                                            </p>
-                                            <Separator class="flex-1" />
-                                        </div>
 
-                                        <div
+                                            <!-- Content -->
-                                            class="rounded-lg border bg-muted/40 px-4 py-3 text-sm leading-relaxed whitespace-pre-wrap text-muted-foreground">
+                                            <p
-                                            {{ post.reason || 'No reason provided.' }}
+                                                class="mt-1 text-md whitespace-pre-wrap leading-relaxed text-muted-foreground">
+                                                {{ post.reason }}
+                                            </p>
                                         </div>
                                     </div>
-
                                 </div>
                             </TableCell>
                         </TableRow>

ui/src/components/members/DischargeMember.vue

@@ -1,94 +0,0 @@
-<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': [value: boolean]
-    'discharged': [value: { data: Discharge }]
-}>()
-
-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, MemberCardDetails, type MemberLight } from '@shared/types/member'
+import { Member, type MemberLight } from '@shared/types/member'
 import Popover from '../ui/popover/Popover.vue';
 import PopoverTrigger from '../ui/popover/PopoverTrigger.vue';
 import PopoverContent from '../ui/popover/PopoverContent.vue';
@@ -9,7 +9,6 @@ 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
@@ -22,7 +21,7 @@ const props = defineProps({
 
 // Local state
 const memberLight = ref<MemberLight | null>(null);
-const memberFull = ref<MemberCardDetails | null>(null)
+const memberFull = ref<Member | null>(null)
 const loadingFull = ref(false)
 const membersStore = useMemberDirectory();
 
@@ -64,7 +63,7 @@ const hasFullInfo = computed(() => {
     if (!memberFull.value) return false
 
     // check if any field has a value
-    const { rank, unit, status } = memberFull.value.member
+    const { rank, unit, status } = memberFull.value
     return !!(rank || unit || status)
 })
 
@@ -91,7 +90,7 @@ function formatDate(date: Date): string {
                 {{ displayName }}
             </p>
         </PopoverTrigger>
-        <PopoverContent class="w-80 p-0 overflow-hidden">
+        <PopoverContent class="w-72 p-0 overflow-hidden">
             <!-- Loading -->
             <div v-if="loadingFull" class="p-4 text-sm text-muted-foreground mx-auto flex justify-center my-5">
                 <Spinner></Spinner>
@@ -115,36 +114,26 @@ function formatDate(date: Date): string {
                 <div class="p-4 space-y-3 text-sm">
                     <!-- Full info -->
                     <template v-if="hasFullInfo">
-                        <div v-if="memberFull.member.loa_until"
+                        <div v-if="memberFull.loa_until"
                             class=" rounded-md text-center bg-yellow-500/10 px-2 py-1 text-xs text-yellow-600">
-                            On Leave of Absence until {{ formatDate(memberFull.member.loa_until) }}
+                            On Leave of Absence until {{ formatDate(memberFull.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.member.rank }}</span>
+                            <span class="font-medium">{{ memberFull.rank }}</span>
                         </div>
 
-                        <div v-if="memberFull.member.unit" class="flex justify-between items-center">
+                        <div v-if="memberFull.unit" class="flex justify-between">
                             <span class="text-muted-foreground">Unit</span>
-                            <span class="font-medium flex items-center gap-2">
+                            <span class="font-medium">{{ memberFull.unit }}</span>
-                                <span class="w-2 h-2 rounded-full" :style="{ backgroundColor: textColor }"></span>
-                                {{ memberFull.member.unit }}
-                            </span>
                         </div>
 
-                        <div v-if="memberFull.member.status" class="flex justify-between">
+                        <div v-if="memberFull.status" class="flex justify-between">
                             <span class="text-muted-foreground">Status</span>
-                            <span class="font-medium">{{ memberFull.member.status }}</span>
+                            <span class="font-medium">{{ memberFull.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/members/TransferMember.vue

@@ -1,250 +0,0 @@
-<script setup lang="ts">
-import { computed, ref, watch } from 'vue'
-
-import { adminAssignUnit, getUnits } from '@/api/units'
-import { getAllRanks } from '@/api/rank'
-import { Button } from '@/components/ui/button'
-import {
-    Dialog,
-    DialogContent,
-    DialogDescription,
-    DialogFooter,
-    DialogHeader,
-    DialogTitle,
-} from '@/components/ui/dialog'
-import { Field, FieldError, FieldLabel } from '@/components/ui/field'
-import { Input } from '@/components/ui/input'
-import {
-    Select,
-    SelectContent,
-    SelectItem,
-    SelectTrigger,
-    SelectValue,
-} from '@/components/ui/select'
-import MemberCard from './MemberCard.vue'
-import type { Member } from '@shared/types/member'
-import type { Rank } from '@shared/types/rank'
-import type { Unit } from '@shared/types/units'
-
-const props = defineProps<{
-    open: boolean
-    member: Member | null
-}>()
-
-const emit = defineEmits<{
-    'update:open': [value: boolean]
-    transferred: [value: { memberId: number; unitId: number; rankId: number; reason: string }]
-}>()
-
-const units = ref<Unit[]>([])
-const ranks = ref<Rank[]>([])
-const loadingUnits = ref(false)
-const loadingRanks = ref(false)
-const submitting = ref(false)
-const formError = ref('')
-
-const selectedUnitId = ref('')
-const selectedRankId = ref('')
-const selectedReason = ref('transfer_request')
-const customReason = ref('')
-
-const reasonOptions = [
-    { label: 'Transfer Request', value: 'transfer_request' },
-    { label: 'Leadership Vote', value: 'leadership_vote' },
-    { label: 'Appointment', value: 'appointment' },
-    { label: 'Step Down', value: 'step_down' },
-    { label: 'Custom', value: 'custom' },
-]
-
-const resolvedReason = computed(() => {
-    if (selectedReason.value === 'custom') {
-        return customReason.value.trim()
-    }
-    return selectedReason.value
-})
-
-const canSubmit = computed(() => {
-    return !!props.member && !!selectedUnitId.value && !!selectedRankId.value && !!resolvedReason.value
-})
-
-function resolveDefaultRankId(member: Member | null): string {
-    if (!member || !member.rank) {
-        return ''
-    }
-
-    const normalizedMemberRank = member.rank.trim().toLowerCase()
-    const matchedRank = ranks.value.find((rank) => {
-        return rank.name.trim().toLowerCase() === normalizedMemberRank
-            || rank.short_name.trim().toLowerCase() === normalizedMemberRank
-    })
-
-    return matchedRank ? String(matchedRank.id) : ''
-}
-
-function resetForm() {
-    selectedUnitId.value = ''
-    selectedRankId.value = ''
-    selectedReason.value = 'transfer_request'
-    customReason.value = ''
-    formError.value = ''
-}
-
-async function loadUnits() {
-    loadingUnits.value = true
-    formError.value = ''
-    try {
-        units.value = await getUnits()
-    } catch {
-        formError.value = 'Failed to load units. Please try again.'
-    } finally {
-        loadingUnits.value = false
-    }
-}
-
-async function loadRanks() {
-    loadingRanks.value = true
-    formError.value = ''
-    try {
-        ranks.value = await getAllRanks()
-        selectedRankId.value = resolveDefaultRankId(props.member)
-    } catch {
-        formError.value = 'Failed to load ranks. Please try again.'
-    } finally {
-        loadingRanks.value = false
-    }
-}
-
-watch(
-    () => props.open,
-    (isOpen) => {
-        if (isOpen) {
-            resetForm()
-            loadUnits()
-            loadRanks()
-        }
-    },
-)
-
-async function onSubmit() {
-    if (!props.member) {
-        return
-    }
-
-    if (!selectedUnitId.value) {
-        formError.value = 'Please select a target unit.'
-        return
-    }
-
-    if (!selectedRankId.value) {
-        formError.value = 'Please select a target rank.'
-        return
-    }
-
-    if (!resolvedReason.value) {
-        formError.value = 'Please select a reason or enter a custom reason.'
-        return
-    }
-
-    submitting.value = true
-    formError.value = ''
-    try {
-        const unitId = Number(selectedUnitId.value)
-        const rankId = Number(selectedRankId.value)
-        await adminAssignUnit(props.member.member_id, unitId, rankId, resolvedReason.value)
-
-        emit('transferred', {
-            memberId: props.member.member_id,
-            unitId,
-            rankId,
-            reason: resolvedReason.value,
-        })
-        emit('update:open', false)
-    } catch {
-        formError.value = 'Failed to transfer member. Please try again.'
-    } finally {
-        submitting.value = false
-    }
-}
-</script>
-
-<template>
-    <Dialog :open="open" @update:open="emit('update:open', $event)">
-        <DialogContent class="sm:max-w-[425px]">
-            <DialogHeader>
-                <DialogTitle>Transfer Member</DialogTitle>
-                <DialogDescription>
-                    Select a new unit assignment for
-                    <MemberCard v-if="member" :member-id="member.member_id" />
-                </DialogDescription>
-            </DialogHeader>
-
-            <form id="transferForm" @submit.prevent="onSubmit" class="space-y-4 py-2">
-                <Field>
-                    <FieldLabel>Target Unit</FieldLabel>
-                    <Select v-model="selectedUnitId" :disabled="loadingUnits || submitting">
-                        <SelectTrigger>
-                            <SelectValue placeholder="Select unit" />
-                        </SelectTrigger>
-                        <SelectContent>
-                            <SelectItem v-for="unit in units" :key="unit.id" :value="String(unit.id)">
-                                {{ unit.name }}
-                            </SelectItem>
-                        </SelectContent>
-                    </Select>
-                </Field>
-
-                <Field>
-                    <FieldLabel>Target Rank</FieldLabel>
-                    <Select v-model="selectedRankId" :disabled="loadingRanks || submitting">
-                        <SelectTrigger>
-                            <SelectValue placeholder="Select rank" />
-                        </SelectTrigger>
-                        <SelectContent>
-                            <SelectItem v-for="rank in ranks" :key="rank.id" :value="String(rank.id)">
-                                {{ rank.name }}
-                            </SelectItem>
-                        </SelectContent>
-                    </Select>
-                </Field>
-
-                <Field>
-                    <FieldLabel>Reason</FieldLabel>
-                    <Select v-model="selectedReason" :disabled="submitting">
-                        <SelectTrigger>
-                            <SelectValue placeholder="Select reason" />
-                        </SelectTrigger>
-                        <SelectContent>
-                            <SelectItem
-                                v-for="reason in reasonOptions"
-                                :key="reason.value"
-                                :value="reason.value"
-                            >
-                                {{ reason.label }}
-                            </SelectItem>
-                        </SelectContent>
-                    </Select>
-                </Field>
-
-                <Field v-if="selectedReason === 'custom'">
-                    <FieldLabel>Custom Reason</FieldLabel>
-                    <Input
-                        v-model="customReason"
-                        :disabled="submitting"
-                        placeholder="Enter custom transfer reason"
-                    />
-                </Field>
-
-                <FieldError v-if="formError" :errors="[formError]" />
-            </form>
-
-            <DialogFooter class="gap-2">
-                <Button variant="ghost" @click="emit('update:open', false)">
-                    Cancel
-                </Button>
-                <Button type="submit" form="transferForm" :disabled="!canSubmit || loadingUnits || loadingRanks || submitting">
-                    {{ submitting ? 'Transferring...' : 'Transfer Member' }}
-                </Button>
-            </DialogFooter>
-        </DialogContent>
-    </Dialog>
-</template>

ui/src/components/promotions/promotionForm.vue

@@ -26,36 +26,25 @@ 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({
+const { handleSubmit, errors, values, resetForm, setFieldValue } = 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);
 
@@ -134,15 +123,21 @@ function setAllToday() {
 <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">
+            class="w-full min-w-0 flex flex-col gap-6">
-            <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">
+                        <div>
+                            <FieldLegend class="scroll-m-20 text-2xl font-semibold tracking-tight">
+                                Promotion Form
+                            </FieldLegend>
+                            <div class="h-6">
+                                <p v-if="errors.promotions && typeof errors.promotions === 'string'"
+                                    class="text-sm text-red-500">
+                                    {{ errors.promotions }}
+                                </p>
+                            </div>
+                        </div>
                         <!-- TABLE SHELL -->
                         <div class="">
                             <FieldGroup class="">
@@ -254,53 +249,9 @@ function setAllToday() {
                     </div>
                 </FieldSet>
             </VeeFieldArray>
-            <div class="flex justify-between items-start">
+            <div class="flex justify-end items-center gap-5">
-                <VeeField name="approver" v-slot="{ field, errors }">
+                <p v-if="submitError" class="text-destructive">{{ submitError }}</p>
-                    <div class="flex flex-col min-w-0 gap-2">
+                <Button type="submit">Submit</Button>
-                        <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>

ui/src/components/promotions/promotionList.vue

@@ -40,17 +40,6 @@ async function loadHistory() {
     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);
 
@@ -83,6 +72,9 @@ function formatDate(date: Date): string {
 </script>
 <template>
     <div class="flex flex-col max-w-7xl w-full">
+        <p class="scroll-m-20 text-2xl font-semibold tracking-tight mb-3">
+            Promotion History
+        </p>
         <div class="w-full mx-auto">
             <Table>
                 <TableHeader>
@@ -115,8 +107,7 @@ function formatDate(date: Date): string {
                             :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 :date="new Date(batch.entry_day)"></PromotionListDay>
-                                    </PromotionListDay>
                                 </div>
                             </TableCell>
                         </TableRow>
@@ -127,7 +118,7 @@ function formatDate(date: Date): string {
             <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 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">

ui/src/components/promotions/promotionListDay.vue

@@ -13,17 +13,8 @@ const props = defineProps<{
 const promoList = ref<PromotionDetails[]>();
 const loading = ref(true);
 
-async function loadData() {
-    promoList.value = await getPromotionsOnDay(props.date);
-}
-
-defineExpose({
-    loadData
-})
-
 onMounted(async () => {
-    // promoList.value = await getPromotionsOnDay(props.date);
+    promoList.value = await getPromotionsOnDay(props.date);
-    await loadData();
     loading.value = false;
 })
 
@@ -36,8 +27,7 @@ onMounted(async () => {
                 <tr class="border-b-2 border-gray-200 bg-white/10">
                     <th class="px-4 py-3 text-sm font-semibold">Member</th>
                     <th class="px-4 py-3 text-sm font-semibold">Rank</th>
-                    <th class="px-4 py-3 text-sm font-semibold">Approved By</th>
+                    <th class="px-4 py-3 text-sm font-semibold text-right">Approved By</th>
-                    <th class="px-4 py-3 text-sm font-semibold text-right">Submitted By</th>
                 </tr>
             </thead>
 
@@ -49,9 +39,6 @@ onMounted(async () => {
                     <td class="px-4 py-2 text-sm">
                         {{ p.short_name }}
                     </td>
-                    <td class="px-2 py-2 text-sm text-right">
-                        <MemberCard :member-id="p.authorized_by_id" />
-                    </td>
                     <td class="px-2 py-2 text-sm text-right">
                         <MemberCard :member-id="p.created_by_id" />
                     </td>

ui/src/components/roles/addMember.vue

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

ui/src/components/roles/roleView.vue

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

ui/src/components/tooltip/Tooltip.vue

@@ -1,20 +0,0 @@
-<script setup lang="ts">
-defineProps<{
-    open: boolean,
-    message: string
-}>();
-</script>
-
-<template>
-    <div class="relative inline-flex items-center group w-min">
-        <slot></slot>
-        <div v-if="open" class="pointer-events-none absolute -top-9 left-1/2 -translate-x-1/2
-                                                whitespace-nowrap rounded-md bg-popover px-2 py-1 text-xs
-                                                text-popover-foreground shadow-md border border-border
-                                                opacity-0 translate-y-1
-                                                group-hover:opacity-100 group-hover:translate-y-0
-                                                transition-opacity transition-transform duration-150">
-            {{ message }}
-        </div>
-    </div>
-</template>

ui/src/components/trainingReport/trainingReportForm.vue

@@ -25,8 +25,6 @@ import Popover from "@/components/ui/popover/Popover.vue";
 import PopoverTrigger from "@/components/ui/popover/PopoverTrigger.vue";
 import PopoverContent from "@/components/ui/popover/PopoverContent.vue";
 import Combobox from '../ui/combobox/Combobox.vue'
-import Tooltip from '../tooltip/Tooltip.vue'
-import Spinner from '../ui/spinner/Spinner.vue'
 
 
 const { handleSubmit, resetForm, errors, values, setFieldValue } = useForm({
@@ -52,9 +50,7 @@ watch(() => values.course_id, (newCourseId, oldCourseId) => {
     if (!oldCourseId) return;
 
     values.attendees.forEach((a, index) => {
-        // @ts-ignore
         setFieldValue(`attendees[${index}].passed_bookwork`, false);
-        // @ts-ignore
         setFieldValue(`attendees[${index}].passed_qual`, false);
     });
 });
@@ -68,24 +64,19 @@ function toMySQLDateTime(date: Date): string {
         .replace("T", " ") + "000";    // becomes → 2025-11-19 00:00:00.000000
 }
 
-const submitting = ref(false);
+
-async function onSubmit(vals) {
+function onSubmit(vals) {
-    //catch double submit
-    if (submitting.value) return;
-    submitting.value = true;
     try {
         const clean: CourseEventDetails = {
             ...vals,
             event_date: new Date(vals.event_date),
         }
 
-        await postTrainingReport(clean).then((newID) => {
+        postTrainingReport(clean).then((newID) => {
             emit("submit", newID);
         });
     } catch (err) {
         console.error("There was an error submitting the training report", err);
-    } finally {
-        submitting.value = false;
     }
 }
 
@@ -335,13 +326,22 @@ const filteredMembers = computed(() => {
                             <VeeField v-slot="{ field }" :name="`attendees[${index}].passed_bookwork`" type="checkbox"
                                 :value="false" :unchecked-value="true">
                                 <div class="flex flex-col items-center">
-                                    <Tooltip :open="!selectedCourse?.hasBookwork"
+                                    <div class="relative inline-flex items-center group">
-                                        message="This course does not have bookwork">
+
                                         <Checkbox :disabled="!selectedCourse?.hasBookwork"
                                             :name="`attendees[${index}].passed_bookwork`" :model-value="!field.checked"
                                             @update:model-value="field['onUpdate:modelValue']">
                                         </Checkbox>
-                                    </Tooltip>
+                                        <!-- Tooltip bubble -->
+                                        <div v-if="!selectedCourse?.hasBookwork" class="pointer-events-none absolute -top-9 left-1/2 -translate-x-1/2
+                                                whitespace-nowrap rounded-md bg-popover px-2 py-1 text-xs
+                                                text-popover-foreground shadow-md border border-border
+                                                opacity-0 translate-y-1
+                                                group-hover:opacity-100 group-hover:translate-y-0
+                                                transition-opacity transition-transform duration-150">
+                                            This course does not have bookwork
+                                        </div>
+                                    </div>
                                     <div class="h-4">
                                     </div>
                                 </div>
@@ -351,12 +351,20 @@ const filteredMembers = computed(() => {
                             <VeeField v-slot="{ field }" :name="`attendees[${index}].passed_qual`" type="checkbox"
                                 :value="false" :unchecked-value="true">
                                 <div class="flex flex-col items-center">
-                                    <Tooltip :open="!selectedCourse?.hasQual"
+                                    <div class="relative inline-flex items-center group">
-                                        message="This course does not have a qualification">
                                         <Checkbox :disabled="!selectedCourse?.hasQual"
                                             :name="`attendees[${index}].passed_qual`" :model-value="!field.checked"
                                             @update:model-value="field['onUpdate:modelValue']"></Checkbox>
-                                    </Tooltip>
+                                        <!-- Tooltip bubble -->
+                                        <div v-if="!selectedCourse?.hasQual" class="pointer-events-none absolute -top-9 left-1/2 -translate-x-1/2
+                                                whitespace-nowrap rounded-md bg-popover px-2 py-1 text-xs
+                                                text-popover-foreground shadow-md border border-border
+                                                opacity-0 translate-y-1
+                                                group-hover:opacity-100 group-hover:translate-y-0
+                                                transition-opacity transition-transform duration-150">
+                                            This course does not have a qualification
+                                        </div>
+                                    </div>
                                     <div class="h-4">
                                     </div>
                                 </div>
@@ -408,12 +416,7 @@ const filteredMembers = computed(() => {
         </FieldGroup>
         <div class="flex gap-3 justify-end">
             <Button type="button" variant="outline" @click="resetForm">Reset</Button>
-            <Button type="submit" form="trainingForm" :disabled="submitting" class="w-35">
+            <Button type="submit" form="trainingForm">Submit</Button>
-                <span class="flex items-center gap-2" v-if="submitting">
-                    <Spinner></Spinner> Submitting…
-                </span>
-                <span v-else>Submit</span>
-            </Button>
         </div>
     </form>
 </template>

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

@@ -16,7 +16,7 @@ export const buttonVariants = cva(
         secondary:
           "bg-secondary text-secondary-foreground shadow-xs hover:bg-secondary/80",
         ghost:
-          "hover:bg-accent active:bg-accent hover:text-accent-foreground dark:hover:bg-accent/50",
+          "hover:bg-accent hover:text-accent-foreground dark:hover:bg-accent/50",
         success:
           "bg-success text-success-foreground shadow-xs hover:bg-success/90",
         link: "text-primary underline-offset-4 hover:underline",

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

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

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

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

ui/src/lib/copyLink.ts

@@ -1,3 +0,0 @@
-export function CopyLink() {
-    navigator.clipboard.writeText(window.location.href);
-}

ui/src/main.js

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

ui/src/pages/Application.vue

@@ -5,11 +5,10 @@ import { onMounted, ref } from 'vue';
 import { approveApplication, denyApplication, loadApplication, postApplication, postChatMessage, getMyApplication, postAdminChatMessage } from '@/api/application';
 import { useRoute } from 'vue-router';
 import Button from '@/components/ui/button/Button.vue';
-import { CheckIcon, Link, XIcon } from 'lucide-vue-next';
+import { CheckIcon, XIcon } from 'lucide-vue-next';
 import Unauthorized from './Unauthorized.vue';
 import { ApplicationData, ApplicationFull, ApplicationStatus, CommentRow } from '@shared/types/application';
 import Spinner from '@/components/ui/spinner/Spinner.vue';
-import { CopyLink } from '@/lib/copyLink';
 
 const appData = ref<ApplicationData>(null);
 const appID = ref<number | null>(null);
@@ -21,7 +20,6 @@ const decisionDate = ref<Date | null>(null);
 const submitDate = ref<Date | null>(null);
 const loading = ref<boolean>(true);
 const member_name = ref<string>();
-const notFound = ref<boolean>(false);
 
 const props = defineProps<{
     mode?: "create" | "view-self" | "view-recruiter" | "view-self-id"
@@ -31,11 +29,6 @@ const finalMode = ref<"create" | "view-self" | "view-recruiter" | "view-self-id"
 
 function loadData(raw: ApplicationFull) {
 
-    if (!raw) {
-        notFound.value = true;
-        return;
-    }
-
     const data = raw.application;
 
     appID.value = data.id;
@@ -136,18 +129,11 @@ async function handleDeny(id) {
         <div v-if="unauthorized" class="flex justify-center w-full my-10">
             You do not have permission to view this application.
         </div>
-        <div v-else-if="notFound" class="flex justify-center w-full my-10 text-muted-foreground">
-            Looks like you dont have an application, reach out to the administration team if you believe this is an
-            error.
-        </div>
         <div v-else>
             <div v-if="!newApp" class="flex flex-row justify-between items-center py-2 mb-8">
                 <!-- Application header -->
                 <div>
-                    <div class="flex gap-4 items-center">
+                    <h3 class="scroll-m-20 text-2xl font-semibold tracking-tight">{{ member_name }}</h3>
-                        <h3 class="scroll-m-20 text-2xl font-semibold tracking-tight">{{ member_name }}</h3>
-                        <Button v-if="finalMode === 'view-recruiter'" variant="ghost" size="icon" @click="CopyLink()"><Link class="size-5"/></Button>
-                    </div>
                     <p class="text-muted-foreground">Submitted: {{ submitDate?.toLocaleString("en-US", {
                         year: "numeric",
                         month: "long",
@@ -195,7 +181,8 @@ async function handleDeny(id) {
         </div>
 
     </div>
+    <!-- TODO: Implement some kinda loading screen -->
     <div v-else class="flex items-center justify-center h-full">
-        <Spinner class="size-8" />
+        <Spinner class="size-8"/>
     </div>
 </template>

ui/src/pages/Banned.vue

@@ -0,0 +1,26 @@
+<template>
+    <div class="w-full max-w-2xl flex flex-col gap-8 justify-center mx-auto">
+        <h1 class="text-3xl sm:text-4xl font-bold text-left">
+            Access Restricted
+        </h1>
+        <div class="space-y-4 text-muted-foreground text-left leading-relaxed">
+            <p>
+                Your access to the <strong>17th Ranger Battalion</strong> has been
+                <strong>revoked</strong> due to a violation of our community standards
+                or policies.
+            </p>
+            <p>
+                If you believe this action was taken in error or would like to better
+                understand the reason for this decision, you may
+                <strong>reach out to our administrative staff on Discord</strong>
+                to request clarification or discuss a potential appeal.
+            </p>
+            <p>
+                Regards,<br />
+                <span class="text-foreground font-medium">
+                    The 17th Ranger Battalion Administration Team
+                </span>
+            </p>
+        </div>
+    </div>
+</template>

ui/src/pages/Calendar.vue

@@ -11,8 +11,6 @@ import { useRouter, useRoute } from 'vue-router'
 import { useCalendarEvents } from '@/composables/useCalendarEvents'
 import { useCalendarNavigation } from '@/composables/useCalendarNavigation'
 import { useUserStore } from '@/stores/user'
-import { CalendarOptions } from '@fullcalendar/core'
-import { MemberState } from '@shared/types/member'
 
 const monthLabels = [
     'January', 'February', 'March', 'April', 'May', 'June',
@@ -51,14 +49,14 @@ const dialogRef = ref<any>(null)
 // NEW: handle day/time slot clicks to start creating an event
 function onDateClick(arg: { dateStr: string }) {
     if (!userStore.isLoggedIn) return;
-    if (userStore.state !== MemberState.Member) return;
+    if (userStore.state !== 'member') return;
     dialogRef.value?.openDialog(arg.dateStr);
 }
 
-const calendarOptions = ref<CalendarOptions>({
+const calendarOptions = ref({
     plugins: [dayGridPlugin, interactionPlugin],
     initialView: 'dayGridMonth',
-    height: 'auto',
+    height: '100%',
     expandRows: true,
     headerToolbar: {
         left: '',
@@ -72,7 +70,6 @@ const calendarOptions = ref<CalendarOptions>({
     eventClick: onEventClick,
     editable: false,
 
-
     // force block-mode in dayGrid so we can lay it out on one line
     eventDisplay: 'block',
 
@@ -158,8 +155,8 @@ onMounted(() => {
     <div>
         <CreateCalendarEvent ref="dialogRef" @reload="loadEvents(); eventViewRef.forceReload();"></CreateCalendarEvent>
         <div class="flex">
-            <div class="flex-1 min-h-0 mt-5" :class="{ 'hidden md:block': panelOpen }">
+            <div class="flex-1 min-h-0 mt-5">
-                <div class="max-h-[80vh] overflow-y-auto min-h-0 scrollbar-themed p-2">
+                <div class="h-[80vh] min-h-0">
                     <!-- calendar header -->
                     <div class="flex items-center justify-between mx-5">
                         <!-- Left: title + pickers -->
@@ -199,7 +196,7 @@ onMounted(() => {
                                 @click="goToday">
                                 Today
                             </button>
-                            <button v-if="userStore.isLoggedIn && userStore.state === MemberState.Member"
+                            <button v-if="userStore.isLoggedIn && userStore.state === 'member'"
                                 class="cursor-pointer ml-1 inline-flex items-center gap-1.5 rounded-md bg-primary px-3 py-1.5 text-sm text-primary-foreground hover:opacity-90"
                                 @click="onCreateEvent">
                                 <Plus class="h-4 w-4" />
@@ -211,49 +208,50 @@ onMounted(() => {
                 </div>
             </div>
             <aside v-if="panelOpen"
-                class="w-screen 3xl:w-lg 2xl:w-md lg:border-l bg-card text-foreground flex flex-col overflow-auto scrollbar-themed"
+                class="3xl:w-lg 2xl:w-md border-l bg-card text-foreground flex flex-col overflow-auto scrollbar-themed"
                 :style="{ height: 'calc(100vh - 61px)', position: 'sticky', top: '64px' }">
                 <ViewCalendarEvent ref="eventViewRef" :key="currentEventID" @close="() => { router.push('/calendar'); }"
-                    @reload="loadEvents()" @load="calendarRef.getApi().updateSize()"
+                    @reload="loadEvents()" @edit="(val) => { dialogRef.openDialog(null, 'edit', val) }">
-                    @edit="(val) => { dialogRef.openDialog(null, 'edit', val) }">
                 </ViewCalendarEvent>
             </aside>
         </div>
     </div>
 </template>
 
+<style scoped>
+/* Firefox */
+.scrollbar-themed {
+    scrollbar-width: thin;
+    scrollbar-color: #555 #1f1f1f;
+    padding-right: 6px;
+}
+
+/* Chrome, Edge, Safari */
+.scrollbar-themed::-webkit-scrollbar {
+    width: 10px;
+    /* slightly wider to allow padding look */
+}
+
+.scrollbar-themed::-webkit-scrollbar-track {
+    background: #1f1f1f;
+    margin-left: 6px;
+    /* ❗ adds space between content + scrollbar */
+}
+
+.scrollbar-themed::-webkit-scrollbar-thumb {
+    background: #555;
+    border-radius: 9999px;
+}
+
+.scrollbar-themed::-webkit-scrollbar-thumb:hover {
+    background: #777;
+}
+</style>
+
 <style scoped>
 /* ---------- Optional container "card" around the calendar ---------- */
-/* Ensure the calendar fills the container properly */
 :global(.fc) {
     height: 100% !important;
-    --fc-border-color: var(--color-border);
-    --fc-button-bg-color: transparent;
-    --fc-button-border-color: var(--color-border);
-    --fc-button-hover-bg-color: var(--color-muted);
-}
-
-:global(.fc-theme-standard .fc-scrollgrid) {
-    border-radius: 8px;
-    overflow: hidden;
-    /* Rounds the corners of the grid */
-    border: 1px solid var(--color-border);
-}
-
-:global(.fc-daygrid-day-frame) {
-    display: flex;
-    flex-direction: column;
-    padding: 4px;
-}
-
-:global(.fc .fc-scroller-harness) {
-    background: transparent;
-}
-
-
-:global(.fc-daygrid-day-events) {
-    flex-grow: 1;
-    /* Pushes events to take up available space */
 }
 
 :global(.ev-pill.is-cancelled) {
@@ -346,9 +344,6 @@ onMounted(() => {
     text-decoration: none;
 }
 
-:global(#app > div > div.flex-1.min-h-0 > div > div > div > div.fc.fc-media-screen.fc-direction-ltr.fc-theme-standard > div.fc-view-harness.fc-view-harness-passive > div > table > thead > tr > th) {
-    background-color: transparent;
-}
 :global(.fc .fc-daygrid-day-top) {
     padding: 8px 8px 0 8px;
 }

ui/src/pages/Homepage.vue

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

ui/src/pages/Join.vue

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

ui/src/pages/ManageApplications.vue

@@ -13,10 +13,9 @@ import {
 import Button from '@/components/ui/button/Button.vue';
 import { computed, onMounted, ref, watch } from 'vue';
 import { useRoute, useRouter } from 'vue-router';
-import { CheckIcon, Link, XIcon } from 'lucide-vue-next';
+import { CheckIcon, XIcon } from 'lucide-vue-next';
 import Application from './Application.vue';
 import MemberCard from '@/components/members/MemberCard.vue';
-import { CopyLink } from '@/lib/copyLink';
 
 const appList = ref([]);
 const now = Date.now();
@@ -128,11 +127,9 @@ onMounted(async () => {
         <div v-if="openPanel" class="pl-9 border-l w-3/5" :key="$route.params.id">
             <div class="mb-5 flex justify-between">
                 <p class="scroll-m-20 text-2xl font-semibold tracking-tight"> Application</p>
-                <div class="flex items-center gap-2">
+                <button @click="closeApplication()" class="cursor-pointer">
-                    <Button @click="closeApplication()" variant="ghost" size="icon">
+                    <XIcon></XIcon>
-                        <XIcon class="size-6"></XIcon>
+                </button>
-                    </Button>
-                </div>
             </div>
             <div class="overflow-y-auto max-h-[80vh] h-full mt-5 scrollbar-themed">
                 <Application :mode="'view-recruiter'"></Application>