Possible fix for user card display crashing

Reviewed-on: #201

.gitea/workflows/deploy-dev.yaml

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

.gitea/workflows/deploy-prod.yaml

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

.gitea/workflows/pull-request.yaml

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

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

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

api/migrations/20260204140912-state-history-suspensions.js

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

api/migrations/20260212052346-state-reason-detailed.js

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

api/migrations/20260212165353-audit-log.js

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

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

@@ -473,55 +473,6 @@ CREATE TABLE IF NOT EXISTS `members_unit` (
   CONSTRAINT `FK_members_unit_units` FOREIGN KEY (`unit_id`) REFERENCES `units` (`id`) ON UPDATE CASCADE
 ) ENGINE=InnoDB AUTO_INCREMENT=100 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
 
-CREATE TABLE IF NOT EXISTS `mission_attendee_roles` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `name` varchar(50) DEFAULT NULL,
-  `short_name` varchar(50) DEFAULT NULL,
-  `description` text DEFAULT NULL,
-  `deleted` tinyint(1) NOT NULL DEFAULT 0,
-  PRIMARY KEY (`id`),
-  UNIQUE KEY `role_name` (`name`) USING BTREE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
-
-CREATE TABLE IF NOT EXISTS `mission_event_attendees` (
-  `id` int(11) DEFAULT NULL,
-  `member_id` int(11) NOT NULL,
-  `event_id` int(11) NOT NULL,
-  `member_role_id` int(11) DEFAULT NULL,
-  `event_type` int(11) NOT NULL,
-  `created_at` datetime NOT NULL DEFAULT current_timestamp(),
-  `updated_at` datetime NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
-  PRIMARY KEY (`member_id`,`event_id`) USING BTREE,
-  KEY `fk_mission_event_attendees_role_id` (`member_role_id`),
-  KEY `fk_mission_event_events_id` (`event_id`),
-  CONSTRAINT `fk_member_event_member_id` FOREIGN KEY (`member_id`) REFERENCES `members` (`id`) ON UPDATE CASCADE,
-  CONSTRAINT `fk_mission_event_attendees_role_id` FOREIGN KEY (`member_role_id`) REFERENCES `mission_attendee_roles` (`id`) ON UPDATE CASCADE,
-  CONSTRAINT `fk_mission_event_events_id` FOREIGN KEY (`event_id`) REFERENCES `mission_events` (`id`) ON UPDATE CASCADE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
-
-CREATE TABLE IF NOT EXISTS `mission_events` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `event_type_id` int(11) NOT NULL,
-  `event_name` varchar(100) NOT NULL,
-  `description` varchar(100) DEFAULT NULL,
-  `mission_name` varchar(100) NOT NULL,
-  `author_id` int(11) DEFAULT NULL,
-  `map_id` int(11) DEFAULT NULL,
-  `event_date` datetime NOT NULL,
-  `guilded_event_id` int(11) DEFAULT NULL,
-  `created_at` datetime NOT NULL DEFAULT current_timestamp(),
-  `updated_at` datetime NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
-  `deleted` tinyint(1) DEFAULT 0,
-  PRIMARY KEY (`id`),
-  UNIQUE KEY `event_name` (`event_name`),
-  KEY `fk_events_author_member_id` (`author_id`) USING BTREE,
-  KEY `fk_mission_event_type_id` (`event_type_id`),
-  KEY `fk_mission_event_map_id` (`map_id`),
-  CONSTRAINT `fk_events_author_id` FOREIGN KEY (`author_id`) REFERENCES `members` (`id`) ON UPDATE CASCADE,
-  CONSTRAINT `fk_mission_event_map_id` FOREIGN KEY (`map_id`) REFERENCES `arma_maps` (`id`) ON UPDATE CASCADE,
-  CONSTRAINT `fk_mission_event_type_id` FOREIGN KEY (`event_type_id`) REFERENCES `event_types` (`id`) ON UPDATE CASCADE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
-
 CREATE TABLE IF NOT EXISTS `operation_campaigns` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
   `name` varchar(100) NOT NULL,
@@ -1006,7 +957,7 @@ BEGIN
       AND ce.deleted = 0;
 END;
 
-
+DROP PROCEDURE IF EXISTS `sp_update_member_rank`;
 CREATE PROCEDURE IF NOT EXISTS `sp_update_member_rank`(
 	IN `p_member_id` INT,
 	IN `p_rank_id` INT,
@@ -1110,7 +1061,7 @@ BEGIN
     END IF;
 END;
 
-
+DROP PROCEDURE IF EXISTS `sp_update_member_status`;
 CREATE PROCEDURE IF NOT EXISTS `sp_update_member_status`(
 	IN `p_member_id` INT,
 	IN `p_status_id` INT,
@@ -1214,7 +1165,7 @@ BEGIN
     END IF;
 END;
 
-
+DROP PROCEDURE IF EXISTS `sp_update_member_unit`;
 CREATE PROCEDURE IF NOT EXISTS `sp_update_member_unit`(
 	IN `p_member_id` INT,
 	IN `p_unit_id` INT,
@@ -1374,34 +1325,10 @@ CREATE TABLE IF NOT EXISTS `units` (
   PRIMARY KEY (`id`) USING BTREE
 ) ENGINE=InnoDB AUTO_INCREMENT=8 DEFAULT CHARSET=utf8mb4;
 
-CREATE TABLE `view_member_rank_unit_status_latest` (
+CREATE OR REPLACE VIEW `view_member_rank_unit_status_latest` AS select `m`.`id` AS `member_id`,`m`.`name` AS `member_name`,`m`.`displayName` AS `displayName`,`m`.`state` AS `member_state`,`r`.`id` AS `rank_id`,`r`.`name` AS `rank`,`r`.`short_name` AS `rank_abv`,`mr`.`start_date` AS `rank_date`,`u`.`id` AS `unit_id`,`u`.`name` AS `unit`,`mu`.`start_date` AS `unit_date`,`s`.`name` AS `status`,`ms`.`start_date` AS `status_date`,`loa`.`loa_until` AS `loa_until` from (((((((`members` `m` left join (select `x`.`id` AS `id`,`x`.`member_id` AS `member_id`,`x`.`rank_id` AS `rank_id`,`x`.`authorized_by_id` AS `authorized_by_id`,`x`.`created_by_id` AS `created_by_id`,`x`.`reason` AS `reason`,`x`.`start_date` AS `start_date`,`x`.`end_date` AS `end_date`,`x`.`created_at` AS `created_at`,`x`.`updated_at` AS `updated_at`,`x`.`batch` AS `batch` from (`members_ranks` `x` join (select `members_ranks`.`member_id` AS `member_id`,max(`members_ranks`.`created_at`) AS `max_created` from `members_ranks` where `members_ranks`.`end_date` is null group by `members_ranks`.`member_id`) `y` on(`x`.`member_id` = `y`.`member_id` and `x`.`created_at` = `y`.`max_created`))) `mr` on(`mr`.`member_id` = `m`.`id`)) left join `ranks` `r` on(`r`.`id` = `mr`.`rank_id`)) left join (select `x`.`id` AS `id`,`x`.`member_id` AS `member_id`,`x`.`unit_id` AS `unit_id`,`x`.`authorized_by_id` AS `authorized_by_id`,`x`.`created_by_id` AS `created_by_id`,`x`.`reason` AS `reason`,`x`.`start_date` AS `start_date`,`x`.`end_date` AS `end_date`,`x`.`created_at` AS `created_at`,`x`.`updated_at` AS `updated_at` from (`members_unit` `x` join (select `members_unit`.`member_id` AS `member_id`,max(`members_unit`.`created_at`) AS `max_created` from `members_unit` where `members_unit`.`end_date` is null group by `members_unit`.`member_id`) `y` on(`x`.`member_id` = `y`.`member_id` and `x`.`created_at` = `y`.`max_created`))) `mu` on(`mu`.`member_id` = `m`.`id`)) left join `units` `u` on(`u`.`id` = `mu`.`unit_id`)) left join (select `x`.`id` AS `id`,`x`.`member_id` AS `member_id`,`x`.`status_id` AS `status_id`,`x`.`authorized_by_id` AS `authorized_by_id`,`x`.`created_by_id` AS `created_by_id`,`x`.`reason` AS `reason`,`x`.`start_date` AS `start_date`,`x`.`end_date` AS `end_date`,`x`.`created_at` AS `created_at`,`x`.`updated_at` AS `updated_at` from (`members_statuses` `x` join (select `members_statuses`.`member_id` AS `member_id`,max(`members_statuses`.`created_at`) AS `max_created` from `members_statuses` where `members_statuses`.`end_date` is null group by `members_statuses`.`member_id`) `y` on(`x`.`member_id` = `y`.`member_id` and `x`.`created_at` = `y`.`max_created`))) `ms` on(`ms`.`member_id` = `m`.`id`)) left join `statuses` `s` on(`s`.`id` = `ms`.`status_id`)) left join (select `x`.`id` AS `id`,`x`.`member_id` AS `member_id`,`x`.`filed_date` AS `filed_date`,`x`.`start_date` AS `start_date`,`x`.`end_date` AS `end_date`,`x`.`extended_till` AS `extended_till`,`x`.`type_id` AS `type_id`,`x`.`reason` AS `reason`,`x`.`created_by_id` AS `created_by_id`,`x`.`deleted` AS `deleted`,`x`.`expired` AS `expired`,`x`.`closed_by` AS `closed_by`,`x`.`ended_at` AS `ended_at`,`x`.`closed` AS `closed`,`x`.`created_at` AS `created_at`,`x`.`updated_at` AS `updated_at`,greatest(cast(`x`.`end_date` as date),cast(coalesce(`x`.`extended_till`,`x`.`end_date`) as date)) AS `loa_until` from (`leave_of_absences` `x` join (select `leave_of_absences`.`member_id` AS `member_id`,max(`leave_of_absences`.`created_at`) AS `max_created` from `leave_of_absences` where (`leave_of_absences`.`deleted` = 0 or `leave_of_absences`.`deleted` is null) and (`leave_of_absences`.`closed` = 0 or `leave_of_absences`.`closed` is null) group by `leave_of_absences`.`member_id`) `y` on(`x`.`member_id` = `y`.`member_id` and `x`.`created_at` = `y`.`max_created`))) `loa` on(`loa`.`member_id` = `m`.`id`)) order by `m`.`displayName`
-	`member_id` INT(11) NOT NULL,
-	`member_name` VARCHAR(1) NOT NULL COLLATE 'utf8mb4_general_ci',
-	`displayName` VARCHAR(1) NULL COLLATE 'utf8mb4_general_ci',
-	`member_state` ENUM('guest','applicant','member','retired','banned','denied') NOT NULL COLLATE 'utf8mb4_general_ci',
-	`rank_id` INT(11) NULL,
-	`rank` LONGTEXT NULL COLLATE 'utf8mb4_general_ci',
-	`rank_abv` VARCHAR(1) NULL COLLATE 'utf8mb4_general_ci',
-	`rank_date` DATE NULL,
-	`unit_id` INT(11) NULL,
-	`unit` VARCHAR(1) NULL COLLATE 'utf8mb4_general_ci',
-	`unit_date` DATE NULL,
-	`status` VARCHAR(1) NULL COLLATE 'utf8mb4_general_ci',
-	`status_date` DATE NULL,
-	`loa_until` DATE NULL
-);
-
-CREATE TABLE `view_member_settings` (
-	`id` INT(11) NOT NULL,
-	`displayName` VARCHAR(1) NULL COLLATE 'utf8mb4_general_ci'
-);
-
-DROP TABLE IF EXISTS `view_member_rank_unit_status_latest`;
-CREATE ALGORITHM=UNDEFINED VIEW `view_member_rank_unit_status_latest` AS select `m`.`id` AS `member_id`,`m`.`name` AS `member_name`,`m`.`displayName` AS `displayName`,`m`.`state` AS `member_state`,`r`.`id` AS `rank_id`,`r`.`name` AS `rank`,`r`.`short_name` AS `rank_abv`,`mr`.`start_date` AS `rank_date`,`u`.`id` AS `unit_id`,`u`.`name` AS `unit`,`mu`.`start_date` AS `unit_date`,`s`.`name` AS `status`,`ms`.`start_date` AS `status_date`,`loa`.`loa_until` AS `loa_until` from (((((((`members` `m` left join (select `x`.`id` AS `id`,`x`.`member_id` AS `member_id`,`x`.`rank_id` AS `rank_id`,`x`.`authorized_by_id` AS `authorized_by_id`,`x`.`created_by_id` AS `created_by_id`,`x`.`reason` AS `reason`,`x`.`start_date` AS `start_date`,`x`.`end_date` AS `end_date`,`x`.`created_at` AS `created_at`,`x`.`updated_at` AS `updated_at`,`x`.`batch` AS `batch` from (`members_ranks` `x` join (select `members_ranks`.`member_id` AS `member_id`,max(`members_ranks`.`created_at`) AS `max_created` from `members_ranks` where `members_ranks`.`end_date` is null group by `members_ranks`.`member_id`) `y` on(`x`.`member_id` = `y`.`member_id` and `x`.`created_at` = `y`.`max_created`))) `mr` on(`mr`.`member_id` = `m`.`id`)) left join `ranks` `r` on(`r`.`id` = `mr`.`rank_id`)) left join (select `x`.`id` AS `id`,`x`.`member_id` AS `member_id`,`x`.`unit_id` AS `unit_id`,`x`.`authorized_by_id` AS `authorized_by_id`,`x`.`created_by_id` AS `created_by_id`,`x`.`reason` AS `reason`,`x`.`start_date` AS `start_date`,`x`.`end_date` AS `end_date`,`x`.`created_at` AS `created_at`,`x`.`updated_at` AS `updated_at` from (`members_unit` `x` join (select `members_unit`.`member_id` AS `member_id`,max(`members_unit`.`created_at`) AS `max_created` from `members_unit` where `members_unit`.`end_date` is null group by `members_unit`.`member_id`) `y` on(`x`.`member_id` = `y`.`member_id` and `x`.`created_at` = `y`.`max_created`))) `mu` on(`mu`.`member_id` = `m`.`id`)) left join `units` `u` on(`u`.`id` = `mu`.`unit_id`)) left join (select `x`.`id` AS `id`,`x`.`member_id` AS `member_id`,`x`.`status_id` AS `status_id`,`x`.`authorized_by_id` AS `authorized_by_id`,`x`.`created_by_id` AS `created_by_id`,`x`.`reason` AS `reason`,`x`.`start_date` AS `start_date`,`x`.`end_date` AS `end_date`,`x`.`created_at` AS `created_at`,`x`.`updated_at` AS `updated_at` from (`members_statuses` `x` join (select `members_statuses`.`member_id` AS `member_id`,max(`members_statuses`.`created_at`) AS `max_created` from `members_statuses` where `members_statuses`.`end_date` is null group by `members_statuses`.`member_id`) `y` on(`x`.`member_id` = `y`.`member_id` and `x`.`created_at` = `y`.`max_created`))) `ms` on(`ms`.`member_id` = `m`.`id`)) left join `statuses` `s` on(`s`.`id` = `ms`.`status_id`)) left join (select `x`.`id` AS `id`,`x`.`member_id` AS `member_id`,`x`.`filed_date` AS `filed_date`,`x`.`start_date` AS `start_date`,`x`.`end_date` AS `end_date`,`x`.`extended_till` AS `extended_till`,`x`.`type_id` AS `type_id`,`x`.`reason` AS `reason`,`x`.`created_by_id` AS `created_by_id`,`x`.`deleted` AS `deleted`,`x`.`expired` AS `expired`,`x`.`closed_by` AS `closed_by`,`x`.`ended_at` AS `ended_at`,`x`.`closed` AS `closed`,`x`.`created_at` AS `created_at`,`x`.`updated_at` AS `updated_at`,greatest(cast(`x`.`end_date` as date),cast(coalesce(`x`.`extended_till`,`x`.`end_date`) as date)) AS `loa_until` from (`leave_of_absences` `x` join (select `leave_of_absences`.`member_id` AS `member_id`,max(`leave_of_absences`.`created_at`) AS `max_created` from `leave_of_absences` where (`leave_of_absences`.`deleted` = 0 or `leave_of_absences`.`deleted` is null) and (`leave_of_absences`.`closed` = 0 or `leave_of_absences`.`closed` is null) group by `leave_of_absences`.`member_id`) `y` on(`x`.`member_id` = `y`.`member_id` and `x`.`created_at` = `y`.`max_created`))) `loa` on(`loa`.`member_id` = `m`.`id`)) order by `m`.`displayName`
 ;
 
-DROP TABLE IF EXISTS `view_member_settings`;
+CREATE OR REPLACE VIEW `view_member_settings` AS select `m`.`id` AS `id`,`m`.`displayName` AS `displayName` from `members` `m`
-CREATE ALGORITHM=UNDEFINED VIEW `view_member_settings` AS select `m`.`id` AS `id`,`m`.`displayName` AS `displayName` from `members` `m`
 ;
 
 /*!40103 SET TIME_ZONE=IFNULL(@OLD_TIME_ZONE, 'system') */;

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

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

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

@@ -0,0 +1,5 @@
+/* Replace with your SQL commands */
+
+DROP PROCEDURE `sp_update_member_rank_Backup_1-27-2026`;
+DROP PROCEDURE `sp_update_member_status_Backup_1-27-2026`;
+DROP PROCEDURE `sp_update_member_unit_Backup_1-27-2026`;

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

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

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

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

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

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

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

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

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

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

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

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

api/src/index.ts

@@ -18,7 +18,8 @@ app.use(morgan((tokens: morgan.TokenIndexer, req: express.Request, res: express.
   }
 
   const payload: LogPayload = {
-    message: 'HTTP request completed',
+    message: `${tokens.method(req, res)} ${tokens.url(req, res)}`,
+    // message: 'HTTP request completed',
     data: {
       method: tokens.method(req, res),
       path: tokens.url(req, res),
@@ -102,7 +103,7 @@ import { roles, memberRoles } from './routes/roles';
 import { courseRouter, eventRouter } from './routes/course';
 import { calendarRouter } from './routes/calendar';
 import { docsRouter } from './routes/docs';
-import { units } from './routes/units';
+import { memberUnits, units } from './routes/units';
 
 app.use('/application', applicationRouter);
 app.use('/ranks', ranks);
@@ -117,6 +118,7 @@ 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)
 

api/src/routes/applications.ts

@@ -12,6 +12,7 @@ import { Request, response, Response } from 'express';
 import { getUserRoles } from '../services/db/rolesService';
 import { requireLogin, requireRole } from '../middleware/auth';
 import { logger } from '../services/logging/logger';
+import { audit, AuditContext } from '../services/logging/auditLog';
 import { bus } from '../services/events/eventBus';
 
 //get CoC
@@ -54,10 +55,12 @@ router.post('/', [requireLogin], async (req: Request, res: Response) => {
   try {
     let appID = await createApplication(memberID, appVersion, JSON.stringify(App));
 
-    await setUserState(memberID, MemberState.Applicant);
+    await setUserState(memberID, MemberState.Applicant, "Application Submitted", memberID);
 
     res.sendStatus(201);
 
+    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', {
@@ -225,22 +228,34 @@ router.post('/approve/:id', [requireLogin, requireRole("Recruiter")], async (req
   const appID = Number(req.params.id);
   const approved_by = req.user.id;
 
-  try {
   const app = await getApplicationByID(appID);
-    await approveApplication(appID, approved_by);
+
+  try {
+    var con = await pool.getConnection();
+
+    con.beginTransaction();
+
+    await approveApplication(appID, approved_by, con);
 
     //update user profile
-    await setUserState(app.member_id, MemberState.Member);
+    await setUserState(app.member_id, MemberState.Member, "Application Accepted", approved_by, con);
 
-    await pool.query('CALL sp_accept_new_recruit_validation(?, ?, ?, ?)', [Number(process.env.CONFIG_ID), app.member_id, approved_by, approved_by])
+    await con.query('CALL sp_accept_new_recruit_validation(?, ?, ?, ?)', [Number(process.env.CONFIG_ID), app.member_id, approved_by, approved_by])
 
+    con.commit();
     logger.info('app', "Member application approved", {
       application: app.id,
       applicant: app.member_id,
       approver: approved_by
     })
+
+    audit.application('approved', { actorId: approved_by, targetId: appID }, { applicantId: app.member_id });
+
     res.sendStatus(200);
   } catch (error) {
+
+    con.rollback();
+
     logger.error(
       'app',
       'Failed to approve application',
@@ -251,6 +266,8 @@ router.post('/approve/:id', [requireLogin, requireRole("Recruiter")], async (req
       }
     );
     res.status(500).json({ error: 'Failed to approve application' });
+  } finally {
+    if (con) con.release();
   }
 });
 
@@ -262,13 +279,14 @@ router.post('/deny/:id', [requireLogin, requireRole("Recruiter")], async (req: R
   try {
     const app = await getApplicationByID(appID);
     await denyApplication(appID, approver);
-    await setUserState(app.member_id, MemberState.Denied);
+    await setUserState(app.member_id, MemberState.Denied, "Application Denied", approver);
 
     logger.info('app', "Member application approved", {
       application: app.id,
       applicant: app.member_id,
       approver: approver
     })
+    audit.application('denied', { actorId: approver, targetId: appID }, { applicantId: app.member_id });
     res.sendStatus(200);
   } catch (error) {
     logger.error(
@@ -286,7 +304,7 @@ router.post('/deny/:id', [requireLogin, requireRole("Recruiter")], async (req: R
 
 // POST /application/:id/comment
 router.post('/:id/comment', [requireLogin], async (req: Request, res: Response) => {
-  const appID = req.params.id;
+  const appID = Number(req.params.id);
   const data = req.body.message;
   const user = req.user;
 
@@ -318,10 +336,12 @@ VALUES(?, ?, ?);`
         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: result.insertId,
+      comment: Number(result.insertId),
     })
 
     res.status(201).json(comment[0]);
@@ -344,7 +364,7 @@ VALUES(?, ?, ?);`
 
 // POST /application/:id/comment
 router.post('/:id/adminComment', [requireLogin, requireRole("Recruiter")], async (req: Request, res: Response) => {
-  const appID = req.params.id;
+  const appID = Number(req.params.id);
   const data = req.body.message;
   const user = req.user;
 
@@ -376,7 +396,7 @@ 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,
@@ -403,8 +423,9 @@ VALUES(?, ?, ?, 1);`
 router.post('/restart', async (req: Request, res: Response) => {
   const user = req.user.id;
   try {
-    await setUserState(user, MemberState.Guest);
+    await setUserState(user, MemberState.Guest, "Restarted Application", user);
 
+    audit.application('restarted', { actorId: user, targetId: user });
     logger.info('app', "Member restarted application", {
       user: user
     })

api/src/routes/calendar.ts

@@ -4,6 +4,7 @@ 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();
@@ -46,10 +47,12 @@ r.get('/upcoming', async (req, res) => {
 })
 
 r.post('/:id/cancel', [requireLogin, requireMemberState(MemberState.Member)], async (req: Request, res: Response) => {
+    let member = req.user.id;
     try {
         const eventID = Number(req.params.id);
-        setEventCancelled(eventID, true);
+        await setEventCancelled(eventID, true);
 
+        audit.calendar('cancelled', { actorId: member, targetId: eventID });
         logger.info('app', 'Calendar event cancelled', {
             event: eventID,
             user: req.user.id
@@ -68,10 +71,12 @@ r.post('/:id/cancel', [requireLogin, requireMemberState(MemberState.Member)], as
     }
 })
 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
@@ -96,8 +101,9 @@ r.post('/:id/attendance', [requireLogin, requireMemberState(MemberState.Member)]
         let member = req.user.id;
         let event = Number(req.params.id);
         let state = req.query.state as CalendarAttendance;
-        setAttendanceStatus(member, event, state);
+        await setAttendanceStatus(member, event, state);
 
+        audit.calendar('attendance_set', { actorId: member, targetId: event }, { attendanceState: state });
         logger.info('app', 'Member set calendar event attendance', {
             event: event,
             user: req.user.id,
@@ -148,8 +154,8 @@ r.post('/', [requireLogin, requireMemberState(MemberState.Member)], async (req:
         event.creator_id = member;
         event.start = new Date(event.start);
         event.end = new Date(event.end);
-        createEvent(event);
+        let eventID = await createEvent(event);
-
+        audit.calendar('event_created', { actorId: member, targetId: eventID });
         logger.info('app', 'Calendar event posted', {
             event: event.id,
             user: req.user.id
@@ -170,12 +176,14 @@ r.post('/', [requireLogin, requireMemberState(MemberState.Member)], async (req:
 })
 
 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

api/src/routes/course.ts

@@ -4,6 +4,7 @@ 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();
@@ -125,6 +126,7 @@ er.post('/', async (req: Request, res: Response) => {
         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) {

api/src/routes/loa.ts

@@ -7,6 +7,7 @@ import { closeLOA, createNewLOA, getAllLOA, getLOAbyID, getLoaTypes, getUserLOA,
 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);
 
@@ -18,7 +19,9 @@ router.post("/", async (req: Request, res: Response) => {
     LOARequest.filed_date = new Date();
 
     try {
-        await createNewLOA(LOARequest);
+        let loaID = await createNewLOA(LOARequest);
+
+        audit.leaveOfAbsence('created', { actorId: req.user.id, targetId: loaID })
         logger.info('app', 'LOA Posted', { poster: req.user.id, user: LOARequest.member_id })
         res.sendStatus(201);
     } catch (error) {
@@ -40,7 +43,8 @@ router.post("/admin", [requireRole(['17th Administrator', '17th HQ', '17th Comma
     LOARequest.created_by = req.user.id;
     LOARequest.filed_date = new Date();
     try {
-        await createNewLOA(LOARequest);
+        let loaID = await createNewLOA(LOARequest);
+        audit.leaveOfAbsence('admin_created', { actorId: req.user.id, targetId: loaID }, { for: LOARequest.member_id })
         logger.info('app', 'LOA Posted', { poster: req.user.id, user: LOARequest.member_id })
         res.sendStatus(201);
     } catch (error) {
@@ -144,6 +148,7 @@ 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);
@@ -166,6 +171,7 @@ router.post('/adminCancel/:id', [requireRole(['17th Administrator', '17th HQ', '
     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);
@@ -183,7 +189,50 @@ router.post('/adminCancel/:id', [requireRole(['17th Administrator', '17th HQ', '
 })
 
 // extend LOA
-router.post('/extend/:id', [requireRole(['17th Administrator', '17th HQ', '17th Command'])], async (req: Request, res: Response) => {
+router.post('/extend/:id', async (req: Request, res: Response) => {
+    const to: Date = req.body.to;
+
+    const member = req.user.id;
+
+    let LOA = await getLOAbyID(Number(req.params.id));
+    if (!LOA) {
+        return res.status(404).send("LOA not found");
+    }
+
+    if (LOA.member_id !== member) {
+        return res.status(403).send("You do not have permission to extend this LOA");
+    }
+
+    if (LOA.extended_till !== null) {
+        return res.status(409).send("You must contact the administration team to extend your LOA again");
+    }
+
+    if (!to) {
+        return res.status(400).send("Extension length is required");
+    }
+
+    try {
+        await setLOAExtension(Number(req.params.id), to);
+
+        audit.leaveOfAbsence('extended', { actorId: req.user.id, targetId: Number(req.params.id) });
+        logger.info('app', 'LOA Extended', { extended_by: req.user.id, LOA: req.params.id })
+
+        res.sendStatus(200);
+    } catch (error) {
+        logger.error(
+            'app',
+            'Failed to extend LOA',
+            {
+                error: error instanceof Error ? error.message : String(error),
+                stack: error instanceof Error ? error.stack : undefined,
+            }
+        );
+        res.status(500).json(error);
+    }
+})
+
+// admin extend LOA
+router.post('/extendAdmin/:id', [requireRole(['17th Administrator', '17th HQ', '17th Command'])], async (req: Request, res: Response) => {
     const to: Date = req.body.to;
 
     if (!to) {
@@ -192,6 +241,8 @@ router.post('/extend/:id', [requireRole(['17th Administrator', '17th HQ', '17th
 
     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);

api/src/routes/members.ts

@@ -5,8 +5,8 @@ import { Request, Response } from 'express';
 import pool from '../db';
 import { requireLogin, requireMemberState, requireRole } from '../middleware/auth';
 import { getUserActiveLOA } from '../services/db/loaService';
-import { getAllMembersLite, getMemberSettings, getMembersFull, getMembersLite, getUserData, getUserState, setUserSettings, getFilteredMembers, setUserState } from '../services/db/memberService';
+import { getAllMembersLite, getMemberSettings, getMembersFull, getMembersLite, getUserData, getUserState, setUserSettings, getFilteredMembers, setUserState, getLastNonSuspendedState } from '../services/db/memberService';
-import { getUserRoles } from '../services/db/rolesService';
+import { getUserRoles, stripUserRoles } from '../services/db/rolesService';
 import { memberSettings, MemberState, myData } from '@app/shared/types/member';
 import { Discharge } from '@app/shared/schemas/dischargeSchema';
 
@@ -15,6 +15,7 @@ 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) => {
@@ -157,7 +158,9 @@ router.put('/settings', [requireLogin], async (req: Request, res: Response) => {
 
 router.get('/lite', [requireLogin], async (req: Request, res: Response) => {
     try {
-        let out = await getAllMembersLite();
+        let activeOnly = Boolean(req.query.active);
+        console.log(activeOnly);
+        let out = await getAllMembersLite(activeOnly);
         res.status(200).json(out);
     } catch (error) {
         logger.error(
@@ -240,16 +243,21 @@ router.put('/:id/displayname', async (req, res) => {
 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.Retired, con);
+        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', {
@@ -258,10 +266,53 @@ router.post('/discharge', [requireLogin, requireMemberState(MemberState.Member),
             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

@@ -5,6 +5,7 @@ import { BatchPromotion, BatchPromotionMember } from '@app/shared/schemas/promot
 
 import express = require('express');
 import { logger } from "../services/logging/logger";
+import { audit } from "../services/logging/auditLog";
 const r = express.Router();
 const ur = express.Router();
 
@@ -21,6 +22,8 @@ ur.post('/', [requireRole(["17th Command", "17th Administrator", "17th HQ"]), re
         if (!change) res.sendStatus(400);
 
         await batchInsertMemberRank(change, author, approver);
+
+        audit.member('update_rank', { actorId: author, targetId: null }, { changes: change.length });
         logger.info('app', 'Promotion batch submitted', { author: author })
         res.sendStatus(201);
     } catch (error) {

api/src/routes/roles.ts

@@ -8,6 +8,7 @@ import { requireLogin, requireMemberState, requireRole } from '../middleware/aut
 import { assignUserGroup, createGroup, getAllRoles, getRole, getUsersWithRole } from '../services/db/rolesService';
 import { Request, Response } from 'express';
 import { logger } from '../services/logging/logger';
+import { audit } from '../services/logging/auditLog';
 
 r.use(requireLogin)
 ur.use(requireLogin)
@@ -22,6 +23,8 @@ ur.post('/', [requireMemberState(MemberState.Member), requireRole("17th Administ
 
         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 (error) {
         if (error?.code === 'ER_DUP_ENTRY') {
             return res.status(400).json({
@@ -54,6 +57,7 @@ ur.delete('/', [requireMemberState(MemberState.Member), requireRole("17th Admini
         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);
     }
@@ -144,7 +148,8 @@ r.post('/', [requireMemberState(MemberState.Member), requireRole("dev")], async
             return res.status(400).json({ error: 'Color must be a valid hex color (#ffffff)' });
         }
 
-        await createGroup(name, color, description);
+        let out = await createGroup(name, color, description);
+        audit.roles('create', { actorId: req.user.id, targetId: out.id });
 
         res.sendStatus(201);
     } catch (err) {
@@ -159,6 +164,9 @@ r.delete('/:id', [requireMemberState(MemberState.Member), requireRole("dev")], a
 
         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/units.ts

@@ -1,10 +1,17 @@
 import express = require('express');
 const unitsRouter = express.Router();
+const memberUnitsRouter = express.Router();
+
+import { Request, Response } from 'express';
 
 import pool from '../db';
-import { requireLogin } from '../middleware/auth';
+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);
 
@@ -26,4 +33,41 @@ unitsRouter.get('/', async (req, res) => {
     }
 });
 
+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/db/applicationService.ts

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

api/src/services/db/calendarService.ts

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

api/src/services/db/loaService.ts

@@ -74,12 +74,13 @@ export async function getUserActiveLOA(userId: number): Promise<LOARequest[]> {
     return LOAData;
 }
 
-export async function createNewLOA(data: LOARequest) {
+export async function createNewLOA(data: LOARequest): Promise<number> {
     const sql = `INSERT INTO leave_of_absences 
                 (member_id, filed_date, start_date, end_date, type_id, reason) 
              VALUES (?, ?, ?, ?, ?, ?)`;
-    await pool.query(sql, [data.member_id, toDateTime(data.filed_date), toDateTime(data.start_date), toDateTime(data.end_date), data.type_id, data.reason])
+    let out = await pool.query(sql, [data.member_id, toDateTime(data.filed_date), toDateTime(data.start_date), toDateTime(data.end_date), data.type_id, data.reason])
-    return;
+
+    return Number(out.insertId);
 }
 
 export async function closeLOA(id: number, closer: number) {

api/src/services/db/memberService.ts

@@ -74,6 +74,7 @@ export async function getFilteredMembers(
             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 {
@@ -99,16 +100,39 @@ export async function getUserData(userID: number): Promise<Member> {
     return res[0] ?? null;
 }
 
-export async function setUserState(userID: number, state: MemberState, con: mariadb.Pool | mariadb.Connection = pool) {
+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 {
-    const sql = `UPDATE members
+        if (isInternalConn) await con.beginTransaction();
-        SET state = ?
+
-        WHERE id = ?;`;
+        if (endPrevious)
-    return await con.query(sql, [state, userID]);
+            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();
     }
 }
 
@@ -146,39 +170,37 @@ export async function getMembersLite(ids: number[]): Promise<MemberLight[]> {
     return res;
 }
 
-export async function getAllMembersLite(): Promise<MemberLight[]> {
+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;`;
+                  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(
+        m.*,
-        JSON_ARRAYAGG(
+        (
-          CASE
+            SELECT COALESCE(JSON_ARRAYAGG(JSON_OBJECT(
-            WHEN r.id IS NOT NULL THEN JSON_OBJECT(
                 'id', r.id,
                 'name', r.name,
                 'color', r.color,
                 'description', r.description
-            )
+            )), JSON_ARRAY())
-          END
+            FROM members_roles mr
-        ),
+            JOIN roles r ON mr.role_id = r.id
-        JSON_ARRAY()
+            WHERE mr.member_id = m.member_id
         ) AS roles
     FROM view_member_rank_unit_status_latest m
-    LEFT JOIN members_roles mr ON m.member_id = mr.member_id
+    WHERE m.member_id IN (?);
-    LEFT JOIN roles r ON mr.role_id = r.id
-    WHERE m.member_id IN (?)
-    GROUP BY m.member_id;
   `;
 
     const rows: any[] = await pool.query(sql, [ids]);
@@ -197,7 +219,10 @@ export async function getMembersFull(ids: number[]): Promise<MemberCardDetails[]
             loa_until: row.loa_until ? new Date(row.loa_until) : undefined,
         };
         // roles comes as array of strings; parse each one
-    const roles: Role[] = row.roles;
+        const roles: Role[] =
+            typeof row.roles === "string"
+                ? JSON.parse(row.roles)
+                : row.roles;
 
         return { member, roles };
     });
@@ -208,3 +233,53 @@ export async function mapDiscordtoID(id: number): Promise<number | null> {
     let res = await pool.query(sql, [id]);
     return res.length > 0 ? res[0].id : null;
 }
+
+export async function endLatestMemberState(memberID: number, con: mariadb.Pool | mariadb.Connection = pool) {
+    const sql = `UPDATE member_state_history
+                SET end_date = NOW(),
+                    updated_at = NOW()
+                WHERE id = (
+                        SELECT id
+                        FROM (
+                                SELECT id
+                                FROM member_state_history
+                                WHERE member_id = ?
+                                    AND end_date IS NULL
+                                ORDER BY start_date DESC,
+                                    created_at DESC
+                                LIMIT 1
+                            ) AS x
+                    );`;
+
+    try {
+        let res = await con.query(sql, [memberID]);
+        console.log(res);
+        return;
+    } catch (error) {
+        logger.error('app', 'Error ending latest member state', {
+            error: error instanceof Error ? error.message : String(error),
+        });
+        throw error;
+    }
+    // let res = await pool.query(sql, [memberID]);
+    // console.log(res);
+}
+
+export async function getLastNonSuspendedState(memberID: number): Promise<MemberState> {
+    try {
+        const sql = `SELECT state_id 
+                        FROM member_state_history 
+                        WHERE member_id = ? 
+                        AND state_id != ? 
+                        ORDER BY start_date DESC, id DESC
+                        LIMIT 1;`
+        const res = await pool.query(sql, [memberID, MemberState.Suspended]);
+        console.log(res as MemberState[])
+        if (res.length)
+            return res[0].state_id as MemberState;
+    } catch (error) {
+        logger.error('app', 'Error ending latest member state', {
+            error: error instanceof Error ? error.message : String(error),
+        });
+    }
+}

api/src/services/db/rankService.ts

@@ -36,6 +36,16 @@ 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]);
+
+    if (!result || result.affectedRows === 0) {
+        throw new Error("Failed to update member rank");
+    }
+}
+
 
 export async function batchInsertMemberRank(promos: BatchPromotionMember[], author: number, approver: number) {
     try {

api/src/services/db/rolesService.ts

@@ -3,6 +3,7 @@ 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 {
@@ -63,3 +64,15 @@ export async function getUsersWithRole(roleId: number): Promise<MemberLight[]> {
 
     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

@@ -11,3 +11,12 @@ export async function cancelLatestUnit(userID: number, con: mariadb.Pool | maria
         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/logging/auditLog.ts

@@ -0,0 +1,61 @@
+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,6 +1,6 @@
 export type LogLevel = 'debug' | 'info' | 'warn' | 'error';
 export type LogDepth = 'normal' | 'verbose' | 'profiling';
-export type LogType = 'http' | 'app' | 'auth' | 'profiling';
+export type LogType = 'http' | 'app' | 'auth' | 'profiling' | 'audit';
 
 export interface LogHeader {
     timestamp: string;

shared/types/member.ts

@@ -9,12 +9,14 @@ export interface memberSettings {
 export type PaginatedMembers = PagedData<Member>;
 
 export enum MemberState {
-    Guest = "guest",
+    Guest = 1,
-    Applicant = "applicant",
+    Applicant = 2,
-    Member = "member",
+    Member = 3,
-    Retired = "retired",
+    Retired = 4,
-    Banned = "banned",
+    Discharged = 5,
-    Denied = "denied"
+    Suspended = 6,
+    Banned = 7,
+    Denied = 8
 }
 
 export type Member = {
@@ -28,6 +30,7 @@ export type Member = {
     status: string | null;
     status_date: string | null;
     loa_until?: Date;
+    member_state?: MemberState;
 };
 
 export interface MemberLight {

ui/package-lock.json

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

ui/package.json

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

ui/src/App.vue

@@ -1,25 +1,27 @@
-<script setup>
+<script setup lang="ts">
-import { RouterView } from 'vue-router';
+  import { RouterView } from 'vue-router';
-import Button from './components/ui/button/Button.vue';
+  import Button from './components/ui/button/Button.vue';
-import { useUserStore } from './stores/user';
+  import { useUserStore } from './stores/user';
-import Alert from './components/ui/alert/Alert.vue';
+  import Alert from './components/ui/alert/Alert.vue';
-import AlertDescription from './components/ui/alert/AlertDescription.vue';
+  import AlertDescription from './components/ui/alert/AlertDescription.vue';
-import Navbar from './components/Navigation/Navbar.vue';
+  import Navbar from './components/Navigation/Navbar.vue';
-import { cancelLOA } from './api/loa';
+  import { cancelLOA } from './api/loa';
 
-const userStore = useUserStore();
+  const userStore = useUserStore();
 
-function formatDate(dateStr) {
+  function formatDate(dateStr) {
     if (!dateStr) return "";
     return new Date(dateStr).toLocaleDateString("en-US", {
       year: "numeric",
       month: "short",
       day: "numeric",
     });
-}
+  }
 
-const environment = import.meta.env.VITE_ENVIRONMENT;
+  //@ts-ignore
-const version = import.meta.env.VITE_APPLICATION_VERSION;
+  const environment = import.meta.env.VITE_ENVIRONMENT;
+  //@ts-ignore
+  const version = import.meta.env.VITE_APPLICATION_VERSION;
 </script>
 
 <template>
@@ -36,11 +38,14 @@ const version = import.meta.env.VITE_APPLICATION_VERSION;
       </Alert>
       <Alert v-if="userStore.user?.LOAs?.[0]" class="m-2 mx-auto max-w-5xl" variant="info">
         <AlertDescription class="flex flex-row items-center text-nowrap gap-5 mx-auto">
-            <p v-if="new Date(userStore.user?.LOAs?.[0].extended_till || userStore.user?.LOAs?.[0].end_date) > new Date()">
+          <p
-            LOA until <strong>{{ formatDate(userStore.user?.LOAs?.[0].extended_till || userStore.user?.LOAs?.[0].end_date) }}</strong>
+            v-if="new Date(userStore.user?.LOAs?.[0].extended_till || userStore.user?.LOAs?.[0].end_date) > new Date()">
+            LOA until <strong>{{ formatDate(userStore.user?.LOAs?.[0].extended_till ||
+              userStore.user?.LOAs?.[0].end_date) }}</strong>
           </p>
           <p v-else>
-            LOA expired on <strong>{{ formatDate(userStore.user?.LOAs?.[0].extended_till || userStore.user?.LOAs?.[0].end_date) }}</strong>
+            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
@@ -52,5 +57,3 @@ const version = import.meta.env.VITE_APPLICATION_VERSION;
     <RouterView class="flex-1 min-h-0"></RouterView>
   </div>
 </template>
-
-<style scoped></style>

ui/src/api/loa.ts

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

ui/src/api/member.ts

@@ -1,5 +1,5 @@
 import { Discharge } from "@shared/schemas/dischargeSchema";
-import { memberSettings, Member, MemberLight, MemberCardDetails, PaginatedMembers } from "@shared/types/member";
+import { memberSettings, Member, MemberLight, MemberCardDetails, PaginatedMembers, MemberState } from "@shared/types/member";
 
 //  @ts-ignore
 const addr = import.meta.env.VITE_APIHOST;
@@ -18,7 +18,7 @@ export async function getMembersFiltered(params: {
     page?: number;
     pageSize?: number;
     search?: string;
-    status?: string;
+    status?: string | MemberState;
     unitId?: string;
 } = {}): Promise<PaginatedMembers> {
 
@@ -27,7 +27,7 @@ export async function getMembersFiltered(params: {
     if (params.page) query.append('page', params.page.toString());
     if (params.pageSize) query.append('pageSize', params.pageSize.toString());
     if (params.search) query.append('search', params.search);
-    if (params.status && params.status !== 'all') query.append('status', params.status);
+    if (params.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()}`, {
@@ -66,8 +66,8 @@ export async function setMemberSettings(settings: memberSettings) {
     return;
 }
 
-export async function getAllLightMembers(): Promise<MemberLight[]> {
+export async function getAllLightMembers(activeOnly: boolean = true): Promise<MemberLight[]> {
-    const response = await fetch(`${addr}/members/lite`, {
+    const response = await fetch(`${addr}/members/lite${activeOnly ? '?active=true' : '?active=false'}`, {
         credentials: 'include',
         headers: {
             "Content-Type": "application/json",
@@ -136,3 +136,25 @@ export async function dischargeMember(data: Discharge): Promise<boolean> {
     }
     return true;
 }
+
+export async function suspendMember(memberID: number): Promise<boolean> {
+    const response = await fetch(`${addr}/members/suspend?target=${memberID}`, {
+        credentials: 'include',
+        method: 'POST',
+    });
+    if (!response.ok) {
+        throw new Error("Failed to discharge member");
+    }
+    return true;
+}
+
+export async function unsuspendMember(memberID: number): Promise<boolean> {
+    const response = await fetch(`${addr}/members/unsuspend?target=${memberID}`, {
+        credentials: 'include',
+        method: 'POST',
+    });
+    if (!response.ok) {
+        throw new Error("Failed to discharge member");
+    }
+    return true;
+}

ui/src/api/units.ts

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

ui/src/components/application/ApplicationForm.vue

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

ui/src/components/calendar/ViewCalendarEvent.vue

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

ui/src/components/loa/loaList.vue

@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import {
+    import {
         Table,
         TableBody,
         TableCaption,
@@ -7,53 +7,53 @@ import {
         TableHead,
         TableHeader,
         TableRow,
-} from "@/components/ui/table"
+    } from "@/components/ui/table"
-import { Badge } from '@/components/ui/badge'
+    import { Badge } from '@/components/ui/badge'
-import {
+    import {
         DropdownMenu,
         DropdownMenuContent,
         DropdownMenuItem,
         DropdownMenuTrigger,
-} from "@/components/ui/dropdown-menu"
+    } from "@/components/ui/dropdown-menu"
-import { ChevronDown, ChevronUp, Ellipsis, X } from "lucide-vue-next";
+    import { ChevronDown, ChevronUp, Ellipsis, X } from "lucide-vue-next";
-import { cancelLOA, extendLOA, getAllLOAs, getMyLOAs } from "@/api/loa";
+    import { adminExtendLOA, cancelLOA, extendLOA, getAllLOAs, getMyLOAs } from "@/api/loa";
-import { onMounted, ref, computed } from "vue";
+    import { onMounted, ref, computed } from "vue";
-import { LOARequest } from "@shared/types/loa";
+    import { LOARequest } from "@shared/types/loa";
-import Dialog from "../ui/dialog/Dialog.vue";
+    import Dialog from "../ui/dialog/Dialog.vue";
-import DialogTrigger from "../ui/dialog/DialogTrigger.vue";
+    import DialogTrigger from "../ui/dialog/DialogTrigger.vue";
-import DialogContent from "../ui/dialog/DialogContent.vue";
+    import DialogContent from "../ui/dialog/DialogContent.vue";
-import DialogHeader from "../ui/dialog/DialogHeader.vue";
+    import DialogHeader from "../ui/dialog/DialogHeader.vue";
-import DialogTitle from "../ui/dialog/DialogTitle.vue";
+    import DialogTitle from "../ui/dialog/DialogTitle.vue";
-import DialogDescription from "../ui/dialog/DialogDescription.vue";
+    import DialogDescription from "../ui/dialog/DialogDescription.vue";
-import Button from "../ui/button/Button.vue";
+    import Button from "../ui/button/Button.vue";
-import Calendar from "../ui/calendar/Calendar.vue";
+    import Calendar from "../ui/calendar/Calendar.vue";
-import {
+    import {
         CalendarDate,
         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,
         PaginationContent,
         PaginationEllipsis,
         PaginationItem,
         PaginationNext,
         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
-}>()
+    }>()
 
-const LOAList = ref<LOARequest[]>([]);
+    const LOAList = ref<LOARequest[]>([]);
 
-onMounted(async () => {
+    onMounted(async () => {
         await loadLOAs();
-});
+    });
 
-async function loadLOAs() {
+    async function loadLOAs() {
         if (props.adminMode) {
             let result = await getAllLOAs(pageNum.value, pageSize.value);
             LOAList.value = result.data;
@@ -63,9 +63,9 @@ async function loadLOAs() {
             LOAList.value = result.data;
             pageData.value = result.pagination;
         }
-}
+    }
 
-function formatDate(date: Date): string {
+    function formatDate(date: Date): string {
         if (!date) return "";
         date = typeof date === 'string' ? new Date(date) : date;
         return date.toLocaleDateString("en-US", {
@@ -73,9 +73,9 @@ function formatDate(date: Date): string {
             month: "short",
             day: "numeric",
         });
-}
+    }
 
-function loaStatus(loa: LOARequest): "Upcoming" | "Active" | "Extended" | "Overdue" | "Closed" {
+    function loaStatus(loa: LOARequest): "Upcoming" | "Active" | "Extended" | "Overdue" | "Closed" {
         if (loa.closed) return "Closed";
 
         const now = new Date();
@@ -89,50 +89,53 @@ function loaStatus(loa: LOARequest): "Upcoming" | "Active" | "Extended" | "Overd
         if (now > loa.extended_till || end) return "Overdue";
 
         return "Overdue"; // fallback
-}
+    }
 
-async function cancelAndReload(id: number) {
+    async function cancelAndReload(id: number) {
         await cancelLOA(id, props.adminMode);
         await loadLOAs();
-}
+    }
 
-const isExtending = ref(false);
+    const isExtending = ref(false);
-const targetLOA = ref<LOARequest | null>(null);
+    const targetLOA = ref<LOARequest | null>(null);
-const extendTo = ref<CalendarDate | null>(null);
+    const extendTo = ref<CalendarDate | null>(null);
 
-const targetEnd = computed(() => { return targetLOA.value.extended_till ? targetLOA.value.extended_till : targetLOA.value.end_date })
+    const targetEnd = computed(() => { return targetLOA.value.extended_till ? targetLOA.value.extended_till : targetLOA.value.end_date })
-
+    function toCalendarDate(date: Date): CalendarDate {
-function toCalendarDate(date: Date): CalendarDate {
         if (typeof date === 'string')
             date = new Date(date);
         return new CalendarDate(date.getFullYear(), date.getMonth() + 1, date.getDate())
-}
+    }
 
-async function commitExtend() {
+    async function commitExtend() {
+        if (props.adminMode) {
+            await adminExtendLOA(targetLOA.value.id, extendTo.value.toDate(getLocalTimeZone()));
+        } else {
             await extendLOA(targetLOA.value.id, extendTo.value.toDate(getLocalTimeZone()));
+        }
         isExtending.value = false;
         await loadLOAs();
-}
+    }
 
-const expanded = ref<number | null>(null);
+    const expanded = ref<number | null>(null);
-const hoverID = ref<number | null>(null);
+    const hoverID = ref<number | null>(null);
 
-const pageNum = ref<number>(1);
+    const pageNum = ref<number>(1);
-const pageData = ref<pagination>();
+    const pageData = ref<pagination>();
 
-const pageSize = ref<number>(15)
+    const pageSize = ref<number>(15)
-const pageSizeOptions = [10, 15, 30]
+    const pageSizeOptions = [10, 15, 30]
 
-function setPageSize(size: number) {
+    function setPageSize(size: number) {
         pageSize.value = size
         pageNum.value = 1;
         loadLOAs();
-}
+    }
 
-function setPage(pagenum: number) {
+    function setPage(pagenum: number) {
         pageNum.value = pagenum;
         loadLOAs();
-}
+    }
 </script>
 
 <template>
@@ -145,7 +148,7 @@ function setPage(pagenum: number) {
                 <div class="flex gap-5">
                     <Calendar v-model="extendTo" class="rounded-md border shadow-sm w-min" layout="month-and-year"
                         :min-value="toCalendarDate(targetEnd)"
-                        :max-value="toCalendarDate(targetEnd).add({ years: 1 })" />
+                        :max-value="props.adminMode ? toCalendarDate(targetEnd).add({ years: 1 }) : toCalendarDate(targetEnd).add({ months: 1 })" />
                     <div class="flex flex-col w-full gap-3 px-2">
                         <p>Quick Options</p>
                         <Button variant="outline" @click="extendTo = toCalendarDate(targetEnd).add({ days: 7 })">1
@@ -205,9 +208,10 @@ function setPage(pagenum: number) {
                                         </Button>
                                     </DropdownMenuTrigger>
                                     <DropdownMenuContent>
-                                        <DropdownMenuItem v-if="!post.closed && props.adminMode"
+                                        <DropdownMenuItem v-if="!post.closed"
+                                            :disabled="post.extended_till !== null && !props.adminMode"
                                             @click="isExtending = true; targetLOA = post">
-                                            Extend
+                                             {{ (post.extended_till !== null && !props.adminMode) ? 'Extend (Already Extended)' : 'Extend' }}
                                         </DropdownMenuItem>
                                         <DropdownMenuItem v-if="!post.closed" :variant="'destructive'"
                                             @click="cancelAndReload(post.id)">{{ loaStatus(post) === 'Upcoming' ?
@@ -256,7 +260,7 @@ function setPage(pagenum: number) {
                                         <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' }}
+                                                {{ post.extended_till ? formatDate(post.extended_till) : 'N/A' }}
                                             </p>
                                         </div>
                                     </div>

ui/src/components/members/DischargeMember.vue

@@ -26,7 +26,10 @@ const props = defineProps<{
     member: Member | null
 }>()
 
-const emit = defineEmits(['update:open', 'discharged'])
+const emit = defineEmits<{
+    'update:open': [value: boolean]
+    'discharged': [value: { data: Discharge }]
+}>()
 
 const formSchema = toTypedSchema(dischargeSchema);
 

ui/src/components/members/TransferMember.vue

@@ -0,0 +1,250 @@
+<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/main.js

@@ -10,14 +10,9 @@ 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") {
@@ -38,7 +33,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/Calendar.vue

@@ -12,6 +12,7 @@ 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',
@@ -50,7 +51,7 @@ const dialogRef = ref<any>(null)
 // NEW: handle day/time slot clicks to start creating an event
 function onDateClick(arg: { dateStr: string }) {
     if (!userStore.isLoggedIn) return;
-    if (userStore.state !== 'member') return;
+    if (userStore.state !== MemberState.Member) return;
     dialogRef.value?.openDialog(arg.dateStr);
 }
 
@@ -198,7 +199,7 @@ onMounted(() => {
                                 @click="goToday">
                                 Today
                             </button>
-                            <button v-if="userStore.isLoggedIn && userStore.state === 'member'"
+                            <button v-if="userStore.isLoggedIn && userStore.state === MemberState.Member"
                                 class="cursor-pointer ml-1 inline-flex items-center gap-1.5 rounded-md bg-primary px-3 py-1.5 text-sm text-primary-foreground hover:opacity-90"
                                 @click="onCreateEvent">
                                 <Plus class="h-4 w-4" />

ui/src/pages/Homepage.vue

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

ui/src/pages/Join.vue

@@ -1,7 +1,7 @@
 <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,
         StepperDescription,
         StepperIndicator,
@@ -9,24 +9,25 @@ import {
         StepperSeparator,
         StepperTitle,
         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')
         //@ts-ignore
         const addr = import.meta.env.VITE_APIHOST;
         window.location.href = `${addr}/login?redirect=${redirectUrl}`;
-}
+    }
 
-let userStore = useUserStore();
+    let userStore = useUserStore();
 
-const steps = computed(() => {
+    const steps = computed(() => {
-    const isDenied = userStore.state === 'denied'
+        const isDenied = userStore.state === MemberState.Denied
 
         return [
             {
@@ -52,39 +53,41 @@ const steps = computed(() => {
                     : 'Get started with the 17th Rangers',
             },
         ]
-})
+    })
 
-const currentStep = computed<number>(() => {
+    const currentStep = computed<number>(() => {
         if (!userStore.isLoggedIn)
             return 1;
         switch (userStore.state) {
-        case "guest":
+            case MemberState.Guest:
                 return 2;
                 break;
-        case "applicant":
+            case MemberState.Applicant:
                 return 3;
                 break;
-        case "member":
+            case MemberState.Member:
                 return 5;
                 break;
-        case "denied":
+            case MemberState.Denied:
                 return 5;
                 break;
-        case "retired":
+            case MemberState.Retired:
+                return 5;
+            case MemberState.Discharged:
                 return 5;
                 break;
         }
-})
+    })
 
-const finalPanel = ref<'app' | 'message'>('message');
+    const finalPanel = ref<'app' | 'message'>('message');
 
-const reloadKey = ref(0);
+    const reloadKey = ref(0);
 
-async function restartApp() {
+    async function restartApp() {
         await restartApplication();
         await userStore.loadUser();
         reloadKey.value++;
-}
+    }
 </script>
 
 <template>
@@ -104,7 +107,8 @@ async function restartApp() {
                                 size="icon" class="z-10 rounded-full shrink-0"
                                 :class="[state === 'active' && 'ring-2 ring-ring ring-offset-2 ring-offset-background']">
                                 <template v-if="state === 'completed'">
-                                    <X v-if="step.step === 4 && userStore.state === 'denied'" class="size-5" />
+                                    <X v-if="step.step === 4 && userStore.state === MemberState.Denied"
+                                        class="size-5" />
                                     <Check v-else class="size-5" />
                                 </template>
                                 <Circle v-if="state === 'active'" />
@@ -160,7 +164,7 @@ async function restartApp() {
                 </div>
                 <div v-if="finalPanel === 'message'">
                     <!-- Accepted message -->
-                    <div v-if="userStore.state === 'member'">
+                    <div v-if="userStore.state === MemberState.Member">
                         <h1 class="text-3xl sm:text-4xl font-bold mb-4 text-left">
                             Welcome to the 17th Ranger Battalion
                         </h1>
@@ -232,7 +236,7 @@ async function restartApp() {
                         </div>
                     </div>
                     <!-- Denied message -->
-                    <div v-else-if="userStore.state === 'denied'">
+                    <div v-else-if="userStore.state === MemberState.Denied">
                         <div class="w-full max-w-2xl flex flex-col gap-8">
                             <h1 class="text-3xl sm:text-4xl font-bold text-left">
                                 Application Not Approved
@@ -263,7 +267,8 @@ async function restartApp() {
                             <Button class="w-min" @click="restartApp">New Application</Button>
                         </div>
                     </div>
-                    <div v-else-if="userStore.state === 'retired'">
+                    <div
+                        v-else-if="userStore.state === MemberState.Discharged || userStore.state === MemberState.Retired">
                         <div class="w-full max-w-2xl flex flex-col gap-8">
                             <h1 class="text-3xl sm:text-4xl font-bold text-left">
                                 You have retired from the 17th Ranger Battalion

ui/src/pages/memberList.vue

@@ -1,65 +1,73 @@
 <script setup lang="ts">
-import { ref, computed, onMounted, watch } from "vue";
+    import { ref, computed, onMounted, watch } from "vue";
-import { useRouter } from 'vue-router';
+    import { useRouter } from 'vue-router';
-import {
+    import {
         Ellipsis, Search, Trash2, UserX,
         X,
-} from "lucide-vue-next";
+    } from "lucide-vue-next";
-import {
+    import {
         Pagination,
         PaginationContent,
         PaginationEllipsis,
         PaginationItem,
         PaginationNext,
         PaginationPrevious,
-} from '@/components/ui/pagination'
+    } from '@/components/ui/pagination'
 
-// API & Types
+    // API & Types
-import { getMembersFiltered } from "@/api/member";
+    import { getMembersFiltered, suspendMember, unsuspendMember } from "@/api/member";
-import { getUnits } from "@/api/units";
+    import { getUnits } from "@/api/units";
-import type { Member } from "@shared/types/member";
+    import type { Member } from "@shared/types/member";
-import { MemberState } from "@shared/types/member";
+    import { MemberState } from "@shared/types/member";
-import type { Unit } from "@shared/types/units";
+    import type { Unit } from "@shared/types/units";
-import type { pagination as PaginationType } from "@shared/types/pagination";
+    import type { pagination as PaginationType } from "@shared/types/pagination";
 
-// UI Components
+    // UI Components
-import { Table, TableBody, TableCell, TableHead, TableHeader, TableRow } from "@/components/ui/table";
+    import { Table, TableBody, TableCell, TableHead, TableHeader, TableRow } from "@/components/ui/table";
-import { DropdownMenu, DropdownMenuContent, DropdownMenuItem, DropdownMenuTrigger } from "@/components/ui/dropdown-menu";
+    import { DropdownMenu, DropdownMenuContent, DropdownMenuItem, DropdownMenuTrigger } from "@/components/ui/dropdown-menu";
-import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '@/components/ui/select';
+    import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '@/components/ui/select';
-import { Button } from "@/components/ui/button";
+    import { Button } from "@/components/ui/button";
-import Badge from "@/components/ui/badge/Badge.vue";
+    import Badge from "@/components/ui/badge/Badge.vue";
-import Input from "@/components/ui/input/Input.vue";
+    import Input from "@/components/ui/input/Input.vue";
-import Spinner from "@/components/ui/spinner/Spinner.vue";
+    import Spinner from "@/components/ui/spinner/Spinner.vue";
-import DischargeMember from "@/components/members/DischargeMember.vue";
+    import DischargeMember from "@/components/members/DischargeMember.vue";
-import MemberCard from "@/components/members/MemberCard.vue";
+    import MemberCard from "@/components/members/MemberCard.vue";
+    import { useMemberDirectory } from "@/stores/memberDirectory";
+    import { Discharge } from "@shared/schemas/dischargeSchema";
+    import TransferMember from "@/components/members/TransferMember.vue";
 
-// --- State ---
+    // --- State ---
-const router = useRouter();
+    const router = useRouter();
-const members = ref<Member[]>([]);
+    const members = ref<Member[]>([]);
-const units = ref<Unit[]>([]);
+    const units = ref<Unit[]>([]);
-const isLoaded = ref(false);
+    const isLoaded = ref(false);
-const pagination = ref<PaginationType>({
+    const pagination = ref<PaginationType>({
         page: 1,
         pageSize: 15,
         total: 0,
         totalPages: 0,
-});
+    });
 
-const filters = ref<{ search: string; status: "all" | MemberState; unitId: string }>({
+    const filters = ref<{ search: string; status: "all" | MemberState; unitId: string }>({
         search: "",
         status: MemberState.Member,
         unitId: "all"
-});
+    });
 
-// Pagination State
+    // Pagination State
-const pageNum = ref(1);
+    const pageNum = ref(1);
-const pageSize = ref(15);
+    const pageSize = ref(15);
-const pageSizeOptions = [10, 15, 30];
+    const pageSizeOptions = [10, 15, 30];
 
-const MEMBER_STATUSES = Object.values(MemberState);
+    const MEMBER_STATUSES = Object.entries(MemberState)
+        .filter(([key, value]) => isNaN(Number(key)))
+        .map(([label, id]) => ({
+            label,
+            id: id as number // Casting back to number for your SQL logic
+        }));
 
-// --- Methods ---
+    // --- Methods ---
-const fetchMembers = async () => {
+    const fetchMembers = async () => {
         isLoaded.value = false;
         try {
             const result = await getMembersFiltered({
@@ -77,78 +85,107 @@ const fetchMembers = async () => {
         } finally {
             isLoaded.value = true;
         }
-};
+    };
 
-const fetchUnits = async () => {
+    const fetchUnits = async () => {
         try {
             units.value = await getUnits();
         } catch (error) {
             console.error('Failed to fetch units:', error);
         }
-};
+    };
 
-const navigateToMember = (id: string | number) => router.push(`/member/${id}`);
+    const navigateToMember = (id: string | number) => router.push(`/member/${id}`);
 
-const setPage = (num: number) => {
+    const setPage = (num: number) => {
         pageNum.value = num;
-};
+    };
 
-const setPageSize = (size: number) => {
+    const setPageSize = (size: number) => {
         pageSize.value = size;
         pageNum.value = 1;
-};
+    };
 
-// --- Computed ---
+    // --- Computed ---
-const paginatedMembers = computed(() => members.value);
+    const paginatedMembers = computed(() => members.value);
-const totalItems = computed(() => pagination.value.total);
+    const totalItems = computed(() => pagination.value.total);
 
-let debounceTimer: ReturnType<typeof setTimeout> | null = null;
+    let debounceTimer: ReturnType<typeof setTimeout> | null = null;
-// Watch pagination (Immediate)
+    // Watch pagination (Immediate)
-watch([pageNum, pageSize], () => {
+    watch([pageNum, pageSize], () => {
         if (debounceTimer) clearTimeout(debounceTimer);
         fetchMembers();
-});
+    });
 
-// Watch filters (Debounced)
+    // Watch filters (Debounced)
-watch(filters, () => {
+    watch(filters, () => {
         if (debounceTimer) clearTimeout(debounceTimer);
         debounceTimer = setTimeout(() => {
+            setPage(1); //reset page number when filters change to avoid that one annoying bug eagle keeps finding
             fetchMembers();
         }, 300);
-}, { deep: true });
+    }, { deep: true });
 
-function clearFilters() {
+    function clearFilters() {
         filters.value = {
             search: "",
             status: "all",
             unitId: "all"
         }
-}
+    }
 
 
-onMounted(() => {
+    onMounted(() => {
         fetchUnits();
         fetchMembers();
-});
+    });
 
-//discharge form logic
+    //discharge form logic
-const isDischargeOpen = ref(false)
+    const isDischargeOpen = ref(false)
-const targetMember = ref(null)
+    const isTransferOpen = ref(false)
+    const targetMember = ref<Member | null>(null)
 
-function openDischargeModal(member) {
+    function openDischargeModal(member: Member) {
         targetMember.value = member
         isDischargeOpen.value = true
-}
+    }
 
-function handleDischargeSuccess(data) {
+    function openTransferModal(member: Member) {
+        targetMember.value = member
+        isTransferOpen.value = true
+    }
+
+    async function onSuspend(member: Member) {
+        await suspendMember(member.member_id);
+        await fetchMembers();
+        memberCache.invalidateMember(member.member_id);
+    }
+
+    async function onUnsuspend(member: Member) {
+        await unsuspendMember(member.member_id);
+        await fetchMembers();
+        memberCache.invalidateMember(member.member_id);
+    }
+
+    const memberCache = useMemberDirectory();
+
+    function handleDischargeSuccess(value: { data: Discharge }) {
         fetchMembers();
-}
+        memberCache.invalidateMember(value.data.userID);
+    }
+
+    function handleTransferSuccess(value: { memberId: number; unitId: number; rankId: number; reason: string }) {
+        fetchMembers();
+        memberCache.invalidateMember(value.memberId);
+    }
 </script>
 
 <template>
     <div>
         <DischargeMember v-model:open="isDischargeOpen" :member="targetMember" @discharged="handleDischargeSuccess">
         </DischargeMember>
+        <TransferMember v-model:open="isTransferOpen" :member="targetMember" @transferred="handleTransferSuccess">
+        </TransferMember>
         <div class="mx-auto max-w-7xl w-full py-10 px-4">
             <div class="flex flex-col gap-2">
                 <div class="flex flex-col md:flex-row md:items-center justify-between gap-4">
@@ -167,8 +204,8 @@ function handleDischargeSuccess(data) {
                             </SelectTrigger>
                             <SelectContent>
                                 <SelectItem value="all">All Statuses</SelectItem>
-                                <SelectItem v-for="s in MEMBER_STATUSES" :key="s" :value="s">
+                                <SelectItem v-for="s in MEMBER_STATUSES" :key="s.id" :value="s.id">
-                                    <span class="capitalize">{{ s }}</span>
+                                    <span class="capitalize">{{ s.label }}</span>
                                 </SelectItem>
                             </SelectContent>
                         </Select>
@@ -186,8 +223,8 @@ function handleDischargeSuccess(data) {
                         </Select>
                         <div v-if="filters.status !== 'all' || filters.unitId !== 'all'"
                             class="h-4 w-[1px] bg-border mx-1" />
-                        <Button v-if="filters.status !== MemberState.Member || filters.unitId !== 'all'" variant="ghost" size="sm"
+                        <Button v-if="filters.status !== MemberState.Member || filters.unitId !== 'all'" variant="ghost"
-                            class="h-8 px-2 text-xs text-muted-foreground"
+                            size="sm" class="h-8 px-2 text-xs text-muted-foreground"
                             @click="filters.status = MemberState.Member; filters.unitId = 'all'">
                             Clear Filters
                         </Button>
@@ -213,7 +250,7 @@ function handleDischargeSuccess(data) {
                             <TableHead class="w-[200px]">Member</TableHead>
                             <TableHead>Rank</TableHead>
                             <TableHead>Unit</TableHead>
-                            <TableHead>Status</TableHead>
+                            <TableHead>State</TableHead>
                             <TableHead></TableHead>
                             <TableHead class="text-right">Actions</TableHead>
                         </TableRow>
@@ -229,7 +266,8 @@ function handleDischargeSuccess(data) {
                                 <TableCell>{{ member.rank }}</TableCell>
                                 <TableCell>{{ member.unit }}</TableCell>
                                 <TableCell>
-                                    <Badge variant="outline" class="capitalize font-normal">{{ member.status }}</Badge>
+                                    <Badge variant="outline" class="capitalize font-normal">{{
+                                        MemberState[member.member_state] }}</Badge>
                                 </TableCell>
                                 <TableCell>
                                     <Badge v-if="member.loa_until" variant="secondary"
@@ -246,10 +284,24 @@ function handleDischargeSuccess(data) {
                                             <!-- <DropdownMenuItem @click="navigateToMember(member.member_id)">
                                                 View Profile
                                             </DropdownMenuItem> -->
-                                            <DropdownMenuItem @click="openDischargeModal(member)"
+                                            <DropdownMenuItem v-if="member.member_state === MemberState.Member"
+                                                @click="openTransferModal(member)">
+                                                Transfer Member
+                                            </DropdownMenuItem>
+                                            <DropdownMenuItem v-if="member.member_state !== MemberState.Discharged"
+                                                @click="openDischargeModal(member)"
                                                 class="text-destructive focus:bg-destructive focus:text-destructive-foreground font-medium">
                                                 Discharge Member
                                             </DropdownMenuItem>
+                                            <DropdownMenuItem v-if="member.member_state !== MemberState.Suspended"
+                                                @click="onSuspend(member)"
+                                                class="text-destructive focus:bg-destructive focus:text-destructive-foreground font-medium">
+                                                Suspend Member
+                                            </DropdownMenuItem>
+                                            <DropdownMenuItem v-else @click="onUnsuspend(member)"
+                                                class="text-destructive focus:bg-destructive focus:text-destructive-foreground font-medium">
+                                                Remove Suspension
+                                            </DropdownMenuItem>
                                         </DropdownMenuContent>
                                     </DropdownMenu>
                                 </TableCell>

ui/src/router/index.ts

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

ui/src/stores/user.ts

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