feat(KAN-19): add responsive permission-aware navigation

resources/js/components/AppLogo.vue

@@ -1,16 +1,17 @@
 <script setup lang="ts">
-import AppLogoIcon from '@/components/AppLogoIcon.vue';
+import { Columns3 } from 'lucide-vue-next';
 </script>
 
 <template>
-    <div
-        class="bg-sidebar-primary text-sidebar-primary-foreground flex aspect-square size-8 items-center justify-center rounded-md"
-    >
-        <AppLogoIcon class="size-5 fill-current text-white dark:text-black" />
-    </div>
-    <div class="ml-1 grid flex-1 text-left text-sm">
-        <span class="mb-0.5 truncate font-semibold leading-tight"
-            >Laravel Starter Kit</span
+    <span class="flex min-w-0 items-center gap-3">
+        <span
+            class="bg-brand text-brand-foreground flex size-8 shrink-0 items-center justify-center rounded-md"
         >
-    </div>
+            <Columns3 class="size-5" aria-hidden="true" />
+        </span>
+        <span
+            class="text-title truncate font-semibold group-data-[collapsible=icon]:hidden"
+            >KanbanGit</span
+        >
+    </span>
 </template>

resources/js/components/AppSidebar.vue

@@ -1,19 +1,10 @@
 <script setup lang="ts">
-import { Link, usePage } from '@inertiajs/vue3';
-import {
-    BookOpen,
-    Folder,
-    FolderGit2,
-    LayoutGrid,
-    Layers3,
-    Shield,
-    Users,
-} from 'lucide-vue-next';
-import { computed } from 'vue';
+import { Link, router } from '@inertiajs/vue3';
+import { Settings2, X } from 'lucide-vue-next';
+import { computed, onMounted, onUnmounted } from 'vue';
 import AppLogo from '@/components/AppLogo.vue';
-import NavFooter from '@/components/NavFooter.vue';
 import NavMain from '@/components/NavMain.vue';
