From b8f18c060e0214fac9bcbf1534a549d095e0e69e Mon Sep 17 00:00:00 2001
From: ajdj100 <ajairplane@gmail.com>
Date: Wed, 3 Dec 2025 13:37:03 -0500
Subject: [PATCH 1/8] Mega recruitment pipeline overhaul

---
 api/src/routes/applications.ts                |  23 ++-
 ui/src/api/application.ts                     |   2 +-
 ui/src/components/ui/stepper/Stepper.vue      |  31 ++++
 .../ui/stepper/StepperDescription.vue         |  25 +++
 .../ui/stepper/StepperIndicator.vue           |  36 +++++
 ui/src/components/ui/stepper/StepperItem.vue  |  33 ++++
 .../ui/stepper/StepperSeparator.vue           |  33 ++++
 ui/src/components/ui/stepper/StepperTitle.vue |  24 +++
 .../components/ui/stepper/StepperTrigger.vue  |  29 ++++
 ui/src/components/ui/stepper/index.js         |   7 +
 ui/src/pages/Application.vue                  | 105 ++++++++----
 ui/src/pages/Join.vue                         | 150 +++++++++++++++---
 ui/src/router/index.js                        |   2 +-
 13 files changed, 445 insertions(+), 55 deletions(-)
 create mode 100644 ui/src/components/ui/stepper/Stepper.vue
 create mode 100644 ui/src/components/ui/stepper/StepperDescription.vue
 create mode 100644 ui/src/components/ui/stepper/StepperIndicator.vue
 create mode 100644 ui/src/components/ui/stepper/StepperItem.vue
 create mode 100644 ui/src/components/ui/stepper/StepperSeparator.vue
 create mode 100644 ui/src/components/ui/stepper/StepperTitle.vue
 create mode 100644 ui/src/components/ui/stepper/StepperTrigger.vue
 create mode 100644 ui/src/components/ui/stepper/index.js

diff --git a/api/src/routes/applications.ts b/api/src/routes/applications.ts
index 8b2f61d..76c0eca 100644
--- a/api/src/routes/applications.ts
+++ b/api/src/routes/applications.ts
@@ -38,12 +38,27 @@ router.get('/all', async (req, res) => {
 });
 
 router.get('/me', async (req, res) => {
+
   let userID = req.user.id;
 
-  console.log("application/me")
+  try {
+    let application = await getMemberApplication(userID);
 
-  let app = getMemberApplication(userID);
-  console.log(app);
+    if (application === undefined)
+      res.sendStatus(204);
+
+    const comments: CommentRow[] = await getApplicationComments(application.id);
+
+    const output: ApplicationFull = {
+      application,
+      comments,
+    }
+
+    return res.status(200).json(output);
+  } catch (error) {
+    console.error('Failed to load application:', error);
+    return res.status(500).json(error);
+  }
 })
 
 // GET /application/:id
