From a1ca07e6fd6f46e3a946cf5bc9edef39e6f7f72e Mon Sep 17 00:00:00 2001
From: ajdj100 <ajairplane@gmail.com>
Date: Fri, 16 Jan 2026 23:42:13 -0500
Subject: [PATCH 01/11] Implemented new mobile navigation system

---
 ui/src/components/Navigation/Navbar.vue | 216 +++++++++++++++++++++++-
 1 file changed, 212 insertions(+), 4 deletions(-)

diff --git a/ui/src/components/Navigation/Navbar.vue b/ui/src/components/Navigation/Navbar.vue
index 9aebc3d..e454789 100644
--- a/ui/src/components/Navigation/Navbar.vue
+++ b/ui/src/components/Navigation/Navbar.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { RouterLink } from 'vue-router';
+import { RouterLink, useRouter } from 'vue-router';
 import Separator from '../ui/separator/Separator.vue';
 import { Popover, PopoverContent, PopoverTrigger } from '../ui/popover';
 import {
@@ -18,9 +18,10 @@ import NavigationMenuTrigger from '../ui/navigation-menu/NavigationMenuTrigger.v
 import NavigationMenuContent from '../ui/navigation-menu/NavigationMenuContent.vue';
 import { navigationMenuTriggerStyle } from '../ui/navigation-menu/'
 import { useAuth } from '@/composables/useAuth';
-import { ArrowUpRight, CircleArrowOutUpRight } from 'lucide-vue-next';
+import { ArrowUpRight, ChevronDown, ChevronUp, CircleArrowOutUpRight, LogIn, LogOut, Menu, Settings, X } from 'lucide-vue-next';
 import DropdownMenuGroup from '../ui/dropdown-menu/DropdownMenuGroup.vue';
 import DropdownMenuSeparator from '../ui/dropdown-menu/DropdownMenuSeparator.vue';
+import { computed, nextTick, ref } from 'vue';
 
 const userStore = useUserStore();
 const auth = useAuth();
@@ -40,11 +41,116 @@ function blurAfter() {
         (document.activeElement as HTMLElement)?.blur();
     });
 }
+
+type NavItem = {
+    title: string;
+    to?: string;
+    href?: string;
+    status?: 'member' | 'guest';
+    isExternal?: boolean;
+    roles?: string[];
+    items?: NavItem[];
+};
+
+const navConfig: NavItem[] = [
+    {
+        title: 'Calendar',
+        to: '/calendar',
+    },
+    {
+        title: 'Documents',
+        href: 'https://docs.iceberg-gaming.com',
+        status: 'member',
+        isExternal: true
+    },
+    {
+        title: 'Forms',
+        status: 'member',
+        items: [
+            { title: 'Leave of Absence', to: '/loa' },
+            { title: 'Training Report', to: '/trainingReport' },
+        ]
+    },
+    {
+        title: 'Administration',
+        status: 'member',
+        roles: ['17th Administrator', '17th HQ', '17th Command', 'Recruiter'],
+        items: [
+            {
+                title: 'Leave of Absence',
+                to: '/administration/loa',
+                roles: ['17th Administrator', '17th HQ', '17th Command']
+            },
+            {
+                title: 'Promotions',
+                to: '/administration/rankChange',
+                roles: ['17th Administrator', '17th HQ', '17th Command']
+            },
+            {
+                title: 'Recruitment',
+                to: '/administration/applications',
+                roles: ['Recruiter']
+            },
+            {
+                title: 'Role Management',
+                to: '/administration/roles',
+                roles: ['17th Administrator']
+            },
+        ]
+    },
+    {
+        title: 'Join',
+        to: '/join',
+        status: 'guest'
+    },
+];
+
+const filteredNav = computed(() => {
+    return navConfig.flatMap(item => {
+        const filtered: NavItem[] = [];
+
+        const shouldShow = (!item.status || item.status === auth.accountStatus.value) &&
+            (!item.roles || auth.hasAnyRole(item.roles));
+
+        if (shouldShow) {
+            if (item.items) {
+                const filteredItems = item.items.filter(subItem =>
+                    !subItem.roles || auth.hasAnyRole(subItem.roles)
+                );
+                filtered.push({ ...item, items: filteredItems });
+            } else {
+                filtered.push(item);
+            }
+        }
+
+        return filtered;
+    });
+})
+
+const isMobileMenuOpen = ref(false);
+const expandedMenu = ref(null);
+
+const router = useRouter();
+
+function openMobileMenu() {
+    expandedMenu.value = null;
+    isMobileMenuOpen.value = true;
+}
+
+function closeMobileMenu() {
+    isMobileMenuOpen.value = false;
+    expandedMenu.value = null;
+}
+
+function mobileNavigateTo(to: string) {
+    closeMobileMenu();
+    router.push(to);
+}
 </script>
 
 <template>
     <div class="w-full border-b">
-        <div class="max-w-screen-3xl w-full mx-auto flex items-center justify-between pr-10 pl-7">
+        <div class="hidden lg:flex max-w-screen-3xl w-full mx-auto items-center justify-between pr-10 pl-7">
             <!-- left side -->
             <div class="flex items-center gap-7">
                 <RouterLink to="/">