-import NavUser from '@/components/NavUser.vue';
+import { Button } from '@/components/ui/button';
 import {
     Sidebar,
     SidebarContent,
@@ -22,93 +13,98 @@ import {
     SidebarMenu,
     SidebarMenuButton,
     SidebarMenuItem,
+    useSidebar,
 } from '@/components/ui/sidebar';
+import { useAppNavigation } from '@/composables/useAppNavigation';
+import { useCurrentUrl } from '@/composables/useCurrentUrl';
+import { useLocalization } from '@/composables/useLocalization';
 import { dashboard } from '@/routes';
-import { index as adminUsers } from '@/routes/admin/users';
-import { index as projectTemplatesIndex } from '@/routes/project-templates';
-import { index as projectsIndex } from '@/routes/projects';
-import { index as teamsIndex } from '@/routes/teams';
-import type { NavItem } from '@/types';
+import { edit as profile } from '@/routes/profile';
+import { show } from '@/routes/projects';
 
-const page = usePage();
-
-const mainNavItems = computed<NavItem[]>(() => {
-    const items: NavItem[] = [
-        {
-            title: 'Dashboard',
-            href: dashboard(),
-            icon: LayoutGrid,
-        },
-        {
-            title: 'Projects',
-            href: projectsIndex(),
-            icon: Folder,
-        },
-    ];
-
-    if (page.props.auth.permissions.projectCreate) {
-        items.push({
-            title: 'Project templates',
-            href: projectTemplatesIndex(),
-            icon: Layers3,
-        });
-    }
-
-    if (page.props.auth.permissions.globalAdmin) {
-        items.push({
-            title: 'Users',
-            href: adminUsers(),
-            icon: Shield,
-        });
-    }
-
-    if (page.props.auth.permissions.canManageTeams) {
-        items.push({
-            title: 'Teams',
-            href: teamsIndex(),
-            icon: Users,
-        });
-    }
-
-    return items;
+const { t } = useLocalization();
+const { currentUrl } = useCurrentUrl();
+const { project, workspaceItems, projectItems, projectSettingsItems } =
+    useAppNavigation();
+const { isMobile, setOpenMobile } = useSidebar();
+const accountItems = computed(() => [
+    {
+        title: t('navigation.settings'),
+        href: profile(),
+        icon: Settings2,
+        isActive: currentUrl.value.startsWith('/settings/'),
+    },
+]);
+let removeNavigationListener: (() => void) | undefined;
+onMounted(() => {
+    removeNavigationListener = router.on('navigate', () =>
+        setOpenMobile(false),
+    );
 });
-
-const footerNavItems: NavItem[] = [
-    {
-        title: 'Repository',
-        href: 'https://github.com/laravel/vue-starter-kit',
-        icon: FolderGit2,
-    },
-    {
-        title: 'Documentation',
-        href: 'https://laravel.com/docs/starter-kits#vue',
-        icon: BookOpen,
-    },
-];
+onUnmounted(() => removeNavigationListener?.());
 </script>
 
 <template>
-    <Sidebar collapsible="icon" variant="inset">
-        <SidebarHeader>
-            <SidebarMenu>
-                <SidebarMenuItem>
-                    <SidebarMenuButton size="lg" as-child>
-                        <Link :href="dashboard()">
-                            <AppLogo />
-                        </Link>
-                    </SidebarMenuButton>
-                </SidebarMenuItem>
-            </SidebarMenu>
+    <Sidebar id="app-navigation" collapsible="icon" variant="sidebar">
+        <SidebarHeader class="border-sidebar-border gap-4 border-b p-3">
+            <div class="flex items-center gap-2">
+                <SidebarMenu class="min-w-0">
+                    <SidebarMenuItem>
+                        <SidebarMenuButton
+                            size="lg"
+                            as-child
+                            tooltip="KanbanGit"
+                        >
+                            <Link :href="dashboard()" aria-label="KanbanGit"
+                                ><AppLogo
+                            /></Link>
+                        </SidebarMenuButton>
+                    </SidebarMenuItem>
+                </SidebarMenu>
+                <Button
+                    v-if="isMobile"
+                    variant="ghost"
+                    size="icon"
+                    :aria-label="t('navigation.close')"
+                    @click="setOpenMobile(false)"
+                >
+                    <X aria-hidden="true" />
+                </Button>
+            </div>
+            <Link
+                v-if="project"
+                :href="show(project.id)"
+                class="bg-sidebar-accent flex min-w-0 items-center gap-3 rounded-md p-3 group-data-[collapsible=icon]:hidden"
+            >
+                <span
+                    class="text-label bg-brand/15 text-primary shrink-0 rounded-md px-2 py-1"
+                    >{{ project.key }}</span
+                >
+                <span class="truncate font-semibold" :title="project.name">{{
+                    project.name
+                }}</span>
+            </Link>
         </SidebarHeader>
-
         <SidebarContent>
-            <NavMain :items="mainNavItems" />
+            <nav :aria-label="t('navigation.main')">
+                <NavMain
+                    :items="workspaceItems"
+                    :label="t('navigation.workspace')"
+                />
+                <NavMain
+                    v-if="projectItems.length"
+                    :items="projectItems"
+                    :label="t('navigation.project')"
+                />
+                <NavMain
+                    v-if="projectSettingsItems.length"
+                    :items="projectSettingsItems"
+                    :label="t('navigation.projectSettings')"
+                />
+            </nav>
         </SidebarContent>
-
-        <SidebarFooter>
-            <NavFooter :items="footerNavItems" />
-            <NavUser />
+        <SidebarFooter class="border-sidebar-border border-t p-0">
+            <NavMain :items="accountItems" :label="t('navigation.account')" />
         </SidebarFooter>
     </Sidebar>
-    <slot />
 </template>

resources/js/components/AppSidebarHeader.vue

@@ -1,27 +1,145 @@
 <script setup lang="ts">
+import { Link, usePage } from '@inertiajs/vue3';
+import { Monitor, Moon, Plus, Sun } from 'lucide-vue-next';
+import { computed } from 'vue';
 import Breadcrumbs from '@/components/Breadcrumbs.vue';
+import UserMenuContent from '@/components/UserMenuContent.vue';
+import { UserAvatar } from '@/components/ui/avatar';
+import { Button } from '@/components/ui/button';
+import {
+    DropdownMenu,
+    DropdownMenuContent,
+    DropdownMenuLabel,
+    DropdownMenuRadioGroup,
+    DropdownMenuRadioItem,
+    DropdownMenuSeparator,
+    DropdownMenuTrigger,
+} from '@/components/ui/dropdown-menu';
 import { SidebarTrigger } from '@/components/ui/sidebar';
+import { useAppNavigation } from '@/composables/useAppNavigation';
+import {
+    normalizeAppearance,
+    useAppearance,
+} from '@/composables/useAppearance';
+import { useCurrentUrl } from '@/composables/useCurrentUrl';
+import { useLocalization } from '@/composables/useLocalization';
+import { create as createProject } from '@/routes/projects';
+import { index as board } from '@/routes/projects/board';
+import { create as createTicket } from '@/routes/projects/tickets';
 import type { BreadcrumbItem } from '@/types';
 
-withDefaults(
-    defineProps<{
-        breadcrumbs?: BreadcrumbItem[];
-    }>(),
-    {
-        breadcrumbs: () => [],
-    },
+withDefaults(defineProps<{ breadcrumbs?: BreadcrumbItem[] }>(), {
+    breadcrumbs: () => [],
+});
+const page = usePage();
+const { project } = useAppNavigation();
+const { isCurrentUrl } = useCurrentUrl();
+const { t } = useLocalization();
+const { appearance, updateAppearance } = useAppearance();
+const themeIcon = computed(
+    () => ({ light: Sun, dark: Moon, system: Monitor })[appearance.value],
 );
+const createAction = computed(() => {
+    if (project.value?.canCreateTickets) {
+        return {
+            title: t('navigation.createTicket'),
+            href: createTicket(project.value.id, {
+                query: {
+                    source: isCurrentUrl(board(project.value.id))
+                        ? 'board'
+                        : 'backlog',
+                },
+            }),
+        };
+    }
+    if (!project.value && page.props.auth.permissions.projectCreate) {
+        return { title: t('navigation.createProject'), href: createProject() };
+    }
+    return null;
+});
 </script>
 
 <template>
     <header
-        class="border-sidebar-border/70 group-has-data-[collapsible=icon]/sidebar-wrapper:h-12 flex h-16 shrink-0 items-center gap-2 border-b px-6 transition-[width,height] ease-linear md:px-4"
+        class="bg-background md:px-page sticky top-0 z-20 flex min-h-16 min-w-0 shrink-0 items-center justify-between gap-2 border-b px-3 md:gap-4"
     >
-        <div class="flex items-center gap-2">
-            <SidebarTrigger class="-ml-1" />
-            <template v-if="breadcrumbs && breadcrumbs.length > 0">
-                <Breadcrumbs :breadcrumbs="breadcrumbs" />
-            </template>
+        <div class="flex min-w-0 flex-1 items-center gap-2">
+            <SidebarTrigger class="shrink-0" />
+            <Breadcrumbs v-if="breadcrumbs.length" :breadcrumbs="breadcrumbs" />
+            <span v-else class="truncate font-semibold">KanbanGit</span>
+        </div>
+        <div class="flex shrink-0 items-center gap-1 sm:gap-2">
+            <Button
+                v-if="createAction"
+                as-child
+                :aria-label="createAction.title"
+                class="px-3"
+            >
+                <Link :href="createAction.href"
+                    ><Plus aria-hidden="true" /><span
+                        class="hidden sm:inline"
+                        >{{ createAction.title }}</span
+                    ></Link
+                >
+            </Button>
+            <DropdownMenu>
+                <DropdownMenuTrigger as-child>
+                    <Button
+                        variant="ghost"
+                        size="icon"
+                        :aria-label="t('appearance.label')"
+                        ><component :is="themeIcon" aria-hidden="true"
+                    /></Button>
+                </DropdownMenuTrigger>
+                <DropdownMenuContent align="end">
+                    <DropdownMenuLabel>{{
+                        t('appearance.label')
+                    }}</DropdownMenuLabel>
+                    <DropdownMenuSeparator />
+                    <DropdownMenuRadioGroup
+                        :model-value="appearance"
+                        @update:model-value="
+                            (value) =>
+                                updateAppearance(normalizeAppearance(value))
+                        "
+                    >
+                        <DropdownMenuRadioItem value="light"
+                            ><Sun aria-hidden="true" />{{
+                                t('appearance.light')
+                            }}</DropdownMenuRadioItem
+                        >
+                        <DropdownMenuRadioItem value="dark"
+                            ><Moon aria-hidden="true" />{{
+                                t('appearance.dark')
+                            }}</DropdownMenuRadioItem
+                        >
+                        <DropdownMenuRadioItem value="system"
+                            ><Monitor aria-hidden="true" />{{
+                                t('appearance.system')
+                            }}</DropdownMenuRadioItem
+                        >
+                    </DropdownMenuRadioGroup>
+                </DropdownMenuContent>
+            </DropdownMenu>
+            <DropdownMenu>
+                <DropdownMenuTrigger as-child>
+                    <Button
+                        variant="ghost"
+                        size="icon"
+                        :aria-label="
+                            t('navigation.userMenu', {
+                                name: page.props.auth.user.name,
+                            })
+                        "
+                        data-test="sidebar-menu-button"
+                    >
+                        <UserAvatar :user="page.props.auth.user" />
+                    </Button>
+                </DropdownMenuTrigger>
+                <DropdownMenuContent align="end" class="min-w-60">
+                    <UserMenuContent :user="page.props.auth.user" />
+                </DropdownMenuContent>
+            </DropdownMenu>
         </div>
     </header>
 </template>

resources/js/components/Breadcrumbs.vue

@@ -9,29 +9,48 @@ import {
     BreadcrumbSeparator,
 } from '@/components/ui/breadcrumb';
 import type { BreadcrumbItem as BreadcrumbItemType } from '@/types';
+import { useLocalization } from '@/composables/useLocalization';
 
 type Props = {
     breadcrumbs: BreadcrumbItemType[];
 };
 
 defineProps<Props>();
+const { t } = useLocalization();
 </script>
 
 <template>
-    <Breadcrumb>
-        <BreadcrumbList>
+    <Breadcrumb class="min-w-0" :aria-label="t('navigation.breadcrumbs')">
+        <BreadcrumbList class="flex-nowrap">
             <template v-for="(item, index) in breadcrumbs" :key="index">
-                <BreadcrumbItem>
+                <BreadcrumbItem
+                    :class="[
+                        'min-w-0',
+                        index !== breadcrumbs.length - 1
+                            ? 'hidden md:inline-flex'
+                            : '',
+                    ]"
+                >
                     <template v-if="index === breadcrumbs.length - 1">
-                        <BreadcrumbPage>{{ item.title }}</BreadcrumbPage>
+                        <BreadcrumbPage class="truncate" :title="item.title">{{
+                            item.title
+                        }}</BreadcrumbPage>
                     </template>
                     <template v-else>
                         <BreadcrumbLink as-child>
-                            <Link :href="item.href">{{ item.title }}</Link>
+                            <Link
+                                :href="item.href"
+                                class="max-w-40 truncate"
+                                :title="item.title"
+                                >{{ item.title }}</Link
+                            >
                         </BreadcrumbLink>
                     </template>
                 </BreadcrumbItem>
-                <BreadcrumbSeparator v-if="index !== breadcrumbs.length - 1" />
+                <BreadcrumbSeparator
+                    v-if="index !== breadcrumbs.length - 1"
+                    class="hidden md:block"
+                />
             </template>
         </BreadcrumbList>
     </Breadcrumb>

resources/js/components/NavMain.vue

@@ -12,23 +12,46 @@ import type { NavItem } from '@/types';
 
 defineProps<{
     items: NavItem[];
+    label: string;
 }>();
 
 const { isCurrentUrl } = useCurrentUrl();
 </script>
 
 <template>
-    <SidebarGroup class="px-2 py-0">
-        <SidebarGroupLabel>Platform</SidebarGroupLabel>
-        <SidebarMenu>
+    <SidebarGroup class="px-3 py-2">
+        <SidebarGroupLabel class="text-label text-muted-foreground uppercase">{{
+            label
+        }}</SidebarGroupLabel>
+        <SidebarMenu role="list" :aria-label="label">
             <SidebarMenuItem v-for="item in items" :key="item.title">
                 <SidebarMenuButton
                     as-child
-                    :is-active="isCurrentUrl(item.href)"
+                    :is-active="
+                        item.isActive ??
+                        isCurrentUrl(
+                            item.href,
+                            undefined,
+                            item.match === 'section',
+                        )
+                    "
                     :tooltip="item.title"
+                    class="min-h-control data-[active=true]:border-brand border-l-2 border-transparent px-3 data-[active=true]:font-semibold group-data-[collapsible=icon]:min-h-8"
                 >
-                    <Link :href="item.href">
-                        <component :is="item.icon" />
+                    <Link
+                        :href="item.href"
+                        :aria-current="
+                            (item.isActive ??
+                            isCurrentUrl(
+                                item.href,
+                                undefined,
+                                item.match === 'section',
+                            ))
+                                ? 'page'
+                                : undefined
+                        "
+                    >
+                        <component :is="item.icon" aria-hidden="true" />
                         <span>{{ item.title }}</span>
                     </Link>
                 </SidebarMenuButton>

resources/js/components/ProjectNavigation.vue

@@ -0,0 +1,89 @@
+<script setup lang="ts">
+import { Link } from '@inertiajs/vue3';
+import { ChevronDown, Settings2 } from 'lucide-vue-next';
+import { computed } from 'vue';
+import { Button } from '@/components/ui/button';
+import {
+    DropdownMenu,
+    DropdownMenuContent,
+    DropdownMenuItem,
+    DropdownMenuTrigger,
+} from '@/components/ui/dropdown-menu';
+import { useAppNavigation } from '@/composables/useAppNavigation';
+import { useCurrentUrl } from '@/composables/useCurrentUrl';
+import { useLocalization } from '@/composables/useLocalization';
+
+const { projectItems, projectSettingsItems } = useAppNavigation();
+const { isCurrentUrl } = useCurrentUrl();
+const { t } = useLocalization();
+const settingsActive = computed(() =>
+    projectSettingsItems.value.some((item) => isCurrentUrl(item.href)),
+);
+</script>
+
+<template>
+    <div
+        v-if="projectItems.length"
+        class="bg-card md:px-page flex min-w-0 items-center gap-2 border-b px-4"
+    >
+        <nav
+            :aria-label="t('navigation.project')"
+            class="flex min-w-0 flex-1 gap-4 overflow-x-auto"
+        >
+            <Link
+                v-for="item in projectItems"
+                :key="item.title"
+                :href="item.href"
+                :aria-current="isCurrentUrl(item.href) ? 'page' : undefined"
+                :class="[
+                    'min-h-control text-body flex shrink-0 items-center gap-2 border-b-2 px-1 py-3 font-medium outline-offset-[-3px]',
+                    isCurrentUrl(item.href)
+                        ? 'border-brand text-primary'
+                        : 'text-muted-foreground hover:border-border hover:text-foreground border-transparent',
+                ]"
+            >
+                <component
+                    :is="item.icon"
+                    class="size-4"
+                    aria-hidden="true"
+                />{{ item.title }}
+            </Link>
+        </nav>
+        <DropdownMenu v-if="projectSettingsItems.length">
+            <DropdownMenuTrigger as-child>
+                <Button
+                    variant="ghost"
+                    size="sm"
+                    :aria-label="t('navigation.projectSettings')"
+                    :class="{
+                        'bg-accent text-accent-foreground': settingsActive,
+                    }"
+                >
+                    <Settings2 aria-hidden="true" /><span
+                        class="hidden sm:inline"
+                        >{{ t('navigation.projectSettings') }}</span
+                    ><ChevronDown class="hidden sm:block" aria-hidden="true" />
+                </Button>
+            </DropdownMenuTrigger>
+            <DropdownMenuContent align="end">
+                <DropdownMenuItem
+                    v-for="item in projectSettingsItems"
+                    :key="item.title"
+                    as-child
+                >
+                    <Link
+                        :href="item.href"
+                        :aria-current="
+                            isCurrentUrl(item.href) ? 'page' : undefined
+                        "
+                        :class="{ 'bg-accent': isCurrentUrl(item.href) }"
+                    >
+                        <component :is="item.icon" aria-hidden="true" />{{
+                            item.title
+                        }}
+                    </Link>
+                </DropdownMenuItem>
+            </DropdownMenuContent>
+        </DropdownMenu>
+    </div>
+</template>

resources/js/components/UserInfo.vue

@@ -1,33 +1,22 @@
 <script setup lang="ts">
-import { computed } from 'vue';
-import { useInitials } from '@/composables/useInitials';
-import type { User } from '@/types';
 import UserAvatar from '@/components/ui/avatar/UserAvatar.vue';
+import type { User } from '@/types';
 
-type Props = {
-    user: User;
-    showEmail?: boolean;
-};
-
-const props = withDefaults(defineProps<Props>(), {
+withDefaults(defineProps<{ user: User; showEmail?: boolean }>(), {
     showEmail: false,
 });
-
-const { getInitials } = useInitials();
-
-// Compute whether we should show the avatar image
-const showAvatar = computed(
-    () => props.user.avatar && props.user.avatar !== '',
-);
 </script>
 
 <template>
-    <UserAvatar />
-
-    <div class="grid flex-1 text-left text-sm leading-tight">
-        <span class="truncate font-medium">{{ user.name }}</span>
-        <span v-if="showEmail" class="text-muted-foreground truncate text-xs">{{
-            user.email
-        }}</span>
+    <div class="flex min-w-0 items-center gap-2">
+        <UserAvatar :user="user" />
+        <div class="grid min-w-0 flex-1 text-left text-sm leading-tight">
+            <span class="truncate font-medium">{{ user.name }}</span>
+            <span
+                v-if="showEmail"
+                class="text-muted-foreground truncate text-xs"
+                >{{ user.email }}</span
+            >
+        </div>
     </div>
 </template>

resources/js/components/UserMenuContent.vue

@@ -11,6 +11,7 @@ import UserInfo from '@/components/UserInfo.vue';
 import { logout } from '@/routes/index';
 import { edit } from '@/routes/profile/index';
 import type { User } from '@/types';
+import { useLocalization } from '@/composables/useLocalization';
 
 type Props = {
     user: User;
@@ -21,6 +22,7 @@ const handleLogout = () => {
 };
 
 defineProps<Props>();
+const { t } = useLocalization();
 </script>
 
 <template>
@@ -34,7 +36,7 @@ defineProps<Props>();
         <DropdownMenuItem :as-child="true">
             <Link class="block w-full cursor-pointer" :href="edit()" prefetch>
                 <Settings class="mr-2 h-4 w-4" />
-                Settings
+                {{ t('navigation.settings') }}
             </Link>
         </DropdownMenuItem>
     </DropdownMenuGroup>
@@ -48,7 +50,7 @@ defineProps<Props>();
             data-test="logout-button"
         >
             <LogOut class="mr-2 h-4 w-4" />
-            Log out
+            {{ t('navigation.logout') }}
         </Link>
     </DropdownMenuItem>
 </template>

resources/js/components/ui/sidebar/Sidebar.vue

@@ -1,96 +1,118 @@
 <script setup lang="ts">
-import type { SidebarProps } from "."
-import { cn } from "@/lib/utils"
-import { Sheet, SheetContent } from '@/components/ui/sheet'
-import SheetDescription from '@/components/ui/sheet/SheetDescription.vue'
-import SheetHeader from '@/components/ui/sheet/SheetHeader.vue'
-import SheetTitle from '@/components/ui/sheet/SheetTitle.vue'
-import { SIDEBAR_WIDTH_MOBILE, useSidebar } from "./utils"
+import type { SidebarProps } from ".";
+import { cn } from "@/lib/utils";
+import { Sheet, SheetContent } from "@/components/ui/sheet";
+import SheetDescription from "@/components/ui/sheet/SheetDescription.vue";
+import SheetHeader from "@/components/ui/sheet/SheetHeader.vue";
+import SheetTitle from "@/components/ui/sheet/SheetTitle.vue";
+import { SIDEBAR_WIDTH_MOBILE, useSidebar } from "./utils";
+import { useLocalization } from "@/composables/useLocalization";
 
 defineOptions({
-  inheritAttrs: false,
-})
+    inheritAttrs: false,
+});
 
 const props = withDefaults(defineProps<SidebarProps>(), {
-  side: "left",
-  variant: "sidebar",
-  collapsible: "offcanvas",
-})
+    side: "left",
+    variant: "sidebar",
+    collapsible: "offcanvas",
+});
 