@@ -54,7 +69,7 @@ router.get('/:id', async (req, res) => {
     const application = await getApplicationByID(appID);
     if (application === undefined)
       return res.sendStatus(204);
-    
+
     const comments: CommentRow[] = await getApplicationComments(appID);
 
     const output: ApplicationFull = {
diff --git a/ui/src/api/application.ts b/ui/src/api/application.ts
index 7ef6086..85a3dc5 100644
--- a/ui/src/api/application.ts
+++ b/ui/src/api/application.ts
@@ -74,7 +74,7 @@ export enum ApplicationStatus {
 const addr = import.meta.env.VITE_APIHOST;
 
 export async function loadApplication(id: number | string): Promise<ApplicationFull | null> {
-  const res = await fetch(`${addr}/application/${id}`)
+  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()
diff --git a/ui/src/components/ui/stepper/Stepper.vue b/ui/src/components/ui/stepper/Stepper.vue
new file mode 100644
index 0000000..2232560
--- /dev/null
+++ b/ui/src/components/ui/stepper/Stepper.vue
@@ -0,0 +1,31 @@
+<script setup>
+import { reactiveOmit } from "@vueuse/core";
+import { StepperRoot, useForwardPropsEmits } from "reka-ui";
+import { cn } from "@/lib/utils";
+
+const props = defineProps({
+  defaultValue: { type: Number, required: false },
+  orientation: { type: String, required: false },
+  dir: { type: String, required: false },
+  modelValue: { type: Number, required: false },
+  linear: { type: Boolean, required: false },
+  asChild: { type: Boolean, required: false },
+  as: { type: null, required: false },
+  class: { type: null, required: false },
+});
+const emits = defineEmits(["update:modelValue"]);
+
+const delegatedProps = reactiveOmit(props, "class");
+
+const forwarded = useForwardPropsEmits(delegatedProps, emits);
+</script>
+
+<template>
+  <StepperRoot
+    v-slot="slotProps"
+    :class="cn('flex gap-2', props.class)"
+    v-bind="forwarded"
+  >
+    <slot v-bind="slotProps" />
+  </StepperRoot>
+</template>
diff --git a/ui/src/components/ui/stepper/StepperDescription.vue b/ui/src/components/ui/stepper/StepperDescription.vue
new file mode 100644
index 0000000..7445252
--- /dev/null
+++ b/ui/src/components/ui/stepper/StepperDescription.vue
@@ -0,0 +1,25 @@
+<script setup>
+import { reactiveOmit } from "@vueuse/core";
+import { StepperDescription, 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 forwarded = useForwardProps(delegatedProps);
+</script>
+
+<template>
+  <StepperDescription
+    v-slot="slotProps"
+    v-bind="forwarded"
+    :class="cn('text-xs text-muted-foreground', props.class)"
+  >
+    <slot v-bind="slotProps" />
+  </StepperDescription>
+</template>
diff --git a/ui/src/components/ui/stepper/StepperIndicator.vue b/ui/src/components/ui/stepper/StepperIndicator.vue
new file mode 100644
index 0000000..64be9d7
--- /dev/null
+++ b/ui/src/components/ui/stepper/StepperIndicator.vue
@@ -0,0 +1,36 @@
+<script setup>
+import { reactiveOmit } from "@vueuse/core";
+import { StepperIndicator, 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 forwarded = useForwardProps(delegatedProps);
+</script>
+
+<template>
+  <StepperIndicator
+    v-slot="slotProps"
+    v-bind="forwarded"
+    :class="
+      cn(
+        'inline-flex items-center justify-center rounded-full text-muted-foreground/50 w-8 h-8',
+        // Disabled
+        'group-data-[disabled]:text-muted-foreground group-data-[disabled]:opacity-50',
+        // Active
+        'group-data-[state=active]:bg-primary group-data-[state=active]:text-primary-foreground',
+        // Completed
+        'group-data-[state=completed]:bg-accent group-data-[state=completed]:text-accent-foreground',
+        props.class,
+      )
+    "
+  >
+    <slot v-bind="slotProps" />
+  </StepperIndicator>
+</template>
diff --git a/ui/src/components/ui/stepper/StepperItem.vue b/ui/src/components/ui/stepper/StepperItem.vue
new file mode 100644
index 0000000..6c5a9f2
--- /dev/null
+++ b/ui/src/components/ui/stepper/StepperItem.vue
@@ -0,0 +1,33 @@
+<script setup>
+import { reactiveOmit } from "@vueuse/core";
+import { StepperItem, useForwardProps } from "reka-ui";
+import { cn } from "@/lib/utils";
+
+const props = defineProps({
+  step: { type: Number, required: true },
+  disabled: { type: Boolean, required: false },
+  completed: { type: Boolean, required: false },
+  asChild: { type: Boolean, required: false },
+  as: { type: null, required: false },
+  class: { type: null, required: false },
+});
+
+const delegatedProps = reactiveOmit(props, "class");
+
+const forwarded = useForwardProps(delegatedProps);
+</script>
+
+<template>
+  <StepperItem
+    v-slot="slotProps"
+    v-bind="forwarded"
+    :class="
+      cn(
+        'flex items-center gap-2 group data-[disabled]:pointer-events-none',
+        props.class,
+      )
+    "
+  >
+    <slot v-bind="slotProps" />
+  </StepperItem>
+</template>
diff --git a/ui/src/components/ui/stepper/StepperSeparator.vue b/ui/src/components/ui/stepper/StepperSeparator.vue
new file mode 100644
index 0000000..8ed502d
--- /dev/null
+++ b/ui/src/components/ui/stepper/StepperSeparator.vue
@@ -0,0 +1,33 @@
+<script setup>
+import { reactiveOmit } from "@vueuse/core";
+import { StepperSeparator, useForwardProps } from "reka-ui";
+import { cn } from "@/lib/utils";
+
+const props = defineProps({
+  orientation: { type: String, required: false },
+  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");
+
+const forwarded = useForwardProps(delegatedProps);
+</script>
+
+<template>
+  <StepperSeparator
+    v-bind="forwarded"
+    :class="
+      cn(
+        'bg-muted',
+        // Disabled
+        'group-data-[disabled]:bg-muted group-data-[disabled]:opacity-50',
+        // Completed
+        'group-data-[state=completed]:bg-accent',
+        props.class,
+      )
+    "
+  />
+</template>
diff --git a/ui/src/components/ui/stepper/StepperTitle.vue b/ui/src/components/ui/stepper/StepperTitle.vue
new file mode 100644
index 0000000..d8a81ac
--- /dev/null
+++ b/ui/src/components/ui/stepper/StepperTitle.vue
@@ -0,0 +1,24 @@
+<script setup>
+import { reactiveOmit } from "@vueuse/core";
+import { StepperTitle, 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 forwarded = useForwardProps(delegatedProps);
+</script>
+
+<template>
+  <StepperTitle
+    v-bind="forwarded"
+    :class="cn('text-md font-semibold whitespace-nowrap', props.class)"
+  >
+    <slot />
+  </StepperTitle>
+</template>
diff --git a/ui/src/components/ui/stepper/StepperTrigger.vue b/ui/src/components/ui/stepper/StepperTrigger.vue
new file mode 100644
index 0000000..f252535
--- /dev/null
+++ b/ui/src/components/ui/stepper/StepperTrigger.vue
@@ -0,0 +1,29 @@
+<script setup>
+import { reactiveOmit } from "@vueuse/core";
+import { StepperTrigger, 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 forwarded = useForwardProps(delegatedProps);
+</script>
+
+<template>
+  <StepperTrigger
+    v-bind="forwarded"
+    :class="
+      cn(
+        'p-1 flex flex-col items-center text-center gap-1 rounded-md',
+        props.class,
+      )
+    "
+  >
+    <slot />
+  </StepperTrigger>
+</template>
diff --git a/ui/src/components/ui/stepper/index.js b/ui/src/components/ui/stepper/index.js
new file mode 100644
index 0000000..62f0e03
--- /dev/null
+++ b/ui/src/components/ui/stepper/index.js
@@ -0,0 +1,7 @@
+export { default as Stepper } from "./Stepper.vue";
+export { default as StepperDescription } from "./StepperDescription.vue";
+export { default as StepperIndicator } from "./StepperIndicator.vue";
+export { default as StepperItem } from "./StepperItem.vue";
+export { default as StepperSeparator } from "./StepperSeparator.vue";
+export { default as StepperTitle } from "./StepperTitle.vue";
+export { default as StepperTrigger } from "./StepperTrigger.vue";
diff --git a/ui/src/pages/Application.vue b/ui/src/pages/Application.vue
index 2558340..3670654 100644
--- a/ui/src/pages/Application.vue
+++ b/ui/src/pages/Application.vue
@@ -17,48 +17,95 @@ const decisionDate = ref<Date | null>(null);
 const submitDate = ref<Date | null>(null);
 const loading = ref<boolean>(true);
 const member_name = ref<string>();
+
+const props = defineProps<{
+    mode?: "create" | "view-self" | "view-recruiter"
+}>()
+
+const finalMode = ref<"create" | "view-self" | "view-recruiter">("create");
+
+async function loadByID(id: number | string) {
+    const raw = await loadApplication(id);
+
+    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;
+}
+
+const router = useRoute();
+
 onMounted(async () => {
-    try {
-        //get app ID from URL param
-        const router = useRoute();
-        const appIDRaw = router.params.id;
-        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);
+    //recruiter mode
+    if (props.mode === 'view-recruiter') {
+        finalMode.value = 'view-recruiter';
+        await loadByID(Number(router.params.id));
     }
+
+    //viewer mode
+    if (props.mode === 'view-self') {
+        finalMode.value = 'view-self';
+        await loadByID('me');
+    }
+
+    //creator mode
+    if (props.mode === 'create') {
+        finalMode.value = 'create';
+        appData.value = null
+        readOnly.value = false;
+        newApp.value = true;
+    }
+
     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));
 }
 
+const emit = defineEmits(['submit']);
+
 async function postApp(appData) {
-    console.log("test")
     const res = await postApplication(appData);
     if (res.ok) {
         readOnly.value = true;
         newApp.value = false;
+        emit('submit');
     }
     // TODO: Handle fail to post
 }
@@ -74,7 +121,7 @@ async function handleDeny(id) {
 </script>
 
 <template>
-    <div v-if="!loading" class="max-w-3xl mx-auto my-20">
+    <div v-if="!loading" class="max-w-3xl mx-auto">
         <div v-if="!newApp" class="flex flex-row justify-between items-center py-2 mb-8">
             <!-- Application header -->
             <div>
@@ -102,7 +149,7 @@ async function handleDeny(id) {
                         hour: "2-digit",
                         minute: "2-digit"
                     }) }}</p>
-                <div class="mt-2" v-else>
+                <div class="mt-2" v-else-if="finalMode === 'view-recruiter'">
                     <Button variant="success" class="mr-2" :onclick="() => { handleApprove(appID) }">
                         <CheckIcon></CheckIcon>
                     </Button>
diff --git a/ui/src/pages/Join.vue b/ui/src/pages/Join.vue
index f3fa0fe..626dfda 100644
--- a/ui/src/pages/Join.vue
+++ b/ui/src/pages/Join.vue
@@ -1,24 +1,134 @@
-<template>
-    <div class="min-h-screen flex items-center justify-center ">
-        <div class="w-full max-w-2xl mx-auto p-8 text-center">
-            <h1 class="text-4xl sm:text-5xl font-extrabold  mb-4">
-                welcome to the 17th
-            </h1>
-            <p class=" mb-8">
-                Welcome — click below to get started.
-            </p>
+<script setup lang="ts">
+import ApplicationForm from '@/components/application/ApplicationForm.vue';
+import Button from '@/components/ui/button/Button.vue';
+import {
+    Stepper,
+    StepperDescription,
+    StepperIndicator,
+    StepperItem,
+    StepperSeparator,
+    StepperTitle,
+    StepperTrigger,
+} from '@/components/ui/stepper'
+import { useUserStore } from '@/stores/user';
+import { Check, Circle, Dot } from 'lucide-vue-next'
+import { computed } from 'vue';
+import Application from './Application.vue';
 
-            <Button class="w-44" @click="goToLogin">Get started</Button>
+function goToLogin() {
+    const redirectUrl = encodeURIComponent(window.location.origin + '/join')
+    window.location.href = `https://aj17thdevapi.nexuszone.net/login?redirect=${redirectUrl}`;
+}
+const steps = [
+    {
+        step: 1,
+        title: 'Create account',
+        description: 'Begin by setting up your account',
+    },
+    {
+        step: 2,
+        title: 'Submit application',
+        description: 'Provide a few details about yourself',
+    },
+    {
+        step: 3,
+        title: 'Application review',
+        description: 'Our team will review your submission',
+    },
+    {
+        step: 4,
+        title: 'Acceptance',
+        description: 'Join the 17th and get started',
+    },
+]
+
+let userStore = useUserStore();
+const currentStep = computed<number>(() => {
+    if (!userStore.isLoggedIn)
+        return 1;
+    switch (userStore.state) {
+        case "guest":
+            return 2;
+            break;
+        case "applicant":
+            return 3;
+            break;
+        case "member":
+            return 4;
+            break;
+        case "denied":
+            return 4;
+            break;
+    }
+})
+</script>
+
+<template>
+    <div class="flex flex-col items-center mt-10 w-full">
+
+        <!-- Stepper Container -->
+        <div class="w-full flex justify-center">
+            <div class="w-full max-w-7xl">
+                <Stepper class="flex w-full items-start gap-2" v-model="currentStep">
+                    <StepperItem v-for="step in steps" :key="step.step" v-slot="{ state }"
+                        class="relative flex w-full flex-col items-center" :step="step.step">
+                        <StepperSeparator v-if="step.step !== steps[steps.length - 1]?.step"
+                            class="absolute left-[calc(50%+20px)] right-[calc(-50%+10px)] top-5 block h-0.5 rounded-full bg-muted group-data-[state=completed]:bg-primary" />
+
+                        <StepperTrigger as-child>
+                            <Button :variant="state === 'completed' || state === 'active' ? 'default' : 'outline'"
+                                size="icon" class="z-10 rounded-full shrink-0"
+                                :class="[state === 'active' && 'ring-2 ring-ring ring-offset-2 ring-offset-background']">
+                                <Check v-if="state === 'completed'" class="size-5" />
+                                <Circle v-if="state === 'active'" />
+                                <Dot v-if="state === 'inactive'" />
+                            </Button>
+                        </StepperTrigger>
+
+                        <div class="mt-2 flex flex-col items-center text-center">
+                            <StepperTitle class="text-sm font-semibold transition lg:text-base"
+                                :class="[state === 'active' && 'text-primary']">
+                                {{ step.title }}
+                            </StepperTitle>
+
+                            <StepperDescription
+                                class="sr-only text-xs text-muted-foreground transition md:not-sr-only lg:text-sm"
+                                :class="[state === 'active' && 'text-primary']">
+                                {{ step.description }}
+                            </StepperDescription>
+                        </div>
+                    </StepperItem>
+                </Stepper>
+            </div>
+        </div>
+
+        <!-- Content -->
+        <div class="mt-12 mb-20 flex w-full justify-center">
+            <div v-if="currentStep === 1" class="w-full max-w-2xl p-8">
+                <h1 class="text-3xl sm:text-4xl font-bold mb-4 text-left">
+                    Create your account
+                </h1>
+
+                <p class="text-left text-muted-foreground mb-6">
+                    You'll be redirected to our secure sign-in system to set up your account
+                    and begin your application.
+                </p>
+
+                <Button class="px-6 py-3" @click="goToLogin">
+                    Continue to account creation
+                </Button>
+            </div>
+            <Application v-else-if="currentStep === 2" @submit="userStore.loadUser()" :mode="'create'"></Application>
+            <Application v-else-if="currentStep === 3" :mode="'view-self'"></Application>
+            <div v-if="currentStep === 4" class="w-full max-w-2xl p-8">
+                <h1 class="text-3xl sm:text-4xl font-bold mb-4 text-left">
+                    Welcome to the 17th Ranger Battalion
+                </h1>
+
+                <p class="text-left text-muted-foreground mb-6">
+                    Yadda yadda here are your resources and stuff or something.
+                </p>
+            </div>
         </div>
     </div>
 </template>
-
-<script setup>
-import Button from '@/components/ui/button/Button.vue';
-
-
-function goToLogin() {
-    window.location.href = 'https://aj17thdevapi.nexuszone.net/login';
-}
-
-</script>
\ No newline at end of file
diff --git a/ui/src/router/index.js b/ui/src/router/index.js
index f6230ae..5957564 100644
--- a/ui/src/router/index.js
+++ b/ui/src/router/index.js
@@ -9,7 +9,7 @@ const router = createRouter({
 
     // AUTH REQUIRED
     { path: '/apply', component: () => import('@/pages/Application.vue'), meta: { requiresAuth: true } },
-    { path: '/', component: () => import('@/pages/Homepage.vue'), meta: { requiresAuth: true } },
+    { path: '/', component: () => import('@/pages/Homepage.vue') },
 
     // MEMBER ROUTES
     { path: '/members', component: () => import('@/pages/memberList.vue'), meta: { requiresAuth: true, memberOnly: true } },
-- 
2.37.3.windows.1


From b79e78c2a6d24837a9767b243a921f9533056bee Mon Sep 17 00:00:00 2001
From: ajdj100 <ajairplane@gmail.com>
Date: Wed, 3 Dec 2025 15:20:37 -0500
Subject: [PATCH 2/8] overhauled recruiter tools

---
 ui/src/pages/Application.vue        |   4 +-
 ui/src/pages/ManageApplications.vue | 142 ++++++++++++++++++++--------
 ui/src/router/index.js              |   2 +-
 3 files changed, 106 insertions(+), 42 deletions(-)

diff --git a/ui/src/pages/Application.vue b/ui/src/pages/Application.vue
index 3670654..81d87c4 100644
--- a/ui/src/pages/Application.vue
+++ b/ui/src/pages/Application.vue
@@ -121,7 +121,7 @@ async function handleDeny(id) {
 </script>
 
 <template>
-    <div v-if="!loading" class="max-w-3xl mx-auto">
+    <div v-if="!loading" class="w-full">
         <div v-if="!newApp" class="flex flex-row justify-between items-center py-2 mb-8">
             <!-- Application header -->
             <div>
@@ -170,5 +170,5 @@ async function handleDeny(id) {
         </div>
     </div>
     <!-- TODO: Implement some kinda loading screen -->
-    <div v-else>Loading</div>
+    <div v-else class="flex items-center justify-center h-full -mt-40">Loading</div>
 </template>
\ No newline at end of file
diff --git a/ui/src/pages/ManageApplications.vue b/ui/src/pages/ManageApplications.vue
index 02ed0ae..e794834 100644
--- a/ui/src/pages/ManageApplications.vue
+++ b/ui/src/pages/ManageApplications.vue
@@ -10,9 +10,10 @@ import {
     TableRow,
 } from '@/components/ui/table'
 import Button from '@/components/ui/button/Button.vue';
-import { onMounted, ref } from 'vue';
-import { useRouter } from 'vue-router';
+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();
@@ -61,48 +62,111 @@ async function handleDeny(id) {
 
 const router = useRouter();
 function openApplication(id) {
-    router.push(`./application/${id}`)
+    router.push(`/administration/applications/${id}`)
+    openPanel.value = true;
 }
 
+function closeApplication() {
+    router.push('/administration/applications')
+    openPanel.value = false;
+}
+
+const route = useRoute();
+
+watch(() => route.params.id, (newId) => {
+    if (newId === undefined) {
+        openPanel.value = false;
+    }
+})
+
+const openPanel = ref(false);
+
 onMounted(async () => {
     appList.value = await getAllApplications();
+
+    //preload application
+    if (route.params.id != undefined) {
+        openApplication(route.params.id)
+    }
 })
 </script>
 <template>
-    <div class="mx-auto w-full max-w-5xl">
-        <h1 class="my-4">Manage Applications</h1>
-        <Table>
-            <!-- <TableCaption>A list of your recent invoices.</TableCaption> -->
-            <TableHeader>
-                <TableRow>
-                    <TableHead>User</TableHead>
-                    <TableHead>Date Submitted</TableHead>
-                    <TableHead class="text-right">Status</TableHead>
-                </TableRow>
-            </TableHeader>
-            <TableBody>
-                <TableRow v-for="app in appList" :key="app.id" class="cursor-pointer"
-                    :onClick="() => { openApplication(app.id) }">
-                    <TableCell class="font-medium">{{ app.member_name }}</TableCell>
-                    <TableCell :title="formatExact(app.submitted_at)">
-                        {{ formatAgo(app.submitted_at) }}
-                    </TableCell>
-                    <TableCell v-if="app.app_status === ApplicationStatus.Pending" class="inline-flex items-end gap-2">
-                        <Button variant="success" @click.stop="() => { handleApprove(app.id) }">
-                            <CheckIcon></CheckIcon>
-                        </Button>
-                        <Button variant="destructive" @click.stop="() => { handleDeny(app.id) }">
-                            <XIcon></XIcon>
-                        </Button>
-                    </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 class="px-20 mx-auto max-w-[100rem] w-full flex mt-5">
+        <!-- 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">Manage Applications</h1>
+            <Table>
+                <TableHeader>
+                    <TableRow>
+                        <TableHead>User</TableHead>
+                        <TableHead>Date Submitted</TableHead>
+                        <TableHead class="text-right">Status</TableHead>
+                    </TableRow>
+                </TableHeader>
+                <TableBody>
+                    <TableRow v-for="app in appList" :key="app.id" class="cursor-pointer"
+                        :onClick="() => { openApplication(app.id) }">
+                        <TableCell class="font-medium">{{ app.member_name }}</TableCell>
+                        <TableCell :title="formatExact(app.submitted_at)">
+                            {{ formatAgo(app.submitted_at) }}
+                        </TableCell>
+                        <TableCell v-if="app.app_status === ApplicationStatus.Pending"
+                            class="inline-flex items-end gap-2">
+                            <Button variant="success" @click.stop="() => { handleApprove(app.id) }">
+                                <CheckIcon></CheckIcon>
+                            </Button>
+                            <Button variant="destructive" @click.stop="() => { handleDeny(app.id) }">
+                                <XIcon></XIcon>
+                            </Button>
+                        </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>
+                <button @click="closeApplication()" class="cursor-pointer">
+                    <XIcon></XIcon>
+                </button>
+            </div>
+            <Application :mode="'view-recruiter'"></Application>
+        </div>
     </div>
-</template>
\ No newline at end of file
+</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>
\ No newline at end of file
diff --git a/ui/src/router/index.js b/ui/src/router/index.js
index 5957564..29cc862 100644
--- a/ui/src/router/index.js
+++ b/ui/src/router/index.js
@@ -29,7 +29,7 @@ const router = createRouter({
       meta: { requiresAuth: true, memberOnly: true, roles: ['staff', 'admin'] },
       children: [
         { path: 'applications', component: () => import('@/pages/ManageApplications.vue') },
-        { path: 'application/:id', component: () => import('@/pages/Application.vue') },
+        { path: 'applications/:id', component: () => import('@/pages/ManageApplications.vue') },
         { path: 'rankChange', component: () => import('@/pages/RankChange.vue') },
         { path: 'applications/:id', component: () => import('@/pages/Application.vue') },
         { path: 'transfer', component: () => import('@/pages/ManageTransfers.vue') },
-- 
2.37.3.windows.1


From 12d538dafcb9d5225c3a7f886aa671105e1fa647 Mon Sep 17 00:00:00 2001
From: ajdj100 <ajairplane@gmail.com>
Date: Wed, 3 Dec 2025 15:36:49 -0500
Subject: [PATCH 3/8] vastly modified acceptance/denial display

---
 ui/src/pages/Join.vue | 162 ++++++++++++++++++++++++++++++++++--------
 1 file changed, 132 insertions(+), 30 deletions(-)

diff --git a/ui/src/pages/Join.vue b/ui/src/pages/Join.vue
index 626dfda..643134b 100644
--- a/ui/src/pages/Join.vue
+++ b/ui/src/pages/Join.vue
@@ -11,7 +11,7 @@ import {
     StepperTrigger,
 } from '@/components/ui/stepper'
 import { useUserStore } from '@/stores/user';
-import { Check, Circle, Dot } from 'lucide-vue-next'
+import { Check, Circle, Dot, Users } from 'lucide-vue-next'
 import { computed } from 'vue';
 import Application from './Application.vue';
 
@@ -19,30 +19,38 @@ function goToLogin() {
     const redirectUrl = encodeURIComponent(window.location.origin + '/join')
     window.location.href = `https://aj17thdevapi.nexuszone.net/login?redirect=${redirectUrl}`;
 }
-const steps = [
-    {
-        step: 1,
-        title: 'Create account',
-        description: 'Begin by setting up your account',
-    },
-    {
-        step: 2,
-        title: 'Submit application',
-        description: 'Provide a few details about yourself',
-    },
-    {
-        step: 3,
-        title: 'Application review',
-        description: 'Our team will review your submission',
-    },
-    {
-        step: 4,
-        title: 'Acceptance',
-        description: 'Join the 17th and get started',
-    },
-]
 
 let userStore = useUserStore();
+
+const steps = computed(() => {
+    const isDenied = userStore.state === 'denied'
+
+    return [
+        {
+            step: 1,
+            title: 'Create account',
+            description: 'Begin by setting up your account',
+        },
+        {
+            step: 2,
+            title: 'Submit application',
+            description: 'Provide a few details about yourself',
+        },
+        {
+            step: 3,
+            title: 'Application review',
+            description: 'Our team will review your submission',
+        },
+        {
+            step: 4,
+            title: isDenied ? 'Application denied' : 'Acceptance',
+            description: isDenied
+                ? 'Your application was not approved'
+                : 'Get started with the 17th Rangers',
+        },
+    ]
+})
+
 const currentStep = computed<number>(() => {
     if (!userStore.isLoggedIn)
         return 1;
@@ -120,14 +128,108 @@ const currentStep = computed<number>(() => {
             </div>
             <Application v-else-if="currentStep === 2" @submit="userStore.loadUser()" :mode="'create'"></Application>
             <Application v-else-if="currentStep === 3" :mode="'view-self'"></Application>
-            <div v-if="currentStep === 4" class="w-full max-w-2xl p-8">
-                <h1 class="text-3xl sm:text-4xl font-bold mb-4 text-left">
-                    Welcome to the 17th Ranger Battalion
-                </h1>
+            <div v-if="currentStep === 4" class="w-full max-w-4xl p-8">
+                <!-- Accepted message -->
+                <div v-if="userStore.state === 'member'">
+                    <h1 class="text-3xl sm:text-4xl font-bold mb-4 text-left">
+                        Welcome to the 17th Ranger Battalion
+                    </h1>
+                    <div class="space-y-4 text-muted-foreground text-left leading-relaxed">
+                        <p>
+                            Your application to the 17th Ranger Battalion has been <strong>accepted</strong>!
+                            We’re excited to welcome you to the community.
+                        </p>
+                        <p>
+                            There are just a couple of steps to complete before joining us on the battlefield:
+                        </p>
+                        <!-- MODPACK SECTION -->
+                        <h2 class="text-xl font-semibold text-foreground mt-6">1. Download the Modpack</h2>
+                        <p>
+                            You’ll need to download our private server modpack. This can take some time, so we recommend
+                            starting as soon as possible. The link below leads to our
+                            <strong>Shadow Mod</strong>, which automatically pulls all required dependencies.
+                        </p>
+                        <ul class="list-disc pl-6 space-y-1">
+                            <li>Subscribe to the Shadow Mod.</li>
+                            <li>When prompted, choose <em>“Yes”</em> to download all associated mods.</li>
+                        </ul>
+                        <p>
+                            <a href="https://www.guilded.gg/Iceberg-gaming/groups/v3j2vAP3/channels/6979335e-60f7-4ab9-9590-66df69367d1e/docs/2013948655"
+                                class="text-primary underline" target="_blank">
+                                Click here for the full installation guide
+                            </a>
+                        </p>
+                        <!-- CONTACT SECTION -->
+                        <h2 class="text-xl font-semibold text-foreground mt-6">2. Contact a Corporal or Higher</h2>
+                        <p>
+                            Once you have the modpack installed, connect on TeamSpeak or post in Discord. Anyone with
+                            the
+                            rank of <strong>Corporal or above</strong> can help get you set up.
+                        </p>
+                        <ul class="list-none pl-0 space-y-1">
+                            <li><strong>TeamSpeak:</strong><a href="ts3server://ts.iceberg-gaming.com"
+                                    class="text-primary underline" target="_blank">ts3server://ts.iceberg-gaming.com</a>
+                            </li>
+                            <li>
+                                <strong>Discord:</strong>
+                                <a href="https://discord.gg/7hDQCEb" class="text-primary underline"
+                                    target="_blank">https://discord.gg/7hDQCEb</a>
+                            </li>
+                        </ul>
+                        <p>
+                            They will assist you with your initial assessments and training. Basic trainings run on a
+                            rotating schedule or can be requested through our Battalion Forms. Don’t hesitate to hop in
+                            during weeknights or Saturday operations to start playing with us!
+                        </p>
+                        <!-- FINAL NOTES -->
+                        <h2 class="text-xl font-semibold text-foreground mt-6">3. Get Familiar with the Unit</h2>
+                        <p>
+                            Please take a moment to read through our <strong>Code of Conduct</strong>,
+                            <strong>Ranks</strong>, and <strong>Structure</strong> pages. We also encourage you to
+                            browse
+                            our forums and introduce yourself.
+                        </p>
+                        <p>
+                            If you have any questions, feel free to reach out on TeamSpeak, Discord, or Guilded, someone
+                            will always be around to help.
+                        </p>
+                    </div>
+                </div>
+                <!-- Denied message -->
+                <div v-else-if="userStore.state === 'denied'">
+                    <div class="w-full max-w-2xl p-8">
+                        <h1 class="text-3xl sm:text-4xl font-bold mb-4 text-left text-destructive">
+                            Application Not Approved
+                        </h1>
 
-                <p class="text-left text-muted-foreground mb-6">
-                    Yadda yadda here are your resources and stuff or something.
-                </p>
+                        <div class="space-y-4 text-muted-foreground text-left leading-relaxed">
+                            <p>
+                                Thank you for your interest in joining the <strong>17th Ranger Battalion</strong>.
+                                After reviewing your application, we regret to inform you that we are not able to
+                                approve it at this time.
+                            </p>
+
+                            <p>
+                                If you would like more information, you are encouraged to
+                                <strong>reach out and inquire</strong> about the reason your application was not
+                                approved.
+                                We are always happy to provide clarification where possible.
+                            </p>
+
+                            <p>
+                                You are welcome to <strong>resubmit your application in the future</strong> should your
+                                circumstances change or when we may be better able to incorporate you into the unit.
+                            </p>
+
+                            <p>
+                                All the best,<br />
+                                <span class="text-foreground font-medium">The 17th Ranger Battalion Recruitment
+                                    Team</span>
+                            </p>
+                        </div>
+                    </div>
+
+                </div>
             </div>
         </div>
     </div>
-- 
2.37.3.windows.1


From 3449dcec5cf7dcd20ad15b7440ce507aa20f722e Mon Sep 17 00:00:00 2001
From: ajdj100 <ajairplane@gmail.com>
Date: Wed, 3 Dec 2025 16:05:47 -0500
Subject: [PATCH 4/8] minor UX refinements

---
 ui/src/pages/Join.vue | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/ui/src/pages/Join.vue b/ui/src/pages/Join.vue
index 643134b..3e4386d 100644
--- a/ui/src/pages/Join.vue
+++ b/ui/src/pages/Join.vue
@@ -11,7 +11,7 @@ import {
     StepperTrigger,
 } from '@/components/ui/stepper'
 import { useUserStore } from '@/stores/user';
-import { Check, Circle, Dot, Users } from 'lucide-vue-next'
+import { Check, Circle, Dot, Users, X } from 'lucide-vue-next'
 import { computed } from 'vue';
 import Application from './Application.vue';
 
@@ -62,10 +62,10 @@ const currentStep = computed<number>(() => {
             return 3;
             break;
         case "member":
-            return 4;
+            return 5;
             break;
         case "denied":
-            return 4;
+            return 5;
             break;
     }
 })
@@ -87,7 +87,10 @@ const currentStep = computed<number>(() => {
                             <Button :variant="state === 'completed' || state === 'active' ? 'default' : 'outline'"
                                 size="icon" class="z-10 rounded-full shrink-0"
                                 :class="[state === 'active' && 'ring-2 ring-ring ring-offset-2 ring-offset-background']">
-                                <Check v-if="state === 'completed'" class="size-5" />
+                                <template v-if="state === 'completed'">
+                                    <X v-if="step.step === 4 && userStore.state === 'denied'" class="size-5" />
+                                    <Check v-else class="size-5" />
+                                </template>
                                 <Circle v-if="state === 'active'" />
                                 <Dot v-if="state === 'inactive'" />
                             </Button>
@@ -128,7 +131,7 @@ const currentStep = computed<number>(() => {
             </div>
             <Application v-else-if="currentStep === 2" @submit="userStore.loadUser()" :mode="'create'"></Application>
             <Application v-else-if="currentStep === 3" :mode="'view-self'"></Application>
-            <div v-if="currentStep === 4" class="w-full max-w-4xl p-8">
+            <div v-if="currentStep === 5" class="w-full max-w-4xl p-8">
                 <!-- Accepted message -->
                 <div v-if="userStore.state === 'member'">
                     <h1 class="text-3xl sm:text-4xl font-bold mb-4 text-left">
-- 
2.37.3.windows.1


From faf183a23d01d7fda7ac71054be4f6c018f13903 Mon Sep 17 00:00:00 2001
From: ajdj100 <ajairplane@gmail.com>
Date: Wed, 3 Dec 2025 17:01:52 -0500
Subject: [PATCH 5/8] fixed scrolling issues

---
 ui/src/components/application/ApplicationChat.vue | 2 +-
 ui/src/pages/Application.vue                      | 2 +-
 ui/src/pages/ManageApplications.vue               | 8 +++++---
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/ui/src/components/application/ApplicationChat.vue b/ui/src/components/application/ApplicationChat.vue
index a4d48a1..cc1d653 100644
--- a/ui/src/components/application/ApplicationChat.vue
+++ b/ui/src/components/application/ApplicationChat.vue
@@ -38,7 +38,7 @@ function onSubmit(values: { text: string }, { resetForm }: { resetForm: () => vo
     <Form :validation-schema="commentSchema" @submit="onSubmit">
       <FormField name="text" v-slot="{ componentField }">
         <FormItem>
-          <FormLabel class="sr-only">Comment</FormLabel>
+          <FormLabel>Comment</FormLabel>
           <FormControl>
             <Textarea v-bind="componentField" rows="3" placeholder="Write a comment…"
               class="bg-neutral-800 resize-none w-full" />
diff --git a/ui/src/pages/Application.vue b/ui/src/pages/Application.vue
index 81d87c4..dd2c4ad 100644
--- a/ui/src/pages/Application.vue
+++ b/ui/src/pages/Application.vue
@@ -121,7 +121,7 @@ async function handleDeny(id) {
 </script>
 
 <template>
-    <div v-if="!loading" class="w-full">
+    <div v-if="!loading" class="w-full h-20">
         <div v-if="!newApp" class="flex flex-row justify-between items-center py-2 mb-8">
             <!-- Application header -->
             <div>
diff --git a/ui/src/pages/ManageApplications.vue b/ui/src/pages/ManageApplications.vue
index e794834..cc3e689 100644
--- a/ui/src/pages/ManageApplications.vue
+++ b/ui/src/pages/ManageApplications.vue
@@ -91,7 +91,7 @@ onMounted(async () => {
 })
 </script>
 <template>
-    <div class="px-20 mx-auto max-w-[100rem] w-full flex mt-5">
+    <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">Manage Applications</h1>
@@ -103,7 +103,7 @@ onMounted(async () => {
                         <TableHead class="text-right">Status</TableHead>
                     </TableRow>
                 </TableHeader>
-                <TableBody>
+                <TableBody class="overflow-y-auto scrollbar-themed">
                     <TableRow v-for="app in appList" :key="app.id" class="cursor-pointer"
                         :onClick="() => { openApplication(app.id) }">
                         <TableCell class="font-medium">{{ app.member_name }}</TableCell>
@@ -136,7 +136,9 @@ onMounted(async () => {
                     <XIcon></XIcon>
                 </button>
             </div>
-            <Application :mode="'view-recruiter'"></Application>
+            <div class="overflow-y-auto max-h-[80vh] h-full mt-5 scrollbar-themed">
+                <Application :mode="'view-recruiter'"></Application>
+            </div>
         </div>
     </div>
 </template>
-- 
2.37.3.windows.1


From 4e6745553bd607417e796bcb6820af1c9270e7a3 Mon Sep 17 00:00:00 2001
From: ajdj100 <ajairplane@gmail.com>
Date: Wed, 3 Dec 2025 17:44:41 -0500
Subject: [PATCH 6/8] added application view to final stage of onboarding

---
 ui/src/pages/Join.vue | 195 +++++++++++++++++++++++-------------------
 1 file changed, 107 insertions(+), 88 deletions(-)

diff --git a/ui/src/pages/Join.vue b/ui/src/pages/Join.vue
index 3e4386d..233ad70 100644
--- a/ui/src/pages/Join.vue
+++ b/ui/src/pages/Join.vue
@@ -12,7 +12,7 @@ import {
 } from '@/components/ui/stepper'
 import { useUserStore } from '@/stores/user';
 import { Check, Circle, Dot, Users, X } from 'lucide-vue-next'
-import { computed } from 'vue';
+import { computed, ref } from 'vue';
 import Application from './Application.vue';
 
 function goToLogin() {
@@ -69,6 +69,8 @@ const currentStep = computed<number>(() => {
             break;
     }
 })
+
+const finalPanel = ref<'app' | 'message'>('message');
 </script>
 
 <template>
@@ -131,107 +133,124 @@ const currentStep = computed<number>(() => {
             </div>
             <Application v-else-if="currentStep === 2" @submit="userStore.loadUser()" :mode="'create'"></Application>
             <Application v-else-if="currentStep === 3" :mode="'view-self'"></Application>
-            <div v-if="currentStep === 5" class="w-full max-w-4xl p-8">
-                <!-- Accepted message -->
-                <div v-if="userStore.state === 'member'">
-                    <h1 class="text-3xl sm:text-4xl font-bold mb-4 text-left">
-                        Welcome to the 17th Ranger Battalion
-                    </h1>
-                    <div class="space-y-4 text-muted-foreground text-left leading-relaxed">
-                        <p>
-                            Your application to the 17th Ranger Battalion has been <strong>accepted</strong>!
-                            We’re excited to welcome you to the community.
-                        </p>
-                        <p>
-                            There are just a couple of steps to complete before joining us on the battlefield:
-                        </p>
-                        <!-- MODPACK SECTION -->
-                        <h2 class="text-xl font-semibold text-foreground mt-6">1. Download the Modpack</h2>
-                        <p>
-                            You’ll need to download our private server modpack. This can take some time, so we recommend
-                            starting as soon as possible. The link below leads to our
-                            <strong>Shadow Mod</strong>, which automatically pulls all required dependencies.
-                        </p>
-                        <ul class="list-disc pl-6 space-y-1">
-                            <li>Subscribe to the Shadow Mod.</li>
-                            <li>When prompted, choose <em>“Yes”</em> to download all associated mods.</li>
-                        </ul>
-                        <p>
-                            <a href="https://www.guilded.gg/Iceberg-gaming/groups/v3j2vAP3/channels/6979335e-60f7-4ab9-9590-66df69367d1e/docs/2013948655"
-                                class="text-primary underline" target="_blank">
-                                Click here for the full installation guide
-                            </a>
-                        </p>
-                        <!-- CONTACT SECTION -->
-                        <h2 class="text-xl font-semibold text-foreground mt-6">2. Contact a Corporal or Higher</h2>
-                        <p>
-                            Once you have the modpack installed, connect on TeamSpeak or post in Discord. Anyone with
-                            the
-                            rank of <strong>Corporal or above</strong> can help get you set up.
-                        </p>
-                        <ul class="list-none pl-0 space-y-1">
-                            <li><strong>TeamSpeak:</strong><a href="ts3server://ts.iceberg-gaming.com"
-                                    class="text-primary underline" target="_blank">ts3server://ts.iceberg-gaming.com</a>
-                            </li>
-                            <li>
-                                <strong>Discord:</strong>
-                                <a href="https://discord.gg/7hDQCEb" class="text-primary underline"
-                                    target="_blank">https://discord.gg/7hDQCEb</a>
-                            </li>
-                        </ul>
-                        <p>
-                            They will assist you with your initial assessments and training. Basic trainings run on a
-                            rotating schedule or can be requested through our Battalion Forms. Don’t hesitate to hop in
-                            during weeknights or Saturday operations to start playing with us!
-                        </p>
-                        <!-- FINAL NOTES -->
-                        <h2 class="text-xl font-semibold text-foreground mt-6">3. Get Familiar with the Unit</h2>
-                        <p>
-                            Please take a moment to read through our <strong>Code of Conduct</strong>,
-                            <strong>Ranks</strong>, and <strong>Structure</strong> pages. We also encourage you to
-                            browse
-                            our forums and introduce yourself.
-                        </p>
-                        <p>
-                            If you have any questions, feel free to reach out on TeamSpeak, Discord, or Guilded, someone
-                            will always be around to help.
-                        </p>
+            <div v-if="currentStep === 5" class="w-full max-w-4xl p-8 pt-0">
+                <div class="mb-5">
+                    <div class="flex w-min *:px-10 pt-2 border-b *:w-full *:text-center *:pb-1 *:cursor-pointer">
+                        <label :class="finalPanel === 'message' ? 'border-b-3 border-foreground' : 'mb-[2px]'"
+                            @click="finalPanel = 'message'">Message
+                        </label>
+                        <label :class="finalPanel === 'app' ? 'border-b-3 border-foreground' : 'mb-[2px]'"
+                            @click="finalPanel = 'app'">Application
+                        </label>
                     </div>
                 </div>
-                <!-- Denied message -->
-                <div v-else-if="userStore.state === 'denied'">
-                    <div class="w-full max-w-2xl p-8">
-                        <h1 class="text-3xl sm:text-4xl font-bold mb-4 text-left text-destructive">
-                            Application Not Approved
+                <div v-if="finalPanel === 'message'">
+                    <!-- Accepted message -->
+                    <div v-if="userStore.state === 'member'">
+                        <h1 class="text-3xl sm:text-4xl font-bold mb-4 text-left">
+                            Welcome to the 17th Ranger Battalion
                         </h1>
-
                         <div class="space-y-4 text-muted-foreground text-left leading-relaxed">
                             <p>
-                                Thank you for your interest in joining the <strong>17th Ranger Battalion</strong>.
-                                After reviewing your application, we regret to inform you that we are not able to
-                                approve it at this time.
+                                Your application to the 17th Ranger Battalion has been <strong>accepted</strong>!
+                                We’re excited to welcome you to the community.
                             </p>
-
                             <p>
-                                If you would like more information, you are encouraged to
-                                <strong>reach out and inquire</strong> about the reason your application was not
-                                approved.
-                                We are always happy to provide clarification where possible.
+                                There are just a couple of steps to complete before joining us on the battlefield:
                             </p>
-
+                            <!-- MODPACK SECTION -->
+                            <h2 class="text-xl font-semibold text-foreground mt-6">1. Download the Modpack</h2>
                             <p>
-                                You are welcome to <strong>resubmit your application in the future</strong> should your
-                                circumstances change or when we may be better able to incorporate you into the unit.
+                                You’ll need to download our private server modpack. This can take some time, so we
+                                recommend
+                                starting as soon as possible. The link below leads to our
+                                <strong>Shadow Mod</strong>, which automatically pulls all required dependencies.
                             </p>
-
+                            <ul class="list-disc pl-6 space-y-1">
+                                <li>Subscribe to the Shadow Mod.</li>
+                                <li>When prompted, choose <em>“Yes”</em> to download all associated mods.</li>
+                            </ul>
                             <p>
-                                All the best,<br />
-                                <span class="text-foreground font-medium">The 17th Ranger Battalion Recruitment
-                                    Team</span>
+                                <a href="https://www.guilded.gg/Iceberg-gaming/groups/v3j2vAP3/channels/6979335e-60f7-4ab9-9590-66df69367d1e/docs/2013948655"
+                                    class="text-primary underline" target="_blank">
+                                    Click here for the full installation guide
+                                </a>
+                            </p>
+                            <!-- CONTACT SECTION -->
+                            <h2 class="text-xl font-semibold text-foreground mt-6">2. Contact a Corporal or Higher</h2>
+                            <p>
+                                Once you have the modpack installed, connect on TeamSpeak or post in Discord. Anyone
+                                with
+                                the
+                                rank of <strong>Corporal or above</strong> can help get you set up.
+                            </p>
+                            <ul class="list-none pl-0 space-y-1">
+                                <li><strong>TeamSpeak:</strong><a href="ts3server://ts.iceberg-gaming.com"
+                                        class="text-primary underline"
+                                        target="_blank">ts3server://ts.iceberg-gaming.com</a>
+                                </li>
+                                <li>
+                                    <strong>Discord:</strong>
+                                    <a href="https://discord.gg/7hDQCEb" class="text-primary underline"
+                                        target="_blank">https://discord.gg/7hDQCEb</a>
+                                </li>
+                            </ul>
+                            <p>
+                                They will assist you with your initial assessments and training. Basic trainings run on
+                                a
+                                rotating schedule or can be requested through our Battalion Forms. Don’t hesitate to hop
+                                in
+                                during weeknights or Saturday operations to start playing with us!
+                            </p>
+                            <!-- FINAL NOTES -->
+                            <h2 class="text-xl font-semibold text-foreground mt-6">3. Get Familiar with the Unit</h2>
+                            <p>
+                                Please take a moment to read through our <strong>Code of Conduct</strong>,
+                                <strong>Ranks</strong>, and <strong>Structure</strong> pages. We also encourage you to
+                                browse
+                                our forums and introduce yourself.
+                            </p>
+                            <p>
+                                If you have any questions, feel free to reach out on TeamSpeak, Discord, or Guilded,
+                                someone
+                                will always be around to help.
                             </p>
                         </div>
                     </div>
-
+                    <!-- Denied message -->
+                    <div v-else-if="userStore.state === 'denied'">
+                        <div class="w-full max-w-2xl p-8">
+                            <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">
+                                <p>
+                                    Thank you for your interest in joining the <strong>17th Ranger Battalion</strong>.
+                                    After reviewing your application, we regret to inform you that we are not able to
+                                    approve it at this time.
+                                </p>
+                                <p>
+                                    If you would like more information, you are encouraged to
+                                    <strong>reach out and inquire</strong> about the reason your application was not
+                                    approved.
+                                    We are always happy to provide clarification where possible.
+                                </p>
+                                <p>
+                                    You are welcome to <strong>resubmit your application in the future</strong> should
+                                    your
+                                    circumstances change or when we may be better able to incorporate you into the unit.
+                                </p>
+                                <p>
+                                    All the best,<br />
+                                    <span class="text-foreground font-medium">The 17th Ranger Battalion Recruitment
+                                        Team</span>
+                                </p>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div v-if="finalPanel === 'app'">
+                    <Application :mode="'view-self'"></Application>
                 </div>
             </div>
         </div>
-- 
2.37.3.windows.1


From d31cb50d7122d33d57b0c5911c3ed929f5bca36f Mon Sep 17 00:00:00 2001
From: ajdj100 <ajairplane@gmail.com>
Date: Wed, 3 Dec 2025 17:53:31 -0500
Subject: [PATCH 7/8] Added navigation to application stuff under the profile
 menu

---
 ui/src/components/Navigation/Navbar.vue | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/ui/src/components/Navigation/Navbar.vue b/ui/src/components/Navigation/Navbar.vue
index 58335d4..72c5bd4 100644
--- a/ui/src/components/Navigation/Navbar.vue
+++ b/ui/src/components/Navigation/Navbar.vue
@@ -167,8 +167,9 @@ function blurAfter() {
                         <p>{{ userStore.user.name }}</p>
                     </DropdownMenuTrigger>
                     <DropdownMenuContent>
-                        <DropdownMenuItem>My Profile</DropdownMenuItem>
-                        <DropdownMenuItem>Settings</DropdownMenuItem>
+                        <!-- <DropdownMenuItem>My Profile</DropdownMenuItem> -->
+                        <!-- <DropdownMenuItem>Settings</DropdownMenuItem> -->
+                        <DropdownMenuItem @click="$router.push('/join')">My Application</DropdownMenuItem>
                         <DropdownMenuItem :variant="'destructive'" @click="logout()">Logout</DropdownMenuItem>
                     </DropdownMenuContent>
                 </DropdownMenu>
-- 
2.37.3.windows.1


From cf98bba0cd86e24edf85399f778db06cb6da5ac2 Mon Sep 17 00:00:00 2001
From: ajdj100 <ajairplane@gmail.com>
Date: Wed, 3 Dec 2025 17:56:59 -0500
Subject: [PATCH 8/8] fixed loading placeholder location

---
 ui/src/pages/Application.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui/src/pages/Application.vue b/ui/src/pages/Application.vue
index dd2c4ad..04a9b84 100644
--- a/ui/src/pages/Application.vue
+++ b/ui/src/pages/Application.vue
@@ -170,5 +170,5 @@ async function handleDeny(id) {
         </div>
     </div>
     <!-- TODO: Implement some kinda loading screen -->
-    <div v-else class="flex items-center justify-center h-full -mt-40">Loading</div>
+    <div v-else class="flex items-center justify-center h-full">Loading</div>
 </template>
\ No newline at end of file
-- 
2.37.3.windows.1