Merge branch 'main' into Calendar-Improvements

create CI script based on CD script to run on every push to main and deploy on development site

.gitea/workflows/cd-deploy.yaml

@@ -1,6 +1,8 @@
 name: Continuous Deployment
 on:
   push:
+    tags:
+      - '*'
 
 jobs:
   Deploy:
@@ -8,20 +10,27 @@ jobs:
     runs-on: ubuntu-latest
     container:
       volumes:
-        - /var/www/html/milsim-site-v4:/var/www/html/milsim-site-v4:rw
+        - /var/www/html/milsim-site-v4:/var/www/html/milsim-site-v4:z
     steps:
       - name: Setup Local Environment
         run: |
           groupadd -g 989 nginx || true
           useradd nginx -u 990 -g nginx -m || true
 
+      - name: Update Node Environment
+        uses: actions/setup-node@v6
+        with:
+          node-version: 20.19
+
       - name: Verify Node Environment
         run: |
+          which npm
           npm -v
+          which node
           node -v
 
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           fetch-depth: 0
           ref: 'main'
@@ -32,31 +41,43 @@ jobs:
           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"
+          cd /var/www/html/milsim-site-v4
+          sudo -u nginx git reset --hard
+          sudo -u nginx git pull origin main
 
-      - name: Update Shared Dependencies
+      - name: Update Shared Dependencies and Fix Permissions
         run: |
-          sudo -u nginx bash -c "cd /var/www/html/milsim-site-v4/shared && npm install"
+          cd /var/www/html/milsim-site-v4/shared
+          npm install
+          chown -R nginx:nginx .
 
-      - name: Update UI Dependencies
+      - name: Update UI Dependencies and Fix Permissions
         run: |
-          sudo -u nginx bash -c "cd /var/www/html/milsim-site-v4/ui && npm install"
+          cd /var/www/html/milsim-site-v4/ui
+          npm install
+          chown -R nginx:nginx .
 
-      - name: Update API Dependencies
+      - name: Update API Dependencies and Fix Permissions
         run: |
-          sudo -u nginx bash -c "cd /var/www/html/milsim-site-v4/api && npm install"
+          cd /var/www/html/milsim-site-v4/api
+          npm install
+          chown -R nginx:nginx .
 
-      - name: Build UI
+      - name: Build UI and Fix Permissions
         run: |
-          sudo -u nginx bash -c "cd /var/www/html/milsim-site-v4/ui && npm run build"
+          cd /var/www/html/milsim-site-v4/ui
+          npm run build
+          chown -R nginx:nginx .
 
-      - name: Build API
+      - name: Build API and Fix Permissions
         run: |
-          sudo -u nginx bash -c "cd /var/www/html/milsim-site-v4/api && npm run build"
+          cd /var/www/html/milsim-site-v4/api
+          npm run build
+          chown -R nginx:nginx .
+
+      - name: Reset 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

.gitea/workflows/ci-deploy.yaml

@@ -0,0 +1,83 @@
+name: Continuous Integration
+on:
+  push:
+    branches:
+      - main
+
+jobs:
+  Deploy:
+    name: Update Development
+    runs-on: ubuntu-latest
+    container:
+      volumes:
+        - /var/www/html/milsim-site-v4-dev:/var/www/html/milsim-site-v4:z
+    steps:
+      - name: Setup Local Environment
+        run: |
+          groupadd -g 989 nginx || true
+          useradd nginx -u 990 -g nginx -m || true
+
+      - name: Update Node Environment
+        uses: actions/setup-node@v6
+        with:
+          node-version: 20.19
+
+      - name: Verify Node Environment
+        run: |
+          which npm
+          npm -v
+          which node
+          node -v
+
+      - name: Checkout
+        uses: actions/checkout@v5
+        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: Update Application Code
+        run: |
+          cd /var/www/html/milsim-site-v4
+          sudo -u nginx git reset --hard
+          sudo -u nginx git pull origin main
+
+      - name: Update Shared Dependencies and Fix Permissions
+        run: |
+          cd /var/www/html/milsim-site-v4/shared
+          npm install
+          chown -R nginx:nginx .
+
+      - name: Update UI Dependencies and Fix Permissions
+        run: |
+          cd /var/www/html/milsim-site-v4/ui
+          npm install
+          chown -R nginx:nginx .
+
+      - name: Update API Dependencies and Fix Permissions
+        run: |
+          cd /var/www/html/milsim-site-v4/api
+          npm install
+          chown -R nginx:nginx .
+
+      - name: Build UI and Fix Permissions
+        run: |
+          cd /var/www/html/milsim-site-v4/ui
+          npm run build
+          chown -R nginx:nginx .
+
+      - name: Build API and Fix Permissions
+        run: |
+          cd /var/www/html/milsim-site-v4/api
+          npm run build
+          chown -R nginx:nginx .
+
+      - name: Reset 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

api/src/routes/applications.ts

@@ -2,13 +2,11 @@ const express = require('express');
 const router = express.Router();
 
 import pool from '../db';
-import { approveApplication, createApplication, denyApplication, getAllMemberApplications, getApplicationByID, getApplicationComments, getApplicationList, getMemberApplication } from '../services/applicationService';
+import { approveApplication, createApplication, getApplicationByID, getApplicationComments, getApplicationList, getMemberApplication } from '../services/applicationService';
 import { MemberState, setUserState } from '../services/memberService';
 import { getRankByName, insertMemberRank } from '../services/rankService';
 import { ApplicationFull, CommentRow } from "@app/shared/types/application"
 import { assignUserToStatus } from '../services/statusService';
-import { Request, Response } from 'express';
-import { getUserRoles } from '../services/rolesService';
 
 // POST /application
 router.post('/', async (req, res) => {
@@ -18,13 +16,13 @@ router.post('/', async (req, res) => {
 
     const appVersion = 1;
 
-    await createApplication(memberID, appVersion, JSON.stringify(App))
+    createApplication(memberID, appVersion, JSON.stringify(App))
-    await setUserState(memberID, MemberState.Applicant);
+    setUserState(memberID, MemberState.Applicant);
 
     res.sendStatus(201);
   } catch (err) {
-    console.error('Failed to create application: \n', err);
+    console.error('Insert failed:', err);
-    res.status(500).json({ error: 'Failed to create application' });
+    res.status(500).json({ error: 'Failed to save application' });
   }
 });
 
@@ -39,20 +37,6 @@ router.get('/all', async (req, res) => {
   }
 });
 