-const { isMobile, state, openMobile, setOpenMobile } = useSidebar()
+const { isMobile, state, openMobile, setOpenMobile } = useSidebar();
+const { t } = useLocalization();
+
+function restoreTriggerFocus(event: Event) {
+    event.preventDefault();
+    document
+        .querySelector<HTMLButtonElement>('[data-sidebar="trigger"]')
+        ?.focus();
+}
 </script>
 
 <template>
-  <div
-    v-if="collapsible === 'none'"
-    data-slot="sidebar"
-    :class="cn('bg-sidebar text-sidebar-foreground flex h-full w-(--sidebar-width) flex-col', props.class)"
-    v-bind="$attrs"
-  >
-    <slot />
-  </div>
-
-  <Sheet v-else-if="isMobile" :open="openMobile" v-bind="$attrs" @update:open="setOpenMobile">
-    <SheetContent
-      data-sidebar="sidebar"
-      data-slot="sidebar"
-      data-mobile="true"
-      :side="side"
-      class="bg-sidebar text-sidebar-foreground w-(--sidebar-width) p-0 [&>button]:hidden"
-      :style="{
-        '--sidebar-width': SIDEBAR_WIDTH_MOBILE,
-      }"
-    >
-      <SheetHeader class="sr-only">
-        <SheetTitle>Sidebar</SheetTitle>
-        <SheetDescription>Displays the mobile sidebar.</SheetDescription>
-      </SheetHeader>
-      <div class="flex h-full w-full flex-col">
-        <slot />
-      </div>
-    </SheetContent>
-  </Sheet>
-
-  <div
-    v-else
-    class="group peer text-sidebar-foreground hidden md:block"
-    data-slot="sidebar"
-    :data-state="state"
-    :data-collapsible="state === 'collapsed' ? collapsible : ''"
-    :data-variant="variant"
-    :data-side="side"
-  >
-    <!-- This is what handles the sidebar gap on desktop  -->
     <div
