17th-Ranger-Battalion-ORG/milsim-site-v4
8
1
Fork 0
Code Issues 36 Pull Requests 2 Actions Packages Projects 1 Releases 17 Wiki Activity

Merge remote-tracking branch 'Origin/main' into Mobile-Enhancements

Browse Source
This commit is contained in:
ajdj100
2026-03-21 19:48:49 -04:00
parent 0e37a8bc9c b4ff7d4686
commit b40e4f3ec7
76 changed files with 117530 additions and 820 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
ui/src/components/Navigation/Navbar.vue
View File

@@ -21,6 +21,7 @@ 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();
@@ -176,7 +177,7 @@ 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 == '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">
@@ -263,6 +264,12 @@ function mobileNavigateTo(to: string) {
</RouterLink>
</NavigationMenuLink>
<NavigationMenuItem as-child :class="navigationMenuTriggerStyle()">
<RouterLink to="/administration/members" @click="blurAfter">
Member Management
</RouterLink>
</NavigationMenuItem>
<NavigationMenuLink v-if="auth.hasRole('17th Administrator')" as-child
:class="navigationMenuTriggerStyle()">
<RouterLink to="/administration/roles" @click="blurAfter">
@@ -272,12 +279,11 @@ function mobileNavigateTo(to: string) {
</NavigationMenuContent>
</NavigationMenuItem>
<!-- <NavigationMenuItem as-child :class="navigationMenuTriggerStyle()">
<RouterLink to="/members" @click="blurAfter">
Members (debug)
</RouterLink>
</NavigationMenuItem> -->
<NavigationMenuItem v-if="auth.hasRole('Dev')">
<NavigationMenuLink as-child :class="navigationMenuTriggerStyle()">
<RouterLink to="/developer" @click="blurAfter">Developer</RouterLink>
</NavigationMenuLink>
</NavigationMenuItem>
</NavigationMenuList>
</NavigationMenu>
</div>