-router.get('/meList', async (req, res) => {
-
-  let userID = req.user.id;
-
-  try {
-    let application = await getAllMemberApplications(userID);
-
-    return res.status(200).json(application);
-  } catch (error) {
-    console.error('Failed to load applications: \n', error);
-    return res.status(500).json(error);
-  }
-})
-
 router.get('/me', async (req, res) => {
 
   let userID = req.user.id;
@@ -78,17 +62,13 @@ router.get('/me', async (req, res) => {
 })
 
 // GET /application/:id
-router.get('/me/:id', async (req: Request, res: Response) => {
+router.get('/:id', async (req, res) => {
-  let appID = Number(req.params.id);
+  let appID = req.params.id;
-  let member = req.user.id;
+  console.log("HELLO")
   try {
     const application = await getApplicationByID(appID);
     if (application === undefined)
       return res.sendStatus(204);
-    console.log(application.member_id, member)
-    if (application.member_id != member) {
-      return res.sendStatus(403);
-    }
 
     const comments: CommentRow[] = await getApplicationComments(appID);
 
@@ -104,42 +84,6 @@ router.get('/me/:id', async (req: Request, res: Response) => {
   }
 });
 
-// GET /application/:id
-router.get('/:id', async (req: Request, res: Response) => {
-  let appID = Number(req.params.id);
-  let asAdmin = !!req.query.admin || false;
-  let user = req.user.id;
-
-  //TODO: Replace this with bigger authorization system eventually
-  if (asAdmin) {
-    let allowed = (await getUserRoles(user)).some((role) =>
-      role.name.toLowerCase() === 'dev' ||
-      role.name.toLowerCase() === 'recruiter' ||
-      role.name.toLowerCase() === 'administrator')
-    console.log(allowed)
-    if (!allowed) {
-      return res.sendStatus(403)
-    }
-  }
-  try {
-    const application = await getApplicationByID(appID);
-    if (application === undefined)
-      return res.sendStatus(204);
-
-    const comments: CommentRow[] = await getApplicationComments(appID, asAdmin);
-
-    const output: ApplicationFull = {
-      application,
-      comments,
-    }
-    return res.status(200).json(output);
-  }
-  catch (err) {
-    console.error('Query failed:', err);
-    return res.status(500).json({ error: 'Failed to load application' });
-  }
-});
-
 // POST /application/approve/:id
 router.post('/approve/:id', async (req, res) => {
   const appID = req.params.id;
@@ -148,6 +92,9 @@ router.post('/approve/:id', async (req, res) => {
     const app = await getApplicationByID(appID);
     const result = await approveApplication(appID);
 
+    console.log("START");
+    console.log(app, result);
+
     //guard against failures
     if (result.affectedRows != 1) {
       throw new Error("Something went wrong approving the application");
@@ -172,11 +119,26 @@ router.post('/approve/:id', async (req, res) => {
 router.post('/deny/:id', async (req, res) => {
   const appID = req.params.id;
 
+  const sql = `
+      UPDATE applications
+         SET denied_at = NOW()
+       WHERE id = ?
+        AND approved_at IS NULL
+        AND denied_at IS NULL
+      `;
   try {
-    const app = await getApplicationByID(appID);
+    const result = await pool.execute(sql, appID);
-    await denyApplication(appID);
+
-    await setUserState(app.member_id, MemberState.Denied);
+    console.log(result);
-    res.sendStatus(200);
+
+    if (result.affectedRows === 0) {
+      res.status(400).json('Something went wrong denying the application');
+    }
+
+    if (result.affectedRows == 1) {
+      res.sendStatus(200);
+    }
+
   } catch (err) {
     console.error('Approve failed:', err);
     res.status(500).json({ error: 'Failed to deny application' });
@@ -184,12 +146,10 @@ router.post('/deny/:id', async (req, res) => {
 });
 
 // POST /application/:id/comment
-router.post('/:id/comment', async (req: Request, res: Response) => {
+router.post('/:id/comment', async (req, res) => {
   const appID = req.params.id;
   const data = req.body.message;
-  const user = req.user;
+  const user = 1;
-
-  console.log(user)
 
   const sql = `INSERT INTO application_comments(
     application_id,
@@ -201,7 +161,7 @@ VALUES(?, ?, ?);`
   try {
     const conn = await pool.getConnection();
 
-    const result = await conn.query(sql, [appID, user.id, data])
+    const result = await conn.query(sql, [appID, user, data])
     console.log(result)
     if (result.affectedRows !== 1) {
       conn.release();
@@ -226,60 +186,4 @@ VALUES(?, ?, ?);`
   }
 });
 
-// POST /application/:id/comment
-router.post('/:id/adminComment', async (req: Request, res: Response) => {
-  const appID = req.params.id;
-  const data = req.body.message;
-  const user = req.user;
-
-  console.log(user)
-
-  const sql = `INSERT INTO application_comments(
-    application_id,
-    poster_id,
-    post_content,
-    admin_only
-  )
-VALUES(?, ?, ?, 1);`
-
-  try {
-    const conn = await pool.getConnection();
-
-    const result = await conn.query(sql, [appID, user.id, data])
-    console.log(result)
-    if (result.affectedRows !== 1) {
-      conn.release();
-      throw new Error("Insert Failure")
-    }
-
-    const getSQL = `SELECT app.id AS comment_id,
-      app.post_content,
-      app.poster_id,
-      app.post_time,
-      app.last_modified,
-      app.admin_only,
-      member.name AS poster_name
-        FROM application_comments AS app
-          INNER JOIN members AS member ON member.id = app.poster_id
-        WHERE app.id = ?; `;
-    const comment = await conn.query(getSQL, [result.insertId])
-    res.status(201).json(comment[0]);
-
-  } catch (err) {
-    console.error('Comment failed:', err);
-    res.status(500).json({ error: 'Could not post comment' });
-  }
-});
-
-router.post('/restart', async (req: Request, res: Response) => {
-  const user = req.user.id;
-  try {
-    await setUserState(user, MemberState.Guest);
-    res.sendStatus(200);
-  } catch (error) {
-    console.error('Comment failed:', error);
-    res.status(500).json({ error: 'Could not rester application' });
-  }
-})
-
 module.exports = router;

api/src/services/applicationService.ts

@@ -1,6 +1,5 @@
 import { ApplicationListRow, ApplicationRow, CommentRow } from "@app/shared/types/application";
 import pool from "../db";
-import { error } from "console";
 
 export async function createApplication(memberID: number, appVersion: number, app: string) {
   const sql = `INSERT INTO applications (member_id, app_version, app_data) VALUES (?, ?, ?);`;
@@ -13,13 +12,12 @@ export async function getMemberApplication(memberID: number): Promise<Applicatio
           member.name AS member_name
       FROM applications AS app
           INNER JOIN members AS member ON member.id = app.member_id
-      WHERE app.member_id = ? ORDER BY submitted_at DESC LIMIT 1;`;
+      WHERE app.member_id = ?;`;
 
   let app: ApplicationRow[] = await pool.query(sql, [memberID]);
   return app[0];
 }
 
-
 export async function getApplicationByID(appID: number): Promise<ApplicationRow> {
   const sql =
     `SELECT app.*,
@@ -46,20 +44,7 @@ export async function getApplicationList(): Promise<ApplicationListRow[]> {
   return rows;
 }
 
-export async function getAllMemberApplications(memberID: number): Promise<ApplicationListRow[]> {
+export async function approveApplication(id) {
-  const sql = `SELECT
-      app.id,
-      app.member_id,
-      app.submitted_at,
-      app.app_status
-      FROM applications AS app WHERE app.member_id = ? ORDER BY submitted_at DESC;`;
-
-  const rows: ApplicationListRow[] = await pool.query(sql, [memberID])
-  return rows;
-}
-
-
-export async function approveApplication(id: number) {
   const sql = `
       UPDATE applications
          SET approved_at = NOW()
@@ -72,38 +57,15 @@ export async function approveApplication(id: number) {
   return result;
 }
 
-export async function denyApplication(id: number) {
+export async function getApplicationComments(appID: number): Promise<CommentRow[]> {
-  const sql = `
-      UPDATE applications
-         SET denied_at = NOW()
-       WHERE id = ?
-        AND approved_at IS NULL
-        AND denied_at IS NULL
-      `;
-
-  const result = await pool.execute(sql, id);
-
-  if (result.affectedRows == 1) {
-    return
-  } else {
-    throw new Error(`"Something went wrong denying application with ID ${id}`);
-  }
-}
-
-export async function getApplicationComments(appID: number, admin: boolean = false): Promise<CommentRow[]> {
-  const excludeAdmin = ' AND app.admin_only = false';
-
-  const whereClause = `WHERE app.application_id = ?${!admin ? excludeAdmin : ''}`;
-
   return await pool.query(`SELECT app.id AS comment_id,
           app.post_content,
           app.poster_id,
           app.post_time,
           app.last_modified,
-          app.admin_only,
           member.name AS poster_name
         FROM application_comments AS app
           INNER JOIN members AS member ON member.id = app.poster_id
-        ${whereClause}`,
+        WHERE app.application_id = ?;`,
     [appID]);
 }

api/src/services/calendarService.ts

@@ -123,15 +123,9 @@ export async function setAttendanceStatus(memberID: number, eventID: number, sta
 }
 
 export async function getEventAttendance(eventID: number): Promise<CalendarSignup[]> {
-    const sql = `
-        SELECT 
-            s.member_id,
-            s.status,
-            m.name AS member_name
-        FROM calendar_events_signups s
-        LEFT JOIN members m ON s.member_id = m.id
-        WHERE s.event_id = ?
-    `;
 
-    return await pool.query(sql, [eventID]);
+    const sql = "CALL `sp_GetCalendarEventSignups`(?)"
+    const res = await pool.query(sql, [eventID]);
+    console.log(res[0]);
+    return res[0];
 }

ecosystem.config.js

@@ -5,6 +5,7 @@ module.exports = {
     script: 'built/api/src/index.js',
     watch: ['.env', 'built'],
     ignore_watch: ['.gitignore', '\.json', 'src', '\.db', 'node_modules'],
+    appendEnvToName: true,
     watch_options: {
       usePolling: true,
       interval: 10000

shared/types/application.ts

@@ -40,7 +40,6 @@ export interface CommentRow {
     post_time: string;
     last_modified: string | null;
     poster_name: string;
-    admin_only: boolean;
 }
 
 export interface ApplicationFull {

shared/types/calendar.ts

@@ -26,6 +26,7 @@ export interface CalendarSignup {
     eventID: number;
     status: CalendarAttendance;
     member_name?: string;
+    member_unit?: string;
 }    
 
 export interface CalendarEventShort {

ui/src/api/application.ts

@@ -1,11 +1,80 @@
-import { ApplicationFull } from "@shared/types/application";
+export type ApplicationDto = Partial<{
+  age: number | string
+  name: string
+  playtime: number | string
+  hobbies: string
+  military: boolean
+  communities: string
+  joinReason: string
+  milsimAttraction: string
+  referral: string
+  steamProfile: string
+  timezone: string
+  canAttendSaturday: boolean
+  interests: string
+  aknowledgeRules: boolean
+}>
+
+export interface ApplicationData {
+  dob: string;
+  name: string;
+  playtime: number;
+  hobbies: string;
+  military: boolean;
+  communities: string;
+  joinReason: string;
+  milsimAttraction: string;
+  referral: string;
+  steamProfile: string;
+  timezone: string;
+  canAttendSaturday: boolean;
+  interests: string;
+  aknowledgeRules: boolean;
+}
+
+//reflects how applications are stored in the database
+export interface ApplicationRow {
+  id: number;
+  member_id: number;
+  app_version: number;
+  app_data: ApplicationData;
+
+  submitted_at: string;        // ISO datetime from DB (e.g., "2025-08-25T18:04:29.000Z")
+  updated_at: string | null;
+  approved_at: string | null;
+  denied_at: string | null;
+
+  app_status: ApplicationStatus;       // generated column
+  decision_at: string | null;  // generated column
+
+  // present when you join members (e.g., SELECT a.*, m.name AS member_name)
+  member_name: string;
+}
+export interface CommentRow {
+  comment_id: number;
+  post_content: string;
+  poster_id: number;
+  post_time: string;
+  last_modified: string | null;
+  poster_name: string;
+}
+
+export interface ApplicationFull {
+  application: ApplicationRow;
+  comments: CommentRow[];
+}
 
 
+export enum ApplicationStatus {
+  Pending = "Pending",
+  Accepted = "Accepted",
+  Denied = "Denied",
+}
 //  @ts-ignore
 const addr = import.meta.env.VITE_APIHOST;
 
-export async function loadApplication(id: number | string, asAdmin: boolean = false): Promise<ApplicationFull | null> {
+export async function loadApplication(id: number | string): Promise<ApplicationFull | null> {
-  const res = await fetch(`${addr}/application/${id}?admin=${asAdmin}`, { credentials: 'include' })
+  const res = await fetch(`${addr}/application/${id}`, { credentials: 'include' })
   if (res.status === 204) return null
   if (!res.ok) throw new Error('Failed to load application')
   const json = await res.json()
@@ -35,22 +104,6 @@ export async function postChatMessage(message: any, post_id: number) {
 
   const response = await fetch(`${addr}/application/${post_id}/comment`, {
     method: 'POST',
-    credentials: 'include',
-    headers: { 'Content-Type': 'application/json' },
-    body: JSON.stringify(out),
-  })
-
-  return await response.json();
-}
-
-export async function postAdminChatMessage(message: any, post_id: number) {
-  const out = {
-    message: message
-  }
-
-  const response = await fetch(`${addr}/application/${post_id}/adminComment`, {
-    method: 'POST',
-    credentials: 'include',
     headers: { 'Content-Type': 'application/json' },
     body: JSON.stringify(out),
   })
@@ -68,26 +121,6 @@ export async function getAllApplications(): Promise<ApplicationFull> {
   }
 }
 
-export async function loadMyApplications(): Promise<ApplicationFull> {
-  const res = await fetch(`${addr}/application/meList`, { credentials: 'include' })
-
-  if (res.ok) {
-    return res.json()
-  } else {
-    console.error("Something went wrong approving the application")
-  }
-}
-
-export async function getMyApplication(id: number): Promise<ApplicationFull> {
-  const res = await fetch(`${addr}/application/me/${id}`, { credentials: 'include' })
-  if (res.status === 204) return null
-  if (res.status === 403) throw new Error("Unauthorized");
-  if (!res.ok) throw new Error('Failed to load application')
-  const json = await res.json()
-  // Accept either the object at root or under `application`
-  return json;
-}
-
 export async function approveApplication(id: Number) {
   const res = await fetch(`${addr}/application/approve/${id}`, { method: 'POST' })
 
@@ -102,15 +135,4 @@ export async function denyApplication(id: Number) {
   if (!res.ok) {
     console.error("Something went wrong denying the application")
   }
-}
-
-export async function restartApplication() {
-  const res = await fetch(`${addr}/application/restart`, {
-    method: 'POST',
-    credentials: 'include'
-  })
-
-  if (!res.ok) {
-    console.error("Something went wrong restarting your application")
-  }
 }

ui/src/components/Navigation/Navbar.vue

@@ -156,6 +156,12 @@ function blurAfter() {
                                     <RouterLink to="/join" @click="blurAfter">Join</RouterLink>
                                 </NavigationMenuLink>
                             </NavigationMenuItem>
+                            <!-- Calendar -->
+                            <NavigationMenuItem>
+                                <NavigationMenuLink as-child :class="navigationMenuTriggerStyle()">
+                                    <RouterLink to="/calendar" @click="blurAfter">Calendar</RouterLink>
+                                </NavigationMenuLink>
+                            </NavigationMenuItem>
                         </NavigationMenuList>
                     </NavigationMenu>
                 </div>
@@ -170,7 +176,6 @@ function blurAfter() {
                         <!-- <DropdownMenuItem>My Profile</DropdownMenuItem> -->
                         <!-- <DropdownMenuItem>Settings</DropdownMenuItem> -->
                         <DropdownMenuItem @click="$router.push('/join')">My Application</DropdownMenuItem>
-                        <DropdownMenuItem @click="$router.push('/applications')">Application History</DropdownMenuItem>
                         <DropdownMenuItem :variant="'destructive'" @click="logout()">Logout</DropdownMenuItem>
                     </DropdownMenuContent>
                 </DropdownMenu>

ui/src/components/application/ApplicationChat.vue

@@ -11,18 +11,13 @@ import {
 import Textarea from '@/components/ui/textarea/Textarea.vue'
 import { toTypedSchema } from '@vee-validate/zod'
 import * as z from 'zod'
-import { useAuth } from '@/composables/useAuth'
-import { CommentRow } from '@shared/types/application'
-import { Dot } from 'lucide-vue-next'
-import { ref } from 'vue'
 
 const props = defineProps<{
-  messages: CommentRow[]
+  messages: Array<Record<string, any>>
 }>()
 
 const emit = defineEmits<{
   (e: 'post', text: string): void
-  (e: 'postInternal', text: string): void
 }>()
 
 const commentSchema = toTypedSchema(
@@ -31,14 +26,9 @@ const commentSchema = toTypedSchema(
   })
 )
 
-const submitMode = ref("public");
-
 // vee-validate passes (values, actions) to @submit
 function onSubmit(values: { text: string }, { resetForm }: { resetForm: () => void }) {
-  if (submitMode.value === "internal")
+  emit('post', values.text.trim())
-    emit('postInternal', values.text.trim())
-  else
-    emit('post', values.text.trim())
   resetForm()
 }
 </script>
@@ -58,31 +48,25 @@ function onSubmit(values: { text: string }, { resetForm }: { resetForm: () => vo
       </FormField>
 
       <!-- Button below, right-aligned -->
-      <div class="mt-2 flex justify-end gap-2">
+      <div class="mt-2 flex justify-end">
-        <Button type="submit" @click="submitMode = 'internal'" variant="outline">Post (Internal)</Button>
+        <Button type="submit">Post</Button>
-        <Button type="submit" @click="submitMode = 'public'">Post (Public)</Button>
       </div>
     </Form>
 
     <!-- Existing posts -->
     <div class="space-y-3">
-      <div v-for="(message, i) in props.messages" :key="message.comment_id ?? i" class="rounded-md border p-3 space-y-5"
+      <div v-for="(message, i) in props.messages" :key="message.id ?? i"
-        :class="message.admin_only ? 'border-amber-300/70' : 'border-neutral-800'">
+        class="rounded-md border border-neutral-800 p-3 space-y-5">
         <!-- Comment header -->
         <div class="flex justify-between">
-          <div class="flex">
+          <p>{{ message.poster_name }}</p>
-            <p>{{ message.poster_name }}</p>
-            <p v-if="message.admin_only" class="flex">
-              <Dot /><span class="text-amber-300">Internal</span>
-            </p>
-          </div>
           <p class="text-muted-foreground">{{ new Date(message.post_time).toLocaleString("EN-us", {
             year: "numeric",
             month: "long",
             day: "numeric",
             hour: "2-digit",
             minute: "2-digit"
-          }) }}</p>
+            }) }}</p>
         </div>
         <p>{{ message.post_content }}</p>
       </div>

ui/src/components/application/ApplicationForm.vue

@@ -16,27 +16,23 @@ import { Form } from 'vee-validate';
 import { onMounted, ref } from 'vue';
 import * as z from 'zod';
 import DateInput from '../form/DateInput.vue';
-import { ApplicationData } from '@shared/types/application';
+import { ApplicationData } from '@/api/application';
-
-const regexA = /^https?:\/\/steamcommunity\.com\/id\/[A-Za-z0-9_]+\/?$/;
-const regexB = /^https?:\/\/steamcommunity\.com\/profiles\/\d+\/?$/;
-
 
 const formSchema = toTypedSchema(z.object({
   dob: z.string().refine(v => v, { message: "A date of birth is required." }),
-  name: z.string().nonempty(),
+  name: z.string(),
   playtime: z.coerce.number({ invalid_type_error: "Must be a number", }).min(0, "Cannot be less than 0"),
-  hobbies: z.string().nonempty(),
+  hobbies: z.string(),
   military: z.boolean(),
-  communities: z.string().nonempty(),
+  communities: z.string(),
-  joinReason: z.string().nonempty(),
+  joinReason: z.string(),
-  milsimAttraction: z.string().nonempty(),
+  milsimAttraction: z.string(),
-  referral: z.string().nonempty(),
+  referral: z.string(),
-  steamProfile: z.string().nonempty().refine((val) => regexA.test(val) || regexB.test(val), { message: "Invalid Steam profile URL." }),
+  steamProfile: z.string(),
-  timezone: z.string().nonempty(),
+  timezone: z.string(),
   canAttendSaturday: z.boolean(),
-  interests: z.string().nonempty(),
+  interests: z.string(),
-  acknowledgeRules: z.literal(true, {
+  aknowledgeRules: z.literal(true, {
     errorMap: () => ({ message: "Required" })
   }),
 }))
@@ -45,7 +41,7 @@ const formSchema = toTypedSchema(z.object({
 const fallbackInitials = {
   military: false,
   canAttendSaturday: false,
-  acknowledgeRules: false,
+  aknowledgeRules: false,
 }
 
 const props = defineProps<{
@@ -86,9 +82,7 @@ onMounted(() => {
         <FormControl>
           <DateInput :model-value="(value as string) ?? ''" :disabled="readOnly" @update:model-value="handleChange" />
         </FormControl>
-        <div class="h-4">
+        <FormMessage />
-          <FormMessage class="text-destructive" />
-        </div>
       </FormItem>
     </FormField>
 
@@ -100,9 +94,7 @@ onMounted(() => {
         <FormControl>
           <Input :model-value="value" @update:model-value="handleChange" :disabled="readOnly" />
         </FormControl>
-        <div class="h-4">
+        <FormMessage />
-          <FormMessage class="text-destructive" />
-        </div>
       </FormItem>
     </FormField>
 
@@ -113,9 +105,7 @@ onMounted(() => {
         <FormControl>
           <Input type="number" :model-value="value" @update:model-value="handleChange" :disabled="readOnly" />
         </FormControl>
-        <div class="h-4">
+        <FormMessage />
-          <FormMessage class="text-destructive" />
-        </div>
       </FormItem>
     </FormField>
 
@@ -127,9 +117,7 @@ onMounted(() => {
           <Textarea rows="4" class="resize-none" :model-value="value" @update:model-value="handleChange"
             :disabled="readOnly" />
         </FormControl>
-        <div class="h-4">
+        <FormMessage />
-          <FormMessage class="text-destructive" />
-        </div>
       </FormItem>
     </FormField>
 
@@ -143,9 +131,7 @@ onMounted(() => {
             <span>Yes (checked) / No (unchecked)</span>
           </div>
         </FormControl>
-        <div class="h-4">
+        <FormMessage />
-          <FormMessage class="text-destructive" />
-        </div>
       </FormItem>
     </FormField>
 
@@ -156,9 +142,7 @@ onMounted(() => {
         <FormControl>
           <Input :model-value="value" @update:model-value="handleChange" :disabled="readOnly" />
         </FormControl>
-        <div class="h-4">
+        <FormMessage />
-          <FormMessage class="text-destructive" />
-        </div>
       </FormItem>
     </FormField>
 
@@ -170,9 +154,7 @@ onMounted(() => {
           <Textarea rows="4" class="resize-none" :model-value="value" @update:model-value="handleChange"
             :disabled="readOnly" />
         </FormControl>
-        <div class="h-4">
+        <FormMessage />
-          <FormMessage class="text-destructive" />
-        </div>
       </FormItem>
     </FormField>
 
@@ -184,9 +166,7 @@ onMounted(() => {
           <Textarea rows="4" class="resize-none" :model-value="value" @update:model-value="handleChange"
             :disabled="readOnly" />
         </FormControl>
-        <div class="h-4">
+        <FormMessage />
-          <FormMessage class="text-destructive" />
-        </div>
       </FormItem>
     </FormField>
 
@@ -198,9 +178,7 @@ onMounted(() => {
           <Input placeholder="e.g., Reddit / Member: Alice" :model-value="value" @update:model-value="handleChange"
             :disabled="readOnly" />
         </FormControl>
-        <div class="h-4">
+        <FormMessage />
-          <FormMessage class="text-destructive" />
-        </div>
       </FormItem>
     </FormField>
 
@@ -216,9 +194,7 @@ onMounted(() => {
           <Input type="url" placeholder="https://steamcommunity.com/profiles/7656119..." :model-value="value"
             @update:model-value="handleChange" :disabled="readOnly" />
         </FormControl>
-        <div class="h-4">
+        <FormMessage />
-          <FormMessage class="text-destructive" />
-        </div>
       </FormItem>
     </FormField>
 
@@ -230,9 +206,7 @@ onMounted(() => {
           <Input placeholder="e.g., AEST, EST, UTC+10" :model-value="value" @update:model-value="handleChange"
             :disabled="readOnly" />
         </FormControl>
-        <div class="h-4">
+        <FormMessage />
-          <FormMessage class="text-destructive" />
-        </div>
       </FormItem>
     </FormField>
 
@@ -246,9 +220,7 @@ onMounted(() => {
             <span>Yes (checked) / No (unchecked)</span>
           </div>
         </FormControl>
-        <div class="h-4">
+        <FormMessage />
-          <FormMessage class="text-destructive" />
-        </div>
       </FormItem>
     </FormField>
 
@@ -260,26 +232,22 @@ onMounted(() => {
           <Input placeholder="e.g., Rifleman; Medic; Pilot" :model-value="value" @update:model-value="handleChange"
             :disabled="readOnly" />
         </FormControl>
-        <div class="h-4">
+        <FormMessage />
-          <FormMessage class="text-destructive" />
-        </div>
       </FormItem>
     </FormField>
 
     <!-- Code of Conduct (boolean, field name kept as-is) -->
-    <FormField name="acknowledgeRules" v-slot="{ value, handleChange }">
+    <FormField name="aknowledgeRules" v-slot="{ value, handleChange }">
       <FormItem>
         <FormLabel>Community Code of Conduct</FormLabel>
         <FormControl>
           <div class="flex items-center gap-2">
             <Checkbox :model-value="value" @update:model-value="handleChange" :disabled="readOnly" />
-            <span>By checking this box, you accept the <Button variant="link" class="p-0 h-min">Code of
+            <span>By checking this box, you accept the <Button variant="link" class="p-0">Code of
                 Conduct</Button>.</span>
           </div>
         </FormControl>
-        <div class="h-4">
+        <FormMessage />
-          <FormMessage class="text-destructive" />
-        </div>
       </FormItem>
     </FormField>
 

ui/src/components/calendar/ViewCalendarEvent.vue

@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import type { CalendarEvent, CalendarSignup } from '@shared/types/calendar'
-import { CircleAlert, Clock, EllipsisVertical, MapPin, User, X } from 'lucide-vue-next';
+import { CircleAlert, Clock4, EllipsisVertical, MapPin, User, X } from 'lucide-vue-next';
-import { computed, onMounted, ref, watch } from 'vue';
+import { computed, 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';
@@ -11,24 +11,13 @@ 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';
+import { Calendar } from 'lucide-vue-next';
 
 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) => {
@@ -45,23 +34,27 @@ const emit = defineEmits<{
     (e: 'edit', event: CalendarEvent): void
 }>()
 
-// const activeEvent = computed(() => props.event)
+const dateFmt = new Intl.DateTimeFormat(undefined, {
-
+    weekday: 'long', month: 'short', day: 'numeric',
-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, {
+
+const timeFmt = new Intl.DateTimeFormat(undefined, {
     hour: 'numeric', minute: '2-digit'
 })
 
-const whenText = computed(() => {
+const dateText = computed(() => {
-    if (!activeEvent.value?.start) return ''
+    let start = dateFmt.format(new Date(activeEvent.value.start));
-    const s = new Date(activeEvent.value.start)
+    let end = dateFmt.format(new Date(activeEvent.value.end));
-    const e = activeEvent.value?.end ? new Date(activeEvent.value.end) : null
+    if (start === end)
-    return e
+        return start;
-        ? `${startFmt.format(s)} – ${endFmt.format(e)}`
+    else
-        : `${startFmt.format(s)}`
+        return `${start} - ${end}`;
+})
+
+const timeText = computed(() => {
+    let startTime = timeFmt.format(new Date(activeEvent.value.start))
+    let endTime = timeFmt.format(new Date(activeEvent.value.end))
+    return [startTime, endTime]
 })
 
 const attending = computed<CalendarSignup[]>(() => { return activeEvent.value.eventSignups.filter((s) => s.status == CalendarAttendance.Attending) })
@@ -71,6 +64,7 @@ const viewedState = ref<CalendarAttendance>(CalendarAttendance.Attending);
 
 let user = useUserStore();
 const myAttendance = computed<CalendarSignup | null>(() => {
+    if (!user.isLoggedIn) return null;
     return activeEvent.value.eventSignups.find(
         (s) => s.member_id === user.user.id
     ) || null;
@@ -83,6 +77,7 @@ async function setAttendance(state: CalendarAttendance) {
 }
 
 const canEditEvent = computed(() => {
+    if (!user.isLoggedIn) return false;
     if (user.user.id == activeEvent.value.creator_id)
         return true;
 });
@@ -97,17 +92,94 @@ async function forceReload() {
     activeEvent.value = await getCalendarEvent(activeEvent.value.id);
 }
 
-defineExpose({forceReload})
+const isPast = computed(() => {
+    const end = new Date(activeEvent.value.end)
+    // is current date later than end date
+    return new Date() < end;
+})
+
+const attendanceTab = ref<"Alpha" | "Echo" | "Other">("Alpha");
+const attendanceList = computed<CalendarSignup[]>(() => {
+    let out: CalendarSignup[] = [];
+    if (attendanceTab.value === 'Alpha') {
+        out = activeEvent.value.eventSignups?.filter((s) => s.member_unit === 'Alpha Company');
+    } else if (attendanceTab.value === 'Echo') {
+        out = activeEvent.value.eventSignups?.filter((s) => s.member_unit === 'Echo Company')
+    } else {
+        out = activeEvent.value.eventSignups?.filter((s) => s.member_unit != 'Alpha Company' && s.member_unit != 'Echo Company')
+    }
+
+    const statusOrder: Record<CalendarAttendance, number> = {
+        [CalendarAttendance.Attending]: 1,
+        [CalendarAttendance.Maybe]: 2,
+        [CalendarAttendance.NotAttending]: 3,
+    };
+
+    out.sort((a, b) => statusOrder[a.status] - statusOrder[b.status]);
+
+    return out;
+})
+
+const attendanceCountsByGroup = computed(() => {
+    const signups = activeEvent.value.eventSignups ?? [];
+
+    return {
+        Alpha: signups.filter(s => s.member_unit === "Alpha Company").length,
+        Echo: signups.filter(s => s.member_unit === "Echo Company").length,
+        Other: signups.filter(s =>
+            s.member_unit !== "Alpha Company" &&
+            s.member_unit !== "Echo Company"
+        ).length,
+    };
+});
+
+const attendanceStatusSummary = computed(() => {
+    const signups = activeEvent.value.eventSignups ?? [];
+
+    return {
+        attending: signups.filter(s => s.status === CalendarAttendance.Attending).length,
+        maybe: signups.filter(s => s.status === CalendarAttendance.Maybe).length,
+        notAttending: signups.filter(s => s.status === CalendarAttendance.NotAttending).length,
+    };
+});
+
+const statusColor = (status: CalendarAttendance) => {
+    switch (status) {
+        case CalendarAttendance.Attending:
+            return "text-success";
+        case CalendarAttendance.Maybe:
+            return "text-yellow-600";
+        case CalendarAttendance.NotAttending:
+            return "text-destructive";
+        default:
+            return "";
+    }
+};
+
+const displayStatus = (status: CalendarAttendance) => {
+    switch (status) {
+        case CalendarAttendance.Attending:
+            return "Attending";
+        case CalendarAttendance.Maybe:
+            return "Maybe";
+        case CalendarAttendance.NotAttending:
+            return "Declined";
+        default:
+            return status;
+    }
+};
+
+defineExpose({ forceReload })
 </script>
 
 <template>
     <div v-if="loaded">
         <!-- Header -->
-        <div class="flex items-center justify-between gap-3 border-b px-4 py-3">
+        <div class="flex items-center justify-between gap-3 border-b px-4 py-3 h-14">
             <h2 class="text-lg font-semibold break-all">
                 {{ activeEvent?.name || 'Event' }}
             </h2>
-            <div class="flex gap-4">
+            <div class="flex gap-4 items-center">
                 <DropdownMenu v-if="canEditEvent">
                     <DropdownMenuTrigger>
                         <button
@@ -119,8 +191,7 @@ defineExpose({forceReload})
                         <DropdownMenuItem @click="emit('edit', activeEvent)">
                             Edit
                         </DropdownMenuItem>
-                        <DropdownMenuItem v-if="activeEvent.cancelled"
+                        <DropdownMenuItem v-if="activeEvent.cancelled" @click="setCancel(false)">
-                            @click="setCancel(false)">
                             Un-Cancel
                         </DropdownMenuItem>
                         <DropdownMenuItem v-else @click="setCancel(true)">
@@ -142,7 +213,7 @@ defineExpose({forceReload})
                     <CircleAlert></CircleAlert> This event has been cancelled
                 </div>
             </section>
-            <section class="w-full">
+            <section v-if="isPast && user.isLoggedIn" class="w-full">
                 <ButtonGroup class="flex w-full">
                     <Button variant="outline"
                         :class="myAttendance?.status === CalendarAttendance.Attending ? 'border-2 border-primary text-primary' : ''"
@@ -155,24 +226,21 @@ defineExpose({forceReload})
                         @click="setAttendance(CalendarAttendance.NotAttending)">Declined</Button>
                 </ButtonGroup>
             </section>
-            <!-- When -->
+            <!-- Meta -->
-            <section v-if="whenText" class="space-y-2 w-full">
+            <section class="space-y-3 w-full">
-                <div class="inline-flex items-center gap-2 rounded-md border px-2.5 py-1.5 text-sm">
+                <p class="text-lg font-semibold">Details</p>
-                    <Clock class="size-4 opacity-80" />
+                <div class="text-foreground/80 flex gap-3 items-center">
-                    <span class="font-medium">{{ whenText }}</span>
+                    <Calendar :size="20"></Calendar> {{ dateText }}
+                </div>
+                <div class="text-foreground/80 flex gap-3 items-center">
+                    <Clock4 :size="20"></Clock4> {{ timeText[0] }} - {{ timeText[1] }}
+                </div>
+                <div class="text-foreground/80 flex gap-3 items-center">
+                    <MapPin :size="20"></MapPin> {{ activeEvent.location || "Unknown" }}
+                </div>
+                <div class="text-foreground/80 flex gap-3 items-center">
+                    <User :size="20"></User> {{ activeEvent.creator_name || "Unknown User" }}
                 </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">
@@ -181,46 +249,41 @@ defineExpose({forceReload})
                     {{ activeEvent.description }}
                 </p>
             </section>
-            <!-- Attendance -->
+            <!-- attendance -->
             <section class="space-y-2 w-full">
-                <p class="text-lg font-semibold">Attendance</p>
+                <div class="flex items-center gap-5">
+                    <p class="text-lg font-semibold">Attendance</p>
+                    <!-- <div class="text-muted-foreground flex gap-6">
+                        <p>Going <span class="ml-1">{{ attendanceStatusSummary.attending }}</span></p>
+                        <p>Maybe <span class="ml-1">{{ attendanceStatusSummary.maybe }}</span></p>
+                        <p>Declined <span class="ml-1">{{ attendanceStatusSummary.notAttending }}</span></p>
+                    </div> -->
+                </div>
                 <div class="flex flex-col border bg-muted/50 rounded-lg min-h-24 my-2">
                     <div class="flex w-full pt-2 border-b *:w-full *:text-center *:pb-1 *:cursor-pointer">
-                        <label
+                        <label :class="attendanceTab === 'Alpha' ? 'border-b-3 border-foreground' : 'mb-[2px]'"
-                            :class="viewedState === CalendarAttendance.Attending ? 'border-b-3 border-foreground' : 'mb-[2px]'"
+                            @click="attendanceTab = 'Alpha'">Alpha {{ attendanceCountsByGroup.Alpha }}</label>
-                            @click="viewedState = CalendarAttendance.Attending">Going {{ attending.length }}</label>
+                        <label :class="attendanceTab === 'Echo' ? 'border-b-3 border-foreground' : 'mb-[2px]'"
-                        <label
+                            @click="attendanceTab = 'Echo'">Echo {{ attendanceCountsByGroup.Echo }}</label>
-                            :class="viewedState === CalendarAttendance.Maybe ? 'border-b-3 border-foreground' : 'mb-[2px]'"
+                        <label :class="attendanceTab === 'Other' ? 'border-b-3 border-foreground' : 'mb-[2px]'"
-                            @click="viewedState = CalendarAttendance.Maybe">Maybe {{ maybe.length }}</label>
+                            @click="attendanceTab = 'Other'">Other {{ attendanceCountsByGroup.Other }}</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 class="pb-1 min-h-48">
-                        <div v-if="viewedState === CalendarAttendance.Attending" v-for="person in attending">
+                        <div class="grid grid-cols-2 font-semibold text-muted-foreground border-b py-1 px-3 mb-2">
-                            <p>{{ person.member_name }}</p>
+                            <p>Name</p>
+                            <p class="text-right">Status</p>
                         </div>
-                        <div v-if="viewedState === CalendarAttendance.Maybe" v-for="person in maybe">
+
-                            <p>{{ person.member_name }}</p>
+                        <div v-for="person in attendanceList" :key="person.member_id"
-                        </div>
+                            class="grid grid-cols-2 py-1 *:px-3 hover:bg-muted">
-                        <div v-if="viewedState === CalendarAttendance.NotAttending" v-for="person in declined">
                             <p>{{ person.member_name }}</p>
+                            <p :class="statusColor(person.status)" class="text-right">
+                                {{ displayStatus(person.status) }}
+                            </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>

ui/src/pages/Application.vue

@@ -2,16 +2,14 @@
 import ApplicationChat from '@/components/application/ApplicationChat.vue';
 import ApplicationForm from '@/components/application/ApplicationForm.vue';
 import { onMounted, ref } from 'vue';
-import { approveApplication, denyApplication, loadApplication, postApplication, postChatMessage, getMyApplication, postAdminChatMessage } from '@/api/application';
+import { ApplicationData, approveApplication, denyApplication, loadApplication, postApplication, postChatMessage, ApplicationStatus } from '@/api/application';
 import { useRoute } from 'vue-router';
 import Button from '@/components/ui/button/Button.vue';
 import { CheckIcon, XIcon } from 'lucide-vue-next';
-import Unauthorized from './Unauthorized.vue';
-import { ApplicationData, ApplicationFull, ApplicationStatus, CommentRow } from '@shared/types/application';
 
 const appData = ref<ApplicationData>(null);
 const appID = ref<number | null>(null);
-const chatData = ref<CommentRow[]>([])
+const chatData = ref<object[]>([])
 const readOnly = ref<boolean>(false);
 const newApp = ref<boolean>(null);
 const status = ref<ApplicationStatus>(null);
@@ -21,12 +19,13 @@ const loading = ref<boolean>(true);
 const member_name = ref<string>();
 
 const props = defineProps<{
-    mode?: "create" | "view-self" | "view-recruiter" | "view-self-id"
+    mode?: "create" | "view-self" | "view-recruiter"
 }>()
 
-const finalMode = ref<"create" | "view-self" | "view-recruiter" | "view-self-id">("create");
+const finalMode = ref<"create" | "view-self" | "view-recruiter">("create");
 
-function loadData(raw: ApplicationFull) {
+async function loadByID(id: number | string) {
+    const raw = await loadApplication(id);
 
     const data = raw.application;
 
@@ -41,20 +40,20 @@ function loadData(raw: ApplicationFull) {
     readOnly.value = true;
 }
 
-const route = useRoute();
+const router = useRoute();
-const unauthorized = ref(false);
 
 onMounted(async () => {
+
     //recruiter mode
     if (props.mode === 'view-recruiter') {
         finalMode.value = 'view-recruiter';
-        loadData(await loadApplication(Number(route.params.id), true))
+        await loadByID(Number(router.params.id));
     }
 
     //viewer mode
     if (props.mode === 'view-self') {
         finalMode.value = 'view-self';
-        loadData(await loadApplication("me"))
+        await loadByID('me');
     }
 
     //creator mode
@@ -65,33 +64,40 @@ onMounted(async () => {
         newApp.value = true;
     }
 
-    if (props.mode === 'view-self-id') {
-        finalMode.value = 'view-self-id';
-        try {
-            let raw = await getMyApplication(Number(route.params.id))
-            loadData(raw);
-            unauthorized.value = false;
-
-        } catch (error) {
-            if (error.message === "Unauthorized") {
-                unauthorized.value = true;
-            } else {
-                console.error(error);
-            }
-        }
-    }
-
     loading.value = false;
+
+    // try {
+    //     //get app ID from URL param
+    //     if (appIDRaw === undefined) {
+    //         //new app
+    //         appData.value = null
+    //         readOnly.value = false;
+    //         newApp.value = true;
+    //     } else {
+    //         //load app
+    //         const raw = await loadApplication(appIDRaw.toString());
+
+    //         const data = raw.application;
+
+    //         appID.value = data.id;
+    //         appData.value = data.app_data;
+    //         chatData.value = raw.comments;
+    //         status.value = data.app_status;
+    //         decisionDate.value = new Date(data.decision_at);
+    //         submitDate.value = data.submitted_at ? new Date(data.submitted_at) : null;
+    //         member_name.value = data.member_name;
+    //         newApp.value = false;
+    //         readOnly.value = true;
+    //     }
+    // } catch (e) {
+    //     console.error(e);
+    // }
 })
 
 async function postComment(comment) {
     chatData.value.push(await postChatMessage(comment, appID.value));
 }
 
-async function postCommentInternal(comment) {
-    chatData.value.push(await postAdminChatMessage(comment, appID.value));
-}
-
 const emit = defineEmits(['submit']);
 
 async function postApp(appData) {
@@ -101,7 +107,7 @@ async function postApp(appData) {
         newApp.value = false;
         emit('submit');
     }
-    // TODO: Handle fail to post    
+    // TODO: Handle fail to post
 }
 
 async function handleApprove(id) {
@@ -116,59 +122,52 @@ async function handleDeny(id) {
 
 <template>
     <div v-if="!loading" class="w-full h-20">
-        <div v-if="unauthorized" class="flex justify-center w-full my-10">
+        <div v-if="!newApp" class="flex flex-row justify-between items-center py-2 mb-8">
-            You do not have permission to view this application.
+            <!-- Application header -->
-        </div>
+            <div>
-        <div v-else>
+                <h3 class="scroll-m-20 text-2xl font-semibold tracking-tight">{{ member_name }}</h3>
-            <div v-if="!newApp" class="flex flex-row justify-between items-center py-2 mb-8">
+                <p class="text-muted-foreground">Submitted: {{ submitDate.toLocaleString("en-US", {
-                <!-- Application header -->
+                    year: "numeric",
-                <div>
+                    month: "long",
-                    <h3 class="scroll-m-20 text-2xl font-semibold tracking-tight">{{ member_name }}</h3>
+                    day: "numeric",
-                    <p class="text-muted-foreground">Submitted: {{ submitDate.toLocaleString("en-US", {
+                    hour: "2-digit",
+                    minute: "2-digit"
+                }) }}</p>
+            </div>
+            <div>
+                <h3 class="text-right" :class="[
+                    'font-semibold',
+                    status === ApplicationStatus.Pending && 'text-yellow-500',
+                    status === ApplicationStatus.Accepted && 'text-green-500',
+                    status === ApplicationStatus.Denied && 'text-red-500'
+                ]">{{ status }}</h3>
+                <p v-if="status != ApplicationStatus.Pending" class="text-muted-foreground">{{ status }}: {{
+                    decisionDate.toLocaleString("en-US", {
                         year: "numeric",
                         month: "long",
                         day: "numeric",
                         hour: "2-digit",
                         minute: "2-digit"
                     }) }}</p>
+                <div class="mt-2" v-else-if="finalMode === 'view-recruiter'">
+                    <Button variant="success" class="mr-2" :onclick="() => { handleApprove(appID) }">
+                        <CheckIcon></CheckIcon>
+                    </Button>
+                    <Button variant="destructive" :onClick="() => { handleDeny(appID) }">
+                        <XIcon></XIcon>
+                    </Button>
                 </div>
-                <div>
-                    <h3 class="text-right" :class="[
-                        'font-semibold',
-                        status === ApplicationStatus.Pending && 'text-yellow-500',
-                        status === ApplicationStatus.Accepted && 'text-green-500',
-                        status === ApplicationStatus.Denied && 'text-red-500'
-                    ]">{{ status }}</h3>
-                    <p v-if="status != ApplicationStatus.Pending" class="text-muted-foreground">{{ status }}: {{
-                        decisionDate.toLocaleString("en-US", {
-                            year: "numeric",
-                            month: "long",
-                            day: "numeric",
-                            hour: "2-digit",
-                            minute: "2-digit"
-                        }) }}</p>
-                    <div class="mt-2" v-else-if="finalMode === 'view-recruiter'">
-                        <Button variant="success" class="mr-2" :onclick="() => { handleApprove(appID) }">
-                            <CheckIcon></CheckIcon>
-                        </Button>
-                        <Button variant="destructive" :onClick="() => { handleDeny(appID) }">
-                            <XIcon></XIcon>
-                        </Button>
-                    </div>
-                </div>
-            </div>
-            <div v-else class="flex flex-row justify-between items-center py-2 mb-8">
-                <h3 class="scroll-m-20 text-2xl font-semibold tracking-tight">Apply to join the 17th Rangers</h3>
-            </div>
-            <ApplicationForm :read-only="readOnly" :data="appData" @submit="(e) => { postApp(e) }" class="mb-7">
-            </ApplicationForm>
-            <div v-if="!newApp" class="pb-15">
-                <h3 class="scroll-m-20 text-2xl font-semibold tracking-tight mb-4">Discussion</h3>
-                <ApplicationChat :messages="chatData" @post="postComment" @post-internal="postCommentInternal">
-                </ApplicationChat>
             </div>
         </div>
-
+        <div v-else class="flex flex-row justify-between items-center py-2 mb-8">
+            <h3 class="scroll-m-20 text-2xl font-semibold tracking-tight">Apply to join the 17th Rangers</h3>
+        </div>
+        <ApplicationForm :read-only="readOnly" :data="appData" @submit="(e) => { postApp(e) }" class="mb-7">
+        </ApplicationForm>
+        <div v-if="!newApp">
+            <h3 class="scroll-m-20 text-2xl font-semibold tracking-tight mb-4">Discussion</h3>
+            <ApplicationChat :messages="chatData" @post="postComment"></ApplicationChat>
+        </div>
     </div>
     <!-- TODO: Implement some kinda loading screen -->
     <div v-else class="flex items-center justify-center h-full">Loading</div>

ui/src/pages/Calendar.vue

@@ -3,15 +3,14 @@ import { ref, watch, nextTick, computed, onMounted } from 'vue'
 import FullCalendar from '@fullcalendar/vue3'
 import dayGridPlugin from '@fullcalendar/daygrid'
 import interactionPlugin from '@fullcalendar/interaction'
-import { X, Clock, MapPin, User, ListTodo, ChevronLeft, ChevronRight, Plus } from 'lucide-vue-next'
+import { ChevronLeft, ChevronRight, Plus } from 'lucide-vue-next'
 import CreateCalendarEvent from '@/components/calendar/CreateCalendarEvent.vue'
-import { getCalendarEvent, getMonthCalendarEvents } from '@/api/calendar'
+import { CalendarEvent } from '@shared/types/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'
+import { useUserStore } from '@/stores/user'
 
 const monthLabels = [
     'January', 'February', 'March', 'April', 'May', 'June',
@@ -24,13 +23,14 @@ function api() {
 
 const router = useRouter();
 const route = useRoute();
+const userStore = useUserStore();
 
 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 { events, loadEvents } = useCalendarEvents(selectedMonth, selectedYear);
 
 const panelOpen = ref(false)
 const activeEvent = ref<CalendarEvent | null>(null)
@@ -48,6 +48,7 @@ const dialogRef = ref<any>(null)
 
 // NEW: handle day/time slot clicks to start creating an event
 function onDateClick(arg: { dateStr: string }) {
+    if (!userStore.isLoggedIn) return;
     dialogRef.value?.openDialog(arg.dateStr);
     // For now, just open the panel with a draft payload.
     // activeEvent.value = {
@@ -202,7 +203,7 @@ onMounted(() => {
                                 @click="goToday">
                                 Today
                             </button>
-                            <button
+                            <button v-if="userStore.isLoggedIn"
                                 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" />
@@ -216,7 +217,8 @@ onMounted(() => {
             <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 ref="eventViewRef" @close="() => { router.push('/calendar'); }"
+                    @reload="loadEvents()" @edit="(val) => { dialogRef.openDialog(null, 'edit', val) }">
                 </ViewCalendarEvent>
             </aside>
         </div>

ui/src/pages/Join.vue

@@ -14,7 +14,6 @@ import { useUserStore } from '@/stores/user';
 import { Check, Circle, Dot, Users, X } from 'lucide-vue-next'
 import { computed, ref } from 'vue';
 import Application from './Application.vue';
-import { restartApplication } from '@/api/application';
 
 function goToLogin() {
     const redirectUrl = encodeURIComponent(window.location.origin + '/join')
@@ -68,25 +67,14 @@ const currentStep = computed<number>(() => {
         case "denied":
             return 5;
             break;
-        case "retired":
-            return 5;
-            break;
     }
 })
 
 const finalPanel = ref<'app' | 'message'>('message');
-
-const reloadKey = ref(0);
-
-async function restartApp() {
-    await restartApplication();
-    await userStore.loadUser();
-    reloadKey.value++;
-}
 </script>
 
 <template>
-    <div class="flex flex-col items-center mt-10 w-full" :key="reloadKey">
+    <div class="flex flex-col items-center mt-10 w-full">
 
         <!-- Stepper Container -->
         <div class="w-full flex justify-center">
@@ -231,8 +219,8 @@ async function restartApp() {
                     </div>
                     <!-- Denied message -->
                     <div v-else-if="userStore.state === 'denied'">
-                        <div class="w-full max-w-2xl flex flex-col gap-8">
+                        <div class="w-full max-w-2xl p-8">
-                            <h1 class="text-3xl sm:text-4xl font-bold text-left">
+                            <h1 class="text-3xl sm:text-4xl font-bold mb-4 text-left text-destructive">
                                 Application Not Approved
                             </h1>
                             <div class="space-y-4 text-muted-foreground text-left leading-relaxed">
@@ -258,39 +246,6 @@ async function restartApp() {
                                         Team</span>
                                 </p>
                             </div>
-                            <Button class="w-min" @click="restartApp">New Application</Button>
-                        </div>
-                    </div>
-                    <div v-else-if="userStore.state === 'retired'">
-                        <div class="w-full max-w-2xl flex flex-col gap-8">
-                            <h1 class="text-3xl sm:text-4xl font-bold text-left">
-                                You have retired from the 17th Ranger Battalion
-                            </h1>
-                            <div class="space-y-4 text-muted-foreground text-left leading-relaxed">
-                                <p>
-                                    Thank you for your service and participation in the <strong>17th Ranger
-                                        Battalion</strong>.
-                                    Your time with us has been sincerely appreciated.
-                                </p>
-                                <p>
-                                    Should you ever wish to return, you are welcome to <strong>reach out to our
-                                        leadership
-                                        team</strong>
-                                    for guidance on the reinstatement process or to stay connected with the community.
-                                </p>
-                                <p>
-                                    We recognize that circumstances change, and you will always have a place to
-                                    reconnect with
-                                    us
-                                    should the opportunity arise in the future.
-                                </p>
-                                <p>
-                                    All the best,<br />
-                                    <span class="text-foreground font-medium">The 17th Ranger Battalion Leadership
-                                        Team</span>
-                                </p>
-                            </div>
-                            <Button class="w-min" @click="restartApp">New Application</Button>
                         </div>
                     </div>
                 </div>

ui/src/pages/ManageApplications.vue

@@ -1,6 +1,5 @@
 <script setup>
-import { getAllApplications, approveApplication, denyApplication     } from '@/api/application';
+import { getAllApplications, approveApplication, denyApplication, ApplicationStatus } from '@/api/application';
-import { ApplicationStatus } from '@shared/types/application'
 import {
     Table,
     TableBody,

ui/src/pages/MyApplications.vue

@@ -1,148 +0,0 @@
-<script setup>
-import { loadMyApplications } from '@/api/application';
-import { ApplicationStatus } from '@shared/types/application';
-import {
-    Table,
-    TableBody,
-    TableCaption,
-    TableCell,
-    TableHead,
-    TableHeader,
-    TableRow,
-} from '@/components/ui/table'
-import Button from '@/components/ui/button/Button.vue';
-import { onMounted, ref, watch } from 'vue';
-import { useRoute, useRouter } from 'vue-router';
-import { CheckIcon, XIcon } from 'lucide-vue-next';
-import Application from './Application.vue';
-
-const appList = ref([]);
-const now = Date.now();
-// relative time formatter (uses user locale)
-const rtf = new Intl.RelativeTimeFormat(undefined, { numeric: 'auto' })
-// exact date/time for tooltip
-const exactFmt = new Intl.DateTimeFormat(undefined, {
-    dateStyle: 'medium', timeStyle: 'short', timeZone: 'America/Toronto'
-})
-
-function formatAgo(iso) {
-    const d = new Date(iso)
-    if (isNaN(d)) return ''
-    let diff = (d.getTime() - now) / 1000 // seconds relative to page load
-    const divisions = [
-        { amount: 60, name: 'second' },
-        { amount: 60, name: 'minute' },
-        { amount: 24, name: 'hour' },
-        { amount: 7, name: 'day' },
-        { amount: 4.34524, name: 'week' }, // avg weeks per month
-        { amount: 12, name: 'month' },
-        { amount: Infinity, name: 'year' },
-    ]
-    for (const div of divisions) {
-        if (Math.abs(diff) < div.amount) {
-            return rtf.format(Math.round(diff), div.name)
-        }
-        diff /= div.amount
-    }
-}
-
-function formatExact(iso) {
-    const d = new Date(iso)
-    return isNaN(d) ? '' : exactFmt.format(d)
-}
-
-const router = useRouter();
-function openApplication(id) {
-    router.push(`/applications/${id}`)
-    openPanel.value = true;
-}
-
-const route = useRoute();
-
-watch(() => route.params.id, (newId) => {
-    if (newId === undefined) {
-        openPanel.value = false;
-    }
-})
-
-const openPanel = ref(false);
-
-onMounted(async () => {
-    appList.value = await loadMyApplications();
-
-    //preload application
-    if (route.params.id != undefined) {
-        openApplication(route.params.id)
-    } else {
-
-    }
-})
-</script>
-<template>
-    <div class="px-20 mx-auto max-w-[100rem] w-full flex mt-5 h-52 min-h-0 overflow-hidden">
-        <!-- application list -->
-        <div :class="openPanel == false ? 'w-full' : 'w-2/5'" class="pr-9">
-            <h1 class="scroll-m-20 text-2xl font-semibold tracking-tight mb-5">My Applications</h1>
-            <Table>
-                <TableHeader>
-                    <TableRow>
-                        <TableHead>Date Submitted</TableHead>
-                        <TableHead class="text-right">Status</TableHead>
-                    </TableRow>
-                </TableHeader>
-                <TableBody class="overflow-y-auto scrollbar-themed">
-                    <TableRow v-for="app in appList" :key="app.id" class="cursor-pointer"
-                        :onClick="() => { openApplication(app.id) }">
-                        <TableCell :title="formatExact(app.submitted_at)">
-                            {{ formatAgo(app.submitted_at) }}
-                        </TableCell>
-                        <TableCell class="text-right font-semibold" :class="[
-                            ,
-                            app.app_status === ApplicationStatus.Pending && 'text-yellow-500',
-                            app.app_status === ApplicationStatus.Accepted && 'text-green-500',
-                            app.app_status === ApplicationStatus.Denied && 'text-destructive'
-                        ]">{{ app.app_status }}</TableCell>
-                    </TableRow>
-                </TableBody>
-            </Table>
-        </div>
-        <div v-if="openPanel" class="pl-9 border-l w-3/5" :key="$route.params.id">
-            <div class="mb-5 flex justify-between">
-                <p class="scroll-m-20 text-2xl font-semibold tracking-tight"> Application</p>
-            </div>
-            <div class="overflow-y-auto max-h-[80vh] h-full mt-5 scrollbar-themed">
-                <Application :mode="'view-self-id'"></Application>
-            </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>

ui/src/router/index.js

@@ -6,20 +6,19 @@ const router = createRouter({
   routes: [
     // PUBLIC
     { path: '/join', component: () => import('@/pages/Join.vue') },
-    { path: '/applications', component: () => import('@/pages/MyApplications.vue'), meta: { requiresAuth: true } },
-    { path: '/applications/:id', component: () => import('@/pages/MyApplications.vue'), meta: { requiresAuth: true } },
 
     // AUTH REQUIRED
+    { path: '/apply', component: () => import('@/pages/Application.vue'), meta: { requiresAuth: true } },
     { path: '/', component: () => import('@/pages/Homepage.vue') },
 
     // MEMBER ROUTES
     { path: '/members', component: () => import('@/pages/memberList.vue'), meta: { requiresAuth: true, memberOnly: true } },
     { path: '/loa', component: () => import('@/pages/SubmitLOA.vue'), meta: { requiresAuth: true, memberOnly: true } },
     { path: '/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', component: () => import('@/pages/Calendar.vue'), meta: { }, },
-    { path: '/calendar/event/:id', component: () => import('@/pages/Calendar.vue'), meta: { requiresAuth: true, memberOnly: true }, },
+    { path: '/calendar/event/:id', component: () => import('@/pages/Calendar.vue'), meta: { }, },
-
+    
     { 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 } },