-      :class="cn(
-        'relative w-(--sidebar-width) bg-transparent transition-[width] duration-200 ease-linear',
-        'group-data-[collapsible=offcanvas]:w-0',
-        'group-data-[side=right]:rotate-180',
-        variant === 'floating' || variant === 'inset'
-          ? 'group-data-[collapsible=icon]:w-[calc(var(--sidebar-width-icon)+(--spacing(4)))]'
-          : 'group-data-[collapsible=icon]:w-(--sidebar-width-icon)',
-      )"
-    />
-    <div
-      :class="cn(
-        'fixed inset-y-0 z-10 hidden h-svh w-(--sidebar-width) transition-[left,right,width] duration-200 ease-linear md:flex',
-        side === 'left'
-          ? 'left-0 group-data-[collapsible=offcanvas]:left-[calc(var(--sidebar-width)*-1)]'
-          : 'right-0 group-data-[collapsible=offcanvas]:right-[calc(var(--sidebar-width)*-1)]',
-        // Adjust the padding for floating and inset variants.
-        variant === 'floating' || variant === 'inset'
-          ? 'p-2 group-data-[collapsible=icon]:w-[calc(var(--sidebar-width-icon)+(--spacing(4))+2px)]'
-          : 'group-data-[collapsible=icon]:w-(--sidebar-width-icon) group-data-[side=left]:border-r group-data-[side=right]:border-l',
-        props.class,
-      )"
-      v-bind="$attrs"
+        v-if="collapsible === 'none'"
+        data-slot="sidebar"
+        :class="
+            cn(
+                'bg-sidebar text-sidebar-foreground flex h-full w-(--sidebar-width) flex-col',
+                props.class,
+            )
+        "
+        v-bind="$attrs"
     >