@@ -196,6 +302,108 @@ function blurAfter() {
                 <a v-else :href="APIHOST + '/login'">Login</a>
             </div>
         </div>
-        <!-- <Separator></Separator> -->
+
+        <!-- mobile navigation -->
+        <div class="flex flex-col lg:hidden w-full" :class="isMobileMenuOpen ? 'h-screen' : ''">
+            <div class="flex items-center justify-between w-full p-2">
+                <!-- <RouterLink to="/">
+                    <img src="/17RBN_Logo.png" class="w-10 h-10 object-contain"></img>
+                </RouterLink> -->
+                <button @click="mobileNavigateTo('/')">
+                    <img src="/17RBN_Logo.png" class="w-10 h-10 object-contain"></img>
+                </button>
+
+                <Button v-if="!isMobileMenuOpen" variant="ghost" size="icon" @click="openMobileMenu()">
+                    <Menu class="size-7" />
+                </Button>
+                <Button v-else variant="ghost" size="icon" @click="closeMobileMenu()">
+                    <X class="size-7" />
+                </Button>
+            </div>
+            <div v-if="isMobileMenuOpen" class="flex flex-col h-[calc(100vh-60px)] overflow-hidden">
+                <div class="flex-1 overflow-y-auto px-2 py-3 space-y-0.5">
+                    <div v-for="navItem in filteredNav" :key="navItem.title" class="group">
+
+                        <template v-if="!navItem.items">
+                            <a v-if="navItem.isExternal" :href="navItem.href" target="_blank"
+                                class="flex items-center justify-between w-full px-4 py-2.5 text-base font-medium rounded-md hover:bg-accent active:bg-accent transition-colors">
+                                <span class="flex items-center gap-2">
+                                    {{ navItem.title }}
+                                    <ArrowUpRight class="h-3.5 w-3.5 opacity-50" />
+                                </span>
+                            </a>
+                            <button v-else @click="mobileNavigateTo(navItem.to)"
+                                class="w-full text-left px-4 py-2.5 text-base font-medium rounded-md hover:bg-accent active:bg-accent transition-colors">
+                                {{ navItem.title }}
+                            </button>
+                        </template>
+
+                        <div v-else class="space-y-0.5">
+                            <button @click="expandedMenu = expandedMenu === navItem.title ? null : navItem.title"
+                                class="flex items-center justify-between w-full px-4 py-2.5 text-base font-medium rounded-md transition-colors"
+                                :class="expandedMenu === navItem.title ? 'bg-accent/50 text-primary' : 'hover:bg-accent'">
+                                {{ navItem.title }}
+                                <ChevronDown class="h-4 w-4 transition-transform duration-200"
+                                    :class="expandedMenu === navItem.title ? 'rotate-180' : ''" />
+                            </button>
+
+                            <div v-if="expandedMenu === navItem.title"
+                                class="ml-4 mr-2 border-l border-border space-y-0.5">
+                                <button v-for="subNavItem in navItem.items" :key="subNavItem.title"
+                                    @click="mobileNavigateTo(subNavItem.to)"
+                                    class="w-full text-left px-6 py-2 text-sm text-muted-foreground hover:text-foreground active:text-primary transition-colors">
+                                    {{ subNavItem.title }}
+                                </button>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+
+                <div class="p-3 border-t bg-background mt-auto">
+                    <div v-if="userStore.isLoggedIn" class="space-y-3">
+                        <div class="flex items-center justify-between px-2">
+                            <div class="flex gap-3">
+                                <!-- <div
+                                    class="size-8 rounded-full bg-primary/10 flex items-center justify-center text-xs font-bold text-primary">
+                                    {{ userStore.displayName?.charAt(0) }}
+                                </div> -->
+                                <div class="flex flex-col leading-tight">
+                                    <span class="text-sm font-semibold">
+                                        {{ userStore.displayName || userStore.user.member.member_name }}
+                                    </span>
+                                    <span v-if="userStore.displayName"
+                                        class="text-[10px] uppercase tracking-wider text-muted-foreground">
+                                        {{ userStore.user.member.member_name }}
+                                    </span>
+                                </div>
+                            </div>
+                            <div class="flex items-center gap-3">
+                                <Button variant="ghost" size="icon" @click="mobileNavigateTo('/profile')">
+                                    <Settings class="size-6"></Settings>
+                                </Button>
+                                <Button variant="ghost" size="icon" @click="logout()">
+                                    <LogOut class="size-6 text-destructive"></LogOut>
+                                </Button>
+                            </div>
+                        </div>
+
+                        <div class="flex gap-2">
+                            <!-- <Button variant="outline" size="xs" class="flex-1 h-8 text-xs"
+                                @click="mobileNavigateTo('/profile')">Profile</Button> -->
+                            <Button variant="secondary" size="xs" class="flex-1 h-8 text-xs"
+                                @click="mobileNavigateTo('/join')">My Application</Button>
+                            <Button variant="secondary" size="xs" class="flex-1 h-8 text-xs"
+                                @click="mobileNavigateTo('/applications')">Application History</Button>
+                        </div>
+                    </div>
+
+                    <a v-else :href="APIHOST + '/login'" class="block">
+                        <Button class="w-full text-sm h-10">
+                            <LogIn></LogIn> Login
+                        </Button>
+                    </a>
+                </div>
+            </div>
+        </div>
     </div>
 </template>
\ No newline at end of file

From 045de2fe980c7af19a351a9e147d2b5683f1fc10 Mon Sep 17 00:00:00 2001
From: ajdj100 <ajairplane@gmail.com>
Date: Sat, 17 Jan 2026 00:23:27 -0500
Subject: [PATCH 02/11] Fixed the join button not showing while logged out

---
 ui/src/components/Navigation/Navbar.vue | 28 +++++++++++++++++++++----
 1 file changed, 24 insertions(+), 4 deletions(-)

diff --git a/ui/src/components/Navigation/Navbar.vue b/ui/src/components/Navigation/Navbar.vue
index e454789..5a1399f 100644
--- a/ui/src/components/Navigation/Navbar.vue
+++ b/ui/src/components/Navigation/Navbar.vue
@@ -101,7 +101,7 @@ const navConfig: NavItem[] = [
     {
         title: 'Join',
         to: '/join',
-        status: 'guest'
+        status: 'guest',
     },
 ];
 
@@ -109,8 +109,27 @@ const filteredNav = computed(() => {
     return navConfig.flatMap(item => {
         const filtered: NavItem[] = [];
 
-        const shouldShow = (!item.status || item.status === auth.accountStatus.value) &&
-            (!item.roles || auth.hasAnyRole(item.roles));
+        // 1. Check Login Requirements
+        const isLoggedIn = userStore.isLoggedIn;
+
+        // 2. Determine visibility based on status
+        let shouldShow = false;
+
+        if (!item.status) {
+            // Public items - always show
+            shouldShow = true;
+        } else if (item.status === 'guest') {
+            // Show if NOT logged in OR logged in as guest (but NOT a member)
+            shouldShow = !isLoggedIn || auth.accountStatus.value === 'guest';
+        } else if (item.status === 'member') {
+            // Show ONLY if logged in as member
+            shouldShow = isLoggedIn && auth.accountStatus.value === 'member';
+        }
+
+        // 3. Check Role Requirements (if status check passed)
+        if (shouldShow && item.roles) {
+            shouldShow = auth.hasAnyRole(item.roles);
+        }
 
         if (shouldShow) {
             if (item.items) {
@@ -391,7 +410,8 @@ function mobileNavigateTo(to: string) {
                             <!-- <Button variant="outline" size="xs" class="flex-1 h-8 text-xs"
                                 @click="mobileNavigateTo('/profile')">Profile</Button> -->
                             <Button variant="secondary" size="xs" class="flex-1 h-8 text-xs"
-                                @click="mobileNavigateTo('/join')">My Application</Button>
+                                @click="mobileNavigateTo('/join')">My
+                                Application</Button>
                             <Button variant="secondary" size="xs" class="flex-1 h-8 text-xs"
                                 @click="mobileNavigateTo('/applications')">Application History</Button>
                         </div>

From 0e37a8bc9ca7b02f34c66ad58eee4218d1ba6a8c Mon Sep 17 00:00:00 2001
From: ajdj100 <ajairplane@gmail.com>
Date: Sat, 17 Jan 2026 00:54:53 -0500
Subject: [PATCH 03/11] Improved promotion page readability on mobile

---
 .../components/promotions/promotionForm.vue   |  6 +-
 ui/src/pages/RankChange.vue                   | 82 +++++++++----------
 2 files changed, 41 insertions(+), 47 deletions(-)

diff --git a/ui/src/components/promotions/promotionForm.vue b/ui/src/components/promotions/promotionForm.vue
index a6708f6..6563aa2 100644
--- a/ui/src/components/promotions/promotionForm.vue
+++ b/ui/src/components/promotions/promotionForm.vue
@@ -129,11 +129,7 @@ function setAllToday() {
     <div class="w-xl">
         <form v-if="!formSubmitted" id="trainingForm" @submit.prevent="submitForm"
             class="w-full min-w-0 flex flex-col gap-4">
-            <div>
-                <FieldLegend class="scroll-m-20 text-2xl font-semibold tracking-tight">
-                    Promotion Form
-                </FieldLegend>
-            </div>
+
             <VeeFieldArray name="promotions" v-slot="{ fields, push, remove }">
                 <FieldSet class="w-full min-w-0">
                     <div class="flex flex-col gap-2">
diff --git a/ui/src/pages/RankChange.vue b/ui/src/pages/RankChange.vue
index ec99b33..183b6d9 100644
--- a/ui/src/pages/RankChange.vue
+++ b/ui/src/pages/RankChange.vue
@@ -1,29 +1,48 @@
+<script setup>
+import { ref } from 'vue'
+import { Plus, PlusIcon, X } from 'lucide-vue-next'
+import PromotionForm from '@/components/promotions/promotionForm.vue'
+import PromotionList from '@/components/promotions/promotionList.vue'
+import DialogContent from '@/components/ui/dialog/DialogContent.vue'
+import Dialog from '@/components/ui/dialog/Dialog.vue'
+import DialogTrigger from '@/components/ui/dialog/DialogTrigger.vue'
+import DialogHeader from '@/components/ui/dialog/DialogHeader.vue'
+import DialogTitle from '@/components/ui/dialog/DialogTitle.vue'
+import Button from '@/components/ui/button/Button.vue'
+
+const isFormOpen = ref(false)
+const listRef = ref(null)
+
+const isMobileFormOpen = ref(false);
+</script>
+
 <template>
     <div class="mx-auto mt-6 lg:mt-10 px-4 lg:px-8">
 
-        <div class="flex items-center justify-between mb-6 lg:hidden">
-            <h1 class="text-2xl font-semibold tracking-tight">Promotion History</h1>
-
-            <Dialog v-model:open="isFormOpen">
-                <DialogTrigger as-child>
-                    <Button size="sm" class="gap-2">
-                        <Plus class="size-4" />
-                        Promote
+        <div class="flex flex-col items-center justify-between mb-6 lg:hidden">
+            <div v-if="isMobileFormOpen">
+                <div class="mb-4 flex justify-between items-center">
+                    <p class="scroll-m-20 text-2xl font-semibold tracking-tight">
+                        Promotion Form
+                    </p>
+                    <Button variant="ghost" size="icon" @click="isMobileFormOpen = false">
+                        <X v-if="isMobileFormOpen" class="size-6"></X>
                     </Button>
-                </DialogTrigger>
-                <DialogContent class="w-full h-full max-w-none m-0 rounded-none flex flex-col">
-                    <DialogHeader class="flex-row items-center justify-between border-b pb-4">
-                        <DialogTitle>New Promotion</DialogTitle>
-                    </DialogHeader>
-
-                    <div class="flex-1 overflow-y-auto pt-6">
-                        <PromotionForm @submitted="handleMobileSubmit" />
-                    </div>
-                </DialogContent>
-            </Dialog>
+                </div>
+                <PromotionForm @submitted="listRef?.refresh" />
+            </div>
+            <div v-else>
+                <div class="flex justify-between w-full">
+                    <h1 class="text-2xl font-semibold tracking-tight">Promotion History</h1>
+                    <Button @click="isMobileFormOpen = true">
+                        <PlusIcon />Submit
+                    </Button>
+                </div>
+                <PromotionList></PromotionList>
+            </div>
         </div>
 
-        <div class="flex flex-col lg:flex-row lg:max-h-[70vh] gap-8">
+        <div class="hidden lg:flex flex-row lg:max-h-[70vh] gap-8">
             <div class="flex-1 lg:border-r lg:pr-8 w-full lg:min-w-2xl">
                 <p class="hidden lg:block scroll-m-20 text-2xl font-semibold tracking-tight mb-3">
                     Promotion History
@@ -41,25 +60,4 @@
             </div>
         </div>
     </div>
-</template>
-
-<script setup>
-import { ref } from 'vue'
-import { Plus } from 'lucide-vue-next'
-import PromotionForm from '@/components/promotions/promotionForm.vue'
-import PromotionList from '@/components/promotions/promotionList.vue'
-import DialogContent from '@/components/ui/dialog/DialogContent.vue'
-import Dialog from '@/components/ui/dialog/Dialog.vue'
-import DialogTrigger from '@/components/ui/dialog/DialogTrigger.vue'
-import DialogHeader from '@/components/ui/dialog/DialogHeader.vue'
-import DialogTitle from '@/components/ui/dialog/DialogTitle.vue'
-import Button from '@/components/ui/button/Button.vue'
-
-const isFormOpen = ref(false)
-const listRef = ref(null)
-
-const handleMobileSubmit = () => {
-    isFormOpen.value = false // Close the "Whole page" modal
-    listRef.value?.refresh()  // Refresh the list behind it
-}
-</script>
\ No newline at end of file
+</template>
\ No newline at end of file

From 676e09aef5db065e11841401758fd457fda8f55f Mon Sep 17 00:00:00 2001
From: ajdj100 <ajairplane@gmail.com>
Date: Sat, 21 Mar 2026 23:22:41 -0400
Subject: [PATCH 04/11] Updated navigation system for new stuff

---
 ui/src/components/Navigation/Navbar.vue | 312 ++++++++++++------------
 1 file changed, 161 insertions(+), 151 deletions(-)

diff --git a/ui/src/components/Navigation/Navbar.vue b/ui/src/components/Navigation/Navbar.vue
index 8b2a55a..d94bbf8 100644
--- a/ui/src/components/Navigation/Navbar.vue
+++ b/ui/src/components/Navigation/Navbar.vue
@@ -1,171 +1,180 @@
 <script setup lang="ts">
-import { RouterLink, useRouter } from 'vue-router';
-import Separator from '../ui/separator/Separator.vue';
-import { Popover, PopoverContent, PopoverTrigger } from '../ui/popover';
-import {
-    DropdownMenu,
-    DropdownMenuContent,
-    DropdownMenuItem,
-    DropdownMenuTrigger,
-} from '../ui/dropdown-menu';
-import { useUserStore } from '@/stores/user';
-import Button from '../ui/button/Button.vue';
-import NavigationMenu from '../ui/navigation-menu/NavigationMenu.vue';
-import NavigationMenuList from '../ui/navigation-menu/NavigationMenuList.vue';
-import NavigationMenuItem from '../ui/navigation-menu/NavigationMenuItem.vue';
-import NavigationMenuLink from '../ui/navigation-menu/NavigationMenuLink.vue';
-import NavigationMenuTrigger from '../ui/navigation-menu/NavigationMenuTrigger.vue';
-import NavigationMenuContent from '../ui/navigation-menu/NavigationMenuContent.vue';
-import { navigationMenuTriggerStyle } from '../ui/navigation-menu/'
-import { useAuth } from '@/composables/useAuth';
-import { ArrowUpRight, ChevronDown, ChevronUp, CircleArrowOutUpRight, LogIn, LogOut, Menu, Settings, X } from 'lucide-vue-next';
-import DropdownMenuGroup from '../ui/dropdown-menu/DropdownMenuGroup.vue';
-import DropdownMenuSeparator from '../ui/dropdown-menu/DropdownMenuSeparator.vue';
-import { MemberState } from '@shared/types/member';
-import { computed, nextTick, ref } from 'vue';
+    import { RouterLink, useRouter } from 'vue-router';
+    import Separator from '../ui/separator/Separator.vue';
+    import { Popover, PopoverContent, PopoverTrigger } from '../ui/popover';
+    import {
+        DropdownMenu,
+        DropdownMenuContent,
+        DropdownMenuItem,
+        DropdownMenuTrigger,
+    } from '../ui/dropdown-menu';
+    import { useUserStore } from '@/stores/user';
+    import Button from '../ui/button/Button.vue';
+    import NavigationMenu from '../ui/navigation-menu/NavigationMenu.vue';
+    import NavigationMenuList from '../ui/navigation-menu/NavigationMenuList.vue';
+    import NavigationMenuItem from '../ui/navigation-menu/NavigationMenuItem.vue';
+    import NavigationMenuLink from '../ui/navigation-menu/NavigationMenuLink.vue';
+    import NavigationMenuTrigger from '../ui/navigation-menu/NavigationMenuTrigger.vue';
+    import NavigationMenuContent from '../ui/navigation-menu/NavigationMenuContent.vue';
+    import { navigationMenuTriggerStyle } from '../ui/navigation-menu/'
+    import { useAuth } from '@/composables/useAuth';
+    import { ArrowUpRight, ChevronDown, ChevronUp, CircleArrowOutUpRight, LogIn, LogOut, Menu, Settings, X } from 'lucide-vue-next';
+    import DropdownMenuGroup from '../ui/dropdown-menu/DropdownMenuGroup.vue';
+    import DropdownMenuSeparator from '../ui/dropdown-menu/DropdownMenuSeparator.vue';
+    import { MemberState } from '@shared/types/member';
+    import { computed, nextTick, ref } from 'vue';
 
-const userStore = useUserStore();
-const auth = useAuth();
+    const userStore = useUserStore();
+    const auth = useAuth();
 
-//@ts-ignore
-const APIHOST = import.meta.env.VITE_APIHOST;
-//@ts-ignore
-const DOCHOST = import.meta.env.VITE_DOCHOST;
+    //@ts-ignore
+    const APIHOST = import.meta.env.VITE_APIHOST;
+    //@ts-ignore
+    const DOCHOST = import.meta.env.VITE_DOCHOST;
 
-async function logout() {
-    userStore.user = null;
-    window.location.href = APIHOST + "/logout";
-}
+    async function logout() {
+        userStore.user = null;
+        window.location.href = APIHOST + "/logout";
+    }
 
-function blurAfter() {
-    requestAnimationFrame(() => {
-        (document.activeElement as HTMLElement)?.blur();
-    });
-}
+    function blurAfter() {
+        requestAnimationFrame(() => {
+            (document.activeElement as HTMLElement)?.blur();
+        });
+    }
 
-type NavItem = {
-    title: string;
-    to?: string;
-    href?: string;
-    status?: 'member' | 'guest';
-    isExternal?: boolean;
-    roles?: string[];
-    items?: NavItem[];
-};
+    type NavItem = {
+        title: string;
+        to?: string;
+        href?: string;
+        status?: 'member' | 'guest';
+        isExternal?: boolean;
+        roles?: string[];
+        items?: NavItem[];
+    };
 
-const navConfig: NavItem[] = [
-    {
-        title: 'Calendar',
-        to: '/calendar',
-    },
-    {
-        title: 'Documents',
-        href: 'https://docs.iceberg-gaming.com',
-        status: 'member',
-        isExternal: true
-    },
-    {
-        title: 'Forms',
-        status: 'member',
-        items: [
-            { title: 'Leave of Absence', to: '/loa' },
-            { title: 'Training Report', to: '/trainingReport' },
-        ]
-    },
-    {
-        title: 'Administration',
-        status: 'member',
-        roles: ['17th Administrator', '17th HQ', '17th Command', 'Recruiter'],
-        items: [
-            {
-                title: 'Leave of Absence',
-                to: '/administration/loa',
-                roles: ['17th Administrator', '17th HQ', '17th Command']
-            },
-            {
-                title: 'Promotions',
-                to: '/administration/rankChange',
-                roles: ['17th Administrator', '17th HQ', '17th Command']
-            },
-            {
-                title: 'Recruitment',
-                to: '/administration/applications',
-                roles: ['Recruiter']
-            },
-            {
-                title: 'Role Management',
-                to: '/administration/roles',
-                roles: ['17th Administrator']
-            },
-        ]
-    },
-    {
-        title: 'Join',
-        to: '/join',
-        status: 'guest',
-    },
-];
+    const navConfig: NavItem[] = [
+        {
+            title: 'Calendar',
+            to: '/calendar',
+        },
+        {
+            title: 'Documents',
+            href: 'https://docs.iceberg-gaming.com',
+            status: 'member',
+            isExternal: true
+        },
+        {
+            title: 'Forms',
+            status: 'member',
+            items: [
+                { title: 'Leave of Absence', to: '/loa' },
+                { title: 'Training Report', to: '/trainingReport' },
+            ]
+        },
+        {
+            title: 'Administration',
+            status: 'member',
+            roles: ['17th Administrator', '17th HQ', '17th Command', 'Recruiter'],
+            items: [
+                {
+                    title: 'Leave of Absence',
+                    to: '/administration/loa',
+                    roles: ['17th Administrator', '17th HQ', '17th Command']
+                },
+                {
+                    title: 'Promotions',
+                    to: '/administration/rankChange',
+                    roles: ['17th Administrator', '17th HQ', '17th Command']
+                },
+                {
+                    title: 'Recruitment',
+                    to: '/administration/applications',
+                    roles: ['Recruiter']
+                },
+                {
+                    title: 'Member Management',
+                    to: '/administration/members',
+                },
+                {
+                    title: 'Role Management',
+                    to: '/administration/roles',
+                    roles: ['17th Administrator']
+                },
+            ]
+        },
+        {
+            title: 'Developer',
+            to: '/developer',
+            roles: ['Dev']
+        },
+        {
+            title: 'Join',
+            to: '/join',
+            status: 'guest',
+        },
+    ];
 
-const filteredNav = computed(() => {
-    return navConfig.flatMap(item => {
-        const filtered: NavItem[] = [];
+    const filteredNav = computed(() => {
+        return navConfig.flatMap(item => {
+            const filtered: NavItem[] = [];
 
-        // 1. Check Login Requirements
-        const isLoggedIn = userStore.isLoggedIn;
+            // 1. Check Login Requirements
+            const isLoggedIn = userStore.isLoggedIn;
 
-        // 2. Determine visibility based on status
-        let shouldShow = false;
+            // 2. Determine visibility based on status
+            let shouldShow = false;
 
-        if (!item.status) {
-            // Public items - always show
-            shouldShow = true;
-        } else if (item.status === 'guest') {
-            // Show if NOT logged in OR logged in as guest (but NOT a member)
-            shouldShow = !isLoggedIn || auth.accountStatus.value === 'guest';
-        } else if (item.status === 'member') {
-            // Show ONLY if logged in as member
-            shouldShow = isLoggedIn && auth.accountStatus.value === 'member';
-        }
-
-        // 3. Check Role Requirements (if status check passed)
-        if (shouldShow && item.roles) {
-            shouldShow = auth.hasAnyRole(item.roles);
-        }
-
-        if (shouldShow) {
-            if (item.items) {
-                const filteredItems = item.items.filter(subItem =>
-                    !subItem.roles || auth.hasAnyRole(subItem.roles)
-                );
-                filtered.push({ ...item, items: filteredItems });
-            } else {
-                filtered.push(item);
+            if (!item.status) {
+                // Public items - always show
+                shouldShow = true;
+            } else if (item.status === 'guest') {
+                // Show if NOT logged in OR logged in as guest (but NOT a member)
+                shouldShow = !isLoggedIn || auth.accountStatus.value === MemberState.Guest;
+            } else if (item.status === 'member') {
+                // Show ONLY if logged in as member
+                shouldShow = isLoggedIn && auth.accountStatus.value === MemberState.Member;
             }
-        }
 
-        return filtered;
-    });
-})
+            // 3. Check Role Requirements (if status check passed)
+            if (shouldShow && item.roles) {
+                shouldShow = auth.hasAnyRole(item.roles);
+            }
 
-const isMobileMenuOpen = ref(false);
-const expandedMenu = ref(null);
+            if (shouldShow) {
+                if (item.items) {
+                    const filteredItems = item.items.filter(subItem =>
+                        !subItem.roles || auth.hasAnyRole(subItem.roles)
+                    );
+                    filtered.push({ ...item, items: filteredItems });
+                } else {
+                    filtered.push(item);
+                }
+            }
 
-const router = useRouter();
+            return filtered;
+        });
+    })
 
-function openMobileMenu() {
-    expandedMenu.value = null;
-    isMobileMenuOpen.value = true;
-}
+    const isMobileMenuOpen = ref(false);
+    const expandedMenu = ref(null);
 
-function closeMobileMenu() {
-    isMobileMenuOpen.value = false;
-    expandedMenu.value = null;
-}
+    const router = useRouter();
 
-function mobileNavigateTo(to: string) {
-    closeMobileMenu();
-    router.push(to);
-}
+    function openMobileMenu() {
+        expandedMenu.value = null;
+        isMobileMenuOpen.value = true;
+    }
+
+    function closeMobileMenu() {
+        isMobileMenuOpen.value = false;
+        expandedMenu.value = null;
+    }
+
+    function mobileNavigateTo(to: string) {
+        closeMobileMenu();
+        router.push(to);
+    }
 </script>
 
 <template>
@@ -177,7 +186,8 @@ function mobileNavigateTo(to: string) {
                     <img src="/17RBN_Logo.png" class="w-10 h-10 object-contain"></img>
                 </RouterLink>
                 <!-- Member navigation -->
-                <div v-if="auth.accountStatus.value == MemberState.Member" class="h-15 flex items-center justify-center">
+                <div v-if="auth.accountStatus.value == MemberState.Member"
+                    class="h-15 flex items-center justify-center">
                     <NavigationMenu>
                         <NavigationMenuList class="gap-3">
 

From bae5578afb995a21863cfdc4d22d23d1b7ebff0b Mon Sep 17 00:00:00 2001
From: ajdj100 <ajairplane@gmail.com>
Date: Sat, 21 Mar 2026 23:58:12 -0400
Subject: [PATCH 05/11] Reworked spacing and layout to improve mobile
 experience

---
 ui/src/components/loa/loaForm.vue | 28 ++++++++++++++--------------
 ui/src/pages/ManageLOA.vue        |  2 +-
 ui/src/pages/SubmitLOA.vue        |  2 +-
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/ui/src/components/loa/loaForm.vue b/ui/src/components/loa/loaForm.vue
index cfa2077..85b9183 100644
--- a/ui/src/components/loa/loaForm.vue
+++ b/ui/src/components/loa/loaForm.vue
@@ -169,16 +169,16 @@ const filteredMembers = computed(() => {
 </script>
 
 <template>
-    <div class="flex flex-row-reverse gap-6 mx-auto w-full" :class="!adminMode ? 'max-w-5xl' : 'max-w-5xl'">
-        <div v-if="!adminMode" class="flex-1 flex flex-col space-x-4 rounded-md border p-4">
+    <div class="mx-auto flex w-full max-w-5xl flex-col gap-4 lg:flex-row-reverse lg:gap-6">
+        <div v-if="!adminMode" class="order-2 flex flex-1 flex-col rounded-md border p-4 lg:order-1">
             <p class="scroll-m-20 text-2xl font-semibold tracking-tight">LOA Policy</p>
             <div ref="policyRef" class="bookstack-container">
                 <!-- LOA policy gets loaded here -->
             </div>
         </div>
-        <div class="flex-1 flex flex-col gap-5">
+        <div class="order-1 flex flex-1 flex-col gap-5 lg:order-2">
             <form v-if="!formSubmitted" @submit="onSubmit" class="flex flex-col gap-2">
-                <div class="flex w-full gap-5">
+                <div class="grid w-full grid-cols-1 gap-4 sm:grid-cols-2 sm:gap-5">
                     <VeeField v-slot="{ field, errors }" name="member_id">
                         <Field>
                             <FieldContent>
@@ -237,13 +237,13 @@ const filteredMembers = computed(() => {
                         </Field>
                     </VeeField>
                 </div>
-                <div class="flex gap-5">
+                <div class="grid grid-cols-1 gap-4 sm:grid-cols-2 sm:gap-5">
                     <VeeField v-slot="{ field, errors }" name="start_date">
-                        <Field>
+                        <Field class="w-full">
                             <FieldContent>
                                 <FieldLabel>Start Date</FieldLabel>
                                 <Popover>
-                                    <div class="relative inline-flex items-center group">
+                                    <div class="group relative flex w-full items-center">
                                         <PopoverTrigger as-child>
                                             <Button :disabled="!values.type" variant="outline" :class="cn(
                                                 'w-full justify-start text-left font-normal',
@@ -259,7 +259,7 @@ const filteredMembers = computed(() => {
                                                     text-popover-foreground shadow-md border border-border
                                                     opacity-0 translate-y-1
                                                     group-hover:opacity-100 group-hover:translate-y-0
-                                                    transition-opacity transition-transform duration-150">
+                                                    transition-all duration-150">
                                             Select an LOA type first
                                         </div>
                                     </div>
@@ -277,11 +277,11 @@ const filteredMembers = computed(() => {
                         </Field>
                     </VeeField>
                     <VeeField v-slot="{ field, errors }" name="end_date">
-                        <Field>
+                        <Field class="w-full">
                             <FieldContent>
                                 <FieldLabel>End Date</FieldLabel>
                                 <Popover>
-                                    <div class="relative inline-flex items-center group">
+                                    <div class="group relative flex w-full items-center">
                                         <PopoverTrigger as-child>
                                             <Button :disabled="!values.type" variant="outline" :class="cn(
                                                 'w-full justify-start text-left font-normal',
@@ -297,7 +297,7 @@ const filteredMembers = computed(() => {
                                                     text-popover-foreground shadow-md border border-border
                                                     opacity-0 translate-y-1
                                                     group-hover:opacity-100 group-hover:translate-y-0
-                                                    transition-opacity transition-transform duration-150">
+                                                    transition-all duration-150">
                                             Select an LOA type first
                                         </div>
                                     </div>
@@ -330,8 +330,8 @@ const filteredMembers = computed(() => {
                         </Field>
                     </VeeField>
                 </div>
-                <div class="flex justify-end">
-                    <Button type="submit" :disabled="submitting" class="w-35">
+                <div class="flex justify-stretch sm:justify-end">
+                    <Button type="submit" :disabled="submitting" class="w-full sm:w-35">
                         <span class="flex items-center gap-2" v-if="submitting">
                             <Spinner></Spinner> Submitting…
                         </span>
@@ -352,7 +352,7 @@ const filteredMembers = computed(() => {
                 </p>
 
 
-                <div class="flex gap-3 mt-4">
+                <div class="mt-4 flex flex-col gap-3 sm:flex-row">
                     <Button variant="secondary" @click="formSubmitted = false">
                         Submit another request
                     </Button>
diff --git a/ui/src/pages/ManageLOA.vue b/ui/src/pages/ManageLOA.vue
index 37512ac..f3b15b8 100644
--- a/ui/src/pages/ManageLOA.vue
+++ b/ui/src/pages/ManageLOA.vue
@@ -29,7 +29,7 @@ const showLOADialog = ref(false);
                 <LoaForm :admin-mode="true" class="my-3"></LoaForm>
             </DialogContent>
         </Dialog>
-        <div class="max-w-5xl mx-auto pt-10">
+        <div class="mx-auto max-w-5xl px-3 pt-10 sm:px-4 lg:px-0">
             <div class="flex justify-between mb-4">
                 <h1 class="scroll-m-20 text-2xl font-semibold tracking-tight">LOA Log</h1>
                 <div>
diff --git a/ui/src/pages/SubmitLOA.vue b/ui/src/pages/SubmitLOA.vue
index 4d08fa6..de1ce74 100644
--- a/ui/src/pages/SubmitLOA.vue
+++ b/ui/src/pages/SubmitLOA.vue
@@ -11,7 +11,7 @@ const mode = ref<'submit' | 'view'>('submit')
 </script>
 
 <template>
-    <div class="max-w-5xl mx-auto flex w-full flex-col mt-4 mb-10">
+    <div class="mx-auto mt-4 mb-10 flex w-full max-w-5xl flex-col px-3 sm:px-4 lg:px-0">
         <div class="mb-8">
             <p class="scroll-m-20 text-2xl font-semibold tracking-tight">Leave of Absence</p>
             <div class="pt-3">

From 87bdd30a19479a3ffd9492bc3ef3e3dbf686e058 Mon Sep 17 00:00:00 2001
From: ajdj100 <ajairplane@gmail.com>
Date: Sun, 22 Mar 2026 01:12:07 -0400
Subject: [PATCH 06/11] Built mobile display for LOA List

---
 ui/src/components/loa/loaList.vue             | 143 +++++++++++++++---
 ui/src/components/ui/dialog/DialogContent.vue |   2 +-
 2 files changed, 119 insertions(+), 26 deletions(-)

diff --git a/ui/src/components/loa/loaList.vue b/ui/src/components/loa/loaList.vue
index 524dcbe..139d464 100644
--- a/ui/src/components/loa/loaList.vue
+++ b/ui/src/components/loa/loaList.vue
@@ -141,29 +141,125 @@
 <template>
     <div>
         <Dialog :open="isExtending" @update:open="(val) => isExtending = val">
-            <DialogContent>
-                <DialogHeader>
-                    <DialogTitle>Extend {{ targetLOA.name }}'s Leave of Absence </DialogTitle>
+            <DialogContent class="w-[95vw] max-w-[95vw] p-4 sm:max-w-fit sm:p-6">
+                <DialogHeader class="gap-1 pr-12 text-left">
+                    <DialogTitle class="text-base leading-tight sm:text-lg">Extend Leave of Absence</DialogTitle>
+                    <DialogDescription class="truncate text-xs text-muted-foreground sm:text-sm">
+                        {{ targetLOA?.name }}
+                    </DialogDescription>
                 </DialogHeader>
-                <div class="flex gap-5">
-                    <Calendar v-model="extendTo" class="rounded-md border shadow-sm w-min" layout="month-and-year"
+                <div class="flex flex-col gap-4 sm:flex-row sm:items-start sm:gap-5">
+                    <Calendar v-model="extendTo"
+                        class="mx-auto w-min rounded-md border shadow-sm sm:mx-0"
+                        layout="month-and-year"
                         :min-value="toCalendarDate(targetEnd)"
                         :max-value="props.adminMode ? toCalendarDate(targetEnd).add({ years: 1 }) : toCalendarDate(targetEnd).add({ months: 1 })" />
-                    <div class="flex flex-col w-full gap-3 px-2">
-                        <p>Quick Options</p>
-                        <Button variant="outline" @click="extendTo = toCalendarDate(targetEnd).add({ days: 7 })">1
+                    <div class="flex w-full flex-col gap-2 sm:gap-3">
+                        <p class="text-sm font-medium text-muted-foreground">Quick Options</p>
+                        <Button class="w-full" variant="outline" @click="extendTo = toCalendarDate(targetEnd).add({ days: 7 })">1
                             Week</Button>
-                        <Button variant="outline" @click="extendTo = toCalendarDate(targetEnd).add({ months: 1 })">1
+                        <Button class="w-full" variant="outline" @click="extendTo = toCalendarDate(targetEnd).add({ months: 1 })">1
                             Month</Button>
                     </div>
                 </div>
-                <div class="flex justify-end gap-4">
-                    <Button variant="outline" @click="isExtending = false">Cancel</Button>
-                    <Button @click="commitExtend">Extend</Button>
+                <div class="flex flex-row justify-end gap-2 pt-2 sm:gap-4 sm:pt-0">
+                    <Button class="flex-1 sm:flex-none" variant="outline" @click="isExtending = false">Cancel</Button>
+                    <Button class="flex-1 sm:flex-none" @click="commitExtend">Extend</Button>
                 </div>
             </DialogContent>
         </Dialog>
         <div class="max-w-7xl w-full mx-auto">
+            <div class="space-y-3 md:hidden">
+                <template v-for="post in LOAList" :key="`mobile-${post.id}`">
+                    <div class="rounded-lg border bg-card p-2.5 shadow-sm">
+                        <div class="grid grid-cols-[minmax(0,1fr)_auto] items-center gap-2">
+                            <div class="min-w-0 overflow-hidden">
+                                <div class="max-w-[70vw] overflow-hidden whitespace-nowrap">
+                                    <MemberCard :member-id="post.member_id"></MemberCard>
+                                </div>
+                            </div>
+                            <Badge v-if="loaStatus(post) === 'Upcoming'" class="shrink-0 bg-blue-400">Upcoming</Badge>
+                            <Badge v-else-if="loaStatus(post) === 'Active'" class="shrink-0 bg-green-500">Active</Badge>
+                            <Badge v-else-if="loaStatus(post) === 'Extended'" class="shrink-0 bg-green-500">Extended</Badge>
+                            <Badge v-else-if="loaStatus(post) === 'Overdue'" class="shrink-0 bg-yellow-400">Overdue</Badge>
+                            <Badge v-else class="shrink-0 bg-gray-400">Ended</Badge>
+                        </div>
+
+                        <div class="mt-1 grid grid-cols-2 gap-x-4 gap-y-1">
+                            <div>
+                                <p class="text-[11px] uppercase tracking-wide text-muted-foreground/90">Start</p>
+                                <p class="text-sm font-semibold text-foreground">{{ formatDate(post.start_date) }}</p>
+                            </div>
+                            <div class="text-right">
+                                <p class="text-[11px] uppercase tracking-wide text-muted-foreground/90">End</p>
+                                <p class="text-sm font-semibold text-foreground">{{ post.extended_till ? formatDate(post.extended_till) : formatDate(post.end_date) }}</p>
+                            </div>
+                        </div>
+
+                        <div class="mt-1 flex items-center justify-end gap-1">
+                            <Button variant="ghost" class="h-8 px-2 text-xs text-muted-foreground" @click="expanded = expanded === post.id ? null : post.id">
+                                <span class="mr-1">Details</span>
+                                <ChevronUp v-if="expanded === post.id" class="size-4" />
+                                <ChevronDown v-else class="size-4" />
+                            </Button>
+
+                            <DropdownMenu>
+                                <DropdownMenuTrigger class="cursor-pointer">
+                                    <Button variant="ghost" size="icon" class="size-8 text-muted-foreground">
+                                        <Ellipsis class="size-5"></Ellipsis>
+                                    </Button>
+                                </DropdownMenuTrigger>
+                                <DropdownMenuContent>
+                                    <DropdownMenuItem v-if="!post.closed"
+                                        :disabled="post.extended_till !== null && !props.adminMode"
+                                        @click="isExtending = true; targetLOA = post">
+                                        {{ (post.extended_till !== null && !props.adminMode) ? 'Extend (Already Extended)' : 'Extend' }}
+                                    </DropdownMenuItem>
+                                    <DropdownMenuItem v-if="!post.closed" :variant="'destructive'"
+                                        @click="cancelAndReload(post.id)">{{ loaStatus(post) === 'Upcoming' ?
+                                            'Cancel' :
+                                            'End' }}
+                                    </DropdownMenuItem>
+                                    <p v-if="post.closed || (!props.adminMode && post.closed)"
+                                        class="p-2 text-center text-sm">
+                                        No actions
+                                    </p>
+                                </DropdownMenuContent>
+                            </DropdownMenu>
+                        </div>
+
+                        <div v-if="expanded === post.id" class="mt-2 space-y-2.5 border-t pt-2 text-sm">
+                            <div class="space-y-1.5">
+                                <div class="flex items-center justify-between gap-3">
+                                    <span class="text-muted-foreground/90">Type</span>
+                                    <span class="text-right font-semibold text-foreground">{{ post.type_name }}</span>
+                                </div>
+                                <div class="flex items-center justify-between gap-3">
+                                    <span class="text-muted-foreground/90">Posted on</span>
+                                    <span class="text-right font-semibold text-foreground">{{ formatDate(post.filed_date) }}</span>
+                                </div>
+                                <div class="flex items-center justify-between gap-3">
+                                    <span class="text-muted-foreground/90">Original end</span>
+                                    <span class="text-right font-semibold text-foreground">{{ formatDate(post.end_date) }}</span>
+                                </div>
+                                <div class="flex items-center justify-between gap-3">
+                                    <span class="text-muted-foreground/90">Extended to</span>
+                                    <span class="text-right font-semibold text-foreground">{{ post.extended_till ? formatDate(post.extended_till) : 'N/A' }}</span>
+                                </div>
+                            </div>
+
+                            <div>
+                                <h4 class="text-[11px] font-semibold uppercase tracking-wide text-muted-foreground/90">Reason</h4>
+                                <p class="mt-1 whitespace-pre-wrap text-sm leading-relaxed text-foreground/90">
+                                    {{ post.reason || 'No reason provided.' }}
+                                </p>
+                            </div>
+                        </div>
+                    </div>
+                </template>
+            </div>
+
+            <div class="hidden overflow-x-auto md:block">
             <Table>
                 <TableHeader>
                     <TableRow>
@@ -242,7 +338,7 @@
                                 <div class="w-full p-4 mb-6 space-y-4">
 
                                     <!-- Dates -->
-                                    <div class="grid grid-cols-3 gap-4 text-sm">
+                                    <div class="grid grid-cols-1 gap-4 text-sm lg:grid-cols-3">
                                         <div>
                                             <p class="text-muted-foreground">Start</p>
                                             <p class="font-medium">
@@ -266,16 +362,12 @@
                                     </div>
 
                                     <!-- Reason -->
-                                    <div class="space-y-2">
-                                        <div class="flex items-center gap-2">
-                                            <h4 class="text-sm font-semibold text-foreground">
-                                                Reason
-                                            </h4>
-                                            <Separator class="flex-1" />
-                                        </div>
+                                    <div class="space-y-2 border-t pt-3">
+                                        <h4 class="text-sm font-semibold text-foreground">
+                                            Reason
+                                        </h4>
 
-                                        <div
-                                            class="rounded-lg border bg-muted/40 px-4 py-3 text-sm leading-relaxed whitespace-pre-wrap text-muted-foreground">
+                                        <div class="text-sm leading-relaxed whitespace-pre-wrap text-muted-foreground">
                                             {{ post.reason || 'No reason provided.' }}
                                         </div>
                                     </div>
@@ -287,8 +379,9 @@
                     </template>
                 </TableBody>
             </Table>
-            <div class="mt-5 flex justify-between">
-                <div></div>
+            </div>
+            <div class="mt-5 flex flex-col gap-3 md:flex-row md:items-center md:justify-between">
+                <div class="hidden md:block"></div>
                 <Pagination v-slot="{ page }" :items-per-page="pageData?.pageSize || 10" :total="pageData?.total || 10"
                     :default-page="2" :page="pageNum" @update:page="setPage">
                     <PaginationContent v-slot="{ items }">
@@ -303,7 +396,7 @@
                         <PaginationNext />
                     </PaginationContent>
                 </Pagination>
-                <div class="flex items-center gap-3 text-sm">
+                <div class="flex items-center justify-end gap-3 text-sm">
                     <p class="text-muted-foreground text-nowrap">Per page:</p>
 
                     <button v-for="size in pageSizeOptions" :key="size" @click="setPageSize(size)"
diff --git a/ui/src/components/ui/dialog/DialogContent.vue b/ui/src/components/ui/dialog/DialogContent.vue
index 9062dd2..7f667b9 100644
--- a/ui/src/components/ui/dialog/DialogContent.vue
+++ b/ui/src/components/ui/dialog/DialogContent.vue
@@ -47,7 +47,7 @@ const forwarded = useForwardPropsEmits(delegatedProps, emits);
       <slot />
 
       <DialogClose
-        class="ring-offset-background focus:ring-ring data-[state=open]:bg-accent data-[state=open]:text-muted-foreground absolute top-4 right-4 rounded-xs opacity-70 transition-opacity hover:opacity-100 focus:ring-2 focus:ring-offset-2 focus:outline-hidden disabled:pointer-events-none [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4"
+        class="ring-offset-background focus:ring-ring data-[state=open]:bg-accent data-[state=open]:text-muted-foreground absolute top-3.5 right-3.5 inline-flex h-9 w-9 items-center justify-center rounded-xs opacity-70 transition-opacity hover:opacity-100 focus:ring-2 focus:ring-offset-2 focus:outline-hidden disabled:pointer-events-none sm:top-4 sm:right-4 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-5"
       >
         <X />
         <span class="sr-only">Close</span>

From 191bc6f4289fdb6c6af29c89c3e8f517e044060d Mon Sep 17 00:00:00 2001
From: ajdj100 <ajairplane@gmail.com>
Date: Sun, 22 Mar 2026 01:24:24 -0400
Subject: [PATCH 07/11] Improved the admin post LOA dialog to function on
 mobile devices

---
 ui/src/pages/ManageLOA.vue | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/ui/src/pages/ManageLOA.vue b/ui/src/pages/ManageLOA.vue
index f3b15b8..b04b6db 100644
--- a/ui/src/pages/ManageLOA.vue
+++ b/ui/src/pages/ManageLOA.vue
@@ -19,14 +19,17 @@ const showLOADialog = ref(false);
 <template>
     <div>
         <Dialog v-model:open="showLOADialog" v-on:update:open="showLOADialog = false">
-            <DialogContent class="sm:max-w-fit">
+            <DialogContent class="w-[95vw] max-w-[95vw] max-h-[90dvh] overflow-y-auto p-4 sm:max-w-fit sm:p-6">
                 <DialogHeader>
                     <DialogTitle>Post LOA</DialogTitle>
                     <DialogDescription>
                         Post an LOA on behalf of a member.
                     </DialogDescription>
                 </DialogHeader>
-                <LoaForm :admin-mode="true" class="my-3"></LoaForm>
+                <LoaForm :admin-mode="true"></LoaForm>
+                <DialogFooter>
+                    <Button variant="outline" @click="showLOADialog = false">Cancel</Button>
+                </DialogFooter>
             </DialogContent>
         </Dialog>
         <div class="mx-auto max-w-5xl px-3 pt-10 sm:px-4 lg:px-0">

From a05b48cd4c004182196a4ec578ad88074403d6f8 Mon Sep 17 00:00:00 2001
From: ajdj100 <ajairplane@gmail.com>
Date: Sun, 22 Mar 2026 01:52:13 -0400
Subject: [PATCH 08/11] Improved mobile support on training report list

---
 ui/src/pages/TrainingReport.vue | 167 ++++++++++++++++++++++++++------
 1 file changed, 136 insertions(+), 31 deletions(-)

diff --git a/ui/src/pages/TrainingReport.vue b/ui/src/pages/TrainingReport.vue
index bad58a5..79ed7da 100644
--- a/ui/src/pages/TrainingReport.vue
+++ b/ui/src/pages/TrainingReport.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import { getTrainingReport, getTrainingReports } from '@/api/trainingReport';
 import { CourseAttendee, CourseEventDetails, CourseEventSummary } from '@shared/types/course';
-import { computed, onMounted, ref, watch } from 'vue';
+import { computed, onBeforeUnmount, onMounted, ref, watch } from 'vue';
 import {
     Table,
     TableBody,
@@ -10,7 +10,7 @@ import {
     TableHeader,
     TableRow,
 } from '@/components/ui/table'
-import { ArrowUpDown, ChevronDown, ChevronUp, Funnel, Link, Plus, Search, X } from 'lucide-vue-next';
+import { ArrowUpDown, ChevronDown, ChevronLeft, ChevronUp, Funnel, Link, Plus, Search, X } from 'lucide-vue-next';
 import Button from '@/components/ui/button/Button.vue';
 import TrainingReportForm from '@/components/trainingReport/trainingReportForm.vue';
 import Checkbox from '@/components/ui/checkbox/Checkbox.vue';
@@ -49,6 +49,21 @@ const sidePanel = computed<sidePanelState>(() => {
     return sidePanelState.closed;
 })
 
+const isMobile = ref(false);
+const mobilePanel = ref<sidePanelState>(sidePanelState.closed);
+let mobileMediaQuery: MediaQueryList | null = null;
+
+function syncMobileMode() {
+    isMobile.value = mobileMediaQuery?.matches ?? window.innerWidth < 1024;
+    if (!isMobile.value) {
+        mobilePanel.value = sidePanelState.closed;
+    }
+}
+
+const effectivePanel = computed<sidePanelState>(() => {
+    return isMobile.value ? mobilePanel.value : sidePanel.value;
+})
+
 watch(() => route.params.id, async (newID) => {
     if (!newID) {
         focusedTrainingReport.value = null;
@@ -82,6 +97,41 @@ async function closeTrainingReport() {
     focusedTrainingReport.value = null;
 }
 
+async function openTrainingReport(id: number) {
+    if (isMobile.value) {
+        focusedTrainingReport.value = null;
+        TRLoaded.value = false;
+        expanded.value = null;
+        mobilePanel.value = sidePanelState.view;
+        await viewTrainingReport(id);
+        return;
+    }
+
+    router.push(`/trainingReport/${id}`);
+}
+
+function openCreatePanel() {
+    if (isMobile.value) {
+        mobilePanel.value = sidePanelState.create;
+        focusedTrainingReport.value = null;
+        return;
+    }
+
+    router.push('/trainingReport/new');
+}
+
+async function closePanel() {
+    if (isMobile.value) {
+        mobilePanel.value = sidePanelState.closed;
+        focusedTrainingReport.value = null;
+        TRLoaded.value = false;
+        expanded.value = null;
+        return;
+    }
+
+    await closeTrainingReport();
+}
+
 const sortMode = ref<string>("descending");
 const searchString = ref<string>("");
 let debounceTimer: ReturnType<typeof setTimeout> | null = null;
@@ -105,12 +155,20 @@ async function loadTrainingReports() {
 }
 
 onMounted(async () => {
+    mobileMediaQuery = window.matchMedia('(max-width: 1023px)');
+    syncMobileMode();
+    mobileMediaQuery.addEventListener('change', syncMobileMode);
+
     await loadTrainingReports();
     if (route.params.id)
         viewTrainingReport(Number(route.params.id))
     loaded.value = true;
 })
 
+onBeforeUnmount(() => {
+    mobileMediaQuery?.removeEventListener('change', syncMobileMode);
+})
+
 const TRLoaded = ref(false);
 
 const pageNum = ref<number>(1);
@@ -119,6 +177,16 @@ const pageData = ref<pagination>();
 const pageSize = ref<number>(15)
 const pageSizeOptions = [10, 15, 30]
 
+function formatDate(date: Date | string): string {
+    if (!date) return '';
+    const dateObj = typeof date === 'string' ? new Date(date) : date;
+    return dateObj.toLocaleDateString('en-US', {
+        year: 'numeric',
+        month: 'short',
+        day: 'numeric',
+    });
+}
+
 function setPageSize(size: number) {
     pageSize.value = size
     pageNum.value = 1;
@@ -134,21 +202,22 @@ const expanded = ref<number>(null);
 </script>
 
 <template>
-    <div class="px-20 mx-auto max-w-[100rem] w-full flex mt-5">
+    <div class="mx-auto mt-5 flex w-full max-w-[100rem] flex-col px-3 sm:px-4 lg:flex-row lg:px-8 xl:px-20">
         <!-- training report list -->
-        <div class="px-4 my-3" :class="sidePanel == sidePanelState.closed ? 'w-full' : 'w-2/5'">
+        <div v-show="!isMobile || effectivePanel === sidePanelState.closed" class="my-3 px-0 lg:px-4"
+            :class="effectivePanel == sidePanelState.closed ? 'w-full' : 'w-full lg:w-2/5'">
             <div class="flex justify-between mb-4">
                 <p class="scroll-m-20 text-2xl font-semibold tracking-tight">Training Reports</p>
-                <Button @click="router.push('/trainingReport/new')">
+                <Button @click="openCreatePanel()">
                     <Plus></Plus> New Training Report
                 </Button>
             </div>
             <!-- search/filter -->
-            <div class="flex justify-between">
+            <div class="flex flex-col gap-3 sm:flex-row sm:items-end sm:justify-between">
                 <!-- <Search></Search>
                 <Funnel></Funnel> -->
                 <div></div>
-                <div class="flex flex-row gap-5">
+                <div class="flex flex-col gap-3 sm:flex-row sm:gap-5">
                     <div>
                         <label class="text-muted-foreground">Search</label>
                         <Input v-model="searchString" placeholder="Search..."></Input>
@@ -172,7 +241,24 @@ const expanded = ref<number>(null);
                     </div>
                 </div>
             </div>
-            <div class="overflow-y-auto max-h-[70vh] mt-5 scrollbar-themed">
+            <div class="mt-5">
+                <div class="space-y-2 md:hidden">
+                    <button v-for="report in trainingReports" :key="`mobile-report-${report.event_id}`"
+                        class="w-full rounded-lg border bg-card px-3 py-2 text-left transition-colors hover:bg-muted/40"
+                        @click="openTrainingReport(report.event_id)">
+                        <p class="font-semibold text-foreground">
+                            {{ report.course_name.length > 35 ? report.course_shortname : report.course_name }}
+                        </p>
+                        <p class="mt-1 text-sm text-muted-foreground">{{ formatDate(report.date) }}</p>
+                        <div class="mt-2 flex items-center gap-2 text-xs text-muted-foreground">
+                            <span class="font-medium">Posted by:</span>
+                            <MemberCard v-if="report.created_by" :member-id="report.created_by"></MemberCard>
+                            <span v-else>Unknown User</span>
+                        </div>
+                    </button>
+                </div>
+
+                <div class="hidden md:block">
                 <Table>
                     <TableHeader class="">
                         <TableRow>
@@ -187,12 +273,12 @@ const expanded = ref<number>(null);
                     </TableHeader>
                     <TableBody v-if="loaded">
                         <TableRow class="cursor-pointer" v-for="report in trainingReports" :key="report.event_id"
-                            @click="router.push(`/trainingReport/${report.event_id}`)">
+                            @click="openTrainingReport(report.event_id)">
                             <TableCell class="font-medium">{{ report.course_name.length > 30 ? report.course_shortname :
                                 report.course_name }}</TableCell>
                             <TableCell>{{ report.date.split('T')[0] }}</TableCell>
                             <TableCell class="text-right">
-                                <MemberCard v-if="report.created_by_name" :member-id="report.created_by"></MemberCard>
+                                <MemberCard v-if="report.created_by" :member-id="report.created_by"></MemberCard>
                                 <span v-else>Unknown User</span>
                             </TableCell>
                             <!-- <TableCell class="text-right">{{ report.created_by_name === null ? "Unknown User" :
@@ -201,10 +287,11 @@ const expanded = ref<number>(null);
                         </TableRow>
                     </TableBody>
                 </Table>
+                </div>
             </div>
-            <div class="mt-5 flex justify-between"
-                :class="sidePanel !== sidePanelState.closed ? 'flex-col items-center' : 'items-center justify-between'">
-                <div></div>
+            <div class="mt-5 flex flex-col gap-3 md:flex-row md:items-center md:justify-between"
+                :class="effectivePanel !== sidePanelState.closed ? 'items-center' : ''">
+                <div class="hidden md:block"></div>
                 <Pagination v-slot="{ page }" :items-per-page="pageData?.pageSize || 10" :total="pageData?.total || 10"
                     :default-page="2" :page="pageNum" @update:page="setPage">
                     <PaginationContent v-slot="{ items }">
@@ -219,8 +306,9 @@ const expanded = ref<number>(null);
                         <PaginationNext />
                     </PaginationContent>
                 </Pagination>
-                <div class="flex items-center gap-3 text-sm" :class="sidePanel !== sidePanelState.closed ? 'mt-3' : ''">
-                    <p class="text-muted-foreground text-nowrap">Per page:</p>
+                <div class="flex flex-wrap items-center justify-end gap-2 text-sm"
+                    :class="effectivePanel !== sidePanelState.closed ? 'w-full justify-center md:w-auto md:justify-end' : ''">
+                    <p class="text-muted-foreground">Per page:</p>
 
                     <button v-for="size in pageSizeOptions" :key="size" @click="setPageSize(size)"
                         class="px-2 py-1 rounded transition-colors" :class="{
@@ -234,31 +322,35 @@ const expanded = ref<number>(null);
 
         </div>
         <!-- view training report section -->
-        <div v-if="focusedTrainingReport != null && sidePanel == sidePanelState.view" class="pl-9 my-3 border-l w-3/5">
+        <div v-if="focusedTrainingReport != null && effectivePanel == sidePanelState.view"
+            :class="isMobile
+                ? 'fixed inset-0 z-[60] overflow-y-auto bg-background px-3 py-3'
+                : 'my-3 mt-2 w-full lg:mt-0 lg:w-3/5 lg:border-l lg:pl-9'">
             <div class="flex justify-between items-center">
                 <p class="scroll-m-20 text-2xl font-semibold tracking-tight">Training Report Details</p>
                 <div class="flex items-center gap-2">
-                    <Button class="cursor-pointer" variant="ghost" size="icon" @click="CopyLink()">
+                    <Button v-if="isMobile" @click="closePanel" class="cursor-pointer" variant="outline" size="sm">
+                        <ChevronLeft class="size-4"></ChevronLeft> Back
+                    </Button>
+                    <Button v-else class="cursor-pointer" variant="ghost" size="icon" @click="CopyLink()">
                         <Link class="size-4" />
                     </Button>
-                    <Button @click="closeTrainingReport" class="cursor-pointer" variant="ghost" size="icon">
+                    <Button v-if="!isMobile" @click="closePanel" class="cursor-pointer" variant="ghost" size="icon">
                         <X class="size-6"></X>
                     </Button>
                 </div>
             </div>
-            <div v-if="TRLoaded" class="max-h-[70vh] overflow-auto scrollbar-themed my-5">
+            <div v-if="TRLoaded" :class="isMobile ? 'my-3 pb-8' : 'max-h-[70vh] overflow-auto scrollbar-themed my-5'">
                 <div class="flex flex-col mb-5 border rounded-lg bg-muted/70 p-2 py-3 px-4">
                     <p class="scroll-m-20 text-xl font-semibold tracking-tight">{{ focusedTrainingReport.course_name }}
                     </p>
                     <div class="flex gap-10 items-center">
-                        <p class="text-muted-foreground">{{ focusedTrainingReport.event_date.split('T')[0] }}</p>
-                        <p class="flex gap-2 items-center">Created by:
+                        <p class="text-muted-foreground">{{ formatDate(focusedTrainingReport.event_date) }}</p>
+                        <div class="flex gap-2 items-center">Created by:
                             <MemberCard v-if="focusedTrainingReport.created_by"
                                 :member-id="focusedTrainingReport.created_by" />
-                        <p v-else>{{ focusedTrainingReport.created_by_name === null ? "Unknown User" :
-                            focusedTrainingReport.created_by_name
-                            }}</p>
-                        </p>
+                            <span v-else>Unknown User</span>
+                        </div>
                     </div>
                 </div>
                 <div class="flex flex-col gap-8 ">
@@ -452,18 +544,31 @@ const expanded = ref<number>(null);
                 <Spinner class="size-8"></Spinner>
             </div>
         </div>
-        <div v-if="sidePanel == sidePanelState.create" class="pl-7 border-l w-3/5 max-w-5xl">
+        <div v-if="effectivePanel == sidePanelState.create" :class="isMobile
+            ? 'fixed inset-0 z-[60] overflow-y-auto bg-background px-3 py-3'
+            : 'mt-2 w-full max-w-5xl lg:mt-0 lg:w-3/5 lg:border-l lg:pl-7'">
             <div class="flex justify-between items-center my-3">
-                <div class="flex pl-2 gap-5">
+                <div class="flex gap-5 lg:pl-2">
                     <p class="scroll-m-20 text-2xl font-semibold tracking-tight">New Training Report</p>
                 </div>
-                <Button @click="closeTrainingReport" class="cursor-pointer" variant="ghost" size="icon">
+                <Button v-if="isMobile" @click="closePanel" class="cursor-pointer" variant="outline" size="sm">
+                    <ChevronLeft class="size-4"></ChevronLeft> Back
+                </Button>
+                <Button v-else @click="closePanel" class="cursor-pointer" variant="ghost" size="icon">
                     <X class="size-6"></X>
                 </Button>
             </div>
-            <div class="overflow-y-auto max-h-[70vh] mt-5 scrollbar-themed">
-                <TrainingReportForm class="w-full pl-2"
-                    @submit="(newID) => { router.push(`/trainingReport/${newID}`); loadTrainingReports() }">
+            <div :class="isMobile ? 'mt-3 pb-8' : 'overflow-y-auto max-h-[70vh] mt-5 scrollbar-themed'">
+                <TrainingReportForm class="w-full lg:pl-2"
+                    @submit="async (newID) => {
+                        if (isMobile) {
+                            await viewTrainingReport(newID);
+                            mobilePanel = sidePanelState.view;
+                        } else {
+                            router.push(`/trainingReport/${newID}`);
+                        }
+                        loadTrainingReports()
+                    }">
                 </TrainingReportForm>
             </div>
         </div>

From b64891c2a26236b9d14b29fa1d6edff6e7080861 Mon Sep 17 00:00:00 2001
From: ajdj100 <ajairplane@gmail.com>
Date: Sun, 22 Mar 2026 10:14:53 -0400
Subject: [PATCH 09/11] Added mobile friendly display to the training reports
 page

---
 ui/src/App.vue                  |  26 +-
 ui/src/pages/TrainingReport.vue | 421 +++++++++++++++++++++-----------
 2 files changed, 302 insertions(+), 145 deletions(-)

diff --git a/ui/src/App.vue b/ui/src/App.vue
index 19d15fc..f869b64 100644
--- a/ui/src/App.vue
+++ b/ui/src/App.vue
@@ -6,8 +6,11 @@
   import AlertDescription from './components/ui/alert/AlertDescription.vue';
   import Navbar from './components/Navigation/Navbar.vue';
   import { cancelLOA } from './api/loa';
+  import { onBeforeUnmount, onMounted, ref } from 'vue';
 
   const userStore = useUserStore();
+  const headerRef = ref<HTMLDivElement | null>(null);
+  let resizeObserver: ResizeObserver | null = null;
 
   function formatDate(dateStr) {
     if (!dateStr) return "";
@@ -22,6 +25,27 @@
   const environment = import.meta.env.VITE_ENVIRONMENT;
   //@ts-ignore
   const version = import.meta.env.VITE_APPLICATION_VERSION;
+
+  function updateHeaderHeight() {
+    if (!headerRef.value) return;
+    const height = headerRef.value.offsetHeight;
+    document.documentElement.style.setProperty('--app-header-height', `${height}px`);
+  }
+
+  onMounted(() => {
+    updateHeaderHeight();
+
+    // Gracefully skip observer setup for environments that do not support ResizeObserver.
+    if (typeof ResizeObserver === 'undefined' || !headerRef.value) return;
+
+    resizeObserver = new ResizeObserver(updateHeaderHeight);
+    resizeObserver.observe(headerRef.value);
+  });
+
+  onBeforeUnmount(() => {
+    resizeObserver?.disconnect();
+  });
+
 </script>
 
 <template>
@@ -29,7 +53,7 @@
       background-size: contain; 
       background-attachment: fixed;
       background-position: center;">
-    <div class="sticky top-0 bg-background z-50">
+    <div class="sticky top-0 bg-background z-50" ref="headerRef">
       <Navbar class="flex"></Navbar>
       <Alert v-if="environment == 'dev'" class="m-2 mx-auto max-w-5xl" variant="info">
         <AlertDescription class="flex flex-row items-center text-wrap gap-5 mx-auto">
diff --git a/ui/src/pages/TrainingReport.vue b/ui/src/pages/TrainingReport.vue
index 79ed7da..67ff981 100644
--- a/ui/src/pages/TrainingReport.vue
+++ b/ui/src/pages/TrainingReport.vue
@@ -205,7 +205,7 @@ const expanded = ref<number>(null);
     <div class="mx-auto mt-5 flex w-full max-w-[100rem] flex-col px-3 sm:px-4 lg:flex-row lg:px-8 xl:px-20">
         <!-- training report list -->
         <div v-show="!isMobile || effectivePanel === sidePanelState.closed" class="my-3 px-0 lg:px-4"
-            :class="effectivePanel == sidePanelState.closed ? 'w-full' : 'w-full lg:w-2/5'">
+            :class="effectivePanel == sidePanelState.closed ? 'w-full' : 'w-full lg:flex-[0_0_26rem] xl:flex-[0_0_30rem]'">
             <div class="flex justify-between mb-4">
                 <p class="scroll-m-20 text-2xl font-semibold tracking-tight">Training Reports</p>
                 <Button @click="openCreatePanel()">
@@ -323,9 +323,8 @@ const expanded = ref<number>(null);
         </div>
         <!-- view training report section -->
         <div v-if="focusedTrainingReport != null && effectivePanel == sidePanelState.view"
-            :class="isMobile
-                ? 'fixed inset-0 z-[60] overflow-y-auto bg-background px-3 py-3'
-                : 'my-3 mt-2 w-full lg:mt-0 lg:w-3/5 lg:border-l lg:pl-9'">
+            :class="isMobile ? 'fixed inset-0 z-[60] overflow-y-auto px-3 py-3' : 'my-3 mt-2 w-full min-w-0 lg:mt-0 lg:flex-1 lg:border-l lg:pl-9'"
+            :style="isMobile ? { top: 'var(--app-header-height, 60px)' } : {}">
             <div class="flex justify-between items-center">
                 <p class="scroll-m-20 text-2xl font-semibold tracking-tight">Training Report Details</p>
                 <div class="flex items-center gap-2">
@@ -340,11 +339,11 @@ const expanded = ref<number>(null);
                     </Button>
                 </div>
             </div>
-            <div v-if="TRLoaded" :class="isMobile ? 'my-3 pb-8' : 'max-h-[70vh] overflow-auto scrollbar-themed my-5'">
+            <div v-if="TRLoaded" :class="isMobile ? 'my-3 pb-8' : 'my-5 max-h-[70vh] overflow-y-auto overflow-x-hidden scrollbar-themed'">
                 <div class="flex flex-col mb-5 border rounded-lg bg-muted/70 p-2 py-3 px-4">
                     <p class="scroll-m-20 text-xl font-semibold tracking-tight">{{ focusedTrainingReport.course_name }}
                     </p>
-                    <div class="flex gap-10 items-center">
+                    <div class="mt-2 flex flex-col gap-2 text-sm sm:flex-row sm:items-center sm:gap-10">
                         <p class="text-muted-foreground">{{ formatDate(focusedTrainingReport.event_date) }}</p>
                         <div class="flex gap-2 items-center">Created by:
                             <MemberCard v-if="focusedTrainingReport.created_by"
@@ -357,51 +356,91 @@ const expanded = ref<number>(null);
                     <!-- Trainers -->
                     <div>
                         <label class="scroll-m-20 text-xl font-semibold tracking-tight">Trainers</label>
-                        <div
-                            class="grid grid-cols-[1fr_1fr_2fr_3rem] py-2 text-sm font-medium text-muted-foreground border-b">
-                            <span>Name</span>
-                            <span class="">Role</span>
-                            <span class="text-right">Remarks</span>
-                            <span></span>
-                        </div>
-                        <div v-for="person in focusedTrainingTrainers" class=" items-center border-b last:border-none"
-                            :class="expanded === person.attendee_id && 'bg-muted/20'">
-                            <div class="grid grid-cols-[1fr_1fr_2fr_3rem] items-center py-2">
-                                <div>
-                                    <MemberCard v-if="person.attendee_id" :member-id="person.attendee_id"
-                                        class="justify-self-start"></MemberCard>
-                                    <p v-else>{{ person.attendee_name }}</p>
-                                </div>
-                                <p class="">{{ person.role.name }}</p>
-                                <p class="text-right px-2 truncate"
-                                    :class="person.remarks == '' ? 'text-muted-foreground' : ''">
-                                    {{ person.remarks == "" ?
-                                        '--'
-                                        : person.remarks }}</p>
-                                <div class="w-min mx-auto">
-                                    <Button v-if="expanded === person.attendee_id" @click.stop="expanded = null"
-                                        variant="ghost" size="icon">
-                                        <ChevronUp class="size-6" />
-                                    </Button>
-                                    <Button v-else @click.stop="expanded = person.attendee_id" variant="ghost"
-                                        size="icon">
-                                        <ChevronDown class="size-6" />
+                        <div class="mt-3 space-y-2 md:hidden">
+                            <article v-for="person in focusedTrainingTrainers" :key="person.attendee_id ?? person.attendee_name"
+                                class="rounded-xl border bg-card p-3 shadow-sm" :class="expanded === person.attendee_id && 'ring-1 ring-primary/30'">
+                                <div class="flex items-start justify-between gap-2">
+                                    <div class="min-w-0">
+                                        <MemberCard v-if="person.attendee_id" :member-id="person.attendee_id"
+                                            class="max-w-full whitespace-nowrap overflow-hidden text-ellipsis"></MemberCard>
+                                        <p v-else class="font-medium whitespace-nowrap overflow-hidden text-ellipsis">{{ person.attendee_name }}</p>
+                                    </div>
+                                    <Button @click.stop="expanded === person.attendee_id ? expanded = null : expanded = person.attendee_id"
+                                        variant="ghost" size="icon" class="shrink-0">
+                                        <ChevronDown v-if="expanded !== person.attendee_id" class="size-5" />
+                                        <ChevronUp v-else class="size-5" />
                                     </Button>
                                 </div>
-                            </div>
-                            <div class="col-span-full" v-if="expanded === person.attendee_id">
-                                <div class="px-6 pb-5 pt-2 space-y-2">
-                                    <p class="text-sm font-medium text-foreground">
-                                        Remarks
-                                    </p>
+                                <div class="mt-3 grid grid-cols-1 gap-2 text-xs">
+                                    <div class="rounded-lg bg-muted px-3 py-2">
+                                        <p class="text-muted-foreground">Role</p>
+                                        <p class="font-medium text-foreground">{{ person.role.name }}</p>
+                                    </div>
+                                    <div class="rounded-lg bg-muted px-3 py-2">
+                                        <p class="text-muted-foreground">Remarks</p>
+                                        <p class="font-medium text-foreground truncate">{{ person.remarks || '--' }}</p>
+                                    </div>
+                                </div>
+                                <div v-if="expanded === person.attendee_id" class="mt-3 rounded-lg border bg-background px-3 py-2">
+                                    <p class="text-sm font-medium text-foreground">Full Remarks</p>
                                     <p v-if="person.remarks"
-                                        class="text-sm text-muted-foreground leading-relaxed whitespace-pre-wrap max-h-72 overflow-y-auto">
+                                        class="mt-1 text-sm text-muted-foreground leading-relaxed whitespace-pre-wrap max-h-72 overflow-y-auto">
                                         {{ person.remarks }}
                                     </p>
-                                    <p v-else class="text-sm text-muted-foreground italic">
+                                    <p v-else class="mt-1 text-sm text-muted-foreground italic">
                                         None provided
                                     </p>
                                 </div>
+                            </article>
+                        </div>
+                        <div class="mt-2 hidden md:block">
+                            <div
+                                class="grid grid-cols-[minmax(0,1.6fr)_minmax(0,1fr)_minmax(0,1.4fr)_2.5rem] py-2 text-sm font-medium text-muted-foreground border-b gap-x-2">
+                                <span>Name</span>
+                                <span>Role</span>
+                                <span class="text-right">Remarks</span>
+                                <span></span>
+                            </div>
+                            <div v-for="person in focusedTrainingTrainers" :key="person.attendee_id ?? person.attendee_name"
+                                class="items-center border-b last:border-none"
+                                :class="expanded === person.attendee_id && 'bg-muted/20'">
+                                <div class="grid grid-cols-[minmax(0,1.6fr)_minmax(0,1fr)_minmax(0,1.4fr)_2.5rem] items-center py-2 gap-x-2">
+                                    <div class="min-w-0">
+                                        <MemberCard v-if="person.attendee_id" :member-id="person.attendee_id"
+                                            class="justify-self-start max-w-full whitespace-nowrap overflow-hidden text-ellipsis"></MemberCard>
+                                        <p v-else class="whitespace-nowrap overflow-hidden text-ellipsis">{{ person.attendee_name }}</p>
+                                    </div>
+                                    <p class="truncate">{{ person.role.name }}</p>
+                                    <p class="text-right px-2 truncate"
+                                        :class="person.remarks == '' ? 'text-muted-foreground' : ''">
+                                        {{ person.remarks == "" ?
+                                            '--'
+                                            : person.remarks }}</p>
+                                    <div class="w-min mx-auto">
+                                        <Button v-if="expanded === person.attendee_id" @click.stop="expanded = null"
+                                            variant="ghost" size="icon">
+                                            <ChevronUp class="size-6" />
+                                        </Button>
+                                        <Button v-else @click.stop="expanded = person.attendee_id" variant="ghost"
+                                            size="icon">
+                                            <ChevronDown class="size-6" />
+                                        </Button>
+                                    </div>
+                                </div>
+                                <div class="col-span-full" v-if="expanded === person.attendee_id">
+                                    <div class="px-6 pb-5 pt-2 space-y-2">
+                                        <p class="text-sm font-medium text-foreground">
+                                            Remarks
+                                        </p>
+                                        <p v-if="person.remarks"
+                                            class="text-sm text-muted-foreground leading-relaxed whitespace-pre-wrap max-h-72 overflow-y-auto">
+                                            {{ person.remarks }}
+                                        </p>
+                                        <p v-else class="text-sm text-muted-foreground italic">
+                                            None provided
+                                        </p>
+                                    </div>
+                                </div>
                             </div>
                         </div>
                     </div>
@@ -409,63 +448,110 @@ const expanded = ref<number>(null);
                     <div>
                         <div class="flex flex-col">
                             <label class="scroll-m-20 text-xl font-semibold tracking-tight">Trainees</label>
-                            <div
-                                class="grid grid-cols-[1fr_5rem_5rem_2fr_3rem] py-2 text-sm font-medium text-muted-foreground border-b px-2">
-                                <span>Name</span>
-                                <span class="text-center">Bookwork</span>
-                                <span class="text-center">Qual</span>
-                                <span class="text-right">Remarks</span>
-                                <span class="w-15"></span>
+                            <div class="mt-3 space-y-2 md:hidden">
+                                <article v-for="person in focusedTrainingTrainees" :key="person.attendee_id ?? person.attendee_name"
+                                    class="rounded-xl border bg-card p-3 shadow-sm" :class="expanded === person.attendee_id && 'ring-1 ring-primary/30'">
+                                    <div class="flex items-start justify-between gap-2">
+                                        <div class="min-w-0">
+                                            <MemberCard v-if="person.attendee_id" :member-id="person.attendee_id"
+                                                class="max-w-full whitespace-nowrap overflow-hidden text-ellipsis"></MemberCard>
+                                            <p v-else class="font-medium whitespace-nowrap overflow-hidden text-ellipsis">{{ person.attendee_name }}</p>
+                                        </div>
+                                        <Button @click.stop="expanded === person.attendee_id ? expanded = null : expanded = person.attendee_id"
+                                            variant="ghost" size="icon" class="shrink-0">
+                                            <ChevronDown v-if="expanded !== person.attendee_id" class="size-5" />
+                                            <ChevronUp v-else class="size-5" />
+                                        </Button>
+                                    </div>
+                                    <div class="mt-3 grid grid-cols-2 gap-2 text-xs">
+                                        <div class="rounded-lg bg-muted px-3 py-2 text-center">
+                                            <p class="text-muted-foreground">Bookwork</p>
+                                            <p class="font-semibold text-foreground">{{ !focusedTrainingReport.course.hasBookwork ? 'N/A' : (person.passed_bookwork ? 'Pass' : 'Fail') }}</p>
+                                        </div>
+                                        <div class="rounded-lg bg-muted px-3 py-2 text-center">
+                                            <p class="text-muted-foreground">Qual</p>
+                                            <p class="font-semibold text-foreground">{{ !focusedTrainingReport.course.hasQual ? 'N/A' : (person.passed_qual ? 'Pass' : 'Fail') }}</p>
+                                        </div>
+                                        <div class="col-span-2 rounded-lg bg-muted px-3 py-2">
+                                            <p class="text-muted-foreground">Remarks</p>
+                                            <p class="font-medium text-foreground truncate">{{ person.remarks || '--' }}</p>
+                                        </div>
+                                    </div>
+                                    <div v-if="expanded === person.attendee_id" class="mt-3 rounded-lg border bg-background px-3 py-2">
+                                        <p class="text-sm font-medium text-foreground">Full Remarks</p>
+                                        <p v-if="person.remarks"
+                                            class="mt-1 text-sm text-muted-foreground leading-relaxed whitespace-pre-wrap max-h-72 overflow-y-auto">
+                                            {{ person.remarks }}
+                                        </p>
+                                        <p v-else class="mt-1 text-sm text-muted-foreground italic">
+                                            None provided
+                                        </p>
+                                    </div>
+                                </article>
                             </div>
-                        </div>
-                        <div v-for="person in focusedTrainingTrainees" class="border-b last:border-none"
-                            :class="expanded === person.attendee_id && 'bg-muted/20'">
-                            <div class="grid grid-cols-[1fr_5rem_5rem_2fr_3rem] py-2 items-center mx-2">
-                                <div>
-                                    <MemberCard v-if="person.attendee_id" :member-id="person.attendee_id"
-                                        class="justify-self-start"></MemberCard>
-                                    <p v-else>{{ person.attendee_name }}</p>
+                            <div class="hidden md:block">
+                                <div
+                                    class="grid grid-cols-[minmax(0,1.6fr)_4.25rem_4.25rem_minmax(0,1.4fr)_2.5rem] py-2 text-sm font-medium text-muted-foreground border-b px-2 gap-x-2">
+                                    <span>Name</span>
+                                    <span class="text-center">Bookwork</span>
+                                    <span class="text-center">Qual</span>
+                                    <span class="text-right">Remarks</span>
+                                    <span class="w-15"></span>
                                 </div>
-                                <Tooltip :open="!focusedTrainingReport.course.hasBookwork" class="mx-auto"
-                                    message="This course does not have bookwork">
-                                    <Checkbox :disabled="!focusedTrainingReport.course.hasBookwork"
-                                        :model-value="person.passed_bookwork" class="pointer-events-none">
-                                    </Checkbox>
-                                </Tooltip>
-                                <Tooltip :open="!focusedTrainingReport.course.hasQual" class="mx-auto"
-                                    message="This course does not have a qualification">
-                                    <Checkbox :disabled="!focusedTrainingReport.course.hasQual"
-                                        :model-value="person.passed_qual" class="pointer-events-none ml-1">
-                                    </Checkbox>
-                                </Tooltip>
-                                <p class="text-right truncate"
-                                    :class="person.remarks == '' ? 'text-muted-foreground' : ''">
-                                    {{ person.remarks == "" ?
-                                        '--'
-                                        : person.remarks }}</p>
-                                <div class="w-min mx-auto">
-                                    <Button v-if="expanded === person.attendee_id" @click.stop="expanded = null"
-                                        variant="ghost" size="icon">
-                                        <ChevronUp class="size-6" />
-                                    </Button>
-                                    <Button v-else @click.stop="expanded = person.attendee_id" variant="ghost"
-                                        size="icon">
-                                        <ChevronDown class="size-6" />
-                                    </Button>
-                                </div>
-                            </div>
-                            <div class="col-span-full" v-if="expanded === person.attendee_id">
-                                <div class="px-6 pb-5 pt-2 space-y-2">
-                                    <p class="text-sm font-medium text-foreground">
-                                        Remarks
-                                    </p>
-                                    <p v-if="person.remarks"
-                                        class="text-sm text-muted-foreground leading-relaxed whitespace-pre-wrap max-h-72 overflow-y-auto">
-                                        {{ person.remarks }}
-                                    </p>
-                                    <p v-else class="text-sm text-muted-foreground italic">
-                                        None provided
-                                    </p>
+                                <div v-for="person in focusedTrainingTrainees" :key="person.attendee_id ?? person.attendee_name" class="border-b last:border-none"
+                                    :class="expanded === person.attendee_id && 'bg-muted/20'">
+                                    <div class="grid grid-cols-[minmax(0,1.6fr)_4.25rem_4.25rem_minmax(0,1.4fr)_2.5rem] py-2 items-center px-2 gap-x-2">
+                                        <div class="min-w-0">
+                                            <MemberCard v-if="person.attendee_id" :member-id="person.attendee_id"
+                                                class="justify-self-start max-w-full whitespace-nowrap overflow-hidden text-ellipsis"></MemberCard>
+                                            <p v-else class="whitespace-nowrap overflow-hidden text-ellipsis">{{ person.attendee_name }}</p>
+                                        </div>
+                                        <div class="flex justify-center">
+                                            <Tooltip :open="!focusedTrainingReport.course.hasBookwork"
+                                                message="This course does not have bookwork">
+                                                <Checkbox :disabled="!focusedTrainingReport.course.hasBookwork"
+                                                    :model-value="person.passed_bookwork" class="pointer-events-none">
+                                                </Checkbox>
+                                            </Tooltip>
+                                        </div>
+                                        <div class="flex justify-center">
+                                            <Tooltip :open="!focusedTrainingReport.course.hasQual"
+                                                message="This course does not have a qualification">
+                                                <Checkbox :disabled="!focusedTrainingReport.course.hasQual"
+                                                    :model-value="person.passed_qual" class="pointer-events-none">
+                                                </Checkbox>
+                                            </Tooltip>
+                                        </div>
+                                        <p class="text-right truncate"
+                                            :class="person.remarks == '' ? 'text-muted-foreground' : ''">
+                                            {{ person.remarks == "" ?
+                                                '--'
+                                                : person.remarks }}</p>
+                                        <div class="w-min mx-auto">
+                                            <Button v-if="expanded === person.attendee_id" @click.stop="expanded = null"
+                                                variant="ghost" size="icon">
+                                                <ChevronUp class="size-6" />
+                                            </Button>
+                                            <Button v-else @click.stop="expanded = person.attendee_id" variant="ghost"
+                                                size="icon">
+                                                <ChevronDown class="size-6" />
+                                            </Button>
+                                        </div>
+                                    </div>
+                                    <div class="col-span-full" v-if="expanded === person.attendee_id">
+                                        <div class="px-6 pb-5 pt-2 space-y-2">
+                                            <p class="text-sm font-medium text-foreground">
+                                                Remarks
+                                            </p>
+                                            <p v-if="person.remarks"
+                                                class="text-sm text-muted-foreground leading-relaxed whitespace-pre-wrap max-h-72 overflow-y-auto">
+                                                {{ person.remarks }}
+                                            </p>
+                                            <p v-else class="text-sm text-muted-foreground italic">
+                                                None provided
+                                            </p>
+                                        </div>
+                                    </div>
                                 </div>
                             </div>
                         </div>
@@ -477,60 +563,108 @@ const expanded = ref<number>(null);
                                 No Shows
                             </label>
 
-                            <div
-                                class="grid grid-cols-[1fr_5rem_5rem_2fr_3rem] py-2 text-sm font-medium text-muted-foreground border-b">
-                                <span>Name</span>
-                                <span></span>
-                                <span></span>
-                                <span class="text-right">Remarks</span>
-                                <span></span>
-                            </div>
-                        </div>
+                            <div class="mt-3 space-y-2 md:hidden">
+                                <article v-for="person in focusedNoShows" :key="person.attendee_id ?? person.attendee_name"
+                                    class="rounded-xl border bg-card p-3 shadow-sm" :class="expanded === person.attendee_id && 'ring-1 ring-primary/30'">
+                                    <div class="flex items-start justify-between gap-2">
+                                        <div class="min-w-0">
+                                            <MemberCard v-if="person.attendee_id" :member-id="person.attendee_id"
+                                                class="max-w-full whitespace-nowrap overflow-hidden text-ellipsis" />
+                                            <p v-else class="font-medium whitespace-nowrap overflow-hidden text-ellipsis">{{ person.attendee_name }}</p>
+                                        </div>
+                                        <Button variant="ghost" size="icon" class="shrink-0" @click.stop="expanded === person.attendee_id
+                                            ? expanded = null
+                                            : expanded = person.attendee_id">
+                                            <ChevronDown v-if="expanded !== person.attendee_id" class="size-5" />
+                                            <ChevronUp v-else class="size-5" />
+                                        </Button>
+                                    </div>
+                                    <div class="mt-3 grid grid-cols-2 gap-2 text-xs">
+                                        <div class="rounded-lg bg-muted px-3 py-2 text-center">
+                                            <p class="text-muted-foreground">Bookwork</p>
+                                            <p class="font-semibold text-foreground">N/A</p>
+                                        </div>
+                                        <div class="rounded-lg bg-muted px-3 py-2 text-center">
+                                            <p class="text-muted-foreground">Qual</p>
+                                            <p class="font-semibold text-foreground">N/A</p>
+                                        </div>
+                                        <div class="col-span-2 rounded-lg bg-muted px-3 py-2">
+                                            <p class="text-muted-foreground">Remarks</p>
+                                            <p class="font-medium text-foreground truncate">{{ person.remarks || '--' }}</p>
+                                        </div>
+                                    </div>
 
-                        <div v-for="person in focusedNoShows" :key="person.attendee_id ?? person.attendee_name"
-                            class="border-b last:border-none transition-colors"
-                            :class="expanded === person.attendee_id && 'bg-muted/20'">
-                            <!-- Row -->
-                            <div class="grid grid-cols-[1fr_5rem_5rem_2fr_3rem] py-2 items-center">
-                                <!-- Name -->
-                                <div>
-                                    <MemberCard v-if="person.attendee_id" :member-id="person.attendee_id" />
-                                    <p v-else>{{ person.attendee_name }}</p>
+                                    <div v-if="expanded === person.attendee_id" class="mt-3 rounded-lg border bg-background px-3 py-2">
+                                        <p class="text-sm font-medium text-foreground">
+                                            Full Remarks
+                                        </p>
+
+                                        <p v-if="person.remarks"
+                                            class="mt-1 text-sm text-muted-foreground leading-relaxed whitespace-pre-wrap max-h-72 overflow-y-auto">
+                                            {{ person.remarks }}
+                                        </p>
+
+                                        <p v-else class="mt-1 text-sm text-muted-foreground italic">
+                                            None provided
+                                        </p>
+                                    </div>
+                                </article>
+                            </div>
+
+                            <div class="hidden md:block">
+                                <div
+                                    class="grid grid-cols-[minmax(0,1.6fr)_4.25rem_4.25rem_minmax(0,1.4fr)_2.5rem] py-2 text-sm font-medium text-muted-foreground border-b gap-x-2">
+                                    <span>Name</span>
+                                    <span class="text-center">Bookwork</span>
+                                    <span class="text-center">Qual</span>
+                                    <span class="text-right">Remarks</span>
+                                    <span></span>
                                 </div>
 
-                                <div></div>
-                                <div></div>
+                                <div v-for="person in focusedNoShows" :key="person.attendee_id ?? person.attendee_name"
+                                    class="border-b last:border-none transition-colors"
+                                    :class="expanded === person.attendee_id && 'bg-muted/20'">
+                                    <div class="grid grid-cols-[minmax(0,1.6fr)_4.25rem_4.25rem_minmax(0,1.4fr)_2.5rem] py-2 items-center gap-x-2">
+                                        <div class="min-w-0">
+                                            <MemberCard v-if="person.attendee_id" :member-id="person.attendee_id"
+                                                class="max-w-full whitespace-nowrap overflow-hidden text-ellipsis" />
+                                            <p v-else class="whitespace-nowrap overflow-hidden text-ellipsis">{{ person.attendee_name }}</p>
+                                        </div>
 
-                                <p class="text-right px-2 truncate" :class="!person.remarks && 'text-muted-foreground'">
-                                    {{ person.remarks || '--' }}
-                                </p>
+                                        <p class="text-center text-muted-foreground">-</p>
+                                        <p class="text-center text-muted-foreground">-</p>
 
-                                <Button variant="ghost" size="icon" @click.stop="expanded === person.attendee_id
-                                    ? expanded = null
-                                    : expanded = person.attendee_id">
-                                    <ChevronDown v-if="expanded !== person.attendee_id" class="size-5" />
-                                    <ChevronUp v-else class="size-5" />
-                                </Button>
-                            </div>
+                                        <p class="text-right px-2 truncate" :class="!person.remarks && 'text-muted-foreground'">
+                                            {{ person.remarks || '--' }}
+                                        </p>
 
-                            <div v-if="expanded === person.attendee_id" class="col-span-full">
-                                <div class="px-6 py-4 space-y-2">
-                                    <p class="text-sm font-medium text-foreground">
-                                        Remarks
-                                    </p>
+                                        <Button variant="ghost" size="icon" @click.stop="expanded === person.attendee_id
+                                            ? expanded = null
+                                            : expanded = person.attendee_id">
+                                            <ChevronDown v-if="expanded !== person.attendee_id" class="size-5" />
+                                            <ChevronUp v-else class="size-5" />
+                                        </Button>
+                                    </div>
 
-                                    <p v-if="person.remarks"
-                                        class="text-sm text-muted-foreground leading-relaxed whitespace-pre-wrap max-h-72 overflow-y-auto">
-                                        {{ person.remarks }}
-                                    </p>
+                                    <div v-if="expanded === person.attendee_id" class="col-span-full">
+                                        <div class="px-6 py-4 space-y-2">
+                                            <p class="text-sm font-medium text-foreground">
+                                                Remarks
+                                            </p>
 
-                                    <p v-else class="text-sm text-muted-foreground italic">
-                                        None provided
-                                    </p>
+                                            <p v-if="person.remarks"
+                                                class="text-sm text-muted-foreground leading-relaxed whitespace-pre-wrap max-h-72 overflow-y-auto">
+                                                {{ person.remarks }}
+                                            </p>
+
+                                            <p v-else class="text-sm text-muted-foreground italic">
+                                                None provided
+                                            </p>
+                                        </div>
+                                    </div>
                                 </div>
                             </div>
                         </div>
-
                     </div>
                     <div>
                         <label class="scroll-m-20 text-xl font-semibold tracking-tight">Remarks</label>
@@ -544,9 +678,8 @@ const expanded = ref<number>(null);
                 <Spinner class="size-8"></Spinner>
             </div>
         </div>
-        <div v-if="effectivePanel == sidePanelState.create" :class="isMobile
-            ? 'fixed inset-0 z-[60] overflow-y-auto bg-background px-3 py-3'
-            : 'mt-2 w-full max-w-5xl lg:mt-0 lg:w-3/5 lg:border-l lg:pl-7'">
+        <div v-if="effectivePanel == sidePanelState.create" :class="isMobile ? 'fixed inset-0 z-[60] overflow-y-auto bg-background px-3 py-3' : 'mt-2 w-full max-w-5xl lg:mt-0 lg:w-3/5 lg:border-l lg:pl-7'"
+            :style="isMobile ? { top: 'var(--app-header-height, 60px)' } : {}">
             <div class="flex justify-between items-center my-3">
                 <div class="flex gap-5 lg:pl-2">
                     <p class="scroll-m-20 text-2xl font-semibold tracking-tight">New Training Report</p>

From 93c8f3a35cacc600f9445deae22331636b1ba4a8 Mon Sep 17 00:00:00 2001
From: ajdj100 <ajairplane@gmail.com>
Date: Sun, 22 Mar 2026 12:57:55 -0400
Subject: [PATCH 10/11] Fixed issues with viewport height on mobile

---
 ui/src/components/Navigation/Navbar.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui/src/components/Navigation/Navbar.vue b/ui/src/components/Navigation/Navbar.vue
index d94bbf8..099e634 100644
--- a/ui/src/components/Navigation/Navbar.vue
+++ b/ui/src/components/Navigation/Navbar.vue
@@ -355,7 +355,7 @@
                     <X class="size-7" />
                 </Button>
             </div>
-            <div v-if="isMobileMenuOpen" class="flex flex-col h-[calc(100vh-60px)] overflow-hidden">
+            <div v-if="isMobileMenuOpen" class="flex flex-col h-[calc(100dvh-60px)] overflow-hidden">
                 <div class="flex-1 overflow-y-auto px-2 py-3 space-y-0.5">
                     <div v-for="navItem in filteredNav" :key="navItem.title" class="group">
 

From 2db22f995543d41bcb9f49d876fa3412751226e3 Mon Sep 17 00:00:00 2001
From: ajdj100 <ajairplane@gmail.com>
Date: Sun, 22 Mar 2026 13:15:53 -0400
Subject: [PATCH 11/11] Fixed a bunch of issues with the navbar for different
 devices

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

diff --git a/ui/src/components/Navigation/Navbar.vue b/ui/src/components/Navigation/Navbar.vue
index 099e634..e495daa 100644
--- a/ui/src/components/Navigation/Navbar.vue
+++ b/ui/src/components/Navigation/Navbar.vue
@@ -22,7 +22,7 @@
     import DropdownMenuGroup from '../ui/dropdown-menu/DropdownMenuGroup.vue';
     import DropdownMenuSeparator from '../ui/dropdown-menu/DropdownMenuSeparator.vue';
     import { MemberState } from '@shared/types/member';
-    import { computed, nextTick, ref } from 'vue';
+    import { computed, onBeforeUnmount, ref, watch } from 'vue';
 
     const userStore = useUserStore();
     const auth = useAuth();
@@ -175,6 +175,35 @@
         closeMobileMenu();
         router.push(to);
     }
+
+    function lockDocumentScroll() {
+        document.documentElement.style.overflow = 'hidden';
+        document.documentElement.style.overscrollBehavior = 'none';
+        document.body.style.overflow = 'hidden';
+        document.body.style.overscrollBehavior = 'none';
+        document.body.style.touchAction = 'none';
+    }
+
+    function unlockDocumentScroll() {
+        document.documentElement.style.overflow = '';
+        document.documentElement.style.overscrollBehavior = '';
+        document.body.style.overflow = '';
+        document.body.style.overscrollBehavior = '';
+        document.body.style.touchAction = '';
+    }
+
+    watch(isMobileMenuOpen, (isOpen) => {
+        if (isOpen) {
+            lockDocumentScroll();
+            return;
+        }
+
+        unlockDocumentScroll();
+    });
+
+    onBeforeUnmount(() => {
+        unlockDocumentScroll();
+    });
 </script>
 
 <template>
@@ -339,7 +368,7 @@
         </div>
 
         <!-- mobile navigation -->
-        <div class="flex flex-col lg:hidden w-full" :class="isMobileMenuOpen ? 'h-screen' : ''">
+        <div class="flex flex-col lg:hidden w-full">
             <div class="flex items-center justify-between w-full p-2">
                 <!-- <RouterLink to="/">
                     <img src="/17RBN_Logo.png" class="w-10 h-10 object-contain"></img>
@@ -355,8 +384,18 @@
                     <X class="size-7" />
                 </Button>
             </div>
-            <div v-if="isMobileMenuOpen" class="flex flex-col h-[calc(100dvh-60px)] overflow-hidden">
-                <div class="flex-1 overflow-y-auto px-2 py-3 space-y-0.5">
+            <div v-if="isMobileMenuOpen" class="fixed inset-0 z-[70] flex flex-col overflow-hidden bg-background"
+                :style="{ paddingBottom: 'env(safe-area-inset-bottom)' }">
+                <div class="flex items-center justify-between w-full border-b bg-background p-2">
+                    <button @click="mobileNavigateTo('/')">
+                        <img src="/17RBN_Logo.png" class="w-10 h-10 object-contain"></img>
+                    </button>
+                    <Button variant="ghost" size="icon" @click="closeMobileMenu()">
+                        <X class="size-7" />
+                    </Button>
+                </div>
+
+                <div class="flex-1 overflow-y-auto overscroll-contain px-2 py-3 space-y-0.5">
                     <div v-for="navItem in filteredNav" :key="navItem.title" class="group">
 
                         <template v-if="!navItem.items">
@@ -394,7 +433,7 @@
                     </div>
                 </div>
 
-                <div class="p-3 border-t bg-background mt-auto">
+                <div class="p-3 border-t bg-background mt-auto" :style="{ paddingBottom: 'max(0.75rem, env(safe-area-inset-bottom))' }">
                     <div v-if="userStore.isLoggedIn" class="space-y-3">
                         <div class="flex items-center justify-between px-2">
                             <div class="flex gap-3">