added database seed function

added database migration system, reference package.json for commands
created .env manager system and prod/dev run commands
2025-10-29 00:34:34 -04:00 · 2025-10-28 21:31:14 -04:00 · 2025-10-28 17:48:55 -04:00 · 2025-10-28 17:47:56 -04:00 · 2025-10-28 16:24:22 -04:00
81 changed files with 4927 additions and 4620 deletions
--- a/.gitea/workflows/cd-deploy.yaml
+++ b/.gitea/workflows/cd-deploy.yaml
@@ -1,62 +0,0 @@
-name: Continuous Deployment
-on:
-  push:
-
-jobs:
-  Deploy:
-    name: Update Deployment
-    runs-on: ubuntu-latest
-    container:
-      volumes:
-        - /var/www/html/milsim-site-v4:/var/www/html/milsim-site-v4:rw
-    steps:
-      - name: Setup Local Environment
-        run: |
-          groupadd -g 989 nginx || true
-          useradd nginx -u 990 -g nginx -m || true
-
-      - name: Verify Node Environment
-        run: |
-          npm -v
-          node -v
-
-      - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-          ref: 'main'
-
-      - name: Token Copy
-        run: |
-          cd /var/www/html/milsim-site-v4
-          cp /workspace/17th-Ranger-Battalion-ORG/milsim-site-v4/.git/config .git/config
-          chown nginx:nginx .git/config
-
-      - name: Fix File Permissions
-        run: |
-          sudo chown -R nginx:nginx /var/www/html/milsim-site-v4
-          sudo chmod -R u+w /var/www/html/milsim-site-v4
-
-      - name: Update Application Code
-        run: |
-          sudo -u nginx bash -c "cd /var/www/html/milsim-site-v4 && git reset --hard && git pull origin main"
-
-      - name: Update Shared Dependencies
-        run: |
-          sudo -u nginx bash -c "cd /var/www/html/milsim-site-v4/shared && npm install"
-
-      - name: Update UI Dependencies
-        run: |
-          sudo -u nginx bash -c "cd /var/www/html/milsim-site-v4/ui && npm install"
-
-      - name: Update API Dependencies
-        run: |
-          sudo -u nginx bash -c "cd /var/www/html/milsim-site-v4/api && npm install"
-
-      - name: Build UI
-        run: |
-          sudo -u nginx bash -c "cd /var/www/html/milsim-site-v4/ui && npm run build"
-
-      - name: Build API
-        run: |
-          sudo -u nginx bash -c "cd /var/www/html/milsim-site-v4/api && npm run build"
--- a/.gitignore
+++ b/.gitignore
@@ -31,4 +31,6 @@ coverage

 *.sql
 .env