-      <div
-        data-sidebar="sidebar"
-        class="bg-sidebar group-data-[variant=floating]:border-sidebar-border flex h-full w-full flex-col group-data-[variant=floating]:rounded-lg group-data-[variant=floating]:border group-data-[variant=floating]:shadow-sm"
-      >
         <slot />
-      </div>
     </div>
-  </div>
+
+    <Sheet v-else-if="isMobile" :open="openMobile" @update:open="setOpenMobile">
+        <SheetContent
+            v-bind="$attrs"
+            data-sidebar="sidebar"
+            data-slot="sidebar"
+            data-mobile="true"
+            :side="side"
+            class="bg-sidebar text-sidebar-foreground w-(--sidebar-width) max-w-[calc(100vw-2rem)] gap-0 p-0 [&>button]:hidden"
+            @close-auto-focus="restoreTriggerFocus"
+            :style="{
+                '--sidebar-width': SIDEBAR_WIDTH_MOBILE,
+            }"
+        >
+            <SheetHeader class="sr-only">
+                <SheetTitle>{{ t("navigation.main") }}</SheetTitle>
+                <SheetDescription>{{
+                    t("navigation.mobileDescription")
+                }}</SheetDescription>
+            </SheetHeader>
+            <div class="flex min-h-0 h-full w-full flex-col">
+                <slot />
+            </div>
+        </SheetContent>
+    </Sheet>
+
+    <div
+        v-else
+        class="group peer text-sidebar-foreground hidden md:block"
+        data-slot="sidebar"
+        :data-state="state"
+        :data-collapsible="state === 'collapsed' ? collapsible : ''"
+        :data-variant="variant"
+        :data-side="side"
+    >
+        <!-- This is what handles the sidebar gap on desktop  -->
+        <div
+            :class="
+                cn(
+                    'relative w-(--sidebar-width) bg-transparent transition-[width] duration-200 ease-linear',
+                    'group-data-[collapsible=offcanvas]:w-0',
+                    'group-data-[side=right]:rotate-180',
+                    variant === 'floating' || variant === 'inset'
+                        ? 'group-data-[collapsible=icon]:w-[calc(var(--sidebar-width-icon)+(--spacing(4)))]'
+                        : 'group-data-[collapsible=icon]:w-(--sidebar-width-icon)',
+                )
+            "
+        />
+        <div
+            :class="
+                cn(
+                    'fixed inset-y-0 z-10 hidden h-svh w-(--sidebar-width) transition-[left,right,width] duration-200 ease-linear md:flex',
+                    side === 'left'
+                        ? 'left-0 group-data-[collapsible=offcanvas]:left-[calc(var(--sidebar-width)*-1)]'
+                        : 'right-0 group-data-[collapsible=offcanvas]:right-[calc(var(--sidebar-width)*-1)]',
+                    // Adjust the padding for floating and inset variants.
+                    variant === 'floating' || variant === 'inset'
+                        ? 'p-2 group-data-[collapsible=icon]:w-[calc(var(--sidebar-width-icon)+(--spacing(4))+2px)]'
+                        : 'group-data-[collapsible=icon]:w-(--sidebar-width-icon) group-data-[side=left]:border-r group-data-[side=right]:border-l',
+                    props.class,
+                )
+            "
+            v-bind="$attrs"
+        >
+            <div
+                data-sidebar="sidebar"
+                class="bg-sidebar group-data-[variant=floating]:border-sidebar-border flex h-full w-full flex-col group-data-[variant=floating]:rounded-lg group-data-[variant=floating]:border group-data-[variant=floating]:shadow-sm"
+            >
+                <slot />
+            </div>
+        </div>
+    </div>
 </template>

resources/js/components/ui/sidebar/SidebarContent.vue

@@ -1,18 +1,23 @@
 <script setup lang="ts">
-import type { HTMLAttributes } from "vue"
-import { cn } from "@/lib/utils"
+import type { HTMLAttributes } from "vue";
+import { cn } from "@/lib/utils";
 
 const props = defineProps<{
-  class?: HTMLAttributes["class"]
-}>()
+    class?: HTMLAttributes["class"];
+}>();
 </script>
 
 <template>
-  <div
-    data-slot="sidebar-content"
-    data-sidebar="content"
-    :class="cn('flex min-h-0 flex-1 flex-col gap-2 overflow-auto group-data-[collapsible=icon]:overflow-hidden', props.class)"
-  >
-    <slot />
-  </div>
+    <div
+        data-slot="sidebar-content"
+        data-sidebar="content"
+        :class="
+            cn(
+                'flex min-h-0 flex-1 flex-col gap-2 overflow-x-hidden overflow-y-auto',
+                props.class,
+            )
+        "
+    >
+        <slot />
+    </div>
 </template>

resources/js/components/ui/sidebar/SidebarInset.vue

@@ -1,21 +1,23 @@
 <script setup lang="ts">
-import type { HTMLAttributes } from "vue"
-import { cn } from "@/lib/utils"
+import type { HTMLAttributes } from "vue";
+import { cn } from "@/lib/utils";
 
 const props = defineProps<{
-  class?: HTMLAttributes["class"]
-}>()
+    class?: HTMLAttributes["class"];
+}>();
 </script>
 
 <template>
-  <main
-    data-slot="sidebar-inset"
-    :class="cn(
-      'bg-background relative flex w-full flex-1 flex-col',
-      'md:peer-data-[variant=inset]:m-2 md:peer-data-[variant=inset]:ml-0 md:peer-data-[variant=inset]:rounded-xl md:peer-data-[variant=inset]:shadow-sm md:peer-data-[variant=inset]:peer-data-[state=collapsed]:ml-2',
-      props.class,
-    )"
-  >
-    <slot />
-  </main>
+    <main
+        data-slot="sidebar-inset"
+        :class="
+            cn(
+                'bg-background relative flex min-w-0 w-full flex-1 flex-col',
+                'md:peer-data-[variant=inset]:m-2 md:peer-data-[variant=inset]:ml-0 md:peer-data-[variant=inset]:rounded-xl md:peer-data-[variant=inset]:shadow-sm md:peer-data-[variant=inset]:peer-data-[state=collapsed]:ml-2',
+                props.class,
+            )
+        "
+    >
+        <slot />
+    </main>
 </template>

resources/js/components/ui/sidebar/SidebarMenuButton.vue

@@ -1,48 +1,60 @@
 <script setup lang="ts">
-import type { Component } from "vue"
-import type { SidebarMenuButtonProps } from "./SidebarMenuButtonChild.vue"
-import { reactiveOmit } from "@vueuse/core"
-import { Tooltip, TooltipContent, TooltipTrigger } from '@/components/ui/tooltip'
-import SidebarMenuButtonChild from "./SidebarMenuButtonChild.vue"
-import { useSidebar } from "./utils"
+import type { Component } from "vue";
+import type { SidebarMenuButtonProps } from "./SidebarMenuButtonChild.vue";
+import { reactiveOmit } from "@vueuse/core";
+import {
+    Tooltip,
+    TooltipContent,
+    TooltipTrigger,
+} from "@/components/ui/tooltip";
+import SidebarMenuButtonChild from "./SidebarMenuButtonChild.vue";
+import { useSidebar } from "./utils";
 
 defineOptions({
-  inheritAttrs: false,
-})
+    inheritAttrs: false,
+});
 
-const props = withDefaults(defineProps<SidebarMenuButtonProps & {
-  tooltip?: string | Component
-}>(), {
-  as: "button",
-  variant: "default",
-  size: "default",
-})
+const props = withDefaults(
+    defineProps<
+        SidebarMenuButtonProps & {
+            tooltip?: string | Component;
+        }
+    >(),
+    {
+        as: "button",
+        variant: "default",
+        size: "default",
+    },
+);
 