-*.db
+*.db
+
+db_data
--- a/api/.env.development
+++ b/api/.env.development
@@ -0,0 +1,12 @@
+# DATABASE SETTINGS
+DB_HOST=127.0.0.1
+DB_PORT=3306
+DB_DATABASE=ranger_unit_tracker
+DB_USERNAME=dev
+DB_PASSWORD=dev
+
+# AUTH SETTINGS
+AUTH_MODE=mock # mock bypasses authentik
+
+# SERVER SETTINGS
+SERVER_PORT=3000
--- a/api/.env.example
+++ b/api/.env.example
@@ -1,25 +0,0 @@
-# DATABASE SETTINGS
-DB_HOST=
-DB_PORT=
-DB_DATABASE=
-DB_USERNAME=
-DB_PASSWORD=
-
-# AUTH SETTINGS
-AUTH_DOMAIN=
-AUTH_ISSUER=
-AUTH_CLIENT_ID=
-AUTH_CLIENT_SECRET=
-AUTH_REDIRECT_URI=
-AUTH_REVOCATION_URI=
-AUTH_END_SESSION_URI=
-# AUTH_MODE=mock #uncomment this to bypass authentik
-
-# SERVER SETTINGS
-SERVER_PORT=3000
-CLIENT_URL= # This is whatever URL the client web app is served on
-CLIENT_DOMAIN= #whatever.com
-
-# Glitchtip
-GLITCHTIP_DSN=
-DISABLE_GLITCHTIP= # true/false
--- a/api/.gitignore
+++ b/api/.gitignore
@@ -1 +1,3 @@
-built
+built
+
+!migrations/*.sql
--- a/api/migrations/20251029012626_init_database.down.sql
+++ b/api/migrations/20251029012626_init_database.down.sql
--- a/api/migrations/20251029012626_init_database.up.sql
+++ b/api/migrations/20251029012626_init_database.up.sql
@@ -0,0 +1,609 @@
+-- --------------------------------------------------------
+-- Host:                         gs.iceberg-gaming.com
+-- Server version:               10.6.5-MariaDB - mariadb.org binary distribution
+-- Server OS:                    Win64
+-- HeidiSQL Version:             12.12.0.7122
+-- --------------------------------------------------------
+
+/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
+/*!40101 SET NAMES utf8 */;
+/*!50503 SET NAMES utf8mb4 */;
+/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
+/*!40103 SET TIME_ZONE='+00:00' */;
+/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
+/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
+/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
+
+
+-- Dumping database structure for ranger_unit_tracker
+CREATE DATABASE IF NOT EXISTS `ranger_unit_tracker` /*!40100 DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci */;
+USE `ranger_unit_tracker`;
+
+-- Dumping structure for table ranger_unit_tracker.applications
+CREATE TABLE IF NOT EXISTS `applications` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `member_id` int(11) NOT NULL,
+  `app_version` int(11) NOT NULL,
+  `app_data` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL CHECK (json_valid(`app_data`)),
+  `submitted_at` datetime NOT NULL DEFAULT current_timestamp(),
+  `updated_at` datetime DEFAULT NULL,
+  `approved_at` datetime DEFAULT NULL,
+  `denied_at` datetime DEFAULT NULL,
+  `app_status` varchar(20) GENERATED ALWAYS AS (case when `approved_at` is not null then 'Accepted' when `denied_at` is not null then 'Denied' else 'Pending' end) STORED,
+  `decision_at` datetime GENERATED ALWAYS AS (coalesce(`approved_at`,`denied_at`)) STORED,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `member_id` (`member_id`),
+  CONSTRAINT `fk_app_member` FOREIGN KEY (`member_id`) REFERENCES `members` (`id`) ON UPDATE CASCADE,
+  CONSTRAINT `chk_json_valid` CHECK (json_valid(`app_data`)),
+  CONSTRAINT `chk_app_version` CHECK (`app_version` >= 1),
+  CONSTRAINT `chk_exclusive_decision` CHECK (`approved_at` is null or `denied_at` is null)
+) ENGINE=InnoDB AUTO_INCREMENT=9 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+
+-- Data exporting was unselected.
+
+-- Dumping structure for table ranger_unit_tracker.application_comments
+CREATE TABLE IF NOT EXISTS `application_comments` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `post_content` text COLLATE utf8mb4_unicode_ci NOT NULL,
+  `application_id` int(11) NOT NULL,
+  `poster_id` int(11) NOT NULL,
+  `post_time` timestamp NOT NULL DEFAULT current_timestamp(),
+  `last_modified` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00',
+  PRIMARY KEY (`id`),
+  KEY `poster_id` (`poster_id`),
+  KEY `application_id` (`application_id`),
+  CONSTRAINT `application_comments_ibfk_1` FOREIGN KEY (`application_id`) REFERENCES `applications` (`id`),
+  CONSTRAINT `application_comments_ibfk_2` FOREIGN KEY (`poster_id`) REFERENCES `members` (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+
+-- Data exporting was unselected.
+
+-- Dumping structure for table ranger_unit_tracker.arma_maps
+CREATE TABLE IF NOT EXISTS `arma_maps` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `map` varchar(50) DEFAULT NULL,
+  `name` text DEFAULT NULL,
+  `last_used` datetime DEFAULT NULL,
+  `deleted` tinyint(4) DEFAULT 0,
+  `workshop_id` varchar(100) DEFAULT NULL,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `map` (`map`) USING BTREE
+) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb4 COMMENT='Contains a list of Arma3 Maps';
+
+-- Data exporting was unselected.
+
+-- Dumping structure for table ranger_unit_tracker.awards
+CREATE TABLE IF NOT EXISTS `awards` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `name` longtext DEFAULT NULL,
+  `short_name` longtext DEFAULT NULL,
+  `description` longtext DEFAULT NULL,
+  `type` longtext DEFAULT NULL,
+  `footprint` longtext DEFAULT NULL,
+  `created_at` datetime(3) NOT NULL,
+  `updated_at` datetime(3) NOT NULL,
+  `image_url` longtext DEFAULT NULL,
+  `deleted` tinyint(1) NOT NULL DEFAULT 0,
+  `deleted_at` datetime(3) DEFAULT NULL,
+  PRIMARY KEY (`id`),
+  KEY `idx_awards_deleted` (`deleted`)
+) ENGINE=InnoDB AUTO_INCREMENT=81 DEFAULT CHARSET=utf8mb4 COMMENT='Contains a list of Awards for the unit.';
+
+-- Data exporting was unselected.
+
+-- Dumping structure for table ranger_unit_tracker.calendar_events
+CREATE TABLE IF NOT EXISTS `calendar_events` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `name` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL,
+  `start` datetime NOT NULL,
+  `end` datetime NOT NULL,
+  `location` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL,
+  `color` char(7) COLLATE utf8mb4_unicode_ci NOT NULL,
+  `description` text COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  `creator` int(11) DEFAULT NULL,
+  `cancelled` tinyint(1) DEFAULT 0,
+  `created_at` timestamp NOT NULL DEFAULT current_timestamp(),
+  `updated_at` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
+  PRIMARY KEY (`id`),
+  KEY `fk_creator` (`creator`),
+  CONSTRAINT `fk_creator` FOREIGN KEY (`creator`) REFERENCES `members` (`id`) ON DELETE SET NULL ON UPDATE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+
+-- Data exporting was unselected.
+
+-- Dumping structure for table ranger_unit_tracker.calendar_events_signups
+CREATE TABLE IF NOT EXISTS `calendar_events_signups` (
+  `member_id` int(11) NOT NULL,
+  `event_id` int(11) NOT NULL,
+  `status` enum('not_attending','attending','maybe') COLLATE utf8mb4_unicode_ci NOT NULL,
+  `created_at` timestamp NOT NULL DEFAULT current_timestamp(),
+  `updated_at` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
+  PRIMARY KEY (`member_id`,`event_id`),
+  KEY `fk_signup_event` (`event_id`),
+  CONSTRAINT `fk_signup_event` FOREIGN KEY (`event_id`) REFERENCES `calendar_events` (`id`) ON DELETE CASCADE,
+  CONSTRAINT `fk_signup_member` FOREIGN KEY (`member_id`) REFERENCES `members` (`id`) ON DELETE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+
+-- Data exporting was unselected.
+
+-- Dumping structure for table ranger_unit_tracker.courses
+CREATE TABLE IF NOT EXISTS `courses` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `name` varchar(100) NOT NULL,
+  `short_name` varchar(10) NOT NULL,
+  `category` varchar(100) NOT NULL,
+  `description` varchar(1000) DEFAULT NULL,
+  `image_url` varchar(255) DEFAULT NULL,
+  `created_at` datetime NOT NULL DEFAULT current_timestamp(),
+  `updated_at` datetime NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
+  `deleted` tinyint(4) DEFAULT 0,
+  `prereq_id` int(11) DEFAULT NULL,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `name` (`name`),
+  UNIQUE KEY `shortName` (`short_name`) USING BTREE
+) ENGINE=InnoDB AUTO_INCREMENT=39 DEFAULT CHARSET=utf8mb4;
+
+-- Data exporting was unselected.
+
+-- Dumping structure for table ranger_unit_tracker.courses_single
+CREATE TABLE IF NOT EXISTS `courses_single` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `name` varchar(100) NOT NULL,
+  `short_name` varchar(10) NOT NULL,
+  `category` varchar(100) NOT NULL,
+  `description` varchar(1000) DEFAULT NULL,
+  `image_url` varchar(255) DEFAULT NULL,
+  `created_at` datetime NOT NULL DEFAULT current_timestamp(),
+  `updated_at` datetime NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
+  `deleted` tinyint(4) DEFAULT 0,
+  `prereq_id` int(11) DEFAULT NULL,
+  `require_qual` tinyint(4) DEFAULT NULL,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `name` (`name`),
+  UNIQUE KEY `shortName` (`short_name`) USING BTREE
+) ENGINE=InnoDB AUTO_INCREMENT=39 DEFAULT CHARSET=utf8mb4;
+
+-- Data exporting was unselected.
+
+-- Dumping structure for table ranger_unit_tracker.courses_sme
+CREATE TABLE IF NOT EXISTS `courses_sme` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `course_id` int(11) NOT NULL DEFAULT 0,
+  `member_id` int(11) NOT NULL DEFAULT 0,
+  `created_at` datetime DEFAULT current_timestamp(),
+  `updated_at` datetime DEFAULT current_timestamp() ON UPDATE current_timestamp(),
+  PRIMARY KEY (`id`),
+  KEY `fk_course_sme_course_id` (`course_id`),
+  KEY `fk_course_sme_member_id` (`member_id`),
+  CONSTRAINT `fk_course_sme_course_id` FOREIGN KEY (`course_id`) REFERENCES `courses` (`id`) ON UPDATE CASCADE,
+  CONSTRAINT `fk_course_sme_member_id` FOREIGN KEY (`member_id`) REFERENCES `members` (`id`) ON UPDATE CASCADE
+) ENGINE=InnoDB AUTO_INCREMENT=6 DEFAULT CHARSET=utf8mb4;
+
+-- Data exporting was unselected.
+
+-- Dumping structure for table ranger_unit_tracker.course_attendees
+CREATE TABLE IF NOT EXISTS `course_attendees` (
+  `passed` tinyint(1) DEFAULT 0,
+  `attendee_id` int(11) NOT NULL,
+  `course_event_id` int(11) NOT NULL,
+  `attendee_role_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(),
+  PRIMARY KEY (`attendee_id`,`course_event_id`) USING BTREE,
+  KEY `courseInstanceId` (`course_event_id`) USING BTREE,
+  KEY `fk_CourseInstancesMembers_CoureseAttendeeType_id` (`attendee_role_id`) USING BTREE,
+  CONSTRAINT `fk_course_event_member_coures_attendee_type_id` FOREIGN KEY (`attendee_role_id`) REFERENCES `course_attendee_roles` (`id`) ON UPDATE CASCADE,
+  CONSTRAINT `fk_course_event_members_coures_event_id` FOREIGN KEY (`course_event_id`) REFERENCES `course_events` (`id`) ON UPDATE CASCADE,
+  CONSTRAINT `fk_course_event_members_members_id` FOREIGN KEY (`attendee_id`) REFERENCES `members` (`id`) ON UPDATE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+-- Data exporting was unselected.
+
+-- Dumping structure for table ranger_unit_tracker.course_attendee_roles
+CREATE TABLE IF NOT EXISTS `course_attendee_roles` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `name` varchar(50) DEFAULT NULL,
+  `description` text DEFAULT NULL,
+  `created_at` datetime DEFAULT current_timestamp(),
+  `updated_at` datetime DEFAULT current_timestamp() ON UPDATE current_timestamp(),
+  `deleted` tinyint(4) NOT NULL DEFAULT 0,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `type` (`name`) USING BTREE
+) ENGINE=InnoDB AUTO_INCREMENT=7 DEFAULT CHARSET=utf8mb4 COMMENT='Changed from course_attendee_type to event_attendee_type';
+
+-- Data exporting was unselected.
+
+-- Dumping structure for table ranger_unit_tracker.course_category
+CREATE TABLE IF NOT EXISTS `course_category` (
+  `id` int(11) DEFAULT NULL,
+  `name` varchar(50) COLLATE utf8mb4_unicode_ci DEFAULT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+
+-- Data exporting was unselected.
+
+-- Dumping structure for table ranger_unit_tracker.course_events
+CREATE TABLE IF NOT EXISTS `course_events` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `course_id` int(11) DEFAULT NULL,
+  `event_type` 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(4) DEFAULT 0,
+  `report_url` varchar(2048) DEFAULT NULL,
+  PRIMARY KEY (`id`),
+  KEY `fk_course_events_event_type_id` (`event_type`) USING BTREE,
+  KEY `courseId` (`course_id`) USING BTREE,
+  CONSTRAINT `fk_coures_events_course_id` FOREIGN KEY (`course_id`) REFERENCES `courses` (`id`) ON UPDATE CASCADE,
+  CONSTRAINT `fk_course_events_event_type_id` FOREIGN KEY (`event_type`) REFERENCES `event_types` (`id`) ON UPDATE CASCADE
+) ENGINE=InnoDB AUTO_INCREMENT=6 DEFAULT CHARSET=utf8mb4;
+
+-- Data exporting was unselected.
+
+-- Dumping structure for table ranger_unit_tracker.course_qualified_trainers
+CREATE TABLE IF NOT EXISTS `course_qualified_trainers` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `member_id` int(11) DEFAULT NULL,
+  `course_id` int(11) DEFAULT NULL,
+  `created_at` datetime DEFAULT current_timestamp(),
+  `updated_at` datetime DEFAULT current_timestamp() ON UPDATE current_timestamp(),
+  `qualified` tinyint(4) DEFAULT NULL,
+  `instance_qualified_id` int(11) DEFAULT NULL,
+  `deleted` tinyint(4) DEFAULT 0,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `memberId_courseId` (`member_id`,`course_id`) USING BTREE,
+  KEY `fk_coures_qualified_trainers_coures_id` (`course_id`) USING BTREE,
+  KEY `fk_CourseTrainers_CourseInstance_id` (`instance_qualified_id`) USING BTREE,
+  CONSTRAINT `fk_coures_qualified_trainers_coures_events_id` FOREIGN KEY (`instance_qualified_id`) REFERENCES `course_events` (`id`) ON UPDATE CASCADE,
+  CONSTRAINT `fk_coures_qualified_trainers_coures_id` FOREIGN KEY (`course_id`) REFERENCES `courses` (`id`) ON UPDATE CASCADE,
+  CONSTRAINT `fk_coures_qualified_trainers_mebers_id` FOREIGN KEY (`member_id`) REFERENCES `members` (`id`) ON UPDATE CASCADE
+) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8mb4 COMMENT='Contains a linked group of qualified trainers';
+
+-- Data exporting was unselected.
+
+-- Dumping structure for table ranger_unit_tracker.event_types
+CREATE TABLE IF NOT EXISTS `event_types` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `event_type` varchar(100) DEFAULT NULL,
+  `event_category` varchar(100) DEFAULT NULL,
+  `deleted` tinyint(4) NOT NULL DEFAULT 0,
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=9 DEFAULT CHARSET=utf8mb4;
+
+-- Data exporting was unselected.
+
+-- Dumping structure for table ranger_unit_tracker.guilded_events
+CREATE TABLE IF NOT EXISTS `guilded_events` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `channel_id` varchar(100) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  `event_id` varchar(10) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  `name` varchar(50) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  `event_type` int(11) DEFAULT NULL,
+  `event_date` datetime DEFAULT NULL,
+  `created_at` datetime DEFAULT current_timestamp(),
+  `updated_at` datetime DEFAULT current_timestamp() ON UPDATE current_timestamp(),
+  `deleted` int(11) DEFAULT NULL,
+  `url` varchar(2048) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `calendar_id_event_id` (`channel_id`,`event_id`) USING BTREE
+) ENGINE=InnoDB AUTO_INCREMENT=3267 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+
+-- Data exporting was unselected.
+
+-- Dumping structure for table ranger_unit_tracker.leave_of_absences
+CREATE TABLE IF NOT EXISTS `leave_of_absences` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `member_id` int(11) DEFAULT NULL,
+  `filed_date` datetime NOT NULL,
+  `start_date` datetime NOT NULL,
+  `end_date` datetime NOT NULL,
+  `reason` text DEFAULT NULL,
+  `created_at` datetime NOT NULL DEFAULT current_timestamp(),
+  `updated_at` datetime NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
+  `deleted` tinyint(4) NOT NULL DEFAULT 0,
+  PRIMARY KEY (`id`),
+  KEY `fk_leave_of_absesnse_members_id` (`member_id`) USING BTREE,
+  CONSTRAINT `fk_leave_of_absesnse_members_id` FOREIGN KEY (`member_id`) REFERENCES `members` (`id`) ON UPDATE CASCADE
+) ENGINE=InnoDB AUTO_INCREMENT=14 DEFAULT CHARSET=utf8mb4;
+
+-- Data exporting was unselected.
+
+-- Dumping structure for table ranger_unit_tracker.members
+CREATE TABLE IF NOT EXISTS `members` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `name` varchar(100) NOT NULL,
+  `timezone` varchar(5) DEFAULT NULL,
+  `email` varchar(100) DEFAULT NULL,
+  `website` varchar(240) DEFAULT NULL,
+  `guilded_id` varchar(10) DEFAULT NULL,
+  `steam_id_64` varchar(17) DEFAULT NULL,
+  `teamspeak_uid` varchar(32) DEFAULT NULL,
+  `steam_profile_name` varchar(32) DEFAULT NULL,
+  `discord_id` varchar(20) DEFAULT NULL,
+  `discord_username` varchar(32) DEFAULT NULL,
+  `aliases` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL CHECK (json_valid(`aliases`)),
+  `created_at` datetime NOT NULL DEFAULT current_timestamp(),
+  `updated_at` datetime NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
+  `deleted` tinyint(4) DEFAULT NULL,
+  `remarks` text DEFAULT NULL,
+  `authentik_sub` varchar(255) DEFAULT NULL,
+  `authentik_issuer` varchar(255) DEFAULT NULL,
+  `state` enum('guest','applicant','member','retired','banned','denied') NOT NULL DEFAULT 'guest',
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `name` (`name`),
+  UNIQUE KEY `steamId64` (`steam_id_64`) USING BTREE,
+  UNIQUE KEY `discordId` (`discord_id`) USING BTREE,
+  UNIQUE KEY `guilded_id` (`guilded_id`),
+  UNIQUE KEY `uk_authentik_identity` (`authentik_issuer`,`authentik_sub`)
+) ENGINE=InnoDB AUTO_INCREMENT=191 DEFAULT CHARSET=utf8mb4;
+
+-- Data exporting was unselected.
+
+-- Dumping structure for table ranger_unit_tracker.members_awards
+CREATE TABLE IF NOT EXISTS `members_awards` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `member_id` int(11) DEFAULT NULL,
+  `awards_id` int(11) DEFAULT NULL,
+  `event_date` datetime DEFAULT NULL,
+  `created_at` datetime DEFAULT current_timestamp(),
+  `updated_at` datetime DEFAULT current_timestamp() ON UPDATE current_timestamp(),
+  PRIMARY KEY (`id`),
+  KEY `fk_members_awards_membres_id` (`member_id`),
+  KEY `fk_members_awards_awards_id` (`awards_id`),
+  CONSTRAINT `fk_members_awards_awards_id` FOREIGN KEY (`awards_id`) REFERENCES `awards` (`id`) ON UPDATE CASCADE,
+  CONSTRAINT `fk_members_awards_membres_id` FOREIGN KEY (`member_id`) REFERENCES `members` (`id`) ON UPDATE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+-- Data exporting was unselected.
+
+-- Dumping structure for table ranger_unit_tracker.members_qualifications
+CREATE TABLE IF NOT EXISTS `members_qualifications` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `member_id` int(11) DEFAULT 0,
+  `qualification_id` int(11) DEFAULT 0,
+  `event_date` datetime DEFAULT NULL,
+  `created_at` datetime DEFAULT current_timestamp(),
+  `updated_at` datetime DEFAULT current_timestamp() ON UPDATE current_timestamp(),
+  `deleted` tinyint(4) DEFAULT NULL,
+  PRIMARY KEY (`id`),
+  KEY `fk_members_qualifications_member_id` (`member_id`),
+  KEY `fk_members_qualifications_qualifications_id` (`qualification_id`),
+  CONSTRAINT `fk_members_qualifications_member_id` FOREIGN KEY (`member_id`) REFERENCES `members` (`id`) ON UPDATE CASCADE,
+  CONSTRAINT `fk_members_qualifications_qualifications_id` FOREIGN KEY (`qualification_id`) REFERENCES `qualifications` (`id`) ON UPDATE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+-- Data exporting was unselected.
+
+-- Dumping structure for table ranger_unit_tracker.members_ranks
+CREATE TABLE IF NOT EXISTS `members_ranks` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `member_id` int(11) DEFAULT NULL,
+  `rank_id` int(11) DEFAULT NULL,
+  `event_date` datetime DEFAULT NULL,
+  `created_at` datetime DEFAULT current_timestamp(),
+  `updated_at` datetime DEFAULT current_timestamp() ON UPDATE current_timestamp(),
+  PRIMARY KEY (`id`),
+  KEY `fk_members_ranks_members_id` (`member_id`),
+  KEY `fk_members_ranks_rank_id` (`rank_id`),
+  CONSTRAINT `fk_members_ranks_members_id` FOREIGN KEY (`member_id`) REFERENCES `members` (`id`) ON UPDATE CASCADE,
+  CONSTRAINT `fk_members_ranks_rank_id` FOREIGN KEY (`rank_id`) REFERENCES `ranks` (`id`) ON UPDATE CASCADE
+) ENGINE=InnoDB AUTO_INCREMENT=210 DEFAULT CHARSET=utf8mb4;
+
+-- Data exporting was unselected.
+
+-- Dumping structure for table ranger_unit_tracker.members_roles
+CREATE TABLE IF NOT EXISTS `members_roles` (
+  `member_id` int(11) NOT NULL,
+  `role_id` int(11) NOT NULL,
+  PRIMARY KEY (`member_id`,`role_id`),
+  KEY `role_id` (`role_id`),
+  CONSTRAINT `members_roles_ibfk_1` FOREIGN KEY (`member_id`) REFERENCES `members` (`id`) ON DELETE CASCADE,
+  CONSTRAINT `members_roles_ibfk_2` FOREIGN KEY (`role_id`) REFERENCES `roles` (`id`) ON DELETE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+
+-- Data exporting was unselected.
+
+-- Dumping structure for table ranger_unit_tracker.members_statuses
+CREATE TABLE IF NOT EXISTS `members_statuses` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `member_id` int(11) DEFAULT NULL,
+  `status_id` int(11) DEFAULT NULL,
+  `reason_id` int(11) DEFAULT NULL,
+  `event_date` datetime DEFAULT NULL,
+  `created_at` datetime DEFAULT current_timestamp(),
+  `updated_at` datetime DEFAULT current_timestamp() ON UPDATE current_timestamp(),
+  PRIMARY KEY (`id`),
+  KEY `fk_members_statuses_status_id` (`status_id`),
+  KEY `fk_members_statuses_member_id` (`member_id`),
+  KEY `fk_members_statuses_statuses_reasons_id` (`reason_id`) USING BTREE,
+  CONSTRAINT `fk_members_statuses_member_id` FOREIGN KEY (`member_id`) REFERENCES `members` (`id`) ON UPDATE CASCADE,
+  CONSTRAINT `fk_members_statuses_status_id` FOREIGN KEY (`status_id`) REFERENCES `statuses` (`id`) ON UPDATE CASCADE,
+  CONSTRAINT `members_statuses_FK` FOREIGN KEY (`reason_id`) REFERENCES `statuses_reasons` (`id`) ON UPDATE CASCADE
+) ENGINE=InnoDB AUTO_INCREMENT=207 DEFAULT CHARSET=utf8mb4;
+
+-- Data exporting was unselected.
+
+-- Dumping structure for table ranger_unit_tracker.mission_attendee_roles
+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(4) NOT NULL DEFAULT 0,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `role_name` (`name`) USING BTREE
+) ENGINE=InnoDB AUTO_INCREMENT=24 DEFAULT CHARSET=utf8mb4;
+
+-- Data exporting was unselected.
+
+-- Dumping structure for table ranger_unit_tracker.mission_events
+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(4) 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 AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb4;
+
+-- Data exporting was unselected.
+
+-- Dumping structure for table ranger_unit_tracker.mission_event_attendees
+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;
+
+-- Data exporting was unselected.
+
+-- Dumping structure for table ranger_unit_tracker.qualifications
+CREATE TABLE IF NOT EXISTS `qualifications` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `name` varchar(100) DEFAULT NULL,
+  `short_name` varchar(10) DEFAULT NULL,
+  `description` text DEFAULT NULL,
+  `type` varchar(100) DEFAULT NULL,
+  `classification` varchar(100) DEFAULT NULL,
+  `footprint` varchar(50) DEFAULT NULL,
+  `created_at` datetime DEFAULT current_timestamp(),
+  `updated_at` datetime DEFAULT current_timestamp() ON UPDATE current_timestamp(),
+  `image_url` varchar(250) DEFAULT NULL,
+  `deleted` tinytext DEFAULT '0',
+  PRIMARY KEY (`id`) USING BTREE,
+  UNIQUE KEY `name` (`name`) USING BTREE
+) ENGINE=InnoDB AUTO_INCREMENT=99 DEFAULT CHARSET=utf8mb4 COMMENT='Contains a list of Member Qualifications for the unit.';
+
+-- Data exporting was unselected.
+
+-- Dumping structure for table ranger_unit_tracker.ranks
+CREATE TABLE IF NOT EXISTS `ranks` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `name` longtext DEFAULT NULL,
+  `short_name` varchar(70) NOT NULL,
+  `category` varchar(100) NOT NULL,
+  `sort_id` int(11) NOT NULL DEFAULT 0,
+  `image_url` varchar(240) DEFAULT NULL,
+  `created_at` datetime(3) NOT NULL,
+  `updated_at` datetime(3) NOT NULL,
+  `deleted` tinyint(1) NOT NULL DEFAULT 0,
+  `deleted_at` datetime(3) DEFAULT NULL,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `shortName` (`short_name`) USING BTREE
+) ENGINE=InnoDB AUTO_INCREMENT=22 DEFAULT CHARSET=utf8mb4;
+
+-- Data exporting was unselected.
+
+-- Dumping structure for table ranger_unit_tracker.roles
+CREATE TABLE IF NOT EXISTS `roles` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `name` varchar(50) COLLATE utf8mb4_unicode_ci NOT NULL,
+  `color` varchar(9) COLLATE utf8mb4_unicode_ci NOT NULL,
+  `description` text COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `name` (`name`)
+) ENGINE=InnoDB AUTO_INCREMENT=10 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+
+-- Data exporting was unselected.
+
+-- Dumping structure for table ranger_unit_tracker.statuses
+CREATE TABLE IF NOT EXISTS `statuses` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `name` varchar(100) NOT NULL,
+  `created_at` datetime NOT NULL DEFAULT current_timestamp(),
+  `updated_at` datetime NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
+  `deleted` tinyint(4) DEFAULT 0,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `name` (`name`)
+) ENGINE=InnoDB AUTO_INCREMENT=6 DEFAULT CHARSET=utf8mb4;
+
+-- Data exporting was unselected.
+
+-- Dumping structure for table ranger_unit_tracker.statuses_reasons
+CREATE TABLE IF NOT EXISTS `statuses_reasons` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `name` varchar(50) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  `created_at` datetime DEFAULT current_timestamp(),
+  `updated_at` datetime DEFAULT current_timestamp() ON UPDATE current_timestamp(),
+  `deleted` tinyint(4) DEFAULT 0,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `name` (`name`)
+) ENGINE=InnoDB AUTO_INCREMENT=14 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='Contains a list of Reasons that a Status Change occured. This helps determine Promotions, Demotions, Transfers, Joins, Leaves.';
+
+-- Data exporting was unselected.
+
+-- Dumping structure for table ranger_unit_tracker.status_change_requests
+CREATE TABLE IF NOT EXISTS `status_change_requests` (
+  `id` int(11) NOT NULL,
+  `member_id` int(11) DEFAULT NULL,
+  `current_status` int(11) DEFAULT NULL,
+  `next_status` int(11) DEFAULT NULL,
+  `next_rank` int(11) DEFAULT NULL,
+  `approval_from` int(11) DEFAULT NULL,
+  `approval_from_date` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
+  `approval_to` int(11) DEFAULT NULL,
+  `approval_to_date` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `request_date` timestamp NOT NULL DEFAULT current_timestamp(),
+  PRIMARY KEY (`id`),
+  KEY `member_id` (`member_id`),
+  KEY `next_status` (`next_status`),
+  KEY `next_rank` (`next_rank`),
+  KEY `approval_from` (`approval_from`),
+  KEY `approval_to` (`approval_to`),
+  KEY `current_status` (`current_status`),
+  CONSTRAINT `status_change_requests_ibfk_1` FOREIGN KEY (`member_id`) REFERENCES `members` (`id`),
+  CONSTRAINT `status_change_requests_ibfk_2` FOREIGN KEY (`next_status`) REFERENCES `statuses` (`id`),
+  CONSTRAINT `status_change_requests_ibfk_3` FOREIGN KEY (`next_rank`) REFERENCES `ranks` (`id`),
+  CONSTRAINT `status_change_requests_ibfk_4` FOREIGN KEY (`approval_from`) REFERENCES `members` (`id`),
+  CONSTRAINT `status_change_requests_ibfk_5` FOREIGN KEY (`approval_to`) REFERENCES `members` (`id`),
+  CONSTRAINT `status_change_requests_ibfk_6` FOREIGN KEY (`current_status`) REFERENCES `statuses` (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+
+-- Data exporting was unselected.
+
+-- Dumping structure for view ranger_unit_tracker.view_member_rank_status_all
+-- Creating temporary table to overcome VIEW dependency errors
+CREATE TABLE `view_member_rank_status_all` (
+	`member_id` INT(11) NOT NULL,
+	`member_name` VARCHAR(1) NOT NULL COLLATE 'utf8mb4_general_ci',
+	`rank` LONGTEXT NULL COLLATE 'utf8mb4_general_ci',
+	`rank_date` DATETIME NULL,
+	`status` VARCHAR(1) NULL COLLATE 'utf8mb4_general_ci',
+	`status_date` DATETIME NULL
+);
+
+-- Removing temporary table and create final VIEW structure
+DROP TABLE IF EXISTS `view_member_rank_status_all`;
+CREATE ALGORITHM=UNDEFINED SQL SECURITY DEFINER VIEW `view_member_rank_status_all` AS select `ranger_unit_tracker`.`members`.`id` AS `member_id`,`ranger_unit_tracker`.`members`.`name` AS `member_name`,`ranger_unit_tracker`.`ranks`.`name` AS `rank`,`members_ranks`.`event_date` AS `rank_date`,`ranger_unit_tracker`.`statuses`.`name` AS `status`,`members_statuses`.`event_date` AS `status_date` from ((((`ranger_unit_tracker`.`members` left join (select `mr`.`id` AS `id`,`mr`.`member_id` AS `member_id`,`mr`.`rank_id` AS `rank_id`,`mr`.`event_date` AS `event_date`,`mr`.`created_at` AS `created_at`,`mr`.`updated_at` AS `updated_at` from (`ranger_unit_tracker`.`members_ranks` `mr` join (select `ranger_unit_tracker`.`members_ranks`.`member_id` AS `member_id`,max(`ranger_unit_tracker`.`members_ranks`.`event_date`) AS `max_rank_date` from `ranger_unit_tracker`.`members_ranks` group by `ranger_unit_tracker`.`members_ranks`.`member_id`) `latest_ranks` on(`mr`.`member_id` = `latest_ranks`.`member_id` and `mr`.`event_date` = `latest_ranks`.`max_rank_date`))) `members_ranks` on(`ranger_unit_tracker`.`members`.`id` = `members_ranks`.`member_id`)) left join (select `ms`.`id` AS `id`,`ms`.`member_id` AS `member_id`,`ms`.`status_id` AS `status_id`,`ms`.`event_date` AS `event_date`,`ms`.`created_at` AS `created_at`,`ms`.`updated_at` AS `updated_at` from (`ranger_unit_tracker`.`members_statuses` `ms` join (select `ranger_unit_tracker`.`members_statuses`.`member_id` AS `member_id`,max(`ranger_unit_tracker`.`members_statuses`.`event_date`) AS `max_status_date` from `ranger_unit_tracker`.`members_statuses` group by `ranger_unit_tracker`.`members_statuses`.`member_id`) `latest_statuses` on(`ms`.`member_id` = `latest_statuses`.`member_id` and `ms`.`event_date` = `latest_statuses`.`max_status_date`))) `members_statuses` on(`ranger_unit_tracker`.`members`.`id` = `members_statuses`.`member_id`)) left join `ranger_unit_tracker`.`ranks` on(`members_ranks`.`rank_id` = `ranger_unit_tracker`.`ranks`.`id`)) left join `ranger_unit_tracker`.`statuses` on(`members_statuses`.`status_id` = `ranger_unit_tracker`.`statuses`.`id`))
+;
+
+/*!40103 SET TIME_ZONE=IFNULL(@OLD_TIME_ZONE, 'system') */;
+/*!40101 SET SQL_MODE=IFNULL(@OLD_SQL_MODE, '') */;
+/*!40014 SET FOREIGN_KEY_CHECKS=IFNULL(@OLD_FOREIGN_KEY_CHECKS, 1) */;
+/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
+/*!40111 SET SQL_NOTES=IFNULL(@OLD_SQL_NOTES, 1) */;
--- a/api/migrations/seed.sql
+++ b/api/migrations/seed.sql
--- a/api/package-lock.json
+++ b/api/package-lock.json
--- a/api/package.json
+++ b/api/package.json
@@ -8,14 +8,20 @@
  "main": "index.js",
  "scripts": {
    "test": "echo \"Error: no test specified\" && exit 1",
-    "dev": "tsc && tsc-alias && node ./built/api/src/index.js",
-    "build": "tsc && tsc-alias"
+    "dev": "tsc && cross-env NODE_ENV=development node ./built/api/src/index.js",
+    "prod": "tsc && node ./built/api/src/index.js",
+    
+    "migrate": "node ./scripts/migrate.js",
+    "migrate:create": "npm run migrate -- create -ext sql -dir /migrations",
+    "migrate:seed": "node ./scripts/seed.js",
+    "migrate:up": "npm run migrate -- up",
+    "migrate:down": "npm run migrate -- down 1"
+
  },
  "dependencies": {
-    "@sentry/node": "^10.27.0",
    "connect-sqlite3": "^0.9.16",
    "cors": "^2.8.5",
-    "dotenv": "^17.2.1",
+    "dotenv": "16.6.1",
    "express": "^5.1.0",
    "express-session": "^1.18.2",
    "mariadb": "^3.4.5",
@@ -28,7 +34,7 @@
    "@types/express": "^5.0.3",
    "@types/morgan": "^1.9.10",
    "@types/node": "^24.8.1",
-    "tsc-alias": "^1.8.16",
+    "cross-env": "^10.1.0",
    "typescript": "^5.9.3"
  }
-}
+}
--- a/api/scripts/migrate.js
+++ b/api/scripts/migrate.js
@@ -0,0 +1,30 @@
+const dotenv = require('dotenv');
+const path = require('path');
+const { execSync } = require('child_process');
+
+const mode = process.env.NODE_ENV || "development";
+dotenv.config({ path: path.resolve(process.cwd(), `.env.${mode}`) });
+
+const db = {
+    user: process.env.DB_USERNAME,
+    pass: process.env.DB_PASSWORD,
+    host: process.env.DB_HOST,
+    port: process.env.DB_PORT,
+    name: process.env.DB_DATABASE,
+};
+const dbUrl = `mysql://${db.user}:${db.pass}@tcp(host.docker.internal:${db.port})/${db.name}`;
+
+const args = process.argv.slice(2).join(" ");
+const migrations = path.join(process.cwd(), "migrations");
+
+const cmd = [
+    "docker run --rm",
+    `-v ${migrations}:/migrations`,
+    "migrate/migrate",
+    `-path=/migrations`,
+    `-database \"${dbUrl}\"`,
+    args,
+].join(" ");
+
+console.log(cmd);
+execSync(cmd, { stdio: "inherit" });
--- a/api/scripts/seed.js
+++ b/api/scripts/seed.js
@@ -0,0 +1,33 @@
+const dotenv = require("dotenv");
+const path = require("path");
+const mariadb = require("mariadb");
+const fs = require("fs");
+
+const mode = process.env.NODE_ENV || "development";
+dotenv.config({ path: path.resolve(process.cwd(), `.env.${mode}`) });
+
+const { DB_HOST, DB_PORT, DB_USERNAME, DB_PASSWORD, DB_NAME } = process.env;
+
+//do not accidentally seed prod pls
+if (mode !== "development") {
+    process.exit(0);
+}
+
+(async () => {
+    const conn = await mariadb.createConnection({
+        host: DB_HOST,
+        port: DB_PORT,
+        user: DB_USERNAME,
+        password: DB_PASSWORD,
+        database: DB_NAME,
+        multipleStatements: true,
+    });
+
+    const seedFile = path.join(process.cwd(), "migrations", "seed.sql");
+    const sql = fs.readFileSync(seedFile, "utf8");
+
+    await conn.query(sql);
+    await conn.end();
+
+    console.log("Seeded");
+})();
--- a/api/src/db.ts
+++ b/api/src/db.ts
@@ -1,8 +1,14 @@
 // const mariadb = require('mariadb')
 import * as mariadb from 'mariadb';
-const dotenv = require('dotenv')
-dotenv.config();
+// const dotenv = require('dotenv')
+// import path = require('path');
+// console.log('NODE_ENV =', process.env.NODE_ENV);

+// const envFile = process.env.NODE_ENV === 'development' ? '.env.development' : '.env';
+// dotenv.config({ path: path.resolve(process.cwd(), envFile) });
+// console.log(`Loaded environment from ${envFile}`);
+
+// console.log(process.env.DB_HOST)

 const pool = mariadb.createPool({
    host: process.env.DB_HOST,
--- a/api/src/index.js
+++ b/api/src/index.js
@@ -1,5 +1,8 @@
 const dotenv = require('dotenv')
-dotenv.config();
+const path = require('path')
+const envFile = process.env.NODE_ENV === 'development' ? '.env.development' : '.env';
+dotenv.config({ path: path.resolve(process.cwd(), envFile) });
+console.log(`Loaded environment from ${envFile}`);

 const express = require('express')
 const cors = require('cors')
@@ -8,7 +11,7 @@ const app = express()
 app.use(morgan('dev'))

 app.use(cors({
-  origin: [process.env.CLIENT_URL], // your SPA origins
+  origin: ['https://aj17thdev.nexuszone.net', 'http://localhost:5173'], // your SPA origins
  credentials: true
 }));

@@ -18,16 +21,6 @@ app.set('trust proxy', 1);

 const port = process.env.SERVER_PORT;

-//glitchtip setup
-const sentry = require('@sentry/node');
-if (!process.env.DISABLE_GLITCHTIP) {
-  console.log("Glitchtip disabled AAAAAA")
-} else {
-  let dsn = process.env.GLITCHTIP_DSN;
-  sentry.init({ dsn: dsn });
-  console.log("Glitchtip initialized");
-}
-
 //session setup
 const path = require('path')
 const session = require('express-session')
@@ -42,7 +35,7 @@ app.use(session({
  cookie: {
    httpOnly: true,
    sameSite: 'lax',
-    domain: process.env.CLIENT_DOMAIN
+    domain: 'nexuszone.net'
  }
 }));
 app.use(passport.authenticate('session'));
@@ -55,8 +48,6 @@ const loaHandler = require('./routes/loa')
 const { status, memberStatus } = require('./routes/statuses')
 const authRouter = require('./routes/auth')
 const { roles, memberRoles } = require('./routes/roles');
-const { courseRouter, eventRouter } = require('./routes/course');
-const { calendarRouter } = require('./routes/calendar')
 const morgan = require('morgan');

 app.use('/application', applicationsRouter);
@@ -68,9 +59,6 @@ app.use('/status', status)
 app.use('/memberStatus', memberStatus)
 app.use('/roles', roles)
 app.use('/memberRoles', memberRoles)
-app.use('/course', courseRouter)
-app.use('/courseEvent', eventRouter)
-app.use('/calendar', calendarRouter)
 app.use('/', authRouter)

 app.get('/ping', (req, res) => {
--- a/api/src/routes/auth.js
+++ b/api/src/routes/auth.js
@@ -12,9 +12,9 @@ const querystring = require('querystring');

 passport.use(new OpenIDConnectStrategy({
    issuer: process.env.AUTH_ISSUER,
-    authorizationURL: process.env.AUTH_DOMAIN + '/authorize/',
-    tokenURL: process.env.AUTH_DOMAIN + '/token/',
-    userInfoURL: process.env.AUTH_DOMAIN + '/userinfo/',
+    authorizationURL: 'https://sso.iceberg-gaming.com/application/o/authorize/',
+    tokenURL: 'https://sso.iceberg-gaming.com/application/o/token/',
+    userInfoURL: 'https://sso.iceberg-gaming.com/application/o/userinfo/',
    clientID: process.env.AUTH_CLIENT_ID,
    clientSecret: process.env.AUTH_CLIENT_SECRET,
    callbackURL: process.env.AUTH_REDIRECT_URI,
@@ -46,8 +46,9 @@ passport.use(new OpenIDConnectStrategy({
                `INSERT INTO members (name, authentik_sub, authentik_issuer) VALUES (?, ?, ?)`,
                [username, sub, issuer]
            )
-            memberId = Number(result.insertId);
+            memberId = result.insertId;
        }
+
        await con.commit();
        return cb(null, { memberId });
    } catch (error) {
@@ -60,7 +61,7 @@ passport.use(new OpenIDConnectStrategy({

 router.get('/login', (req, res, next) => {
    // Store redirect target in session if provided
-    req.session.redirectTo = req.query.redirect;
+    req.session.redirectTo = req.query.redirect || '/';

    next();
 }, passport.authenticate('openidconnect'));
@@ -68,7 +69,7 @@ router.get('/login', (req, res, next) => {
 // router.get('/callback', (req, res, next) => {
 //     passport.authenticate('openidconnect', {
 //         successRedirect: req.session.redirectTo,
-//         failureRedirect: process.env.CLIENT_URL
+//         failureRedirect: 'https://aj17thdev.nexuszone.net/'
 //     })
 // });

@@ -76,27 +77,27 @@ router.get('/callback', (req, res, next) => {
    const redirectURI = req.session.redirectTo;
    passport.authenticate('openidconnect', (err, user) => {
        if (err) return next(err);
-        if (!user) return res.redirect(process.env.CLIENT_URL);
+        if (!user) return res.redirect('https://aj17thdev.nexuszone.net/');

        req.logIn(user, err => {
            if (err) return next(err);

            // Use redirect saved from session
-            const redirectTo = redirectURI || process.env.CLIENT_URL;
+            const redirectTo = redirectURI || 'https://aj17thdev.nexuszone.net/';
            delete req.session.redirectTo;
            return res.redirect(redirectTo);
        });
    })(req, res, next);
 });

-router.get('/logout', function (req, res, next) {
+router.post('/logout', function (req, res, next) {
    req.logout(function (err) {
        if (err) { return next(err); }
        var params = {
            client_id: process.env.AUTH_CLIENT_ID,
-            returnTo: process.env.CLIENT_URL
+            returnTo: 'https://aj17thdev.nexuszone.net/'
        };
-        res.redirect(process.env.AUTH_END_SESSION_URI + '?' + querystring.stringify(params));
+        res.redirect(process.env.AUTH_DOMAIN + '/v2/logout?' + querystring.stringify(params));
    });
 });

@@ -108,7 +109,6 @@ passport.serializeUser(function (user, cb) {

 passport.deserializeUser(function (user, cb) {
    process.nextTick(async function () {
-
        const memberID = user.memberId;

        const con = await pool.getConnection();
--- a/api/src/routes/calendar.ts
+++ b/api/src/routes/calendar.ts
@@ -1,6 +1,4 @@
-import { Request, Response } from "express";
-import { createEvent, getEventAttendance, getEventDetails, getShortEventsInRange, setAttendanceStatus, setEventCancelled, updateEvent } from "../services/calendarService";
-import { CalendarAttendance, CalendarEvent } from "@app/shared/types/calendar";
+import { getEventAttendance, getEventDetails, getShortEventsInRange } from "../services/calendarService";

 const express = require('express');
 const r = express.Router();
@@ -11,108 +9,42 @@ function addMonths(date: Date, months: number): Date {
    return d
 }

-//get calendar events paged, requires a query string with from= and to= as mariadb ISO strings
+//get calendar events paged
 r.get('/', async (req, res) => {
-    try {
-        const fromDate: string = req.query.from;
-        const toDate: string = req.query.to;
+    const viewDate: Date = req.body.date;
+    //generate date range
+    const backDate: Date = addMonths(viewDate, -1);
+    const frontDate: Date = addMonths(viewDate, 2);

-        if (fromDate === undefined || toDate === undefined) {
-            res.status(400).send("Missing required query parameters 'from' and 'to'");
-            return;
-        }
+    const events = getShortEventsInRange(backDate, frontDate);

-        const events = await getShortEventsInRange(fromDate, toDate);
-
-        res.status(200).json(events);
-    } catch (error) {
-        console.error('Error fetching calendar events:', error);
-        res.status(500).send('Error fetching calendar events');
-    }
+    res.status(200).json(events);
 });

 r.get('/upcoming', async (req, res) => {
    res.sendStatus(501);
 })

-r.post('/:id/cancel', async (req: Request, res: Response) => {
-    try {
-        const eventID = Number(req.params.id);
-        setEventCancelled(eventID, true);
-        res.sendStatus(200);
-    } catch (error) {
-        console.error('Error setting cancel status:', error);
-        res.status(500).send('Error setting cancel status');
-    }
-})
-r.post('/:id/uncancel', async (req: Request, res: Response) => {
-    try {
-        const eventID = Number(req.params.id);
-        setEventCancelled(eventID, false);
-        res.sendStatus(200);
-    } catch (error) {
-        console.error('Error setting cancel status:', error);
-        res.status(500).send('Error setting cancel status');
-    }
-})
-
-
-r.post('/:id/attendance', async (req: Request, res: Response) => {
-    try {
-        let member = req.user.id;
-        let event = Number(req.params.id);
-        let state = req.query.state as CalendarAttendance;
-        setAttendanceStatus(member, event, state);
-        res.sendStatus(200);
-    } catch (error) {
-        console.error('Failed to set attendance:', error);
-        res.status(500).json(error);
-    }
-})
 //get event details
-r.get('/:id', async (req: Request, res: Response) => {
+r.get('/:id', async (req, res) => {
    try {
-        const eventID: number = Number(req.params.id);
+        const eventID: number = req.params.id;

-        let details: CalendarEvent = await getEventDetails(eventID);
-        details.eventSignups = await getEventAttendance(eventID);
-        res.status(200).json(details);
+        let details = getEventDetails(eventID);
+        let attendance = await getEventAttendance(eventID);
+
+        let out = { ...details, attendance }
+        console.log(out);
+        res.status(200).json(out);
    } catch (err) {
        console.error('Insert failed:', err);
        res.status(500).json(err);
    }
 })

+//post a new calendar event
+r.post('/', async (req, res) => {

-//post a new calendar event 
-r.post('/', async (req: Request, res: Response) => {
-    try {
-        const member = req.user.id;
-        let event: CalendarEvent = req.body;
-        event.creator_id = member;
-        event.start = new Date(event.start);
-        event.end = new Date(event.end);
-        createEvent(event);
-        res.sendStatus(200);
-    } catch (error) {
-        console.error('Failed to create event:', error);
-        res.status(500).json(error);
-    }
 })

-r.put('/', async (req: Request, res: Response) => {
-    try {
-        let event: CalendarEvent = req.body;
-        event.start = new Date(event.start);
-        event.end = new Date(event.end);
-        console.log(event);
-        updateEvent(event);
-        res.sendStatus(200);
-    } catch (error) {
-        console.error('Failed to update event:', error);
-        res.status(500).json(error);
-    }
-})
-
-
-module.exports.calendarRouter = r;
+module.exports.calendar = r;
--- a/api/src/routes/course.ts
+++ b/api/src/routes/course.ts
@@ -1,89 +0,0 @@
-import { CourseAttendee, CourseEventDetails } from "@app/shared/types/course";
-import { getAllCourses, getCourseEventAttendees, getCourseEventDetails, getCourseEventRoles, getCourseEvents, insertCourseEvent } from "../services/CourseSerivce";
-import { Request, Response, Router } from "express";
-
-const courseRouter = Router();
-const eventRouter = Router();
-
-courseRouter.get('/', async (req, res) => {
-    try {
-        const courses = await getAllCourses();
-        res.status(200).json(courses);
-    } catch (err) {
-        console.error('failed to fetch courses', err);
-        res.status(500).json('failed to fetch courses\n' + err);
-    }
-})
-
-courseRouter.get('/roles', async (req, res) => {
-    try {
-        const roles = await getCourseEventRoles();
-        res.status(200).json(roles);
-    } catch (err) {
-        console.error('failed to fetch course roles', err);
-        res.status(500).json('failed to fetch course roles\n' + err);
-    }
-})
-
-eventRouter.get('/', async (req: Request, res: Response) => {
-    const allowedSorts = new Map([
-        ["ascending", "ASC"],
-        ["descending", "DESC"]
-    ]);
-
-    const sort = String(req.query.sort || "").toLowerCase();
-    const search = String(req.query.search || "").toLowerCase();
-    if (!allowedSorts.has(sort)) {
-        return res.status(400).json({
-            message: `Invalid sort direction '${req.query.sort}'. Allowed values are 'ascending' or 'descending'.`
-        });
-    }
-
-    const sortDir = allowedSorts.get(sort);
-
-    try {
-        let events = await getCourseEvents(sortDir, search);
-        res.status(200).json(events);
-    } catch (error) {
-        console.error('failed to fetch reports', error);
-        res.status(500).json(error);
-    }
-});
-
-eventRouter.get('/:id', async (req: Request, res: Response) => {
-    try {
-        let out = await getCourseEventDetails(Number(req.params.id));
-        res.status(200).json(out);
-    } catch (error) {
-        console.error('failed to fetch report', error);
-        res.status(500).json(error);
-    }
-});
-
-eventRouter.get('/attendees/:id', async (req: Request, res: Response) => {
-    try {
-        const attendees: CourseAttendee[] = await getCourseEventAttendees(Number(req.params.id));
-        res.status(200).json(attendees);
-    } catch (err) {
-        console.error('failed to fetch attendees', err);
-        res.status(500).json("failed to fetch attendees\n" + err);
-    }
-})
-
-eventRouter.post('/', async (req: Request, res: Response) => {
-    const posterID: number = req.user.id;
-    try {
-        console.log();
-        let data: CourseEventDetails = req.body;
-        data.created_by = posterID;
-        data.event_date = new Date(data.event_date);
-        const id = await insertCourseEvent(data);
-        res.status(201).json(id);
-    } catch (error) {
-        console.error('failed to post training', error);
-        res.status(500).json("failed to post training\n" + error)
-    }
-})
-
-module.exports.courseRouter = courseRouter;
-module.exports.eventRouter = eventRouter;
--- a/api/src/services/CourseSerivce.ts
+++ b/api/src/services/CourseSerivce.ts
@@ -1,147 +0,0 @@
-import pool from "../db"
-import { Course, CourseAttendee, CourseAttendeeRole, CourseEventDetails, CourseEventSummary, RawAttendeeRow } from "@app/shared/types/course"
-import { toDateTime } from "@app/shared/utils/time";
-export async function getAllCourses(): Promise<Course[]> {
-    const sql = "SELECT * FROM courses WHERE deleted = false ORDER BY name ASC;"
-
-    const res: Course[] = await pool.query(sql);
-
-    return res;
-}
-
-export async function getCourseByID(id: number): Promise<Course> {
-    const sql = "SELECT * FROM courses WHERE id = ?;"
-    const res: Course[] = await pool.query(sql, [id]);
-    return res[0];
-}
-
-function buildAttendee(row: RawAttendeeRow): CourseAttendee {
-    return {
-        passed_bookwork: !!row.passed_bookwork,
-        passed_qual: !!row.passed_qual,
-        attendee_id: row.attendee_id,
-        course_event_id: row.course_event_id,
-        created_at: new Date(row.created_at),
-        updated_at: new Date(row.updated_at),
-        remarks: row.remarks,
-        attendee_role_id: row.attendee_role_id,
-        attendee_name: row.attendee_name,
-        role: row.role_id
-            ? {
-                id: row.role_id,
-                name: row.role_name,
-                description: row.role_description,
-                deleted: !!row.role_deleted,
-                created_at: new Date(row.role_created_at),
-                updated_at: new Date(row.role_updated_at),
-            }
-            : null
-    };
-}
-
-export async function getCourseEventAttendees(id: number): Promise<CourseAttendee[]> {
-    const sql = `SELECT
-                ca.*,
-                mem.name AS attendee_name,
-                ar.id AS role_id,
-                ar.name AS role_name,
-                ar.description AS role_description,
-                ar.deleted AS role_deleted,
-                ar.created_at AS role_created_at,
-                ar.updated_at AS role_updated_at
-                FROM course_attendees ca
-                LEFT JOIN course_attendee_roles ar ON ar.id = ca.attendee_role_id
-                LEFT JOIN members mem ON ca.attendee_id = mem.id
-                WHERE ca.course_event_id = ?;`;
-
-    const res: RawAttendeeRow[] = await pool.query(sql, [id]);
-
-    return res.map((row) => buildAttendee(row))
-}
-
-export async function getCourseEventDetails(id: number): Promise<CourseEventDetails> {
-    const sql = `SELECT 
-                    E.*,
-                    M.name AS created_by_name,
-                    C.name AS course_name
-                FROM course_events AS E
-                LEFT JOIN courses AS C 
-                    ON E.course_id = C.id
-                LEFT JOIN members AS M
-                    ON E.created_by = M.id
-                WHERE E.id = ?;
-                `;
-    let rows: CourseEventDetails[] = await pool.query(sql, [id]);
-    let event = rows[0];
-    event.attendees = await getCourseEventAttendees(id);
-    event.course = await getCourseByID(event.course_id);
-    return event;
-}
-
-export async function insertCourseEvent(event: CourseEventDetails): Promise<number> {
-    console.log(event);
-    const con = await pool.getConnection();
-    try {
-        await con.beginTransaction();
-        const res = await con.query("INSERT INTO course_events (course_id, event_date, remarks, created_by) VALUES (?, ?, ?, ?);", [event.course_id, toDateTime(event.event_date), event.remarks, event.created_by]);
-        var eventID: number = res.insertId;
-
-        for (const attendee of event.attendees) {
-            await con.query(`INSERT INTO course_attendees (
-                        attendee_id,
-                        course_event_id,
-                        attendee_role_id,
-                        passed_bookwork,
-                        passed_qual,
-                        remarks
-                        )
-                        VALUES (?, ?, ?, ?, ?, ?);`, [attendee.attendee_id, eventID, attendee.attendee_role_id, attendee.passed_bookwork, attendee.passed_qual, attendee.remarks]);
-        }
-        await con.commit();
-        await con.release();
-        return Number(eventID);
-    } catch (error) {
-        await con.rollback();
-        await con.release();
-        throw error;
-    }
-}
-
-export async function getCourseEvents(sortDir: string, search: string = ""): Promise<CourseEventSummary[]> {
-
-    let params = [];
-    let searchString = "";
-    if (search !== "") {
-        searchString = `WHERE (C.name LIKE ? OR
-                     C.short_name LIKE ? OR
-                     M.name LIKE ?) `;
-        const p = `%${search}%`;
-        params.push(p, p, p);
-    }
-
-    const sql = `SELECT 
-                    E.id AS event_id,
-                    E.course_id,
-                    E.event_date AS date,
-                    E.created_by,
-                    C.name AS course_name,
-                    C.short_name AS course_shortname,
-                    M.name AS created_by_name
-                FROM course_events AS E
-                LEFT JOIN courses AS C 
-                    ON E.course_id = C.id
-                LEFT JOIN members AS M
-                    ON E.created_by = M.id
-                ${searchString}
-                ORDER BY E.event_date ${sortDir};`;
-    console.log(sql)
-    console.log(params)
-    let events: CourseEventSummary[] = await pool.query(sql, params);
-    return events;
-}
-
-export async function getCourseEventRoles(): Promise<CourseAttendeeRole[]> {
-    const sql = "SELECT * FROM course_attendee_roles;"
-    const roles: CourseAttendeeRole[] = await pool.query(sql);
-    return roles;
-}
--- a/api/src/services/calendarService.d.ts
+++ b/api/src/services/calendarService.d.ts
@@ -0,0 +1,6 @@
+export declare function createEvent(eventObject: any): Promise<void>;
+export declare function updateEvent(eventObject: any): Promise<void>;
+export declare function cancelEvent(eventID: any): Promise<void>;
+export declare function getShortEventsInRange(startDate: any, endDate: any): Promise<void>;
+export declare function getEventDetailed(eventID: any): Promise<void>;
+//# sourceMappingURL=calendarService.d.ts.map
--- a/api/src/services/calendarService.d.ts.map
+++ b/api/src/services/calendarService.d.ts.map
@@ -0,0 +1 @@
+{"version":3,"file":"calendarService.d.ts","sourceRoot":"","sources":["calendarService.ts"],"names":[],"mappings":"AAEA,wBAAsB,WAAW,CAAC,WAAW,KAAA,iBAE5C;AAED,wBAAsB,WAAW,CAAC,WAAW,KAAA,iBAE5C;AAED,wBAAsB,WAAW,CAAC,OAAO,KAAA,iBAExC;AAED,wBAAsB,qBAAqB,CAAC,SAAS,KAAA,EAAE,OAAO,KAAA,iBAE7D;AAED,wBAAsB,gBAAgB,CAAC,OAAO,KAAA,iBAE7C"}
--- a/api/src/services/calendarService.js
+++ b/api/src/services/calendarService.js
@@ -0,0 +1,19 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createEvent = createEvent;
+exports.updateEvent = updateEvent;
+exports.cancelEvent = cancelEvent;
+exports.getShortEventsInRange = getShortEventsInRange;
+exports.getEventDetailed = getEventDetailed;
+const pool = require('../db');
+async function createEvent(eventObject) {
+}
+async function updateEvent(eventObject) {
+}
+async function cancelEvent(eventID) {
+}
+async function getShortEventsInRange(startDate, endDate) {
+}
+async function getEventDetailed(eventID) {
+}
+//# sourceMappingURL=calendarService.js.map
--- a/api/src/services/calendarService.js.map
+++ b/api/src/services/calendarService.js.map
@@ -0,0 +1 @@
+{"version":3,"file":"calendarService.js","sourceRoot":"","sources":["calendarService.ts"],"names":[],"mappings":";;AAEA,kCAEC;AAED,kCAEC;AAED,kCAEC;AAED,sDAEC;AAED,4CAEC;AApBD,MAAM,IAAI,GAAG,OAAO,CAAC,OAAO,CAAC,CAAA;AAEtB,KAAK,UAAU,WAAW,CAAC,WAAW;AAE7C,CAAC;AAEM,KAAK,UAAU,WAAW,CAAC,WAAW;AAE7C,CAAC;AAEM,KAAK,UAAU,WAAW,CAAC,OAAO;AAEzC,CAAC;AAEM,KAAK,UAAU,qBAAqB,CAAC,SAAS,EAAE,OAAO;AAE9D,CAAC;AAEM,KAAK,UAAU,gBAAgB,CAAC,OAAO;AAE9C,CAAC"}
--- a/api/src/services/calendarService.ts
+++ b/api/src/services/calendarService.ts
@@ -1,12 +1,26 @@
 import pool from '../db';
-import { CalendarEventShort, CalendarSignup, CalendarEvent, CalendarAttendance } from "@app/shared/types/calendar"
-import { toDateTime } from "@app/shared/utils/time"
+
+export interface CalendarEvent {
+    id: number;
+    name: string;
+    start: Date;          // DATETIME -> Date
+    end: Date;            // DATETIME -> Date
+    location: string;
+    color: string;        // 7 character hex string
+    description?: string | null;
+    creator?: number | null;  // foreign key to members.id, nullable
+    cancelled: boolean;       // TINYINT(1) -> boolean
+    created_at: Date;         // TIMESTAMP -> Date
+    updated_at: Date;         // TIMESTAMP -> Date
+}
+
+export type Attendance = 'attending' | 'maybe' | 'not_attending';

 export async function createEvent(eventObject: Omit<CalendarEvent, 'id' | 'created_at' | 'updated_at' | 'cancelled'>) {
    const sql = `
        INSERT INTO calendar_events 
            (name, start, end, location, color, description, creator)
-        VALUES (?, ?, ?, ?, ?, ?, ?)
+        VALUES (?, ?, ?, ?, ?, ?, ?, ?)
    `;
    const params = [
        eventObject.name,
@@ -15,7 +29,7 @@ export async function createEvent(eventObject: Omit<CalendarEvent, 'id' | 'creat
        eventObject.location,
        eventObject.color,
        eventObject.description ?? null,
-        eventObject.creator_id,
+        eventObject.creator,
    ];

    const result = await pool.query(sql, params);
@@ -26,6 +40,7 @@ export async function updateEvent(eventObject: CalendarEvent) {
    if (!eventObject.id) {
        throw new Error("updateEvent: Missing event ID.");
    }
+
    const sql = `
        UPDATE calendar_events
        SET
@@ -34,14 +49,14 @@ export async function updateEvent(eventObject: CalendarEvent) {
            end = ?,
            location = ?,
            color = ?,
-            description = ?
+            description = ?,
        WHERE id = ?
    `;

    const params = [
        eventObject.name,
-        toDateTime(eventObject.start),
-        toDateTime(eventObject.end),
+        eventObject.start,
+        eventObject.end,
        eventObject.location,
        eventObject.color,
        eventObject.description ?? null,
@@ -52,30 +67,28 @@ export async function updateEvent(eventObject: CalendarEvent) {
    return { success: true };
 }

-export async function setEventCancelled(eventID: number, cancelled: boolean) {
-    const input = cancelled ? 1 : 0;
+export async function cancelEvent(eventID: number) {
    const sql = `
        UPDATE calendar_events
-        SET cancelled = ?
+        SET cancelled = 1
        WHERE id = ?
    `;
-    await pool.query(sql, [input, eventID]);
+    await pool.query(sql, [eventID]);
    return { success: true };
 }


-export async function getShortEventsInRange(startDate: string, endDate: string): Promise<CalendarEventShort[]> {
+export async function getShortEventsInRange(startDate: Date, endDate: Date) {
    const sql = `
-        SELECT id, name, start, end, color, cancelled, full_day
+        SELECT id, name, start, end, color
        FROM calendar_events
        WHERE start BETWEEN ? AND ?
        ORDER BY start ASC
    `;
-    const res: CalendarEventShort[] = await pool.query(sql, [startDate, endDate]);
-    return res;
+    return await pool.query(sql, [startDate, endDate]);
 }

-export async function getEventDetails(eventID: number): Promise<CalendarEvent> {
+export async function getEventDetails(eventID: number) {
    const sql = `
        SELECT 
            e.id,
@@ -88,14 +101,14 @@ export async function getEventDetails(eventID: number): Promise<CalendarEvent> {
            e.cancelled,
            e.created_at,
            e.updated_at,
-            e.creator AS creator_id,
+            m.id AS creator_id,
            m.name AS creator_name
        FROM calendar_events e
        LEFT JOIN members m ON e.creator = m.id
        WHERE e.id = ?
    `;
-    let vals: CalendarEvent[] = await pool.query(sql, [eventID]);
-    return vals[0];
+
+    return await pool.query(sql, [eventID])
 }

 export async function getUpcomingEvents(date: Date, limit: number) {
@@ -111,7 +124,7 @@ export async function getUpcomingEvents(date: Date, limit: number) {
 }


-export async function setAttendanceStatus(memberID: number, eventID: number, status: CalendarAttendance) {
+export async function setAttendanceStatus(memberID: number, eventID: number, status: Attendance) {
    const sql = `
        INSERT INTO calendar_events_signups (member_id, event_id, status)
        VALUES (?, ?, ?)
@@ -122,7 +135,7 @@ export async function setAttendanceStatus(memberID: number, eventID: number, sta
    return { success: true }
 }

-export async function getEventAttendance(eventID: number): Promise<CalendarSignup[]> {
+export async function getEventAttendance(eventID: number) {
    const sql = `
        SELECT 
            s.member_id,
--- a/api/src/services/memberService.ts
+++ b/api/src/services/memberService.ts
@@ -20,15 +20,4 @@ export async function setUserState(userID: number, state: MemberState) {
        SET state = ?
        WHERE id = ?;`;
    return await pool.query(sql, [state, userID]);
-}
-
-declare global {
-  namespace Express {
-    interface Request {
-      user: {
-        id: number;
-        name: string;
-      };
-    }
-  }
-}
+}
--- a/docker-compose.dev.yml
+++ b/docker-compose.dev.yml
@@ -0,0 +1,13 @@
+version: "3.9"
+services:
+  db:
+    image: mariadb:10.6.23-ubi9
+    environment:
+      MARIADB_ROOT_PASSWORD: root
+      MARIADB_DATABASE: ranger_unit_tracker
+      MARIADB_USER: dev
+      MARIADB_PASSWORD: dev
+    ports:
+      - "3306:3306"
+    volumes:
+      - ./db_data:/var/lib/mysql
--- a/ecosystem.config.js
+++ b/ecosystem.config.js
@@ -1,14 +0,0 @@
-module.exports = {
-  apps : [{
-    name: '17th-api',
-    cwd: 'api',
-    script: 'built/api/src/index.js',
-    watch: ['.env', 'built'],
-    ignore_watch: ['.gitignore', '\.json', 'src', '\.db', 'node_modules'],
-    watch_options: {
-      usePolling: true,
-      interval: 10000
-    },
-    time: true
-  }]
-};
--- a/shared/package-lock.json
+++ b/shared/package-lock.json
@@ -1,24 +0,0 @@
-{
-    "name": "@app/shared",
-    "version": "1.0.0",
-    "lockfileVersion": 3,
-    "requires": true,
-    "packages": {
-        "": {
-            "name": "@app/shared",
-            "version": "1.0.0",
-            "dependencies": {
-                "zod": "^3.25.76"
-            }
-        },
-        "node_modules/zod": {
-            "version": "3.25.76",
-            "resolved": "https://registry.npmjs.org/zod/-/zod-3.25.76.tgz",
-            "integrity": "sha512-gzUt/qt81nXsFGKIFcC3YnfEAx5NkunCfnDlvuBSSFS02bcXu4Lmea0AFIUwbLWxWPx3d9p8S5QoaujKcNQxcQ==",
-            "license": "MIT",
-            "funding": {
-                "url": "https://github.com/sponsors/colinhacks"
-            }
-        }
-    }
-}
--- a/shared/package.json
+++ b/shared/package.json
@@ -2,8 +2,5 @@
    "name": "@app/shared",
    "version": "1.0.0",
    "main": "index.ts",
-    "type": "module",
-    "dependencies": {
-        "zod": "^3.25.76"
-    }
-}
+    "type": "module"
+}
--- a/shared/schemas/calendarEventSchema.ts
+++ b/shared/schemas/calendarEventSchema.ts
@@ -1,33 +0,0 @@
-import z from "zod";
-
-const dateRe = /^\d{4}-\d{2}-\d{2}$/        // YYYY-MM-DD
-const timeRe = /^(?:[01]\d|2[0-3]):[0-5]\d$/ // HH:mm (24h)\
-
-export function parseLocalDateTime(dateStr: string, timeStr: string) {
-    // Construct a Date in the user's local timezone
-    const [y, m, d] = dateStr.split("-").map(Number)
-    const [hh, mm] = timeStr.split(":").map(Number)
-    return new Date(y, m - 1, d, hh, mm, 0, 0)
-}
-
-export const calendarEventSchema = z.object({
-    name: z.string().min(2, "Please enter at least 2 characters").max(100),
-    startDate: z.string().regex(dateRe, "Use YYYY-MM-DD"),
-    startTime: z.string().regex(timeRe, "Use HH:mm (24h)"),
-    endDate: z.string().regex(dateRe, "Use YYYY-MM-DD"),
-    endTime: z.string().regex(timeRe, "Use HH:mm (24h)"),
-    location: z.string().max(200).default(""),
-    color: z.string().regex(/^#([0-9A-Fa-f]{6})$/, "Use a hex color like #AABBCC"),
-    description: z.string().max(2000).default(""),
-    id: z.number().int().nonnegative().nullable().default(null),
-}).superRefine((vals, ctx) => {
-    const start = parseLocalDateTime(vals.startDate, vals.startTime)
-    const end = parseLocalDateTime(vals.endDate, vals.endTime)
-    if (!(end > start)) {
-        ctx.addIssue({
-            code: z.ZodIssueCode.custom,
-            message: "End must be after start",
-            path: ["endTime"], // attach to a visible field
-        })
-    }
-})
--- a/shared/schemas/trainingReportSchema.ts
+++ b/shared/schemas/trainingReportSchema.ts
@@ -1,60 +0,0 @@
-import { z } from "zod";
-
-export const courseEventAttendeeSchema = z.object({
-    attendee_id: z.number({ invalid_type_error: "Must select a member" }).int().positive(),
-    passed_bookwork: z.boolean(),
-    passed_qual: z.boolean(),
-    remarks: z.string(),
-    attendee_role_id: z.number({ invalid_type_error: "Must select a role" }).int().positive()
-})
-
-export const trainingReportSchema = z.object({
-    id: z.number().int().positive().optional(),
-    course_id: z.number({ invalid_type_error: "Must select a training" }).int(),
-    event_date: z
-        .string()
-        .refine(
-            (val) => !isNaN(Date.parse(val)),
-            "Must be a valid date"
-        ),
-    remarks: z.string().nullable().optional(),
-    attendees: z.array(courseEventAttendeeSchema).default([]),
-}).superRefine((data, ctx) => {
-    const trainerRole = 1;
-    const traineeRole = 2;
-
-    const hasTrainer = data.attendees.some((a) => a.attendee_role_id === trainerRole);
-    const hasTrainee = data.attendees.some((a) => a.attendee_role_id === traineeRole);
-
-    if (!hasTrainer) {
-        ctx.addIssue({
-            code: z.ZodIssueCode.custom,
-            path: ["attendees"],
-            message: "At least one Primary Trainer is required.",
-        });
-    }
-
-    if (!hasTrainee) {
-        ctx.addIssue({
-            code: z.ZodIssueCode.custom,
-            path: ["attendees"],
-            message: "At least one Trainee is required.",
-        });
-    }
-
-    //no duplicates
-    const idCounts = new Map<number, number>();
-
-    data.attendees.forEach((a, index) => {
-        idCounts.set(a.attendee_id, (idCounts.get(a.attendee_id) ?? 0) + 1);
-
-        if (idCounts.get(a.attendee_id)! > 1) {
-            ctx.addIssue({
-                code: z.ZodIssueCode.custom,
-                path: ["attendees"],
-                message: "Cannot have duplicate attendee.",
-            });
-        }
-    })
-})
-
--- a/shared/tsconfig.json
+++ b/shared/tsconfig.json
@@ -1,17 +0,0 @@
-{
-  "compilerOptions": {
-    "target": "ESNext",
-    "module": "ESNext",
-    "moduleResolution": "Bundler",
-    "declaration": true,
-    "emitDeclarationOnly": true,
-    "outDir": "dist",
-    "strict": true,
-    "skipLibCheck": true,
-    "forceConsistentCasingInFileNames": true,
-    "esModuleInterop": true,
-    "isolatedModules": true,
-    "resolveJsonModule": true
-  },
-  "include": ["./**/*.ts"]
-}
--- a/shared/types/calendar.ts
+++ b/shared/types/calendar.ts
@@ -1,39 +0,0 @@
-export interface CalendarEvent {
-    id?: number;
-    name: string;
-    start: Date;
-    end: Date;
-    location: string;
-    color: string;
-    description: string;
-    creator_id?: number;
-    cancelled?: boolean;
-    created_at?: Date;
-    updated_at?: Date;
-
-    creator_name?: string | null;
-    eventSignups?: CalendarSignup[] | null;
-}
-
-export enum CalendarAttendance {
-    Attending = "attending",
-    NotAttending = "not_attending",
-    Maybe = "maybe"
-}
-
-export interface CalendarSignup {
-    member_id: number;
-    eventID: number;
-    status: CalendarAttendance;
-    member_name?: string;
-}    
-
-export interface CalendarEventShort {
-    id: number;
-    name: string;
-    start: Date;
-    end: Date;
-    color: string;
-    cancelled: boolean;
-    full_day: boolean;
-}
--- a/shared/types/course.ts
+++ b/shared/types/course.ts
@@ -1,91 +0,0 @@
-export interface Course {
-  id: number;
-  name: string;
-  short_name: string;
-  category: string;
-  description?: string | null;
-  image_url?: string | null;
-  created_at: Date;
-  updated_at: Date;
-  deleted?: number | boolean;
-  prereq_id?: number | null;
-  hasBookwork: boolean;
-  hasQual: boolean;
-}
-
-export interface CourseEventDetails {
-  id: number | null;              // PK
-  course_id: number | null;       // FK → courses.id
-  event_type: number | null;      // FK → event_types.id
-  event_date: Date;             // datetime (not nullable)
-
-  guilded_event_id: number | null;
-
-  created_at: Date;             // datetime
-  updated_at: Date;             // datetime
-
-  deleted: boolean | null;        // tinyint(4), nullable
-  report_url: string | null;      // varchar(2048)
-  remarks: string | null;         // text
-
-  attendees: CourseAttendee[] | null;
-
-  created_by: number | null;
-  created_by_name: string | null;
-  course_name: string | null;
-  course: Course | null;
-}
-
-
-export interface CourseAttendee {
-  passed_bookwork: boolean;       // tinyint(1)
-  passed_qual: boolean;           // tinyint(1)
-  attendee_id: number;            // PK
-  course_event_id: number;        // PK
-  attendee_role_id: number | null;
-  role: CourseAttendeeRole | null;
-  created_at: Date;             // datetime → ISO string
-  updated_at: Date;             // datetime → ISO string
-  remarks: string | null;
-
-  attendee_name: string | null;
-}
-
-export interface CourseAttendeeRole {
-  id: number;                  // PK, auto-increment
-  name: string | null;         // varchar(50), unique, nullable
-  description: string | null;  // text
-  created_at: Date | null;   // datetime (nullable)
-  updated_at: Date | null;   // datetime (nullable)
-  deleted: boolean;            // tinyint(4)
-}
-
-export interface RawAttendeeRow {
-  passed_bookwork: number;       // tinyint(1)
-  passed_qual: number;           // tinyint(1)
-  attendee_id: number;
-  course_event_id: number;
-  attendee_role_id: number | null;
-  created_at: string;
-  updated_at: string;
-  remarks: string | null;
-
-  role_id: number | null;
-  role_name: string | null;
-  role_description: string | null;
-  role_deleted: number | null;
-  role_created_at: string | null;
-  role_updated_at: string | null;
-
-  attendee_name: string | null;
-}
-
-export interface CourseEventSummary {
-  event_id: number;
-  course_id: number;
-  course_name: string;
-  course_shortname: string;
-  date: string;
-  created_by: number;
-  created_by_name: string;
-}
--- a/shared/utils/time.ts
+++ b/shared/utils/time.ts
@@ -1,12 +0,0 @@
-export function toDateTime(date: Date): string {
-    console.log(date);
-    // This produces a CST-local time because server runs in CST
-    const year   = date.getFullYear();
-    const month  = (date.getMonth() + 1).toString().padStart(2, "0");
-    const day    = date.getDate().toString().padStart(2, "0");
-    const hour   = date.getHours().toString().padStart(2, "0");
-    const minute = date.getMinutes().toString().padStart(2, "0");
-    const second = date.getSeconds().toString().padStart(2, "0");
-
-    return `${year}-${month}-${day} ${hour}:${minute}:${second}`;
-}
--- a/ui/.env.example
+++ b/ui/.env.example
@@ -1,7 +0,0 @@
-# SITE SETTINGS
-VITE_APIHOST=
-VITE_ENVIRONMENT= # dev / prod
-
-# Glitchtip
-VITE_GLITCHTIP_DSN=
-VITE_DISABLE_GLITCHTIP= # true/false
--- a/ui/jsconfig.json
+++ b/ui/jsconfig.json
@@ -2,7 +2,7 @@
  "compilerOptions": {
    "paths": {
      "@/*": ["./src/*"],
-      "@shared/*": ["../shared/*"]
+      "@shared": ["../shared/*"]
    }
  },
  "exclude": ["node_modules", "dist"]
--- a/ui/package-lock.json
+++ b/ui/package-lock.json
@@ -13,7 +13,6 @@
        "@fullcalendar/interaction": "^6.1.19",
        "@fullcalendar/timegrid": "^6.1.19",
        "@fullcalendar/vue3": "^6.1.19",
-        "@sentry/vue": "^10.27.0",
        "@tailwindcss/vite": "^4.1.11",
        "@tanstack/vue-table": "^8.21.3",
        "@vee-validate/zod": "^4.15.1",
@@ -22,7 +21,7 @@
        "clsx": "^2.1.1",
        "lucide-vue-next": "^0.539.0",
        "pinia": "^3.0.3",
-        "reka-ui": "^2.6.0",
+        "reka-ui": "^2.5.0",
        "tailwind-merge": "^3.3.1",
        "tailwindcss": "^4.1.11",
        "tw-animate-css": "^1.3.6",
@@ -1393,103 +1392,6 @@
      "dev": true,
      "license": "MIT"
    },
-    "node_modules/@sentry-internal/browser-utils": {
-      "version": "10.27.0",
-      "resolved": "https://registry.npmjs.org/@sentry-internal/browser-utils/-/browser-utils-10.27.0.tgz",
-      "integrity": "sha512-17tO6AXP+rmVQtLJ3ROQJF2UlFmvMWp7/8RDT5x9VM0w0tY31z8Twc0gw2KA7tcDxa5AaHDUbf9heOf+R6G6ow==",
-      "license": "MIT",
-      "dependencies": {
-        "@sentry/core": "10.27.0"
-      },
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@sentry-internal/feedback": {
-      "version": "10.27.0",
-      "resolved": "https://registry.npmjs.org/@sentry-internal/feedback/-/feedback-10.27.0.tgz",
-      "integrity": "sha512-UecsIDJcv7VBwycge/MDvgSRxzevDdcItE1i0KSwlPz00rVVxLY9kV28PJ4I2E7r6/cIaP9BkbWegCEcv09NuA==",
-      "license": "MIT",
-      "dependencies": {
-        "@sentry/core": "10.27.0"
-      },
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@sentry-internal/replay": {
-      "version": "10.27.0",
-      "resolved": "https://registry.npmjs.org/@sentry-internal/replay/-/replay-10.27.0.tgz",
-      "integrity": "sha512-tKSzHq1hNzB619Ssrqo25cqdQJ84R3xSSLsUWEnkGO/wcXJvpZy94gwdoS+KmH18BB1iRRRGtnMxZcUkiPSesw==",
-      "license": "MIT",
-      "dependencies": {
-        "@sentry-internal/browser-utils": "10.27.0",
-        "@sentry/core": "10.27.0"
-      },
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@sentry-internal/replay-canvas": {
-      "version": "10.27.0",
-      "resolved": "https://registry.npmjs.org/@sentry-internal/replay-canvas/-/replay-canvas-10.27.0.tgz",
-      "integrity": "sha512-inhsRYSVBpu3BI1kZphXj6uB59baJpYdyHeIPCiTfdFNBE5tngNH0HS/aedZ1g9zICw290lwvpuyrWJqp4VBng==",
-      "license": "MIT",
-      "dependencies": {
-        "@sentry-internal/replay": "10.27.0",
-        "@sentry/core": "10.27.0"
-      },
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@sentry/browser": {
-      "version": "10.27.0",
-      "resolved": "https://registry.npmjs.org/@sentry/browser/-/browser-10.27.0.tgz",
-      "integrity": "sha512-G8q362DdKp9y1b5qkQEmhTFzyWTOVB0ps1rflok0N6bVA75IEmSDX1pqJsNuY3qy14VsVHYVwQBJQsNltQLS0g==",
-      "license": "MIT",
-      "dependencies": {
-        "@sentry-internal/browser-utils": "10.27.0",
-        "@sentry-internal/feedback": "10.27.0",
-        "@sentry-internal/replay": "10.27.0",
-        "@sentry-internal/replay-canvas": "10.27.0",
-        "@sentry/core": "10.27.0"
-      },
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@sentry/core": {
-      "version": "10.27.0",
-      "resolved": "https://registry.npmjs.org/@sentry/core/-/core-10.27.0.tgz",
-      "integrity": "sha512-Zc68kdH7tWTDtDbV1zWIbo3Jv0fHAU2NsF5aD2qamypKgfSIMSbWVxd22qZyDBkaX8gWIPm/0Sgx6aRXRBXrYQ==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@sentry/vue": {
-      "version": "10.27.0",
-      "resolved": "https://registry.npmjs.org/@sentry/vue/-/vue-10.27.0.tgz",
-      "integrity": "sha512-vQVxnw59jRe5WsdB9ad/WpMPQ93QXE6Y0JEy01xIRcDlQ1pXp5wuxLkKGuTfvjdQzVUGIBLr0CgIqRAmPRymVg==",
-      "license": "MIT",
-      "dependencies": {
-        "@sentry/browser": "10.27.0",
-        "@sentry/core": "10.27.0"
-      },
-      "engines": {
-        "node": ">=18"
-      },
-      "peerDependencies": {
-        "pinia": "2.x || 3.x",
-        "vue": "2.x || 3.x"
-      },
-      "peerDependenciesMeta": {
-        "pinia": {
-          "optional": true
-        }
-      }
-    },
    "node_modules/@sindresorhus/merge-streams": {
      "version": "4.0.0",
      "resolved": "https://registry.npmjs.org/@sindresorhus/merge-streams/-/merge-streams-4.0.0.tgz",
@@ -3333,9 +3235,9 @@
      }
    },
    "node_modules/reka-ui": {
-      "version": "2.6.0",
-      "resolved": "https://registry.npmjs.org/reka-ui/-/reka-ui-2.6.0.tgz",
-      "integrity": "sha512-NrGMKrABD97l890mFS3TNUzB0BLUfbL3hh0NjcJRIUSUljb288bx3Mzo31nOyUcdiiW0HqFGXJwyCBh9cWgb0w==",
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/reka-ui/-/reka-ui-2.5.0.tgz",
+      "integrity": "sha512-81aMAmJeVCy2k0E6x7n1kypDY6aM1ldLis5+zcdV1/JtoAlSDck5OBsyLRJU9CfgbrQp1ImnRnBSmC4fZ2fkZQ==",
      "license": "MIT",
      "dependencies": {
        "@floating-ui/dom": "^1.6.13",
--- a/ui/package.json
+++ b/ui/package.json
@@ -17,7 +17,6 @@
    "@fullcalendar/interaction": "^6.1.19",
    "@fullcalendar/timegrid": "^6.1.19",
    "@fullcalendar/vue3": "^6.1.19",
-    "@sentry/vue": "^10.27.0",
    "@tailwindcss/vite": "^4.1.11",
    "@tanstack/vue-table": "^8.21.3",
    "@vee-validate/zod": "^4.15.1",
@@ -26,7 +25,7 @@
    "clsx": "^2.1.1",
    "lucide-vue-next": "^0.539.0",
    "pinia": "^3.0.3",
-    "reka-ui": "^2.6.0",
+    "reka-ui": "^2.5.0",
    "tailwind-merge": "^3.3.1",
    "tailwindcss": "^4.1.11",
    "tw-animate-css": "^1.3.6",
--- a/ui/src/App.vue
+++ b/ui/src/App.vue
@@ -24,16 +24,14 @@ const userStore = useUserStore();
 //   console.log(data);
 //   userStore.user = data;
 // });
-const APIHOST = import.meta.env.VITE_APIHOST;

 async function logout() {
-  // await fetch(`${APIHOST}/logout`, {
-  //   method: 'GET',
-  //   credentials: 'include',
-  // });
+  await fetch(`${import.meta.env.VITE_APIHOST}/logout`, {
+    method: 'POST',
+    credentials: 'include',
+  });

  userStore.user = null;
-  window.location.href = APIHOST + "/logout";
 }

 function formatDate(dateStr) {
@@ -44,8 +42,6 @@ function formatDate(dateStr) {
    day: "numeric",
  });
 }
-
-const environment = import.meta.env.VITE_ENVIRONMENT;
 </script>

 <template>
@@ -116,15 +112,10 @@ const environment = import.meta.env.VITE_ENVIRONMENT;
          </DropdownMenuContent>
        </DropdownMenu>

-        <a v-else :href="APIHOST + '/login'">Login</a>
+        <a v-else href="https://aj17thdevapi.nexuszone.net/login">Login</a>
      </div>
    </div>
    <Separator></Separator>
-    <Alert v-if="environment == 'dev'" class="m-2 mx-auto w-5xl" variant="info">
-      <AlertDescription class="flex flex-row items-center text-nowrap gap-5 mx-auto">
-        <p>This is a development build of the application. Some features will be unavailable or unstable.</p>
-      </AlertDescription>
-    </Alert>
    <Alert v-if="userStore.user?.loa?.[0]" class="m-2 mx-auto w-5xl" variant="info">
      <AlertDescription class="flex flex-row items-center text-nowrap gap-5 mx-auto">
        <p>You are on LOA until <strong>{{ formatDate(userStore.user?.loa?.[0].end_date) }}</strong></p>
--- a/ui/src/api/calendar.ts
+++ b/ui/src/api/calendar.ts
@@ -1,13 +1,13 @@
-// export interface CalendarEvent {
-//     name: string,
-//     start: Date,
-//     end: Date,
-//     location: string,
-//     color: string,
-//     description: string,
-//     creator: any | null, // user object
-//     id: number | null
-// }
+export interface CalendarEvent {
+    name: string,
+    start: Date,
+    end: Date,
+    location: string,
+    color: string,
+    description: string,
+    creator: any | null, // user object
+    id: number | null
+}

 export enum CalendarAttendance {
    Attending = "attending",
@@ -21,107 +21,22 @@ export interface CalendarSignup {
    state: CalendarAttendance
 }

-import { CalendarEventShort, CalendarEvent } from "@shared/types/calendar";
-
-//@ts-ignore
-const addr = import.meta.env.VITE_APIHOST;
-
-export async function getMonthCalendarEvents(viewedMonth: Date): Promise<CalendarEventShort[]> {
-
-    const year = viewedMonth.getFullYear();
-    const month = viewedMonth.getMonth();
-
-    // Base range: first and last day of the month
-    const firstOfMonth = new Date(year, month, 1);
-    const lastOfMonth = new Date(year, month + 1, 0);
-
-    // --- Apply 10 day padding ---
-    const start = new Date(firstOfMonth);
-    start.setDate(start.getDate() - 10);
-
-    const end = new Date(lastOfMonth);
-    end.setDate(end.getDate() + 10);
-    end.setHours(23, 59, 59, 999);
-
-    const from = start.toISOString();
-    const to = end.toISOString();
-
-    const url = `${addr}/calendar?from=${encodeURIComponent(from)}&to=${encodeURIComponent(to)}`;
-
-    const res = await fetch(url);
-
-    if (!res.ok) {
-        throw new Error(`Failed to fetch events: ${res.status} ${res.statusText}`);
-    }
-
-    return res.json();
-}
-
-export async function getCalendarEvent(id: number): Promise<CalendarEvent> {
-    let res = await fetch(`${addr}/calendar/${id}`);
-
-    if (res.ok) {
-        return await res.json();
-    } else {
-        throw new Error(`Failed to fetch event: ${res.status} ${res.statusText}`);
-    }
-}
-
 export async function createCalendarEvent(eventData: CalendarEvent) {
-    let res = await fetch(`${addr}/calendar`, {
-        method: "POST",
-        credentials: "include",
-        headers: { 'Content-Type': 'application/json' },
-        body: JSON.stringify(eventData)
-    });

-    if (res.ok) {
-        return;
-    } else {
-        throw new Error(`Failed to set attendance: ${res.status} ${res.statusText}`);
-    }
 }

 export async function editCalendarEvent(eventData: CalendarEvent) {
-    let res = await fetch(`${addr}/calendar`, {
-        method: "PUT",
-        credentials: "include",
-        headers: { 'Content-Type': 'application/json' },
-        body: JSON.stringify(eventData)
-    });

-    if (res.ok) {
-        return;
-    } else {
-        throw new Error(`Failed to set attendance: ${res.status} ${res.statusText}`);
-    }
 }

-export async function setCancelCalendarEvent(eventID: number, cancel: boolean) {
-    let route = cancel ? "cancel" : "uncancel";
+export async function cancelCalendarEvent(eventID: number) {

-    console.log(route);
-    let res = await fetch(`${addr}/calendar/${eventID}/${route}`, {
-        method: "POST",
-        credentials: "include"
-    });
+}

-    if (res.ok) {
-        return;
-    } else {
-        throw new Error(`Failed to set attendance: ${res.status} ${res.statusText}`);
-    }
+export async function adminCancelCalendarEvent(eventID: number) {
+    
 }

 export async function setCalendarEventAttendance(eventID: number, state: CalendarAttendance) {
-    let res = await fetch(`${addr}/calendar/${eventID}/attendance?state=${state}`, {
-        method: "POST",
-        credentials: "include",
-    });

-    if (res.ok) {
-        return;
-    } else {
-        throw new Error(`Failed to set attendance: ${res.status} ${res.statusText}`);
-    }
 }
--- a/ui/src/api/trainingReport.ts
+++ b/ui/src/api/trainingReport.ts
@@ -1,66 +0,0 @@
-import { Course, CourseAttendeeRole, CourseEventDetails, CourseEventSummary } from '@shared/types/course'
-
-//@ts-ignore
-const addr = import.meta.env.VITE_APIHOST;
-
-export async function getTrainingReports(sortMode: string, search: string): Promise<CourseEventSummary[]> {
-    const res = await fetch(`${addr}/courseEvent?sort=${sortMode}&search=${search}`);
-
-    if (res.ok) {
-        return await res.json() as Promise<CourseEventSummary[]>;
-    } else {
-        console.error("Something went wrong");
-        throw new Error("Failed to load training reports");
-    }
-}
-
-export async function getTrainingReport(id: number): Promise<CourseEventDetails> {
-    const res = await fetch(`${addr}/courseEvent/${id}`);
-
-    if (res.ok) {
-        return await res.json() as Promise<CourseEventDetails>;
-    } else {
-        console.error("Something went wrong");
-        throw new Error("Failed to load training reports");
-    }
-}
-
-export async function getAllTrainings(): Promise<Course[]> {
-    const res = await fetch(`${addr}/course`);
-
-    if (res.ok) {
-        return await res.json() as Promise<Course[]>; 
-    } else {
-        console.error("Something went wrong");
-        throw new Error("Failed to load training list");
-    }
-}
-
-export async function getAllAttendeeRoles(): Promise<CourseAttendeeRole[]> {
-    const res = await fetch(`${addr}/course/roles`);
-
-    if (res.ok) {
-        return await res.json() as Promise<CourseAttendeeRole[]>;
-    } else {
-        console.error("Something went wrong");
-        throw new Error("Failed to load attendee roles");
-    }
-}
-
-export async function postTrainingReport(report: CourseEventDetails) {
-    const res = await fetch(`${addr}/courseEvent`, {
-        method: "POST",
-        headers: {
-            "Content-Type": "application/json",
-        },
-        body: JSON.stringify(report),
-        credentials: 'include',
-    });
-
-    if (!res.ok) {
-        const errorText = await res.text();
-        throw new Error(`Failed to post training report: ${res.status} ${errorText}`);
-    }
-
-    return res.json(); // expected to return the inserted report or new ID
-}
--- a/ui/src/components/calendar/CreateCalendarEvent.vue
+++ b/ui/src/components/calendar/CreateCalendarEvent.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import { toTypedSchema } from "@vee-validate/zod"
-import { ref, defineExpose, watch, nextTick } from "vue"
+import { ref, defineExpose, watch } from "vue"
 import * as z from "zod"

 import { Button } from "@/components/ui/button"
@@ -21,18 +21,11 @@ import {
 } from "@/components/ui/form"
 import { Input } from "@/components/ui/input"
 import Textarea from "../ui/textarea/Textarea.vue"
-import { CalendarEvent } from "@shared/types/calendar"
-import {
-    Select,
-    SelectContent,
-    SelectGroup,
-    SelectItem,
-    SelectLabel,
-    SelectTrigger,
-    SelectValue,
-} from '@/components/ui/select'
-
+import { CalendarEvent } from "@/api/calendar"

+// ---------- helpers ----------
+const dateRe = /^\d{4}-\d{2}-\d{2}$/        // YYYY-MM-DD
+const timeRe = /^(?:[01]\d|2[0-3]):[0-5]\d$/ // HH:mm (24h)

 function toLocalDateString(d: Date) {
    // yyyy-MM-dd with local time zone
@@ -52,50 +45,45 @@ function roundToNextHour(d = new Date()) {
    t.setHours(t.getHours() + 1)
    return t
 }
+function parseLocalDateTime(dateStr: string, timeStr: string) {
+    // Construct a Date in the user's local timezone
+    const [y, m, d] = dateStr.split("-").map(Number)
+    const [hh, mm] = timeStr.split(":").map(Number)
+    return new Date(y, m - 1, d, hh, mm, 0, 0)
+}

-import { calendarEventSchema, parseLocalDateTime } from '@shared/schemas/calendarEventSchema'
-import { createCalendarEvent, editCalendarEvent } from "@/api/calendar"
-import DialogDescription from "../ui/dialog/DialogDescription.vue"
-const formSchema = toTypedSchema(calendarEventSchema)
+// ---------- schema ----------
+const zEvent = z.object({
+    name: z.string().min(2, "Please enter at least 2 characters").max(100),
+    startDate: z.string().regex(dateRe, "Use YYYY-MM-DD"),
+    startTime: z.string().regex(timeRe, "Use HH:mm (24h)"),
+    endDate: z.string().regex(dateRe, "Use YYYY-MM-DD"),
+    endTime: z.string().regex(timeRe, "Use HH:mm (24h)"),
+    location: z.string().max(200).default(""),
+    color: z.string().regex(/^#([0-9A-Fa-f]{6})$/, "Use a hex color like #AABBCC"),
+    description: z.string().max(2000).default(""),
+    id: z.number().int().nonnegative().nullable().default(null),
+}).superRefine((vals, ctx) => {
+    const start = parseLocalDateTime(vals.startDate, vals.startTime)
+    const end = parseLocalDateTime(vals.endDate, vals.endTime)
+    if (!(end > start)) {
+        ctx.addIssue({
+            code: z.ZodIssueCode.custom,
+            message: "End must be after start",
+            path: ["endTime"], // attach to a visible field
+        })
+    }
+})
+
+const formSchema = toTypedSchema(zEvent)

 // ---------- dialog state & defaults ----------
-const clickedDate = ref<string | null>(null);
 const dialogOpen = ref(false)
-const dialogMode = ref<'create' | 'edit'>('create');
-const editEvent = ref<CalendarEvent | null>();
-function openDialog(dateStr?: string, mode?: 'create' | 'edit', event?: CalendarEvent) {
-    dialogMode.value = mode ?? 'create';
-    editEvent.value = event ?? null;
-    clickedDate.value = dateStr ?? null;
-    dialogOpen.value = true
-    initialValues.value = makeInitialValues()
-}
+function openDialog() { dialogOpen.value = true }
 defineExpose({ openDialog })

 function makeInitialValues() {
-
-    if (dialogMode.value === 'edit' && editEvent.value) {
-        const e = editEvent.value;
-        return {
-            name: e.name,
-            startDate: toLocalDateString(new Date(e.start)),
-            startTime: toLocalTimeString(new Date(e.start)),
-            endDate: toLocalDateString(new Date(e.end)),
-            endTime: toLocalTimeString(new Date(e.end)),
-            location: e.location,
-            color: e.color,
-            description: e.description,
-            id: e.id,
-        }
-    }
-
-    let start: Date;
-    if (clickedDate.value) {
-        const local = new Date(clickedDate.value + "T20:00:00");
-        start = local;
-    } else {
-        start = roundToNextHour();
-    }
+    const start = roundToNextHour()
    const end = new Date(start.getTime() + 60 * 60 * 1000)
    return {
        name: "",
@@ -104,77 +92,50 @@ function makeInitialValues() {
        endDate: toLocalDateString(end),
        endTime: toLocalTimeString(end),
        location: "",
-        color: "#6890ee",
+        color: "#3b82f6",
        description: "",
        id: null as number | null,
    }
 }
-const initialValues = ref(null)
+const initialValues = ref(makeInitialValues())

 const formKey = ref(0)

-watch(dialogOpen, async (isOpen) => {
-    if (isOpen) {
-        await nextTick();
-        formRef.value?.resetForm({ values: makeInitialValues() })
+watch(dialogOpen, (isOpen) => {
+    if (!isOpen) {
+        formKey.value++  // remounts the form -> picks up fresh initialValues
    }
 })
 // ---------- submit ----------
-async function onSubmit(vals: z.infer<typeof calendarEventSchema>) {
+function onSubmit(vals: z.infer<typeof zEvent>) {
    const start = parseLocalDateTime(vals.startDate, vals.startTime)
    const end = parseLocalDateTime(vals.endDate, vals.endTime)

    const event: CalendarEvent = {
-        id: vals.id ?? null,
        name: vals.name,
        start,
        end,
        location: vals.location,
        color: vals.color,
        description: vals.description,
+        id: null,
+        creator: null
    }

-    try {
-        if (dialogMode.value === "edit") {
-            await editCalendarEvent(event);
-        } else {
-            await createCalendarEvent(event);
-        }
-        emit('reload');
-    } catch (error) {
-        console.error(error);
-    }
+    console.log("Submitting CalendarEvent:", event)

    // close after success
    dialogOpen.value = false
 }
-
-const emit = defineEmits<{
-    (e: 'reload'): void
-}>()
-const formRef = ref(null);
-
-const colorOptions = [
-    { name: "Blue", hex: "#6890ee" },
-    { name: "Purple", hex: "#a25fce" },
-    { name: "Orange", hex: "#fba037" },
-    { name: "Green", hex: "#6cd265" },
-    { name: "Red", hex: "#ff5959" },
-];
-
-function getColorName(hex: string) {
-    return colorOptions.find(c => c.hex === hex)?.name ?? hex
-}
 </script>

 <template>
-    <Form ref="formRef" :key="formKey" v-slot="{ handleSubmit, resetForm }" :validation-schema="formSchema"
+    <Form :key="formKey" v-slot="{ handleSubmit, resetForm }" :validation-schema="formSchema"
        :initial-values="initialValues" keep-values as="">
        <Dialog v-model:open="dialogOpen">
            <DialogContent class="sm:max-w-[520px]">
                <DialogHeader>
-                    <DialogTitle>{{ dialogMode == "edit" ? 'Edit Event' : 'Create Event' }}</DialogTitle>
-                    <DialogDescription></DialogDescription>
+                    <DialogTitle>Create Event</DialogTitle>
                </DialogHeader>

                <form id="dialogForm" class="grid grid-cols-1 gap-4"
@@ -189,48 +150,21 @@ function getColorName(hex: string) {
                                    <FormControl>
                                        <Input type="text" v-bind="componentField" />
                                    </FormControl>
-                                    <div class="h-3">
-                                        <FormMessage />
-                                    </div>
+                                    <FormMessage />
                                </FormItem>
                            </FormField>
                        </div>

                        <!-- Color -->
-                        <div class="w-[120px]">
+                        <div class="w-[60px]">
                            <FormField v-slot="{ componentField }" name="color">
                                <FormItem>
                                    <FormLabel>Color</FormLabel>
                                    <FormControl>
-                                        <Select :modelValue="componentField.modelValue"
-                                            @update:modelValue="componentField.onChange">
-                                            <SelectTrigger>
-                                                <SelectValue asChild>
-                                                    <template #default="{ selected }">
-                                                        <div class="flex items-center gap-2 w-[70px]">
-                                                            <span class="inline-block size-4 rounded"
-                                                                :style="{ background: componentField.modelValue }">
-                                                            </span>
-                                                            <span>{{ getColorName(componentField.modelValue) }}</span>
-                                                        </div>
-                                                    </template>
-                                                </SelectValue>
-                                            </SelectTrigger>
-                                            <SelectContent>
-                                                <SelectItem v-for="opt in colorOptions" :key="opt.hex" :value="opt.hex">
-                                                    <div class="flex items-center gap-2">
-                                                        <span class="inline-block size-4 rounded"
-                                                            :style="{ background: opt.hex }"></span>
-                                                        <span>{{ opt.name }}</span>
-                                                    </div>
-                                                </SelectItem>
-                                            </SelectContent>
-                                        </Select>
-
+                                        <Input type="color" class="h-[38px] p-1 cursor-pointer"
+                                            v-bind="componentField" />
                                    </FormControl>
-                                    <div class="h-3">
-                                        <FormMessage />
-                                    </div>
+                                    <FormMessage />
                                </FormItem>
                            </FormField>
                        </div>
@@ -246,9 +180,7 @@ function getColorName(hex: string) {
                                <FormControl>
                                    <Input type="date" v-bind="componentField" />
                                </FormControl>
-                                <div class="h-3">
-                                    <FormMessage />
-                                </div>
+                                <FormMessage />
                            </FormItem>
                        </FormField>

@@ -259,9 +191,7 @@ function getColorName(hex: string) {
                                    <Input type="text" v-bind="componentField" />
                                    <!-- If you ever want native picker: type="time" -->
                                </FormControl>
-                                <div class="h-3">
-                                    <FormMessage />
-                                </div>
+                                <FormMessage />
                            </FormItem>
                        </FormField>
                    </div>
@@ -274,9 +204,7 @@ function getColorName(hex: string) {
                                <FormControl>
                                    <Input type="date" v-bind="componentField" />
                                </FormControl>
-                                <div class="h-3">
-                                    <FormMessage />
-                                </div>
+                                <FormMessage />
                            </FormItem>
                        </FormField>

@@ -286,9 +214,7 @@ function getColorName(hex: string) {
                                <FormControl>
                                    <Input type="text" v-bind="componentField" />
                                </FormControl>
-                                <div class="h-3">
-                                    <FormMessage />
-                                </div>
+                                <FormMessage />
                            </FormItem>
                        </FormField>
                    </div>
@@ -300,9 +226,7 @@ function getColorName(hex: string) {
                            <FormControl>
                                <Input type="text" v-bind="componentField" />
                            </FormControl>
-                            <div class="h-3">
-                                <FormMessage />
-                            </div>
+                            <FormMessage />
                        </FormItem>
                    </FormField>

@@ -312,11 +236,9 @@ function getColorName(hex: string) {
                        <FormItem>
                            <FormLabel>Description</FormLabel>
                            <FormControl>
-                                <Textarea class="resize-none h-32 scrollbar-themed" v-bind="componentField" />
+                                <Textarea class="resize-none h-32" v-bind="componentField" />
                            </FormControl>
-                            <div class="h-3">
-                                <FormMessage/>
-                            </div>
+                            <FormMessage />
                        </FormItem>
                    </FormField>

@@ -327,39 +249,9 @@ function getColorName(hex: string) {
                </form>

                <DialogFooter>
-                    <Button type="submit" form="dialogForm">{{ dialogMode == "edit" ? 'Update' : 'Create' }}</Button>
+                    <Button type="submit" form="dialogForm">Create</Button>
                </DialogFooter>
            </DialogContent>
        </Dialog>
    </Form>
 </template>
-
-<style scoped>
-/* Firefox */
-.scrollbar-themed {
-    scrollbar-width: thin;
-    scrollbar-color: #555 #1f1f1f;
-    padding-right: 6px;
-}
-
-/* Chrome, Edge, Safari */
-.scrollbar-themed::-webkit-scrollbar {
-    width: 10px;
-    /* slightly wider to allow padding look */
-}
-
-.scrollbar-themed::-webkit-scrollbar-track {
-    background: #1f1f1f;
-    margin-left: 6px;
-    /* ❗ adds space between content + scrollbar */
-}
-
-.scrollbar-themed::-webkit-scrollbar-thumb {
-    background: #555;
-    border-radius: 9999px;
-}
-
-.scrollbar-themed::-webkit-scrollbar-thumb:hover {
-    background: #777;
-}
-</style>
--- a/ui/src/components/calendar/ViewCalendarEvent.vue
+++ b/ui/src/components/calendar/ViewCalendarEvent.vue
@@ -1,226 +0,0 @@
-<script setup lang="ts">
-import type { CalendarEvent, CalendarSignup } from '@shared/types/calendar'
-import { CircleAlert, Clock, EllipsisVertical, MapPin, User, X } from 'lucide-vue-next';
-import { computed, onMounted, ref, watch } from 'vue';
-import ButtonGroup from '../ui/button-group/ButtonGroup.vue';
-import Button from '../ui/button/Button.vue';
-import { CalendarAttendance, getCalendarEvent, setCalendarEventAttendance, setCancelCalendarEvent } from '@/api/calendar';
-import { useUserStore } from '@/stores/user';
-import { useRoute } from 'vue-router';
-import DropdownMenu from '../ui/dropdown-menu/DropdownMenu.vue';
-import DropdownMenuTrigger from '../ui/dropdown-menu/DropdownMenuTrigger.vue';
-import DropdownMenuContent from '../ui/dropdown-menu/DropdownMenuContent.vue';
-import DropdownMenuItem from '../ui/dropdown-menu/DropdownMenuItem.vue';
-
-const route = useRoute();
-// const eventID = computed(() => {
-//     const id = route.params.id;
-//     if (typeof id === 'string') return id;
-//     return undefined;
-// });
-
-const loaded = ref<boolean>(false);
-const activeEvent = ref<CalendarEvent | null>(null);
-
-// onMounted(async () => {
-//     let eventID = route.params.id;
-//     console.log(eventID);
-//     activeEvent.value = await getCalendarEvent(Number(eventID));
-//     loaded.value = true;
-// });
-
-watch(
-    () => route.params.id,
-    async (id) => {
-        if (!id) return;
-        activeEvent.value = await getCalendarEvent(Number(id));
-        loaded.value = true;
-    },
-    { immediate: true }
-);
-
-const emit = defineEmits<{
-    (e: 'close'): void
-    (e: 'reload'): void
-    (e: 'edit', event: CalendarEvent): void
-}>()
-
-// const activeEvent = computed(() => props.event)
-
-const startFmt = new Intl.DateTimeFormat(undefined, {
-    weekday: 'short', year: 'numeric', month: 'short', day: 'numeric',
-    hour: 'numeric', minute: '2-digit'
-})
-const endFmt = new Intl.DateTimeFormat(undefined, {
-    hour: 'numeric', minute: '2-digit'
-})
-
-const whenText = computed(() => {
-    if (!activeEvent.value?.start) return ''
-    const s = new Date(activeEvent.value.start)
-    const e = activeEvent.value?.end ? new Date(activeEvent.value.end) : null
-    return e
-        ? `${startFmt.format(s)} – ${endFmt.format(e)}`
-        : `${startFmt.format(s)}`
-})
-
-const attending = computed<CalendarSignup[]>(() => { return activeEvent.value.eventSignups.filter((s) => s.status == CalendarAttendance.Attending) })
-const maybe = computed<CalendarSignup[]>(() => { return activeEvent.value.eventSignups.filter((s) => s.status == CalendarAttendance.Maybe) })
-const declined = computed<CalendarSignup[]>(() => { return activeEvent.value.eventSignups.filter((s) => s.status == CalendarAttendance.NotAttending) })
-const viewedState = ref<CalendarAttendance>(CalendarAttendance.Attending);
-
-let user = useUserStore();
-const myAttendance = computed<CalendarSignup | null>(() => {
-    return activeEvent.value.eventSignups.find(
-        (s) => s.member_id === user.user.id
-    ) || null;
-});
-
-async function setAttendance(state: CalendarAttendance) {
-    await setCalendarEventAttendance(activeEvent.value.id, state);
-    //refresh event data
-    activeEvent.value = await getCalendarEvent(activeEvent.value.id);
-}
-
-const canEditEvent = computed(() => {
-    if (user.user.id == activeEvent.value.creator_id)
-        return true;
-});
-
-async function setCancel(isCancelled: boolean) {
-    await setCancelCalendarEvent(activeEvent.value.id, isCancelled);
-    emit("reload");
-    activeEvent.value = await getCalendarEvent(activeEvent.value.id);
-}
-
-async function forceReload() {
-    activeEvent.value = await getCalendarEvent(activeEvent.value.id);
-}
-
-defineExpose({forceReload})
-</script>
-
-<template>
-    <div v-if="loaded">
-        <!-- Header -->
-        <div class="flex items-center justify-between gap-3 border-b px-4 py-3">
-            <h2 class="text-lg font-semibold break-all">
-                {{ activeEvent?.name || 'Event' }}
-            </h2>
-            <div class="flex gap-4">
-                <DropdownMenu v-if="canEditEvent">
-                    <DropdownMenuTrigger>
-                        <button
-                            class="inline-flex flex-none size-8 items-center justify-center cursor-pointer rounded-md hover:bg-muted/40 transition">
-                            <EllipsisVertical class="size-6" />
-                        </button>
-                    </DropdownMenuTrigger>
-                    <DropdownMenuContent>
-                        <DropdownMenuItem @click="emit('edit', activeEvent)">
-                            Edit
-                        </DropdownMenuItem>
-                        <DropdownMenuItem v-if="activeEvent.cancelled"
-                            @click="setCancel(false)">
-                            Un-Cancel
-                        </DropdownMenuItem>
-                        <DropdownMenuItem v-else @click="setCancel(true)">
-                            Cancel
-                        </DropdownMenuItem>
-                    </DropdownMenuContent>
-                </DropdownMenu>
-                <button
-                    class="inline-flex flex-none size-8 items-center justify-center rounded-md border hover:bg-muted/40 transition cursor-pointer"
-                    aria-label="Close" @click="emit('close')">
-                    <X class="size-4" />
-                </button>
-            </div>
-        </div>
-        <!-- Body -->
-        <div class="flex-1 flex flex-col items-center min-h-0 overflow-y-auto px-4 py-4 space-y-6 w-full">
-            <section v-if="activeEvent.cancelled == true" class="w-full">
-                <div class="flex p-2 rounded-md w-full bg-destructive gap-3">
-                    <CircleAlert></CircleAlert> This event has been cancelled
-                </div>
-            </section>
-            <section class="w-full">
-                <ButtonGroup class="flex w-full">
-                    <Button variant="outline"
-                        :class="myAttendance?.status === CalendarAttendance.Attending ? 'border-2 border-primary text-primary' : ''"
-                        @click="setAttendance(CalendarAttendance.Attending)">Going</Button>
-                    <Button variant="outline"
-                        :class="myAttendance?.status === CalendarAttendance.Maybe ? 'border-2 !border-l-2 border-primary text-primary' : ''"
-                        @click="setAttendance(CalendarAttendance.Maybe)">Maybe</Button>
-                    <Button variant="outline"
-                        :class="myAttendance?.status === CalendarAttendance.NotAttending ? 'border-2 !border-l-2 border-primary text-primary' : ''"
-                        @click="setAttendance(CalendarAttendance.NotAttending)">Declined</Button>
-                </ButtonGroup>
-            </section>
-            <!-- When -->
-            <section v-if="whenText" class="space-y-2 w-full">
-                <div class="inline-flex items-center gap-2 rounded-md border px-2.5 py-1.5 text-sm">
-                    <Clock class="size-4 opacity-80" />
-                    <span class="font-medium">{{ whenText }}</span>
-                </div>
-            </section>
-            <!-- Quick meta chips -->
-            <section class="flex flex-wrap gap-2 w-full">
-                <span class="inline-flex items-center gap-1.5 rounded-md border px-2 py-1 text-xs">
-                    <MapPin class="size-3.5 opacity-80" />
-                    <span class="font-medium">{{ activeEvent.location || "Unknown" }}</span>
-                </span>
-                <span class="inline-flex items-center gap-1.5 rounded-md border px-2 py-1 text-xs">
-                    <User class="size-3.5 opacity-80" />
-                    <span class="font-medium">Created by: {{ activeEvent.creator_name || "Unknown User"
-                        }}</span>
-                </span>
-            </section>
-            <!-- Description -->
-            <section class="space-y-2 w-full">
-                <p class="text-lg font-semibold">Description</p>
-                <p class="border bg-muted/50 px-3 py-2 rounded-lg min-h-24 my-2 whitespace-pre-line">
-                    {{ activeEvent.description }}
-                </p>
-            </section>
-            <!-- Attendance -->
-            <section class="space-y-2 w-full">
-                <p class="text-lg font-semibold">Attendance</p>
-                <div class="flex flex-col border bg-muted/50 rounded-lg min-h-24 my-2">
-                    <div class="flex w-full pt-2 border-b *:w-full *:text-center *:pb-1 *:cursor-pointer">
-                        <label
-                            :class="viewedState === CalendarAttendance.Attending ? 'border-b-3 border-foreground' : 'mb-[2px]'"
-                            @click="viewedState = CalendarAttendance.Attending">Going {{ attending.length }}</label>
-                        <label
-                            :class="viewedState === CalendarAttendance.Maybe ? 'border-b-3 border-foreground' : 'mb-[2px]'"
-                            @click="viewedState = CalendarAttendance.Maybe">Maybe {{ maybe.length }}</label>
-                        <label
-                            :class="viewedState === CalendarAttendance.NotAttending ? 'border-b-3 border-foreground' : 'mb-[2px]'"
-                            @click="viewedState = CalendarAttendance.NotAttending">Declined {{ declined.length
-                            }}</label>
-                    </div>
-                    <div class="px-5 py-4 min-h-28">
-                        <div v-if="viewedState === CalendarAttendance.Attending" v-for="person in attending">
-                            <p>{{ person.member_name }}</p>
-                        </div>
-                        <div v-if="viewedState === CalendarAttendance.Maybe" v-for="person in maybe">
-                            <p>{{ person.member_name }}</p>
-                        </div>
-                        <div v-if="viewedState === CalendarAttendance.NotAttending" v-for="person in declined">
-                            <p>{{ person.member_name }}</p>
-                        </div>
-                    </div>
-                </div>
-            </section>
-        </div>
-        <!-- Footer (optional actions) -->
-        <!-- <div class="border-t px-4 py-3 flex items-center justify-end gap-2">
-            <button class="rounded-md border px-3 py-1.5 text-sm hover:bg-muted/40 transition">
-                Edit
-            </button>
-            <button
-                class="rounded-md bg-primary text-primary-foreground px-3 py-1.5 text-sm hover:opacity-90 transition">
-                Open details
-            </button>
-        </div> -->
-
-    </div>
-</template>
--- a/ui/src/components/trainingReport/trainingReportForm.vue
+++ b/ui/src/components/trainingReport/trainingReportForm.vue
@@ -1,309 +0,0 @@
-<script setup lang="ts">
-import { trainingReportSchema, courseEventAttendeeSchema } from '@shared/schemas/trainingReportSchema'
-import { Course, CourseAttendee, CourseAttendeeRole, CourseEventDetails } from '@shared/types/course'
-import { useForm, useFieldArray, FieldArray as VeeFieldArray, ErrorMessage, Field as VeeField } from 'vee-validate'
-import { toTypedSchema } from '@vee-validate/zod'
-import { computed, onMounted, ref, watch } from 'vue'
-import { getAllAttendeeRoles, getAllTrainings, postTrainingReport } from '@/api/trainingReport'
-import { getMembers, Member } from '@/api/member'
-
-import FieldGroup from '../ui/field/FieldGroup.vue'
-import Field from '../ui/field/Field.vue'
-import FieldLabel from '../ui/field/FieldLabel.vue'
-import FieldError from '../ui/field/FieldError.vue'
-import Button from '../ui/button/Button.vue'
-import Textarea from '../ui/textarea/Textarea.vue'
-import { Plus, X } from 'lucide-vue-next';
-import FieldSet from '../ui/field/FieldSet.vue'
-import FieldLegend from '../ui/field/FieldLegend.vue'
-import FieldDescription from '../ui/field/FieldDescription.vue'
-import Checkbox from '../ui/checkbox/Checkbox.vue'
-import { configure } from 'vee-validate'
-
-
-const { handleSubmit, resetForm, errors, values, setFieldValue } = useForm({
-    validationSchema: toTypedSchema(trainingReportSchema),
-    validateOnMount: false,
-    initialValues: {
-        course_id: null,
-        event_date: "",
-        remarks: "",
-        attendees: [],
-    }
-})
-
-// watch(errors, (newErrors) => {
-//     console.log(newErrors)
-// }, { deep: true })
-
-// watch(values, (newErrors) => {
-//     console.log(newErrors.attendees)
-// }, { deep: true })
-
-watch(() => values.course_id, (newCourseId, oldCourseId) => {
-    if (!oldCourseId) return;
-
-    values.attendees.forEach((a, index) => {
-        setFieldValue(`attendees[${index}].passed_bookwork`, false);
-        setFieldValue(`attendees[${index}].passed_qual`, false);
-    });
-});
-
-const submitForm = handleSubmit(onSubmit);
-
-function toMySQLDateTime(date: Date): string {
-    return date
-        .toISOString()                 // 2025-11-19T00:00:00.000Z
-        .slice(0, 23)                  // keep milliseconds → 2025-11-19T00:00:00.000
-        .replace("T", " ") + "000";    // becomes → 2025-11-19 00:00:00.000000
-}
-
-
-function onSubmit(vals) {
-    try {
-        const clean: CourseEventDetails = {
-            ...vals,
-            event_date: new Date(vals.event_date),
-        }
-
-        postTrainingReport(clean).then((newID) => {
-            emit("submit", newID);
-        });
-    } catch (err) {
-        console.error("There was an error submitting the training report", err);
-    }
-}
-
-const { remove, push, fields } = useFieldArray('attendees');
-
-const selectedCourse = computed<Course | undefined>(() => { return trainings.value?.find(c => c.id == values.course_id) })
-
-const trainings = ref<Course[] | null>(null);
-const members = ref<Member[] | null>(null);
-const eventRoles = ref<CourseAttendeeRole[] | null>(null);
-
-const emit = defineEmits(['submit'])
-
-onMounted(async () => {
-    trainings.value = await getAllTrainings();
-    members.value = await getMembers();
-    eventRoles.value = await getAllAttendeeRoles();
-})
-</script>
-<template>
-    <form id="trainingForm" @submit.prevent="submitForm" class="flex flex-col gap-5">
-
-        <div class="flex gap-5">
-            <div class="flex-1">
-                <FieldGroup>
-                    <VeeField v-slot="{ field, errors }" name="course_id">
-                        <Field :data-invalid="!!errors.length">
-                            <FieldLabel class="scroll-m-20 text-lg tracking-tight">Training Course</FieldLabel>
-                            <select v-bind="field"
-                                class="h-9 border rounded p-2 w-auto focus-visible:border-ring focus-visible:ring-ring/50 focus-visible:ring-[3px] bg-background outline-none">
-                                <option value="" disabled>Select a course</option>
-                                <option v-for="course in trainings" :key="course.id" :value="course.id">
-                                    {{ course.name }}
-                                </option>
-                            </select>
-                            <div class="h-4">
-                                <FieldError v-if="errors.length" :errors="errors" />
-                            </div>
-                        </Field>
-                    </VeeField>
-                </FieldGroup>
-            </div>
-            <div class="w-[150px]">
-                <FieldGroup>
-                    <VeeField v-slot="{ field, errors }" name="event_date">
-                        <Field :data-invalid="!!errors.length">
-                            <FieldLabel class="scroll-m-20 text-lg tracking-tight">Event Date</FieldLabel>
-                            <input type="date" v-bind="field"
-                                class="h-9 border rounded p-2 focus-visible:border-ring focus-visible:ring-ring/50 focus-visible:ring-[3px] bg-background outline-none" />
-                            <div class="h-4">
-                                <FieldError v-if="errors.length" :errors="errors" />
-                            </div>
-                        </Field>
-                    </VeeField>
-                </FieldGroup>
-            </div>
-        </div>
-
-        <VeeFieldArray name="attendees" v-slot="{ fields, push, remove }">
-            <FieldSet class="gap-4">
-                <div class="flex flex-col gap-2">
-                    <FieldLegend class="scroll-m-20 text-lg tracking-tight mb-0">Attendees</FieldLegend>
-                    <FieldDescription class="mb-0">Add members who attended this session.</FieldDescription>
-                    <div class="h-4">
-                        <div class="text-red-500 text-sm"
-                            v-if="errors.attendees && typeof errors.attendees === 'string'">
-                            {{ errors.attendees }}
-                        </div>
-                    </div>
-                </div>
-
-
-                <FieldGroup class="gap-4">
-
-                    <!-- Column Headers -->
-                    <div class="relative">
-                        <div
-                            class="grid grid-cols-[180px_155px_65px_41px_1fr_auto] gap-3 font-medium text-sm text-muted-foreground">
-
-                            <div>Member</div>
-                            <div>Role</div>
-
-                            <!-- Bookwork -->
-                            <div class="text-center">Bookwork</div>
-
-                            <!-- Qual -->
-                            <div class="text-center">Qual</div>
-
-                            <div>Remarks</div>
-                            <div></div> <!-- empty for remove button -->
-                        </div>
-
-                        <!-- FLOATING SUPERHEADER -->
-                        <div class="absolute left-[calc(180px+155px+65px/2)] -top-5 
-           w-[106px] text-center text-xs font-medium text-muted-foreground 
-           pointer-events-none">
-                            ──── Pass ────
-                        </div>
-                    </div>
-
-
-                    <!-- Attendee Rows -->
-                    <template v-for="(field, index) in fields" :key="field.key">
-
-                        <div class="grid grid-cols-[180px_160px_50px_50px_1fr_auto] gap-3 items-center">
-
-                            <!-- Member Select -->
-                            <VeeField :name="`attendees[${index}].attendee_id`" v-slot="{ field: f, errors: e }">
-                                <div>
-                                    <select v-bind="f"
-                                        class="border rounded p-2 w-full focus-visible:border-ring focus-visible:ring-ring/50 focus-visible:ring-[3px] bg-background outline-none">
-                                        <option value="">Select member...</option>
-                                        <option v-for="m in members" :key="m.member_id" :value="m.member_id">
-                                            {{ m.member_name }}
-                                        </option>
-                                    </select>
-                                    <div class="h-4">
-                                        <FieldError v-if="e.length" :errors="e" />
-                                    </div>
-                                </div>
-                            </VeeField>
-
-                            <!-- Role Select -->
-                            <VeeField :name="`attendees[${index}].attendee_role_id`" v-slot="{ field: f, errors: e }">
-                                <div>
-                                    <select v-bind="f"
-                                        class="border rounded p-2 w-full focus-visible:border-ring focus-visible:ring-ring/50 focus-visible:ring-[3px] bg-background outline-none">
-                                        <option value="">Select role...</option>
-                                        <option v-for="r in eventRoles" :key="r.id" :value="r.id">
-                                            {{ r.name }}
-                                        </option>
-                                    </select>
-                                    <div class="h-4">
-                                        <FieldError v-if="e.length" :errors="e" />
-                                    </div>
-                                </div>
-                            </VeeField>
-
-                            <!-- Bookwork Checkbox -->
-                            <VeeField v-slot="{ field }" :name="`attendees[${index}].passed_bookwork`" type="checkbox"
-                                :value="false" :unchecked-value="true">
-                                <div class="flex flex-col items-center">
-                                    <div class="relative inline-flex items-center group">
-
-                                        <Checkbox :disabled="!selectedCourse?.hasBookwork"
-                                            :name="`attendees[${index}].passed_bookwork`" :model-value="!field.checked"
-                                            @update:model-value="field['onUpdate:modelValue']">
-                                        </Checkbox>
-                                        <!-- Tooltip bubble -->
-                                        <div v-if="!selectedCourse?.hasBookwork" class="pointer-events-none absolute -top-9 left-1/2 -translate-x-1/2
-                                                whitespace-nowrap rounded-md bg-popover px-2 py-1 text-xs
-                                                text-popover-foreground shadow-md border border-border
-                                                opacity-0 translate-y-1
-                                                group-hover:opacity-100 group-hover:translate-y-0
-                                                transition-opacity transition-transform duration-150">
-                                            This course does not have bookwork
-                                        </div>
-                                    </div>
-                                    <div class="h-4">
-                                    </div>
-                                </div>
-                            </VeeField>
-
-                            <!-- Qual Checkbox -->
-                            <VeeField v-slot="{ field }" :name="`attendees[${index}].passed_qual`" type="checkbox"
-                                :value="false" :unchecked-value="true">
-                                <div class="flex flex-col items-center">
-                                    <div class="relative inline-flex items-center group">
-                                        <Checkbox :disabled="!selectedCourse?.hasQual"
-                                            :name="`attendees[${index}].passed_qual`" :model-value="!field.checked"
-                                            @update:model-value="field['onUpdate:modelValue']"></Checkbox>
-                                        <!-- Tooltip bubble -->
-                                        <div v-if="!selectedCourse?.hasQual" class="pointer-events-none absolute -top-9 left-1/2 -translate-x-1/2
-                                                whitespace-nowrap rounded-md bg-popover px-2 py-1 text-xs
-                                                text-popover-foreground shadow-md border border-border
-                                                opacity-0 translate-y-1
-                                                group-hover:opacity-100 group-hover:translate-y-0
-                                                transition-opacity transition-transform duration-150">
-                                            This course does not have a qualification
-                                        </div>
-                                    </div>
-                                    <div class="h-4">
-                                    </div>
-                                </div>
-                            </VeeField>
-
-                            <!-- Remarks -->
-                            <VeeField :name="`attendees[${index}].remarks`" v-slot="{ field: f, errors: e }">
-                                <div class="flex flex-col">
-                                    <textarea v-bind="f"
-                                        class="h-[38px] resize-none border rounded p-2 w-full focus-visible:border-ring focus-visible:ring-ring/50 focus-visible:ring-[3px] bg-background outline-none"
-                                        placeholder="Optional remarks"></textarea>
-                                    <div class="h-4">
-                                        <FieldError v-if="e.length" :errors="e" />
-                                    </div>
-                                </div>
-                            </VeeField>
-
-                            <div>
-                                <!-- Remove button -->
-                                <Button type="button" variant="ghost" size="sm" @click="remove(index)"
-                                    class="self-center">
-                                    <X :size="10" />
-                                </Button>
-                                <div class="h-4">
-                                </div>
-                            </div>
-                        </div>
-                    </template>
-                </FieldGroup>
-
-
-                <Button type="button" size="sm" variant="outline"
-                    @click="push({ attendee_id: null, attendee_role_id: null, passed_bookwork: false, passed_qual: false, remarks: '' })">
-                    <Plus class="mr-1 h-4 w-4" />
-                    Add Attendee
-                </Button>
-            </FieldSet>
-        </VeeFieldArray>
-
-        <FieldGroup class="pt-3">
-            <VeeField v-slot="{ field, errors }" name="remarks">
-                <Field :data-invalid="!!errors.length">
-                    <FieldLabel class="scroll-m-20 text-lg tracking-tight">Remarks</FieldLabel>
-                    <Textarea v-bind="field" placeholder="Any remarks about this training event..."
-                        autocomplete="off" />
-                    <FieldError v-if="errors.length" :errors="errors" />
-                </Field>
-            </VeeField>
-        </FieldGroup>
-        <div class="flex gap-3 justify-end">
-            <Button type="button" variant="outline" @click="resetForm">Reset</Button>
-            <Button type="submit" form="trainingForm">Submit</Button>
-        </div>
-    </form>
-</template>
--- a/ui/src/components/ui/button-group/ButtonGroup.vue
+++ b/ui/src/components/ui/button-group/ButtonGroup.vue
@@ -1,22 +0,0 @@
-<script setup>
-import { cn } from "@/lib/utils";
-import { buttonGroupVariants } from ".";
-
-const props = defineProps({
-  class: { type: null, required: false },
-  orientation: { type: null, required: false },
-});
-</script>
-
-<template>
-  <div
-    role="group"
-    data-slot="button-group"
-    :data-orientation="props.orientation"
-    :class="
-      cn(buttonGroupVariants({ orientation: props.orientation }), props.class)
-    "
-  >
-    <slot />
-  </div>
-</template>
--- a/ui/src/components/ui/button-group/ButtonGroupSeparator.vue
+++ b/ui/src/components/ui/button-group/ButtonGroupSeparator.vue
@@ -1,28 +0,0 @@
-<script setup>
-import { reactiveOmit } from "@vueuse/core";
-import { cn } from "@/lib/utils";
-import { Separator } from '@/components/ui/separator';
-
-const props = defineProps({
-  orientation: { type: String, required: false, default: "vertical" },
-  decorative: { type: Boolean, required: false },
-  asChild: { type: Boolean, required: false },
-  as: { type: null, required: false },
-  class: { type: null, required: false },
-});
-const delegatedProps = reactiveOmit(props, "class");
-</script>
-
-<template>
-  <Separator
-    data-slot="button-group-separator"
-    v-bind="delegatedProps"
-    :orientation="props.orientation"
-    :class="
-      cn(
-        'bg-input relative !m-0 self-stretch data-[orientation=vertical]:h-auto',
-        props.class,
-      )
-    "
-  />
-</template>
--- a/ui/src/components/ui/button-group/ButtonGroupText.vue
+++ b/ui/src/components/ui/button-group/ButtonGroupText.vue
@@ -1,29 +0,0 @@
-<script setup>
-import { Primitive } from "reka-ui";
-import { cn } from "@/lib/utils";
-
-const props = defineProps({
-  class: { type: null, required: false },
-  orientation: { type: null, required: false },
-  asChild: { type: Boolean, required: false },
-  as: { type: null, required: false, default: "div" },
-});
-</script>
-
-<template>
-  <Primitive
-    role="group"
-    data-slot="button-group"
-    :data-orientation="props.orientation"
-    :as="as"
-    :as-child="asChild"
-    :class="
-      cn(
-        'bg-muted flex items-center gap-2 rounded-md border px-4 text-sm font-medium shadow-xs [&_svg]:pointer-events-none [&_svg:not([class*=\'size-\'])]:size-4',
-        props.class,
-      )
-    "
-  >
-    <slot />
-  </Primitive>
-</template>
--- a/ui/src/components/ui/button-group/index.js
+++ b/ui/src/components/ui/button-group/index.js
@@ -1,22 +0,0 @@
-import { cva } from "class-variance-authority";
-
-export { default as ButtonGroup } from "./ButtonGroup.vue";
-export { default as ButtonGroupSeparator } from "./ButtonGroupSeparator.vue";
-export { default as ButtonGroupText } from "./ButtonGroupText.vue";
-
-export const buttonGroupVariants = cva(
-  "flex w-fit items-stretch [&>*]:focus-visible:z-10 [&>*]:focus-visible:relative [&>[data-slot=select-trigger]:not([class*='w-'])]:w-fit [&>input]:flex-1 has-[select[aria-hidden=true]:last-child]:[&>[data-slot=select-trigger]:last-of-type]:rounded-r-md has-[>[data-slot=button-group]]:gap-2",
-  {
-    variants: {
-      orientation: {
-        horizontal:
-          "[&>*:not(:first-child)]:rounded-l-none [&>*:not(:first-child)]:border-l-0 [&>*:not(:last-child)]:rounded-r-none",
-        vertical:
-          "flex-col [&>*:not(:first-child)]:rounded-t-none [&>*:not(:first-child)]:border-t-0 [&>*:not(:last-child)]:rounded-b-none",
-      },
-    },
-    defaultVariants: {
-      orientation: "horizontal",
-    },
-  },
-);
--- a/ui/src/components/ui/field/Field.vue
+++ b/ui/src/components/ui/field/Field.vue
@@ -1,20 +0,0 @@
-<script setup>
-import { cn } from "@/lib/utils";
-import { fieldVariants } from ".";
-
-const props = defineProps({
-  class: { type: null, required: false },
-  orientation: { type: null, required: false },
-});
-</script>
-
-<template>
-  <div
-    role="group"
-    data-slot="field"
-    :data-orientation="orientation"
-    :class="cn(fieldVariants({ orientation }), props.class)"
-  >
-    <slot />
-  </div>
-</template>
--- a/ui/src/components/ui/field/FieldContent.vue
+++ b/ui/src/components/ui/field/FieldContent.vue
@@ -1,21 +0,0 @@
-<script setup>
-import { cn } from "@/lib/utils";
-
-const props = defineProps({
-  class: { type: null, required: false },
-});
-</script>
-
-<template>
-  <div
-    data-slot="field-content"
-    :class="
-      cn(
-        'group/field-content flex flex-1 flex-col gap-1.5 leading-snug',
-        props.class,
-      )
-    "
-  >
-    <slot />
-  </div>
-</template>
--- a/ui/src/components/ui/field/FieldDescription.vue
+++ b/ui/src/components/ui/field/FieldDescription.vue
@@ -1,23 +0,0 @@
-<script setup>
-import { cn } from "@/lib/utils";
-
-const props = defineProps({
-  class: { type: null, required: false },
-});
-</script>
-
-<template>
-  <p
-    data-slot="field-description"
-    :class="
-      cn(
-        'text-muted-foreground text-sm leading-normal font-normal group-has-[[data-orientation=horizontal]]/field:text-balance',
-        'last:mt-0 nth-last-2:-mt-1 [[data-variant=legend]+&]:-mt-1.5',
-        '[&>a:hover]:text-primary [&>a]:underline [&>a]:underline-offset-4',
-        props.class,
-      )
-    "
-  >
-    <slot />
-  </p>
-</template>
--- a/ui/src/components/ui/field/FieldError.vue
+++ b/ui/src/components/ui/field/FieldError.vue
@@ -1,56 +0,0 @@
-<script setup>
-import { computed } from "vue";
-import { cn } from "@/lib/utils";
-
-const props = defineProps({
-  class: { type: null, required: false },
-  errors: { type: Array, required: false },
-});
-
-const content = computed(() => {
-  if (!props.errors || props.errors.length === 0) return null;
-
-  const uniqueErrors = [
-    ...new Map(
-      props.errors.filter(Boolean).map((error) => {
-        const message = typeof error === "string" ? error : error?.message;
-        return [message, error];
-      }),
-    ).values(),
-  ];
-
-  if (uniqueErrors.length === 1 && uniqueErrors[0]) {
-    return typeof uniqueErrors[0] === "string"
-      ? uniqueErrors[0]
-      : uniqueErrors[0].message;
-  }
-
-  return uniqueErrors.map((error) =>
-    typeof error === "string" ? error : error?.message,
-  );
-});
-</script>
-
-<template>
-  <div
-    v-if="$slots.default || content"
-    role="alert"
-    data-slot="field-error"
-    :class="cn('text-destructive text-sm font-normal', props.class)"
-  >
-    <slot v-if="$slots.default" />
-
-    <template v-else-if="typeof content === 'string'">
-      {{ content }}
-    </template>
-
-    <ul
-      v-else-if="Array.isArray(content)"
-      class="ml-4 flex list-disc flex-col gap-1"
-    >
-      <li v-for="(error, index) in content" :key="index">
-        {{ error }}
-      </li>
-    </ul>
-  </div>
-</template>
--- a/ui/src/components/ui/field/FieldGroup.vue
+++ b/ui/src/components/ui/field/FieldGroup.vue
@@ -1,21 +0,0 @@
-<script setup>
-import { cn } from "@/lib/utils";
-
-const props = defineProps({
-  class: { type: null, required: false },
-});
-</script>
-
-<template>
-  <div
-    data-slot="field-group"
-    :class="
-      cn(
-        'group/field-group @container/field-group flex w-full flex-col gap-7 data-[slot=checkbox-group]:gap-3 [&>[data-slot=field-group]]:gap-4',
-        props.class,
-      )
-    "
-  >
-    <slot />
-  </div>
-</template>
--- a/ui/src/components/ui/field/FieldLabel.vue
+++ b/ui/src/components/ui/field/FieldLabel.vue
@@ -1,24 +0,0 @@
-<script setup>
-import { cn } from "@/lib/utils";
-import { Label } from '@/components/ui/label';
-
-const props = defineProps({
-  class: { type: null, required: false },
-});
-</script>
-
-<template>
-  <Label
-    data-slot="field-label"
-    :class="
-      cn(
-        'group/field-label peer/field-label flex w-fit gap-2 leading-snug group-data-[disabled=true]/field:opacity-50',
-        'has-[>[data-slot=field]]:w-full has-[>[data-slot=field]]:flex-col has-[>[data-slot=field]]:rounded-md has-[>[data-slot=field]]:border [&>*]:data-[slot=field]:p-4',
-        'has-data-[state=checked]:bg-primary/5 has-data-[state=checked]:border-primary dark:has-data-[state=checked]:bg-primary/10',
-        props.class,
-      )
-    "
-  >
-    <slot />
-  </Label>
-</template>
--- a/ui/src/components/ui/field/FieldLegend.vue
+++ b/ui/src/components/ui/field/FieldLegend.vue
@@ -1,25 +0,0 @@
-<script setup>
-import { cn } from "@/lib/utils";
-
-const props = defineProps({
-  class: { type: null, required: false },
-  variant: { type: String, required: false },
-});
-</script>
-
-<template>
-  <legend
-    data-slot="field-legend"
-    :data-variant="variant"
-    :class="
-      cn(
-        'mb-3 font-medium',
-        'data-[variant=legend]:text-base',
-        'data-[variant=label]:text-sm',
-        props.class,
-      )
-    "
-  >
-    <slot />
-  </legend>
-</template>
--- a/ui/src/components/ui/field/FieldSeparator.vue
+++ b/ui/src/components/ui/field/FieldSeparator.vue
@@ -1,30 +0,0 @@
-<script setup>
-import { cn } from "@/lib/utils";
-import { Separator } from '@/components/ui/separator';
-
-const props = defineProps({
-  class: { type: null, required: false },
-});
-</script>
-
-<template>
-  <div
-    data-slot="field-separator"
-    :data-content="!!$slots.default"
-    :class="
-      cn(
-        'relative -my-2 h-5 text-sm group-data-[variant=outline]/field-group:-mb-2',
-        props.class,
-      )
-    "
-  >
-    <Separator class="absolute inset-0 top-1/2" />
-    <span
-      v-if="$slots.default"
-      class="bg-background text-muted-foreground relative mx-auto block w-fit px-2"
-      data-slot="field-separator-content"
-    >
-      <slot />
-    </span>
-  </div>
-</template>
--- a/ui/src/components/ui/field/FieldSet.vue
+++ b/ui/src/components/ui/field/FieldSet.vue
@@ -1,22 +0,0 @@
-<script setup>
-import { cn } from "@/lib/utils";
-
-const props = defineProps({
-  class: { type: null, required: false },
-});
-</script>
-
-<template>
-  <fieldset
-    data-slot="field-set"
-    :class="
-      cn(
-        'flex flex-col gap-6',
-        'has-[>[data-slot=checkbox-group]]:gap-3 has-[>[data-slot=radio-group]]:gap-3',
-        props.class,
-      )
-    "
-  >
-    <slot />
-  </fieldset>
-</template>
--- a/ui/src/components/ui/field/FieldTitle.vue
+++ b/ui/src/components/ui/field/FieldTitle.vue
@@ -1,21 +0,0 @@
-<script setup>
-import { cn } from "@/lib/utils";
-
-const props = defineProps({
-  class: { type: null, required: false },
-});
-</script>
-
-<template>
-  <div
-    data-slot="field-label"
-    :class="
-      cn(
-        'flex w-fit items-center gap-2 text-sm leading-snug font-medium group-data-[disabled=true]/field:opacity-50',
-        props.class,
-      )
-    "
-  >
-    <slot />
-  </div>
-</template>
--- a/ui/src/components/ui/field/index.js
+++ b/ui/src/components/ui/field/index.js
@@ -1,36 +0,0 @@
-import { cva } from "class-variance-authority";
-
-export const fieldVariants = cva(
-  "group/field flex w-full gap-3 data-[invalid=true]:text-destructive",
-  {
-    variants: {
-      orientation: {
-        vertical: ["flex-col [&>*]:w-full [&>.sr-only]:w-auto"],
-        horizontal: [
-          "flex-row items-center",
-          "[&>[data-slot=field-label]]:flex-auto",
-          "has-[>[data-slot=field-content]]:items-start has-[>[data-slot=field-content]]:[&>[role=checkbox],[role=radio]]:mt-px",
-        ],
-        responsive: [
-          "flex-col [&>*]:w-full [&>.sr-only]:w-auto @md/field-group:flex-row @md/field-group:items-center @md/field-group:[&>*]:w-auto",
-          "@md/field-group:[&>[data-slot=field-label]]:flex-auto",
-          "@md/field-group:has-[>[data-slot=field-content]]:items-start @md/field-group:has-[>[data-slot=field-content]]:[&>[role=checkbox],[role=radio]]:mt-px",
-        ],
-      },
-    },
-    defaultVariants: {
-      orientation: "vertical",
-    },
-  },
-);
-
-export { default as Field } from "./Field.vue";
-export { default as FieldContent } from "./FieldContent.vue";
-export { default as FieldDescription } from "./FieldDescription.vue";
-export { default as FieldError } from "./FieldError.vue";
-export { default as FieldGroup } from "./FieldGroup.vue";
-export { default as FieldLabel } from "./FieldLabel.vue";
-export { default as FieldLegend } from "./FieldLegend.vue";
-export { default as FieldSeparator } from "./FieldSeparator.vue";
-export { default as FieldSet } from "./FieldSet.vue";
-export { default as FieldTitle } from "./FieldTitle.vue";
--- a/ui/src/components/ui/input-group/InputGroup.vue
+++ b/ui/src/components/ui/input-group/InputGroup.vue
@@ -1,36 +0,0 @@
-<script setup>
-import { cn } from "@/lib/utils";
-
-const props = defineProps({
-  class: { type: null, required: false },
-});
-</script>
-
-<template>
-  <div
-    data-slot="input-group"
-    role="group"
-    :class="
-      cn(
-        'group/input-group border-input dark:bg-input/30 relative flex w-full items-center rounded-md border shadow-xs transition-[color,box-shadow] outline-none',
-        'h-9 min-w-0 has-[>textarea]:h-auto',
-
-        // Variants based on alignment.
-        'has-[>[data-align=inline-start]]:[&>input]:pl-2',
-        'has-[>[data-align=inline-end]]:[&>input]:pr-2',
-        'has-[>[data-align=block-start]]:h-auto has-[>[data-align=block-start]]:flex-col has-[>[data-align=block-start]]:[&>input]:pb-3',
-        'has-[>[data-align=block-end]]:h-auto has-[>[data-align=block-end]]:flex-col has-[>[data-align=block-end]]:[&>input]:pt-3',
-
-        // Focus state.
-        'has-[[data-slot=input-group-control]:focus-visible]:border-ring has-[[data-slot=input-group-control]:focus-visible]:ring-ring/50 has-[[data-slot=input-group-control]:focus-visible]:ring-[3px]',
-
-        // Error state.
-        'has-[[data-slot][aria-invalid=true]]:ring-destructive/20 has-[[data-slot][aria-invalid=true]]:border-destructive dark:has-[[data-slot][aria-invalid=true]]:ring-destructive/40',
-
-        props.class,
-      )
-    "
-  >
-    <slot />
-  </div>
-</template>
--- a/ui/src/components/ui/input-group/InputGroupAddon.vue
+++ b/ui/src/components/ui/input-group/InputGroupAddon.vue
@@ -1,32 +0,0 @@
-<script setup>
-import { cn } from "@/lib/utils";
-import { inputGroupAddonVariants } from ".";
-
-const props = defineProps({
-  align: { type: null, required: false, default: "inline-start" },
-  class: { type: null, required: false },
-});
-
-function handleInputGroupAddonClick(e) {
-  const currentTarget = e.currentTarget;
-  const target = e.target;
-  if (target && target.closest("button")) {
-    return;
-  }
-  if (currentTarget && currentTarget?.parentElement) {
-    currentTarget.parentElement?.querySelector("input")?.focus();
-  }
-}
-</script>
-
-<template>
-  <div
-    role="group"
-    data-slot="input-group-addon"
-    :data-align="props.align"
-    :class="cn(inputGroupAddonVariants({ align: props.align }), props.class)"
-    @click="handleInputGroupAddonClick"
-  >
-    <slot />
-  </div>
-</template>
--- a/ui/src/components/ui/input-group/index.js
+++ b/ui/src/components/ui/input-group/index.js
@@ -1,47 +0,0 @@
-import { cva } from "class-variance-authority";
-
-export { default as InputGroup } from "./InputGroup.vue";
-export { default as InputGroupAddon } from "./InputGroupAddon.vue";
-export { default as InputGroupButton } from "./InputGroupButton.vue";
-export { default as InputGroupInput } from "./InputGroupInput.vue";
-export { default as InputGroupText } from "./InputGroupText.vue";
-export { default as InputGroupTextarea } from "./InputGroupTextarea.vue";
-
-export const inputGroupAddonVariants = cva(
-  "text-muted-foreground flex h-auto cursor-text items-center justify-center gap-2 py-1.5 text-sm font-medium select-none [&>svg:not([class*='size-'])]:size-4 [&>kbd]:rounded-[calc(var(--radius)-5px)] group-data-[disabled=true]/input-group:opacity-50",
-  {
-    variants: {
-      align: {
-        "inline-start":
-          "order-first pl-3 has-[>button]:ml-[-0.45rem] has-[>kbd]:ml-[-0.35rem]",
-        "inline-end":
-          "order-last pr-3 has-[>button]:mr-[-0.45rem] has-[>kbd]:mr-[-0.35rem]",
-        "block-start":
-          "order-first w-full justify-start px-3 pt-3 [.border-b]:pb-3 group-has-[>input]/input-group:pt-2.5",
-        "block-end":
-          "order-last w-full justify-start px-3 pb-3 [.border-t]:pt-3 group-has-[>input]/input-group:pb-2.5",
-      },
-    },
-    defaultVariants: {
-      align: "inline-start",
-    },
-  },
-);
-
-export const inputGroupButtonVariants = cva(
-  "text-sm shadow-none flex gap-2 items-center",
-  {
-    variants: {
-      size: {
-        xs: "h-6 gap-1 px-2 rounded-[calc(var(--radius)-5px)] [&>svg:not([class*='size-'])]:size-3.5 has-[>svg]:px-2",
-        sm: "h-8 px-2.5 gap-1.5 rounded-md has-[>svg]:px-2.5",
-        "icon-xs":
-          "size-6 rounded-[calc(var(--radius)-5px)] p-0 has-[>svg]:p-0",
-        "icon-sm": "size-8 p-0 has-[>svg]:p-0",
-      },
-    },
-    defaultVariants: {
-      size: "xs",
-    },
-  },
-);
--- a/ui/src/components/ui/select/Select.vue
+++ b/ui/src/components/ui/select/Select.vue
@@ -1,26 +0,0 @@
-<script setup>
-import { SelectRoot, useForwardPropsEmits } from "reka-ui";
-
-const props = defineProps({
-  open: { type: Boolean, required: false },
-  defaultOpen: { type: Boolean, required: false },
-  defaultValue: { type: null, required: false },
-  modelValue: { type: null, required: false },
-  by: { type: [String, Function], required: false },
-  dir: { type: String, required: false },
-  multiple: { type: Boolean, required: false },
-  autocomplete: { type: String, required: false },
-  disabled: { type: Boolean, required: false },
-  name: { type: String, required: false },
-  required: { type: Boolean, required: false },
-});
-const emits = defineEmits(["update:modelValue", "update:open"]);
-
-const forwarded = useForwardPropsEmits(props, emits);
-</script>
-
-<template>
-  <SelectRoot v-slot="slotProps" data-slot="select" v-bind="forwarded">
-    <slot v-bind="slotProps" />
-  </SelectRoot>
-</template>
--- a/ui/src/components/ui/select/SelectContent.vue
+++ b/ui/src/components/ui/select/SelectContent.vue
@@ -1,81 +0,0 @@
-<script setup>
-import { reactiveOmit } from "@vueuse/core";
-import {
-  SelectContent,
-  SelectPortal,
-  SelectViewport,
-  useForwardPropsEmits,
-} from "reka-ui";
-import { cn } from "@/lib/utils";
-import { SelectScrollDownButton, SelectScrollUpButton } from ".";
-
-defineOptions({
-  inheritAttrs: false,
-});
-
-const props = defineProps({
-  forceMount: { type: Boolean, required: false },
-  position: { type: String, required: false, default: "popper" },
-  bodyLock: { type: Boolean, required: false },
-  side: { type: null, required: false },
-  sideOffset: { type: Number, required: false },
-  sideFlip: { type: Boolean, required: false },
-  align: { type: null, required: false },
-  alignOffset: { type: Number, required: false },
-  alignFlip: { type: Boolean, required: false },
-  avoidCollisions: { type: Boolean, required: false },
-  collisionBoundary: { type: null, required: false },
-  collisionPadding: { type: [Number, Object], required: false },
-  arrowPadding: { type: Number, required: false },
-  sticky: { type: String, required: false },
-  hideWhenDetached: { type: Boolean, required: false },
-  positionStrategy: { type: String, required: false },
-  updatePositionStrategy: { type: String, required: false },
-  disableUpdateOnLayoutShift: { type: Boolean, required: false },
-  prioritizePosition: { type: Boolean, required: false },
-  reference: { type: null, required: false },
-  asChild: { type: Boolean, required: false },
-  as: { type: null, required: false },
-  class: { type: null, required: false },
-});
-const emits = defineEmits([
-  "closeAutoFocus",
-  "escapeKeyDown",
-  "pointerDownOutside",
-]);
-
-const delegatedProps = reactiveOmit(props, "class");
-
-const forwarded = useForwardPropsEmits(delegatedProps, emits);
-</script>
-
-<template>
-  <SelectPortal>
-    <SelectContent
-      data-slot="select-content"
-      v-bind="{ ...$attrs, ...forwarded }"
-      :class="
-        cn(
-          'bg-popover text-popover-foreground data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 relative z-50 max-h-(--reka-select-content-available-height) min-w-[8rem] overflow-x-hidden overflow-y-auto rounded-md border shadow-md',
-          position === 'popper' &&
-            'data-[side=bottom]:translate-y-1 data-[side=left]:-translate-x-1 data-[side=right]:translate-x-1 data-[side=top]:-translate-y-1',
-          props.class,
-        )
-      "
-    >
-      <SelectScrollUpButton />
-      <SelectViewport
-        :class="
-          cn(
-            'p-1',
-            position === 'popper' &&
-              'h-[var(--reka-select-trigger-height)] w-full min-w-[var(--reka-select-trigger-width)] scroll-my-1',
-          )
-        "
-      >
-        <slot />
-      </SelectViewport>
-      <SelectScrollDownButton />
-    </SelectContent>
-  </SelectPortal>
-</template>
--- a/ui/src/components/ui/select/SelectGroup.vue
+++ b/ui/src/components/ui/select/SelectGroup.vue
@@ -1,14 +0,0 @@
-<script setup>
-import { SelectGroup } from "reka-ui";
-
-const props = defineProps({
-  asChild: { type: Boolean, required: false },
-  as: { type: null, required: false },
-});
-</script>
-
-<template>
-  <SelectGroup data-slot="select-group" v-bind="props">
-    <slot />
-  </SelectGroup>
-</template>
--- a/ui/src/components/ui/select/SelectItem.vue
+++ b/ui/src/components/ui/select/SelectItem.vue
@@ -1,49 +0,0 @@
-<script setup>
-import { reactiveOmit } from "@vueuse/core";
-import { Check } from "lucide-vue-next";
-import {
-  SelectItem,
-  SelectItemIndicator,
-  SelectItemText,
-  useForwardProps,
-} from "reka-ui";
-import { cn } from "@/lib/utils";
-
-const props = defineProps({
-  value: { type: null, required: true },
-  disabled: { type: Boolean, required: false },
-  textValue: { type: String, required: false },
-  asChild: { type: Boolean, required: false },
-  as: { type: null, required: false },
-  class: { type: null, required: false },
-});
-
-const delegatedProps = reactiveOmit(props, "class");
-
-const forwardedProps = useForwardProps(delegatedProps);
-</script>
-
-<template>
-  <SelectItem
-    data-slot="select-item"
-    v-bind="forwardedProps"
-    :class="
-      cn(
-        'focus:bg-accent focus:text-accent-foreground [&_svg:not([class*=\'text-\'])]:text-muted-foreground relative flex w-full cursor-default items-center gap-2 rounded-sm py-1.5 pr-8 pl-2 text-sm outline-hidden select-none data-[disabled]:pointer-events-none data-[disabled]:opacity-50 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*=\'size-\'])]:size-4 *:[span]:last:flex *:[span]:last:items-center *:[span]:last:gap-2',
-        props.class,
-      )
-    "
-  >
-    <span class="absolute right-2 flex size-3.5 items-center justify-center">
-      <SelectItemIndicator>
-        <slot name="indicator-icon">
-          <Check class="size-4" />
-        </slot>
-      </SelectItemIndicator>
-    </span>
-
-    <SelectItemText>
-      <slot />
-    </SelectItemText>
-  </SelectItem>
-</template>
--- a/ui/src/components/ui/select/SelectItemText.vue
+++ b/ui/src/components/ui/select/SelectItemText.vue
@@ -1,14 +0,0 @@
-<script setup>
-import { SelectItemText } from "reka-ui";
-
-const props = defineProps({
-  asChild: { type: Boolean, required: false },
-  as: { type: null, required: false },
-});
-</script>
-
-<template>
-  <SelectItemText data-slot="select-item-text" v-bind="props">
-    <slot />
-  </SelectItemText>
-</template>
--- a/ui/src/components/ui/select/SelectLabel.vue
+++ b/ui/src/components/ui/select/SelectLabel.vue
@@ -1,20 +0,0 @@
-<script setup>
-import { SelectLabel } from "reka-ui";
-import { cn } from "@/lib/utils";
-
-const props = defineProps({
-  for: { type: String, required: false },
-  asChild: { type: Boolean, required: false },
-  as: { type: null, required: false },
-  class: { type: null, required: false },
-});
-</script>
-
-<template>
-  <SelectLabel
-    data-slot="select-label"
-    :class="cn('text-muted-foreground px-2 py-1.5 text-xs', props.class)"
-  >
-    <slot />
-  </SelectLabel>
-</template>
--- a/ui/src/components/ui/select/SelectScrollDownButton.vue
+++ b/ui/src/components/ui/select/SelectScrollDownButton.vue
@@ -1,30 +0,0 @@
-<script setup>
-import { reactiveOmit } from "@vueuse/core";
-import { ChevronDown } from "lucide-vue-next";
-import { SelectScrollDownButton, useForwardProps } from "reka-ui";
-import { cn } from "@/lib/utils";
-
-const props = defineProps({
-  asChild: { type: Boolean, required: false },
-  as: { type: null, required: false },
-  class: { type: null, required: false },
-});
-
-const delegatedProps = reactiveOmit(props, "class");
-
-const forwardedProps = useForwardProps(delegatedProps);
-</script>
-
-<template>
-  <SelectScrollDownButton
-    data-slot="select-scroll-down-button"
-    v-bind="forwardedProps"
-    :class="
-      cn('flex cursor-default items-center justify-center py-1', props.class)
-    "
-  >
-    <slot>
-      <ChevronDown class="size-4" />
-    </slot>
-  </SelectScrollDownButton>
-</template>
--- a/ui/src/components/ui/select/SelectScrollUpButton.vue
+++ b/ui/src/components/ui/select/SelectScrollUpButton.vue
@@ -1,30 +0,0 @@
-<script setup>
-import { reactiveOmit } from "@vueuse/core";
-import { ChevronUp } from "lucide-vue-next";
-import { SelectScrollUpButton, useForwardProps } from "reka-ui";
-import { cn } from "@/lib/utils";
-
-const props = defineProps({
-  asChild: { type: Boolean, required: false },
-  as: { type: null, required: false },
-  class: { type: null, required: false },
-});
-
-const delegatedProps = reactiveOmit(props, "class");
-
-const forwardedProps = useForwardProps(delegatedProps);
-</script>
-
-<template>
-  <SelectScrollUpButton
-    data-slot="select-scroll-up-button"
-    v-bind="forwardedProps"
-    :class="
-      cn('flex cursor-default items-center justify-center py-1', props.class)
-    "
-  >
-    <slot>
-      <ChevronUp class="size-4" />
-    </slot>
-  </SelectScrollUpButton>
-</template>
--- a/ui/src/components/ui/select/SelectSeparator.vue
+++ b/ui/src/components/ui/select/SelectSeparator.vue
@@ -1,21 +0,0 @@
-<script setup>
-import { reactiveOmit } from "@vueuse/core";
-import { SelectSeparator } from "reka-ui";
-import { cn } from "@/lib/utils";
-
-const props = defineProps({
-  asChild: { type: Boolean, required: false },
-  as: { type: null, required: false },
-  class: { type: null, required: false },
-});
-
-const delegatedProps = reactiveOmit(props, "class");
-</script>
-
-<template>
-  <SelectSeparator
-    data-slot="select-separator"
-    v-bind="delegatedProps"
-    :class="cn('bg-border pointer-events-none -mx-1 my-1 h-px', props.class)"
-  />
-</template>
--- a/ui/src/components/ui/select/SelectTrigger.vue
+++ b/ui/src/components/ui/select/SelectTrigger.vue
@@ -1,37 +0,0 @@
-<script setup>
-import { reactiveOmit } from "@vueuse/core";
-import { ChevronDown } from "lucide-vue-next";
-import { SelectIcon, SelectTrigger, useForwardProps } from "reka-ui";
-import { cn } from "@/lib/utils";
-
-const props = defineProps({
-  disabled: { type: Boolean, required: false },
-  reference: { type: null, required: false },
-  asChild: { type: Boolean, required: false },
-  as: { type: null, required: false },
-  class: { type: null, required: false },
-  size: { type: String, required: false, default: "default" },
-});
-
-const delegatedProps = reactiveOmit(props, "class", "size");
-const forwardedProps = useForwardProps(delegatedProps);
-</script>
-
-<template>
-  <SelectTrigger
-    data-slot="select-trigger"
-    :data-size="size"
-    v-bind="forwardedProps"
-    :class="
-      cn(
-        'border-input data-[placeholder]:text-muted-foreground [&_svg:not([class*=\'text-\'])]:text-muted-foreground focus-visible:border-ring focus-visible:ring-ring/50 aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive dark:bg-input/30 dark:hover:bg-input/50 flex w-fit items-center justify-between gap-2 rounded-md border bg-transparent px-3 py-2 text-sm whitespace-nowrap shadow-xs transition-[color,box-shadow] outline-none focus-visible:ring-[3px] disabled:cursor-not-allowed disabled:opacity-50 data-[size=default]:h-9 data-[size=sm]:h-8 *:data-[slot=select-value]:line-clamp-1 *:data-[slot=select-value]:flex *:data-[slot=select-value]:items-center *:data-[slot=select-value]:gap-2 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*=\'size-\'])]:size-4',
-        props.class,
-      )
-    "
-  >
-    <slot />
-    <SelectIcon as-child>
-      <ChevronDown class="size-4 opacity-50" />
-    </SelectIcon>
-  </SelectTrigger>
-</template>
--- a/ui/src/components/ui/select/SelectValue.vue
+++ b/ui/src/components/ui/select/SelectValue.vue
@@ -1,15 +0,0 @@
-<script setup>
-import { SelectValue } from "reka-ui";
-
-const props = defineProps({
-  placeholder: { type: String, required: false },
-  asChild: { type: Boolean, required: false },
-  as: { type: null, required: false },
-});
-</script>
-
-<template>
-  <SelectValue data-slot="select-value" v-bind="props">
-    <slot />
-  </SelectValue>
-</template>
--- a/ui/src/components/ui/select/index.js
+++ b/ui/src/components/ui/select/index.js
@@ -1,11 +0,0 @@
-export { default as Select } from "./Select.vue";
-export { default as SelectContent } from "./SelectContent.vue";
-export { default as SelectGroup } from "./SelectGroup.vue";
-export { default as SelectItem } from "./SelectItem.vue";
-export { default as SelectItemText } from "./SelectItemText.vue";
-export { default as SelectLabel } from "./SelectLabel.vue";
-export { default as SelectScrollDownButton } from "./SelectScrollDownButton.vue";
-export { default as SelectScrollUpButton } from "./SelectScrollUpButton.vue";
-export { default as SelectSeparator } from "./SelectSeparator.vue";
-export { default as SelectTrigger } from "./SelectTrigger.vue";
-export { default as SelectValue } from "./SelectValue.vue";
--- a/ui/src/composables/useCalendarEvents.ts
+++ b/ui/src/composables/useCalendarEvents.ts
@@ -1,28 +0,0 @@
-import { ref, watch, onMounted } from "vue";
-import { getMonthCalendarEvents } from "@/api/calendar";
-import type { CalendarEventShort } from "@shared/types/calendar";
-
-export function useCalendarEvents(selectedMonth, selectedYear) {
-    const events = ref([]);
-
-    function toCalEvent(e: CalendarEventShort) {
-        return {
-            id: e.id.toString(),
-            title: e.name,
-            start: new Date(e.start),
-            end: e.end ? new Date(e.end) : undefined,
-            extendedProps: { color: e.color, cancelled: !!e.cancelled },
-        };
-    }
-
-    async function loadEvents() {
-        const date = new Date(selectedYear.value, selectedMonth.value, 1);
-        const monthEvents = await getMonthCalendarEvents(date);
-        events.value = monthEvents.map(toCalEvent);
-    }
-
-    watch([selectedMonth, selectedYear], loadEvents);
-    onMounted(loadEvents);
-
-    return { events, loadEvents };
-}
--- a/ui/src/composables/useCalendarNavigation.ts
+++ b/ui/src/composables/useCalendarNavigation.ts
@@ -1,33 +0,0 @@
-import { ref } from "vue";
-
-export function useCalendarNavigation(calendarApiGetter: () => any) {
-    const selectedMonth = ref(new Date().getMonth());
-    const selectedYear = ref(new Date().getFullYear());
-
-    const years = Array.from({ length: 41 }, (_, i) => selectedYear.value - 20 + i);
-
-    function goPrev() { calendarApiGetter()?.prev(); }
-    function goNext() { calendarApiGetter()?.next(); }
-    function goToday() { calendarApiGetter()?.today(); }
-
-    function onDatesSet() {
-        const d = calendarApiGetter()?.getDate() ?? new Date();
-        selectedMonth.value = d.getMonth();
-        selectedYear.value = d.getFullYear();
-    }
-
-    function goToSelectedDate() {
-        calendarApiGetter()?.gotoDate(new Date(selectedYear.value, selectedMonth.value, 1));
-    }
-
-    return {
-        selectedMonth,
-        selectedYear,
-        years,
-        goPrev,
-        goNext,
-        goToday,
-        onDatesSet,
-        goToSelectedDate,
-    };
-}
--- a/ui/src/main.js
+++ b/ui/src/main.js
@@ -8,34 +8,11 @@ import router from './router'
 import FormCheckbox from './components/form/FormCheckbox.vue'
 import FormInput from './components/form/FormInput.vue'

-import * as Sentry from "@sentry/vue";
-
-
-
-
 const app = createApp(App)

-
-
 app.use(createPinia())
 app.use(router)

-if (!!import.meta.env.VITE_DISABLE_GLITCHTIP) {
-    let dsn = import.meta.env.VITE_GLITCHTIP_DSN;
-    let environment = import.meta.env.VITE_ENVIRONMENT;
-
-    Sentry.init({
-        app,
-        dsn: dsn,
-        integrations: [
-            Sentry.browserTracingIntegration({ router }),
-        ],
-        tracesSampleRate: 0.01,
-        environment: environment,
-        release: 'release tag'
-    });
-}
-
 app.component("FormInput", FormInput)
 app.component("FormCheckbox", FormCheckbox)

--- a/ui/src/pages/Calendar.vue
+++ b/ui/src/pages/Calendar.vue
@@ -5,50 +5,85 @@ import dayGridPlugin from '@fullcalendar/daygrid'
 import interactionPlugin from '@fullcalendar/interaction'
 import { X, Clock, MapPin, User, ListTodo, ChevronLeft, ChevronRight, Plus } from 'lucide-vue-next'
 import CreateCalendarEvent from '@/components/calendar/CreateCalendarEvent.vue'
-import { getCalendarEvent, getMonthCalendarEvents } from '@/api/calendar'
-import { CalendarEvent, CalendarEventShort } from '@shared/types/calendar'
-import { Calendar } from '@fullcalendar/core'
-import ViewCalendarEvent from '@/components/calendar/ViewCalendarEvent.vue'
-import { useRouter, useRoute } from 'vue-router'
-import { useCalendarEvents } from '@/composables/useCalendarEvents'
-import { useCalendarNavigation } from '@/composables/useCalendarNavigation'

 const monthLabels = [
    'January', 'February', 'March', 'April', 'May', 'June',
    'July', 'August', 'September', 'October', 'November', 'December'
 ]

+const selectedMonth = ref<number>(new Date().getMonth())
+const selectedYear = ref<number>(new Date().getFullYear())
+const years = Array.from({ length: 41 }, (_, i) => selectedYear.value - 20 + i) // +/- 20 yrs
+
 function api() {
    return calendarRef.value?.getApi()
 }

-const router = useRouter();
-const route = useRoute();
+// keep dropdowns in sync whenever the calendar navigates
+function onDatesSet() {
+    const d = api()?.getDate() ?? new Date()
+    selectedMonth.value = d.getMonth()
+    selectedYear.value = d.getFullYear()
+}

 function buildFullDate(month: number, year: number): Date {
    return new Date(year, month, 1); //default to first of month
 }

-const { selectedMonth, selectedYear, years, goPrev, goNext, goToday, onDatesSet, goToSelectedDate } = useCalendarNavigation(api)
-const { events, loadEvents} = useCalendarEvents(selectedMonth, selectedYear);

-const panelOpen = ref(false)
-const activeEvent = ref<CalendarEvent | null>(null)
-const calendarRef = ref<InstanceType<typeof FullCalendar> | null>(null)
+watch([selectedMonth, selectedYear], () => {
+    console.log('Selected date changed:', selectedMonth.value, selectedYear.value)

-async function onEventClick(arg: any) {
-    const targetEvent = arg.event.id;
-    router.push(`/calendar/event/${targetEvent}`)
-    panelOpen.value = true
+    
+})
+
+onMounted(() => {
+    // fetchEventsFor(selectedMonth.value, selectedYear.value)
+})
+
+
+function goPrev() { api()?.prev() }
+function goNext() { api()?.next() }
+function goToday() { api()?.today() }
+
+// jump to the selected month/year
+function goToSelectedDate() {
+    api()?.gotoDate(new Date(selectedYear.value, selectedMonth.value, 1))
 }

-const currentEventID = ref<number | null>(null);
+type CalEvent = {
+    id: string
+    title: string
+    start: string
+    end?: string
+    extendedProps?: Record<string, any>
+}
+
+const events = ref<CalEvent[]>([
+    { id: '1', title: 'Squad Training', start: '2025-10-08T19:00:00', extendedProps: { trainer: 'Alex', location: 'Range A', color: '#88C4FF' } },
+    { id: '2', title: 'Ops Briefing', start: '2025-10-09T20:30:00', extendedProps: { owner: 'CO', agenda: ['Weather', 'Route', 'Risks'], color: '#dba42c' } },
+])
+
+const panelOpen = ref(false)
+const activeEvent = ref<CalEvent | null>(null)
+const calendarRef = ref<InstanceType<typeof FullCalendar> | null>(null)
+
+function onEventClick(arg: any) {
+    activeEvent.value = {
+        id: arg.event.id,
+        title: arg.event.title,
+        start: arg.event.startStr,
+        end: arg.event.endStr,
+        extendedProps: arg.event.extendedProps
+    }
+    panelOpen.value = true
+}

 const dialogRef = ref<any>(null)

 // NEW: handle day/time slot clicks to start creating an event
 function onDateClick(arg: { dateStr: string }) {
-    dialogRef.value?.openDialog(arg.dateStr);
+    dialogRef.value?.openDialog();
    // For now, just open the panel with a draft payload.
    // activeEvent.value = {
    //     id: '__draft__',
@@ -74,7 +109,7 @@ const calendarOptions = ref({
    navLinks: false,
    dateClick: onDateClick,
    eventClick: onEventClick,
-    editable: false,
+    editable: true,

    // force block-mode in dayGrid so we can lay it out on one line
    eventDisplay: 'block',
@@ -88,25 +123,12 @@ const calendarOptions = ref({

    // custom renderer -> one-line pill
    eventContent(arg) {
-        //debug
-        // console.log("Rendering event:", {
-        //     id: arg.event.id,
-        //     title: arg.event.title,
-        //     extendedProps: arg.event.extendedProps,
-        //     fullEvent: arg.event
-        // })
-
        const ext = arg.event.extendedProps || {}
-        const color = ext.color || arg.backgroundColor || arg.borderColor || ''
-        const isCancelled = !!ext.cancelled;
+        const c = ext.color || arg.backgroundColor || arg.borderColor || ''

        const wrap = document.createElement('div')
        wrap.className = 'ev-pill'
-        if (color) wrap.style.setProperty('--ev-color', String(color)) // dot color
-
-        if (isCancelled) {
-            wrap.classList.add('is-cancelled')
-        }
+        if (c) wrap.style.setProperty('--ev-color', String(c)) // dot color

        const dot = document.createElement('span')
        dot.className = 'ev-dot'
@@ -127,16 +149,6 @@ const calendarOptions = ref({
 //@ts-ignore (shhh)
 calendarOptions.value.datesSet = onDatesSet

-watch(() => route.params.id, async (newID) => {
-    if (newID === undefined) {
-        panelOpen.value = false;
-        currentEventID.value = null;
-    } else {
-        panelOpen.value = true;
-        currentEventID.value = Number(newID);
-    }
-}, { immediate: true })
-

 watch(panelOpen, async () => {
    await nextTick()
@@ -144,128 +156,193 @@ watch(panelOpen, async () => {
 })


+
+const startFmt = new Intl.DateTimeFormat(undefined, {
+    weekday: 'short', year: 'numeric', month: 'short', day: 'numeric',
+    hour: 'numeric', minute: '2-digit'
+})
+const endFmt = new Intl.DateTimeFormat(undefined, {
+    hour: 'numeric', minute: '2-digit'
+})
+
+const whenText = computed(() => {
+    if (!activeEvent.value?.start) return ''
+    const s = new Date(activeEvent.value.start)
+    const e = activeEvent.value?.end ? new Date(activeEvent.value.end) : null
+    return e
+        ? `${startFmt.format(s)} – ${endFmt.format(e)}`
+        : `${startFmt.format(s)}`
+})
+
 function onCreateEvent() {
    const iso = new Date().toISOString().slice(0, 10) // YYYY-MM-DD
    onDateClick({ dateStr: iso })
 }

-const eventViewRef = ref(null);
-
 onMounted(() => {
    onDatesSet()
 })

+const ext = computed(() => activeEvent.value?.extendedProps ?? {})
 </script>

 <template>
-    <div>
-        <CreateCalendarEvent ref="dialogRef" @reload="loadEvents(); eventViewRef.forceReload();"></CreateCalendarEvent>
-        <div class="flex">
-            <div class="flex-1 min-h-0 mt-5">
-                <div class="h-[80vh] min-h-0">
-                    <!-- calendar header -->
-                    <div class="flex items-center justify-between mx-5">
-                        <!-- Left: title + pickers -->
-                        <div class="flex items-center gap-2">
-                            <!-- <h2 class="text-xl font-semibold tracking-tight">
-                                {{ monthLabels[selectedMonth] }} {{ selectedYear }}
-                            </h2> -->
-                            <!-- Month dropdown -->
-                            <select v-model.number="selectedMonth" @change="goToSelectedDate"
-                                class="ml-2 rounded-md border bg-transparent px-2 py-1 text-sm"
-                                aria-label="Select month">
-                                <option v-for="(m, i) in monthLabels" :key="m" :value="i" class="bg-card">
-                                    {{ m }}
-                                </option>
-                            </select>
-                            <!-- Year dropdown -->
-                            <select v-model.number="selectedYear" @change="goToSelectedDate"
-                                class="rounded-md border bg-transparent px-2 py-1 text-sm" aria-label="Select year">
-                                <option v-for="y in years" :key="y" :value="y" class="bg-card">
-                                    {{ y }}
-                                </option>
-                            </select>
-                        </div>
-                        <!-- Right: nav + today + create -->
-                        <div class="flex items-center gap-2">
-                            <button
-                                class="cursor-pointer inline-flex h-8 w-8 items-center justify-center rounded-md border hover:bg-muted/40"
-                                aria-label="Previous month" @click="goPrev">
-                                <ChevronLeft class="h-4 w-4" />
-                            </button>
-                            <button
-                                class="cursor-pointer inline-flex h-8 w-8 items-center justify-center rounded-md border hover:bg-muted/40"
-                                aria-label="Next month" @click="goNext">
-                                <ChevronRight class="h-4 w-4" />
-                            </button>
-                            <button class="cursor-pointer ml-1 rounded-md border px-3 py-1.5 text-sm hover:bg-muted/40"
-                                @click="goToday">
-                                Today
-                            </button>
-                            <button
-                                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" />
-                                Create
-                            </button>
-                        </div>
+    <CreateCalendarEvent ref="dialogRef"></CreateCalendarEvent>
+
+    <div class="flex">
+        <div class="flex-1 min-h-0 mt-5">
+            <div class="h-[80vh] min-h-0">
+                <!-- calendar header -->
+                <div class="flex items-center justify-between mx-5">
+                    <!-- Left: title + pickers -->
+                    <div class="flex items-center gap-2">
+                        <!-- <h2 class="text-xl font-semibold tracking-tight">
+                            {{ monthLabels[selectedMonth] }} {{ selectedYear }}
+                        </h2> -->
+
+                        <!-- Month dropdown -->
+                        <select v-model.number="selectedMonth" @change="goToSelectedDate"
+                            class="ml-2 rounded-md border bg-transparent px-2 py-1 text-sm" aria-label="Select month">
+                            <option v-for="(m, i) in monthLabels" :key="m" :value="i" class="bg-card">
+                                {{ m }}
+                            </option>
+                        </select>
+
+                        <!-- Year dropdown -->
+                        <select v-model.number="selectedYear" @change="goToSelectedDate"
+                            class="rounded-md border bg-transparent px-2 py-1 text-sm" aria-label="Select year">
+                            <option v-for="y in years" :key="y" :value="y" class="bg-card">
+                                {{ y }}
+                            </option>
+                        </select>
                    </div>
-                    <FullCalendar ref="calendarRef" :options="calendarOptions" />
+
+                    <!-- Right: nav + today + create -->
+                    <div class="flex items-center gap-2">
+                        <button
+                            class="cursor-pointer inline-flex h-8 w-8 items-center justify-center rounded-md border hover:bg-muted/40"
+                            aria-label="Previous month" @click="goPrev">
+                            <ChevronLeft class="h-4 w-4" />
+                        </button>
+                        <button
+                            class="cursor-pointer inline-flex h-8 w-8 items-center justify-center rounded-md border hover:bg-muted/40"
+                            aria-label="Next month" @click="goNext">
+                            <ChevronRight class="h-4 w-4" />
+                        </button>
+                        <button class="cursor-pointer ml-1 rounded-md border px-3 py-1.5 text-sm hover:bg-muted/40"
+                            @click="goToday">
+                            Today
+                        </button>
+                        <button
+                            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" />
+                            Create
+                        </button>
+                    </div>
+
                </div>
+                <FullCalendar ref="calendarRef" :options="calendarOptions" />
            </div>
-            <aside v-if="panelOpen"
-                class="3xl:w-lg 2xl:w-md border-l bg-card text-foreground flex flex-col overflow-auto scrollbar-themed"
-                :style="{ height: 'calc(100vh - 61px)', position: 'sticky', top: '64px' }">
-                <ViewCalendarEvent ref="eventViewRef" @close="() => { router.push('/calendar'); }" @reload="loadEvents()" @edit="(val) => {dialogRef.openDialog(null, 'edit', val)}">
-                </ViewCalendarEvent>
-            </aside>
        </div>
+
+        <aside v-if="panelOpen" class="3xl:w-lg 2xl:w-md border-l bg-card text-foreground flex flex-col"
+            :style="{ height: 'calc(100vh - 61px)', position: 'sticky', top: '64px' }">
+            <!-- Header -->
+            <div class="flex items-center justify-between gap-3 border-b px-4 py-3">
+                <h2 class="text-lg font-semibold line-clamp-2">
+                    {{ activeEvent?.title || 'Event' }}
+                </h2>
+                <button
+                    class="inline-flex size-8 items-center justify-center rounded-md border hover:bg-muted/40 transition"
+                    aria-label="Close" @click="panelOpen = false">
+                    <X class="size-4" />
+                </button>
+            </div>
+
+            <!-- Body -->
+            <div class="flex-1 min-h-0 overflow-y-auto px-4 py-4 space-y-6">
+                <!-- When -->
+                <section v-if="whenText" class="space-y-2">
+                    <div class="inline-flex items-center gap-2 rounded-md border px-2.5 py-1.5 text-sm">
+                        <Clock class="size-4 opacity-80" />
+                        <span class="font-medium">{{ whenText }}</span>
+                    </div>
+                </section>
+
+                <!-- Quick meta chips -->
+                <section class="flex flex-wrap gap-2">
+                    <span v-if="ext.location"
+                        class="inline-flex items-center gap-1.5 rounded-md border px-2 py-1 text-xs">
+                        <MapPin class="size-3.5 opacity-80" />
+                        <span class="font-medium">{{ ext.location }}</span>
+                    </span>
+                    <span v-if="ext.owner" class="inline-flex items-center gap-1.5 rounded-md border px-2 py-1 text-xs">
+                        <User class="size-3.5 opacity-80" />
+                        <span class="font-medium">Owner: {{ ext.owner }}</span>
+                    </span>
+                    <span v-if="ext.trainer"
+                        class="inline-flex items-center gap-1.5 rounded-md border px-2 py-1 text-xs">
+                        <User class="size-3.5 opacity-80" />
+                        <span class="font-medium">Trainer: {{ ext.trainer }}</span>
+                    </span>
+                </section>
+
+                <!-- Agenda (special-cased array) -->
+                <section v-if="Array.isArray(ext.agenda) && ext.agenda.length" class="space-y-2">
+                    <div class="flex items-center gap-2 text-sm font-medium">
+                        <ListTodo class="size-4 opacity-80" />
+                        Agenda
+                    </div>
+                    <ul class="space-y-1.5">
+                        <li v-for="(item, i) in ext.agenda" :key="i" class="flex items-start gap-2 text-sm">
+                            <span class="mt-1.5 size-1.5 rounded-full bg-foreground/50"></span>
+                            <span>{{ item }}</span>
+                        </li>
+                    </ul>
+                </section>
+
+                <!-- Generic details (extendedProps minus the ones above) -->
+                <section v-if="ext && Object.keys(ext).length" class="space-y-3">
+                    <div class="text-sm font-medium opacity-80">Details</div>
+                    <dl class="grid grid-cols-1 gap-y-3">
+                        <template v-for="(val, key) in ext" :key="key">
+                            <template v-if="!['agenda', 'owner', 'trainer', 'location'].includes(String(key))">
+                                <div class="grid grid-cols-[120px_1fr] items-start gap-3">
+                                    <dt class="text-xs uppercase tracking-wide opacity-60">{{ key }}</dt>
+                                    <dd class="text-sm">
+                                        <span v-if="Array.isArray(val)">{{ val.join(', ') }}</span>
+                                        <span v-else>{{ String(val) }}</span>
+                                    </dd>
+                                </div>
+                            </template>
+                        </template>
+                    </dl>
+                </section>
+            </div>
+
+            <!-- Footer (optional actions) -->
+            <div class="border-t px-4 py-3 flex items-center justify-end gap-2">
+                <button class="rounded-md border px-3 py-1.5 text-sm hover:bg-muted/40 transition">
+                    Edit
+                </button>
+                <button
+                    class="rounded-md bg-primary text-primary-foreground px-3 py-1.5 text-sm hover:opacity-90 transition">
+                    Open details
+                </button>
+            </div>
+        </aside>
+
    </div>
 </template>

-<style scoped>
-/* Firefox */
-.scrollbar-themed {
-    scrollbar-width: thin;
-    scrollbar-color: #555 #1f1f1f;
-    padding-right: 6px;
-}
-
-/* Chrome, Edge, Safari */
-.scrollbar-themed::-webkit-scrollbar {
-    width: 10px;
-    /* slightly wider to allow padding look */
-}
-
-.scrollbar-themed::-webkit-scrollbar-track {
-    background: #1f1f1f;
-    margin-left: 6px;
-    /* ❗ adds space between content + scrollbar */
-}
-
-.scrollbar-themed::-webkit-scrollbar-thumb {
-    background: #555;
-    border-radius: 9999px;
-}
-
-.scrollbar-themed::-webkit-scrollbar-thumb:hover {
-    background: #777;
-}
-</style>
-
 <style scoped>
 /* ---------- Optional container "card" around the calendar ---------- */
 :global(.fc) {
    height: 100% !important;
 }

-:global(.ev-pill.is-cancelled) {
-    opacity: 0.45;
-    text-decoration: line-through;
-    filter: grayscale(100%);
-}
-
-:global(.calendar-card) {
+.calendar-card {
    background: var(--color-card);
    border: 1px solid var(--color-border);
    border-radius: var(--radius-xl);
@@ -293,10 +370,6 @@ onMounted(() => {
    /* no internal scroll for month grid */
 }

-:global(.fc-daygrid:hover) {
-    cursor: pointer;
-}
-
 /* Subtle borders everywhere */
 :global(.fc .fc-scrollgrid),
 :global(.fc .fc-scrollgrid td),
@@ -358,7 +431,6 @@ onMounted(() => {
    font-weight: 600;
    font-size: 12px;
    text-decoration: none;
-    height: 26px;
 }

 /* Today: soft background + stronger number */
@@ -382,6 +454,7 @@ onMounted(() => {
    background: transparent;
    color: var(--color-foreground);
    border-radius: 4px;
+    padding: 4px 8px;
    margin: 2px 6px;
    text-decoration: none;
    transition: background 120ms ease, border-color 120ms ease, transform 120ms ease;
@@ -392,7 +465,14 @@ onMounted(() => {
    border-color: color-mix(in oklab, var(--color-foreground) 12%, var(--color-border));
 }

-
+/* One-line custom pill content (our renderer) */
+:global(.ev-pill) {
+    display: flex;
+    align-items: center;
+    gap: 6px;
+    min-width: 0;
+    color: inherit;
+}

 :global(.ev-dot) {
    width: 8px;
@@ -419,22 +499,23 @@ onMounted(() => {
 }

 /* One-line custom pill */
-:global(.ev-pill) {
+.ev-pill {
    display: flex;
    align-items: center;
    gap: 6px;
    min-width: 0;
    padding: 4px 8px;
-    border-radius: 6px;
-    background: color-mix(in srgb, var(--ev-color) 15%, transparent);
+    border-radius: 14px;
+    border: 1px solid var(--color-border);
+    background: color-mix(in oklab, var(--color-primary) 14%, transparent);
+    color: var(--color-foreground);
    text-decoration: none;
    transition: background 120ms ease, border-color 120ms ease, transform 120ms ease;
 }

-:global(.ev-pill:hover) {
-    /* background: color-mix(in oklab, var(--color-primary) 20%, transparent);
-    border-color: color-mix(in oklab, var(--color-primary) 45%, var(--color-border)); */
-    cursor: pointer;
+.ev-pill:hover {
+    background: color-mix(in oklab, var(--color-primary) 20%, transparent);
+    border-color: color-mix(in oklab, var(--color-primary) 45%, var(--color-border));
 }

 .ev-dot {
@@ -463,17 +544,15 @@ onMounted(() => {
    color: var(--color-primary-foreground);
 }

-:global(.fc-daygrid-top) {
-    margin-bottom: 2px;
-}
-
 /* --- Replace the default today highlight with a round badge --- */
 :global(.fc .fc-daygrid-day.fc-day-today) {
    background: transparent;
 }

 :global(.fc .fc-daygrid-day.fc-day-today .fc-daygrid-day-number) {
-    border-radius: 6px;
+    display: inline-block;
+    padding: 2px 8px;
+    border-radius: 9999px;
    background: color-mix(in oklab, var(--color-primary) 100%, transparent);
    font-weight: 700;
    text-decoration: none;
--- a/ui/src/pages/TrainingReport.vue
+++ b/ui/src/pages/TrainingReport.vue
@@ -1,314 +0,0 @@
-<script setup lang="ts">
-import { getTrainingReport, getTrainingReports } from '@/api/trainingReport';
-import { CourseAttendee, CourseEventDetails, CourseEventSummary } from '@shared/types/course';
-import { computed, onMounted, ref, watch } from 'vue';
-import {
-    Table,
-    TableBody,
-    TableCell,
-    TableHead,
-    TableHeader,
-    TableRow,
-} from '@/components/ui/table'
-import { ArrowUpDown, Funnel, Plus, Search, X } from 'lucide-vue-next';
-import Button from '@/components/ui/button/Button.vue';
-import TrainingReportForm from '@/components/trainingReport/trainingReportForm.vue';
-import Checkbox from '@/components/ui/checkbox/Checkbox.vue';
-import { useRoute, useRouter } from 'vue-router';
-import Select from '@/components/ui/select/Select.vue';
-import SelectTrigger from '@/components/ui/select/SelectTrigger.vue';
-import SelectValue from '@/components/ui/select/SelectValue.vue';
-import SelectContent from '@/components/ui/select/SelectContent.vue';
-import SelectItem from '@/components/ui/select/SelectItem.vue';
-import Input from '@/components/ui/input/Input.vue';
-
-enum sidePanelState { view, create, closed };
-
-const trainingReports = ref<CourseEventSummary[] | null>(null);
-const loaded = ref(false);
-
-const route = useRoute();
-const router = useRouter();
-
-const sidePanel = computed<sidePanelState>(() => {
-    if (route.path.endsWith('/new')) return sidePanelState.create;
-    if (route.params.id) return sidePanelState.view;
-    return sidePanelState.closed;
-})
-
-watch(() => route.params.id, async (newID) => {
-    if (!newID) {
-        focusedTrainingReport.value = null;
-        return;
-    }
-    viewTrainingReport(Number(route.params.id));
-})
-
-const focusedTrainingReport = ref<CourseEventDetails | null>(null);
-const focusedTrainingTrainees = computed<CourseAttendee[] | null>(() => {
-    if (focusedTrainingReport.value == null) return null;
-    return focusedTrainingReport.value.attendees.filter((attendee) => attendee.role.name == 'Trainee');
-})
-const focusedNoShows = computed<CourseAttendee[] | null>(() => {
-    if (focusedTrainingReport.value == null) return null;
-    return focusedTrainingReport.value.attendees.filter((attendee) => attendee.role.name == 'No-Show');
-})
-const focusedTrainingTrainers = computed<CourseAttendee[] | null>(() => {
-    if (focusedTrainingReport.value == null) return null;
-    return focusedTrainingReport.value.attendees.filter((attendee) => attendee.role.name != 'Trainee' && attendee.role.name != 'No-Show');
-})
-async function viewTrainingReport(id: number) {
-    focusedTrainingReport.value = await getTrainingReport(id);
-}
-
-async function closeTrainingReport() {
-    router.push(`/trainingReport`)
-    focusedTrainingReport.value = null;
-}
-
-const sortMode = ref<string>("descending");
-const searchString = ref<string>("");
-let debounceTimer: ReturnType<typeof setTimeout> | null = null;
-
-watch(searchString, (newValue) => {
-    if (debounceTimer) clearTimeout(debounceTimer);
-
-    debounceTimer = setTimeout(() => {
-        loadTrainingReports();
-    }, 300); // 300ms debounce
-});
-
-watch(() => sortMode.value, async (newSortMode) => {
-    loadTrainingReports();
-})
-
-async function loadTrainingReports() {
-    trainingReports.value = await getTrainingReports(sortMode.value, searchString.value);
-}
-
-onMounted(async () => {
-    loadTrainingReports();
-    if (route.params.id)
-        viewTrainingReport(Number(route.params.id))
-    loaded.value = true;
-})
-</script>
-
-<template>
-    <div class="px-20 mx-auto max-w-[100rem] flex mt-5">
-        <!-- training report list -->
-        <div class="px-4 my-3" :class="sidePanel == sidePanelState.closed ? 'w-full' : 'w-2/5'">
-            <div class="flex justify-between mb-4">
-                <p class="scroll-m-20 text-2xl font-semibold tracking-tight">Training Reports</p>
-                <Button @click="router.push('/trainingReport/new')">
-                    <Plus></Plus> New Training Report
-                </Button>
-            </div>
-            <!-- search/filter -->
-            <div class="flex justify-between">
-                <!-- <Search></Search>
-                <Funnel></Funnel> -->
-                <div></div>
-                <div class="flex flex-row gap-5">
-                    <div>
-                        <label class="text-muted-foreground">Search</label>
-                        <Input v-model="searchString"></Input>
-                    </div>
-                    <div class="flex flex-col">
-                        <label class="text-muted-foreground">Sort By</label>
-                        <Select v-model="sortMode">
-                            <SelectTrigger>
-                                <SelectValue placeholder="Sort By" />
-                                <!-- <ArrowUpDown></ArrowUpDown> -->
-                            </SelectTrigger>
-                            <SelectContent>
-                                <SelectItem value="ascending">
-                                    Date (Ascending)
-                                </SelectItem>
-                                <SelectItem value="descending">
-                                    Date (Descending)
-                                </SelectItem>
-                            </SelectContent>
-                        </Select>
-                    </div>
-                </div>
-            </div>
-            <div class="overflow-y-auto max-h-[70vh] mt-5 scrollbar-themed">
-                <Table>
-                    <TableHeader class="">
-                        <TableRow>
-                            <TableHead class="w-[100px]">
-                                Training
-                            </TableHead>
-                            <TableHead>Date</TableHead>
-                            <TableHead class="text-right">
-                                Posted By
-                            </TableHead>
-                        </TableRow>
-                    </TableHeader>
-                    <TableBody v-if="loaded">
-                        <TableRow class="cursor-pointer" v-for="report in trainingReports" :key="report.event_id"
-                            @click="router.push(`/trainingReport/${report.event_id}`)">
-                            <TableCell class="font-medium">{{ report.course_name.length > 30 ? report.course_shortname :
-                                report.course_name }}</TableCell>
-                            <TableCell>{{ report.date.split('T')[0] }}</TableCell>
-                            <TableCell class="text-right">{{ report.created_by_name === null ? "Unknown User" :
-                                report.created_by_name
-                                }}</TableCell>
-                        </TableRow>
-                    </TableBody>
-                </Table>
-            </div>
-        </div>
-        <!-- view training report section -->
-        <div v-if="focusedTrainingReport != null && sidePanel == sidePanelState.view" class="pl-9 my-3 border-l w-3/5">
-            <div class="flex justify-between">
-                <p class="scroll-m-20 text-2xl font-semibold tracking-tight">Training Report Details</p>
-                <button @click="closeTrainingReport" class="cursor-pointer">
-                    <X></X>
-                </button>
-            </div>
-            <div class="max-h-[70vh] overflow-auto scrollbar-themed my-5">
-                <div class="flex flex-col mb-5 border rounded-lg bg-muted/70 p-2 py-3 px-4">
-                    <p class="scroll-m-20 text-xl font-semibold tracking-tight">{{ focusedTrainingReport.course_name }}
-                    </p>
-                    <div class="flex gap-10">
-                        <p class="text-muted-foreground">{{ focusedTrainingReport.event_date.split('T')[0] }}</p>
-                        <p class="">Created by {{ focusedTrainingReport.created_by_name === null ? "Unknown User" :
-                            focusedTrainingReport.created_by_name
-                        }}
-                        </p>
-                    </div>
-                </div>
-                <div class="flex flex-col gap-8 ">
-                    <!-- Trainers -->
-                    <div>
-                        <label class="scroll-m-20 text-xl font-semibold tracking-tight">Trainers</label>
-                        <div class="grid grid-cols-4 py-2 text-sm font-medium text-muted-foreground border-b">
-                            <span>Name</span>
-                            <span class="">Role</span>
-                            <span class="text-right col-span-2">Remarks</span>
-                        </div>
-                        <div v-for="person in focusedTrainingTrainers"
-                            class="grid grid-cols-4 py-2 items-center border-b last:border-none">
-                            <p>{{ person.attendee_name }}</p>
-                            <p class="">{{ person.role.name }}</p>
-                            <p class="col-span-2 text-right px-2"
-                                :class="person.remarks == '' ? 'text-muted-foreground' : ''">
-                                {{ person.remarks == "" ?
-                                    '--'
-                                    : person.remarks }}</p>
-                        </div>
-                    </div>
-                    <!-- trainees -->
-                    <div>
-                        <div class="flex flex-col">
-                            <label class="scroll-m-20 text-xl font-semibold tracking-tight">Trainees</label>
-                            <div class="grid grid-cols-5 py-2 text-sm font-medium text-muted-foreground border-b">
-                                <span>Name</span>
-                                <span class="">Bookwork</span>
-                                <span class="">Qual</span>
-                                <span class="text-right col-span-2">Remarks</span>
-                            </div>
-                        </div>
-                        <div v-for="person in focusedTrainingTrainees"
-                            class="grid grid-cols-5 py-2 items-center border-b last:border-none">
-                            <p>{{ person.attendee_name }}</p>
-                            <Checkbox :disabled="!focusedTrainingReport.course.hasQual"
-                                :model-value="person.passed_bookwork" class="pointer-events-none ml-5">
-                            </Checkbox>
-                            <Checkbox :disabled="!focusedTrainingReport.course.hasQual"
-                                :model-value="person.passed_qual" class="pointer-events-none ml-1">
-                            </Checkbox>
-                            <p class="col-span-2 text-right px-2"
-                                :class="person.remarks == '' ? 'text-muted-foreground' : ''">
-                                {{ person.remarks == "" ?
-                                    '--'
-                                    : person.remarks }}</p>
-                        </div>
-                    </div>
-                    <!-- No Shows -->
-                    <div v-if="focusedNoShows.length != 0">
-                        <div class="flex flex-col">
-                            <label class="scroll-m-20 text-xl font-semibold tracking-tight">No Shows</label>
-                            <div class="grid grid-cols-5 py-2 text-sm font-medium text-muted-foreground border-b">
-                                <span>Name</span>
-                                <!-- <span class="">Role</span>
-                                <span class="">Role</span> -->
-                                <div></div>
-                                <div></div>
-                                <span class="text-right col-span-2">Remarks</span>
-                            </div>
-                        </div>
-                        <div v-for="person in focusedNoShows"
-                            class="grid grid-cols-5 py-2 items-center border-b last:border-none">
-                            <p>{{ person.attendee_name }}</p>
-                            <!-- <Checkbox :default-value="person.passed_bookwork ? true : false" class="pointer-events-none">
-                            </Checkbox>
-                            <Checkbox :default-value="person.passed_qual ? true : false" class="pointer-events-none">
-                            </Checkbox> -->
-                            <div></div>
-                            <div></div>
-                            <p class="col-span-2 text-right px-2"
-                                :class="person.remarks == '' ? 'text-muted-foreground' : ''">
-                                {{ person.remarks == "" ?
-                                    '--'
-                                    : person.remarks }}</p>
-                        </div>
-                    </div>
-                    <div>
-                        <label class="scroll-m-20 text-xl font-semibold tracking-tight">Remarks</label>
-                        <p class="border bg-muted/50 px-3 py-2 rounded-lg min-h-24 my-2"
-                            :class="focusedTrainingReport.remarks == '' ? 'text-muted-foreground' : ''"> {{
-                                focusedTrainingReport.remarks == "" ? 'None' : focusedTrainingReport.remarks }}</p>
-                    </div>
-                </div>
-            </div>
-        </div>
-        <div v-if="sidePanel == sidePanelState.create" class="pl-7 border-l w-3/5 max-w-5xl">
-            <div class="flex justify-between my-3">
-                <div class="flex pl-2 gap-5">
-                    <p class="scroll-m-20 text-2xl font-semibold tracking-tight">New Training Report</p>
-                </div>
-                <button @click="closeTrainingReport" class="cursor-pointer">
-                    <X></X>
-                </button>
-            </div>
-            <div class="overflow-y-auto max-h-[70vh] mt-5 scrollbar-themed">
-                <TrainingReportForm class="w-full pl-2"
-                    @submit="(newID) => { router.push(`/trainingReport/${newID}`); loadTrainingReports() }">
-                </TrainingReportForm>
-            </div>
-        </div>
-    </div>
-</template>
-
-<style scoped>
-/* Firefox */
-.scrollbar-themed {
-    scrollbar-width: thin;
-    scrollbar-color: #555 #1f1f1f;
-    padding-right: 6px;
-}
-
-/* Chrome, Edge, Safari */
-.scrollbar-themed::-webkit-scrollbar {
-    width: 10px;
-    /* slightly wider to allow padding look */
-}
-
-.scrollbar-themed::-webkit-scrollbar-track {
-    background: #1f1f1f;
-    margin-left: 6px;
-    /* ❗ adds space between content + scrollbar */
-}
-
-.scrollbar-themed::-webkit-scrollbar-thumb {
-    background: #555;
-    border-radius: 9999px;
-}
-
-.scrollbar-themed::-webkit-scrollbar-thumb:hover {
-    background: #777;
-}
-</style>
--- a/ui/src/router/index.js
+++ b/ui/src/router/index.js
@@ -2,7 +2,7 @@ import { useUserStore } from '@/stores/user'
 import { createRouter, createWebHistory } from 'vue-router'

 const router = createRouter({
-  history: createWebHistory(),
+  history: createWebHistory(import.meta.env.BASE_URL),
  routes: [
    // PUBLIC
    { path: '/join', component: () => import('@/pages/Join.vue') },
@@ -15,13 +15,7 @@ const router = createRouter({
    { path: '/members', component: () => import('@/pages/memberList.vue'), meta: { requiresAuth: true, memberOnly: true } },
    { path: '/loa', component: () => import('@/pages/SubmitLOA.vue'), meta: { requiresAuth: true, memberOnly: true } },
    { path: '/transfer', component: () => import('@/pages/Transfer.vue'), meta: { requiresAuth: true, memberOnly: true } },
-    
-    { path: '/calendar', component: () => import('@/pages/Calendar.vue'), meta: { requiresAuth: true, memberOnly: true }, },
-    { path: '/calendar/event/:id', component: () => import('@/pages/Calendar.vue'), meta: { requiresAuth: true, memberOnly: true }, },
-    
-    { path: '/trainingReport', component: () => import('@/pages/TrainingReport.vue'), meta: { requiresAuth: true, memberOnly: true } },
-    { path: '/trainingReport/new', component: () => import('@/pages/TrainingReport.vue'), meta: { requiresAuth: true, memberOnly: true } },
-    { path: '/trainingReport/:id', component: () => import('@/pages/TrainingReport.vue'), meta: { requiresAuth: true, memberOnly: true } },
+    { path: '/calendar', component: () => import('@/pages/Calendar.vue'), meta: { requiresAuth: true, memberOnly: true } },

    // ADMIN / STAFF ROUTES
    {
@@ -43,9 +37,6 @@ const router = createRouter({
  ]
 })

-const addr = import.meta.env.VITE_APIHOST;
-
-
 router.beforeEach(async (to) => {
  const user = useUserStore()

@@ -58,7 +49,7 @@ router.beforeEach(async (to) => {
  if (to.meta.requiresAuth && !user.isLoggedIn) {
    // Redirect back to original page after login
    const redirectUrl = encodeURIComponent(window.location.origin + to.fullPath)
-    window.location.href = `${addr}/login?redirect=${redirectUrl}`
+    window.location.href = `https://aj17thdevapi.nexuszone.net/login?redirect=${redirectUrl}`
    return false // Prevent Vue Router from continuing
  }

--- a/ui/vite.config.js
+++ b/ui/vite.config.js
@@ -15,8 +15,7 @@ export default defineConfig({
  ],
  resolve: {
    alias: {
-      '@': fileURLToPath(new URL('./src', import.meta.url)),
-      '@shared': fileURLToPath(new URL('../shared', import.meta.url)),
+      '@': fileURLToPath(new URL('./src', import.meta.url))
    },
  },
  server: {
Author	SHA1	Message	Date
ajdj100	67ce112934	added database seed function	2025-10-29 00:34:34 -04:00
ajdj100	33eca18e82	added database migration system, reference package.json for commands	2025-10-28 21:31:14 -04:00
ajdj100	6b29501d59	created .env manager system and prod/dev run commands	2025-10-28 17:48:55 -04:00
ajdj100	8670b50b56	ignored dev database files	2025-10-28 17:47:56 -04:00
ajdj100	4445f5dd92	created docker compose dev	2025-10-28 16:24:22 -04:00
				`@@ -0,0 +1 @@`
				`{"version":3,"file":"calendarService.d.ts","sourceRoot":"","sources":["calendarService.ts"],"names":[],"mappings":"AAEA,wBAAsB,WAAW,CAAC,WAAW,KAAA,iBAE5C;AAED,wBAAsB,WAAW,CAAC,WAAW,KAAA,iBAE5C;AAED,wBAAsB,WAAW,CAAC,OAAO,KAAA,iBAExC;AAED,wBAAsB,qBAAqB,CAAC,SAAS,KAAA,EAAE,OAAO,KAAA,iBAE7D;AAED,wBAAsB,gBAAgB,CAAC,OAAO,KAAA,iBAE7C"}`
				`@@ -0,0 +1 @@`
				`{"version":3,"file":"calendarService.js","sourceRoot":"","sources":["calendarService.ts"],"names":[],"mappings":";;AAEA,kCAEC;AAED,kCAEC;AAED,kCAEC;AAED,sDAEC;AAED,4CAEC;AApBD,MAAM,IAAI,GAAG,OAAO,CAAC,OAAO,CAAC,CAAA;AAEtB,KAAK,UAAU,WAAW,CAAC,WAAW;AAE7C,CAAC;AAEM,KAAK,UAAU,WAAW,CAAC,WAAW;AAE7C,CAAC;AAEM,KAAK,UAAU,WAAW,CAAC,OAAO;AAEzC,CAAC;AAEM,KAAK,UAAU,qBAAqB,CAAC,SAAS,EAAE,OAAO;AAE9D,CAAC;AAEM,KAAK,UAAU,gBAAgB,CAAC,OAAO;AAE9C,CAAC"}`