-const { isMobile, state } = useSidebar()
+const { isMobile, state } = useSidebar();
 
-const delegatedProps = reactiveOmit(props, "tooltip")
+const delegatedProps = reactiveOmit(props, "tooltip");
 </script>
 
 <template>
-  <SidebarMenuButtonChild v-if="!tooltip" v-bind="{ ...delegatedProps, ...$attrs }">
-    <slot />
-  </SidebarMenuButtonChild>
-
-  <Tooltip v-else>
-    <TooltipTrigger as-child>
-      <SidebarMenuButtonChild v-bind="{ ...delegatedProps, ...$attrs }">
-        <slot />
-      </SidebarMenuButtonChild>
-    </TooltipTrigger>
-    <TooltipContent
-      side="right"
-      align="center"
-      :hidden="state !== 'collapsed' || isMobile"
+    <SidebarMenuButtonChild
+        v-if="!tooltip || isMobile || state !== 'collapsed'"
+        v-bind="{ ...delegatedProps, ...$attrs }"
     >
-      <template v-if="typeof tooltip === 'string'">
-        {{ tooltip }}
-      </template>
-      <component :is="tooltip" v-else />
-    </TooltipContent>
-  </Tooltip>
+        <slot />
+    </SidebarMenuButtonChild>
+
+    <Tooltip v-else>
+        <TooltipTrigger as-child>
+            <SidebarMenuButtonChild v-bind="{ ...delegatedProps, ...$attrs }">
+                <slot />
+            </SidebarMenuButtonChild>
+        </TooltipTrigger>
+        <TooltipContent
+            side="right"
+            align="center"
+            :hidden="state !== 'collapsed' || isMobile"
+        >
+            <template v-if="typeof tooltip === 'string'">
+                {{ tooltip }}
+            </template>
+            <component :is="tooltip" v-else />
+        </TooltipContent>
+    </Tooltip>
 </template>

resources/js/components/ui/sidebar/SidebarProvider.vue

@@ -1,82 +1,112 @@
 <script setup lang="ts">
-import type { HTMLAttributes, Ref } from "vue"
-import { defaultDocument, useEventListener, useMediaQuery, useVModel } from "@vueuse/core"
-import { TooltipProvider } from "reka-ui"
-import { computed, ref } from "vue"
-import { cn } from "@/lib/utils"
-import { provideSidebarContext, SIDEBAR_COOKIE_MAX_AGE, SIDEBAR_COOKIE_NAME, SIDEBAR_KEYBOARD_SHORTCUT, SIDEBAR_WIDTH, SIDEBAR_WIDTH_ICON } from "./utils"
+import type { HTMLAttributes, Ref } from "vue";
+import {
+    defaultDocument,
+    useEventListener,
+    useMediaQuery,
+    useVModel,
+} from "@vueuse/core";
+import { TooltipProvider } from "reka-ui";
+import { computed, ref, watch } from "vue";
+import { cn } from "@/lib/utils";
+import {
+    provideSidebarContext,
+    SIDEBAR_COOKIE_MAX_AGE,
+    SIDEBAR_COOKIE_NAME,
+    SIDEBAR_KEYBOARD_SHORTCUT,
+    SIDEBAR_WIDTH,
+    SIDEBAR_WIDTH_ICON,
+} from "./utils";
 
-const props = withDefaults(defineProps<{
-  defaultOpen?: boolean
-  open?: boolean
-  class?: HTMLAttributes["class"]
-}>(), {
-  defaultOpen: !defaultDocument?.cookie.includes(`${SIDEBAR_COOKIE_NAME}=false`),
-  open: undefined,
-})
+const props = withDefaults(
+    defineProps<{
+        defaultOpen?: boolean;
+        open?: boolean;
+        class?: HTMLAttributes["class"];
+    }>(),
+    {
+        defaultOpen: !defaultDocument?.cookie.includes(
+            `${SIDEBAR_COOKIE_NAME}=false`,
+        ),
+        open: undefined,
+    },
+);
 
 const emits = defineEmits<{
-  "update:open": [open: boolean]
-}>()
+    "update:open": [open: boolean];
+}>();
 
-const isMobile = useMediaQuery("(max-width: 768px)")
-const openMobile = ref(false)
+const isMobile = useMediaQuery("(width < 768px)");
+const openMobile = ref(false);
+watch(isMobile, () => {
+    openMobile.value = false;
+});
 
 const open = useVModel(props, "open", emits, {
-  defaultValue: props.defaultOpen ?? false,
-  passive: (props.open === undefined) as false,
-}) as Ref<boolean>
+    defaultValue: props.defaultOpen ?? false,
+    passive: (props.open === undefined) as false,
+}) as Ref<boolean>;
 
 function setOpen(value: boolean) {
-  open.value = value // emits('update:open', value)
+    open.value = value; // emits('update:open', value)
 
-  // This sets the cookie to keep the sidebar state.
-  document.cookie = `${SIDEBAR_COOKIE_NAME}=${open.value}; path=/; max-age=${SIDEBAR_COOKIE_MAX_AGE}`
+    // This sets the cookie to keep the sidebar state.
+    document.cookie = `${SIDEBAR_COOKIE_NAME}=${open.value}; path=/; max-age=${SIDEBAR_COOKIE_MAX_AGE}`;
 }
 
 function setOpenMobile(value: boolean) {
-  openMobile.value = value
+    openMobile.value = value;
 }
 
 // Helper to toggle the sidebar.
 function toggleSidebar() {
-  return isMobile.value ? setOpenMobile(!openMobile.value) : setOpen(!open.value)
+    return isMobile.value
+        ? setOpenMobile(!openMobile.value)
+        : setOpen(!open.value);
 }
 
 useEventListener("keydown", (event: KeyboardEvent) => {
-  if (event.key === SIDEBAR_KEYBOARD_SHORTCUT && (event.metaKey || event.ctrlKey)) {
-    event.preventDefault()
-    toggleSidebar()
-  }
-})
+    if (
+        event.key === SIDEBAR_KEYBOARD_SHORTCUT &&
+        (event.metaKey || event.ctrlKey)
+    ) {
+        event.preventDefault();
+        toggleSidebar();
+    }
+});
 
 // We add a state so that we can do data-state="expanded" or "collapsed".
 // This makes it easier to style the sidebar with Tailwind classes.
-const state = computed(() => open.value ? "expanded" : "collapsed")
+const state = computed(() => (open.value ? "expanded" : "collapsed"));
 
 provideSidebarContext({
-  state,
-  open,
-  setOpen,
-  isMobile,
-  openMobile,
-  setOpenMobile,
-  toggleSidebar,
-})
+    state,
+    open,
+    setOpen,
+    isMobile,
+    openMobile,
+    setOpenMobile,
+    toggleSidebar,
+});
 </script>
 
 <template>
-  <TooltipProvider :delay-duration="0">
-    <div
-      data-slot="sidebar-wrapper"
-      :style="{
-        '--sidebar-width': SIDEBAR_WIDTH,
-        '--sidebar-width-icon': SIDEBAR_WIDTH_ICON,
-      }"
-      :class="cn('group/sidebar-wrapper has-data-[variant=inset]:bg-sidebar flex min-h-svh w-full', props.class)"
-      v-bind="$attrs"
-    >
-      <slot />
-    </div>
-  </TooltipProvider>
+    <TooltipProvider :delay-duration="0">
+        <div
+            data-slot="sidebar-wrapper"
+            :style="{
+                '--sidebar-width': SIDEBAR_WIDTH,
+                '--sidebar-width-icon': SIDEBAR_WIDTH_ICON,
+            }"
+            :class="
+                cn(
+                    'group/sidebar-wrapper has-data-[variant=inset]:bg-sidebar flex min-h-svh w-full',
+                    props.class,
+                )
+            "
+            v-bind="$attrs"
+        >
+            <slot />
+        </div>
+    </TooltipProvider>
 </template>

resources/js/components/ui/sidebar/SidebarTrigger.vue

@@ -1,28 +1,44 @@
 <script setup lang="ts">
-import type { HTMLAttributes } from "vue"
-import { PanelLeftClose, PanelLeftOpen } from "lucide-vue-next"
-import { cn } from "@/lib/utils"
-import { Button } from '@/components/ui/button'
-import { useSidebar } from "./utils"
+import type { HTMLAttributes } from "vue";
+import { PanelLeftClose, PanelLeftOpen } from "lucide-vue-next";
+import { cn } from "@/lib/utils";
+import { Button } from "@/components/ui/button";
+import { useSidebar } from "./utils";
+import { useLocalization } from "@/composables/useLocalization";
 
 const props = defineProps<{
-  class?: HTMLAttributes["class"]
-}>()
+    class?: HTMLAttributes["class"];
+}>();
 
-const { isMobile, state, toggleSidebar } = useSidebar()
+const { isMobile, state, openMobile, toggleSidebar } = useSidebar();
+const { t } = useLocalization();
 </script>
 
 <template>
-  <Button
-    data-sidebar="trigger"
-    data-slot="sidebar-trigger"
-    variant="ghost"
-    size="icon"
-    :class="cn('h-7 w-7', props.class)"
-    @click="toggleSidebar"
-  >
-    <PanelLeftOpen v-if="isMobile || state === 'collapsed'" />
-    <PanelLeftClose v-else />
-    <span class="sr-only">Toggle sidebar</span>
-  </Button>
+    <Button
+        data-sidebar="trigger"
+        data-slot="sidebar-trigger"
+        variant="ghost"
+        size="icon"
+        type="button"
+        aria-controls="app-navigation"
+        :aria-expanded="isMobile ? openMobile : state === 'expanded'"
+        :aria-label="
+            isMobile
+                ? t(openMobile ? 'navigation.close' : 'navigation.open')
+                : t(
+                      state === 'collapsed'
+                          ? 'navigation.expand'
+                          : 'navigation.collapse',
+                  )
+        "
+        :class="cn('size-control', props.class)"
+        @click="toggleSidebar"
+    >
+        <PanelLeftOpen
+            v-if="isMobile || state === 'collapsed'"
+            aria-hidden="true"
+        />
+        <PanelLeftClose v-else aria-hidden="true" />
+    </Button>
 </template>

resources/js/components/ui/sidebar/utils.ts

@@ -1,8 +1,8 @@
-import { createContext } from "reka-ui"
-import type { ComputedRef, Ref } from 'vue';
+import { createContext } from "reka-ui";
+import type { ComputedRef, Ref } from "vue";
 
 export type SidebarContext = {
-    state: ComputedRef<'expanded' | 'collapsed'>;
+    state: ComputedRef<"expanded" | "collapsed">;
     open: Ref<boolean>;
     setOpen: (value: boolean) => void;
     isMobile: Ref<boolean>;
@@ -11,11 +11,12 @@ export type SidebarContext = {
     toggleSidebar: () => void;
 };
 
-export const SIDEBAR_COOKIE_NAME = "sidebar_state"
-export const SIDEBAR_COOKIE_MAX_AGE = 60 * 60 * 24 * 7
-export const SIDEBAR_WIDTH = "16rem"
-export const SIDEBAR_WIDTH_MOBILE = "18rem"
-export const SIDEBAR_WIDTH_ICON = "3rem"
-export const SIDEBAR_KEYBOARD_SHORTCUT = "b"
+export const SIDEBAR_COOKIE_NAME = "sidebar_state";
+export const SIDEBAR_COOKIE_MAX_AGE = 60 * 60 * 24 * 7;
+export const SIDEBAR_WIDTH = "16rem";
+export const SIDEBAR_WIDTH_MOBILE = "18rem";
+export const SIDEBAR_WIDTH_ICON = "4rem";
+export const SIDEBAR_KEYBOARD_SHORTCUT = "b";
 
-export const [useSidebar, provideSidebarContext] = createContext<SidebarContext>("Sidebar")
+export const [useSidebar, provideSidebarContext] =
+    createContext<SidebarContext>("Sidebar");