diff --git a/.gitignore b/.gitignore index a161e59..bd52be4 100644 --- a/.gitignore +++ b/.gitignore @@ -40,4 +40,6 @@ yarn-error.log* *.tsbuildinfo next-env.d.ts -docs/ \ No newline at end of file +docs/ +.agents +skills-lock.json \ No newline at end of file diff --git a/src/app/connect-accounts/page.tsx b/src/app/connect-accounts/page.tsx index 1f6cf46..08350c8 100644 --- a/src/app/connect-accounts/page.tsx +++ b/src/app/connect-accounts/page.tsx @@ -1,6 +1,6 @@ import Link from "next/link"; -import { IntegrationAccountsPanel } from "../../components/accounts/integration-accounts-panel"; -import { AppLogo } from "@/components/ui/app-logo"; +import { IntegrationAccountsPanel } from "@/features/integrations/components/integration-accounts-panel"; +import { AppLogo } from "@/shared/components/app-logo"; export default function ConnectAccountsPage() { return ( diff --git a/src/app/dashboard/page.tsx b/src/app/dashboard/page.tsx index f8602e5..08b0dc4 100644 --- a/src/app/dashboard/page.tsx +++ b/src/app/dashboard/page.tsx @@ -1,26 +1,21 @@ "use client"; import { useCallback, useEffect, useState } from "react"; -import { - FiAlertCircle, - FiCheckCircle, - FiClock, - FiRefreshCw, -} from "react-icons/fi"; -import { IntegrationAccountsPanel } from "../../components/accounts/integration-accounts-panel"; -import { AuthenticatedLayout } from "../../components/app-shell/authenticated-layout"; -import { ActivityList } from "../../components/dashboard-overview/activity-list"; -import { ContributionChart } from "../../components/dashboard-overview/contribution-chart"; -import { MetricCard } from "../../components/dashboard-overview/metric-card"; -import { RepositoryTable } from "../../components/dashboard-overview/repository-table"; -import { readApiJson } from "../../lib/api/response"; -import { notify } from "../../lib/notifications/toast"; -import { createSupabaseBrowserClient, isSupabaseConfigured } from "../../lib/supabase/client"; +import { FiRefreshCw } from "react-icons/fi"; +import { IntegrationAccountsPanel } from "@/features/integrations/components/integration-accounts-panel"; +import { AuthenticatedLayout } from "@/shared/app-shell/authenticated-layout"; +import { ActivityList } from "@/features/dashboard/components/activity-list"; +import { ContributionChart } from "@/features/dashboard/components/contribution-chart"; +import { MetricCard } from "@/features/dashboard/components/metric-card"; +import { RepositoryTable } from "@/features/dashboard/components/repository-table"; +import { readApiJson } from "@/lib/api/response"; +import { notify } from "@/lib/notifications/toast"; +import { createSupabaseBrowserClient, isSupabaseConfigured } from "@/lib/supabase/client"; import { DashboardOverview, DashboardSyncStatus, -} from "../../types/dashboard"; -import { KeepGoingCard } from "../../components/dashboard-overview/keep-going-card"; +} from "@/types/dashboard"; +import { KeepGoingCard } from "@/features/dashboard/components/keep-going-card"; export default function DashboardPage() { const [overview, setOverview] = useState(null); @@ -120,18 +115,21 @@ export default function DashboardPage() { loadOverview({ refresh: true })} disabled={isRefreshing} - className="hidden sm:inline-flex h-10 items-center gap-2 rounded-md border border-gray-200 px-3 text-sm font-bold text-muted-foreground transition hover:border-primary hover:text-primary disabled:cursor-not-allowed disabled:opacity-60 dark:border-gray-800" + className="inline-flex min-h-[52px] items-center justify-center gap-2 px-3 text-sm font-bold text-muted-foreground transition hover:bg-gray-50 hover:text-primary disabled:cursor-not-allowed cursor-pointer disabled:opacity-60 dark:hover:bg-gray-900/70 min-[420px]:px-4" + aria-label="Refresh dashboard data" > - Refresh + Refresh } > @@ -141,8 +139,6 @@ export default function DashboardPage() { {!isLoading && overview?.hasConnections && ( <> - -
-
-
- - - -
-

- {title} -

-

- {detail} -

-
-
- {sync.progressPercent === 100 && ( - - 100% - - )} -
- - ); -} - -function formatSyncDate(value: string) { - return new Intl.DateTimeFormat(undefined, { - dateStyle: "medium", - timeStyle: "short", - }).format(new Date(value)); -} - function DashboardLoading() { return (
diff --git a/src/app/layout.tsx b/src/app/layout.tsx index c341fb9..54332dd 100644 --- a/src/app/layout.tsx +++ b/src/app/layout.tsx @@ -1,7 +1,7 @@ import { Analytics } from "@vercel/analytics/react"; import type { Metadata } from "next"; import { ThemeProvider } from "next-themes"; -import { ToastProvider } from "../components/notifications/toast-provider"; +import { ToastProvider } from "@/shared/components/toast-provider"; import { Manrope, Noto_Color_Emoji } from "next/font/google"; import "./globals.css"; @@ -29,7 +29,7 @@ export default function RootLayout({children}: Readonly<{children: React.ReactNo return ( - + {children} diff --git a/src/app/page.tsx b/src/app/page.tsx index f3af5af..5d3a5d7 100644 --- a/src/app/page.tsx +++ b/src/app/page.tsx @@ -1,4 +1,4 @@ -import { LandingPage } from "../components/landing/landing-page"; +import { LandingPage } from "@/features/landing/components/landing-page"; export default function Home() { return ; diff --git a/src/app/settings/page.tsx b/src/app/settings/page.tsx index b284d4c..65af82b 100644 --- a/src/app/settings/page.tsx +++ b/src/app/settings/page.tsx @@ -1,5 +1,5 @@ -import { AuthenticatedLayout } from "../../components/app-shell/authenticated-layout"; -import { SettingsForm } from "../../components/settings/settings-form"; +import { AuthenticatedLayout } from "@/shared/app-shell/authenticated-layout"; +import { SettingsForm } from "@/features/settings/components/settings-form"; export default function SettingsPage() { return ( diff --git a/src/app/sign-in/page.tsx b/src/app/sign-in/page.tsx index 80cb04e..0a2cd43 100644 --- a/src/app/sign-in/page.tsx +++ b/src/app/sign-in/page.tsx @@ -1,5 +1,5 @@ -import { AuthForm } from "../../components/auth/auth-form"; -import { AuthLayout } from "../../components/auth/auth-layout"; +import { AuthForm } from "@/features/auth/components/auth-form"; +import { AuthLayout } from "@/features/auth/components/auth-layout"; export default function SignInPage() { return ( diff --git a/src/app/sign-up/page.tsx b/src/app/sign-up/page.tsx index 41cbdb1..cb48b10 100644 --- a/src/app/sign-up/page.tsx +++ b/src/app/sign-up/page.tsx @@ -1,5 +1,5 @@ -import { AuthForm } from "../../components/auth/auth-form"; -import { AuthLayout } from "../../components/auth/auth-layout"; +import { AuthForm } from "@/features/auth/components/auth-form"; +import { AuthLayout } from "@/features/auth/components/auth-layout"; export default function SignUpPage() { return ( diff --git a/src/components/auth/auth-form.tsx b/src/features/auth/components/auth-form.tsx similarity index 95% rename from src/components/auth/auth-form.tsx rename to src/features/auth/components/auth-form.tsx index 8a7ce5b..35d70c9 100644 --- a/src/components/auth/auth-form.tsx +++ b/src/features/auth/components/auth-form.tsx @@ -3,8 +3,8 @@ import Link from "next/link"; import { useRouter } from "next/navigation"; import { ChangeEvent, FormEvent, useState } from "react"; -import { createSupabaseBrowserClient, isSupabaseConfigured } from "../../lib/supabase/client"; -import { uploadUserAvatar } from "../../lib/supabase/avatar"; +import { createSupabaseBrowserClient, isSupabaseConfigured } from "@/lib/supabase/client"; +import { uploadUserAvatar } from "@/lib/supabase/avatar"; type AuthMode = "sign-in" | "sign-up"; @@ -162,7 +162,7 @@ export function AuthForm({ mode }: AuthFormProps) { diff --git a/src/components/auth/auth-layout.tsx b/src/features/auth/components/auth-layout.tsx similarity index 89% rename from src/components/auth/auth-layout.tsx rename to src/features/auth/components/auth-layout.tsx index fa4cacd..4856ff2 100644 --- a/src/components/auth/auth-layout.tsx +++ b/src/features/auth/components/auth-layout.tsx @@ -1,6 +1,6 @@ import Link from "next/link"; import { ReactNode } from "react"; -import { AppLogo } from "../ui/app-logo"; +import { AppLogo } from "@/shared/components/app-logo"; type AuthLayoutProps = { title: string; @@ -14,16 +14,16 @@ export function AuthLayout({ title, description, children }: AuthLayoutProps) {
-
+
- + Git Fusion
-

One graph. All your code.

+

One graph. All your code.

Unify GitHub and GitLab activity in minutes.

Create a Git Fusion account with email and password. Provider connections stay separate from app authentication. diff --git a/src/components/dashboard-overview/activity-list.tsx b/src/features/dashboard/components/activity-list.tsx similarity index 96% rename from src/components/dashboard-overview/activity-list.tsx rename to src/features/dashboard/components/activity-list.tsx index 4de1f5e..60a396b 100644 --- a/src/components/dashboard-overview/activity-list.tsx +++ b/src/features/dashboard/components/activity-list.tsx @@ -1,5 +1,5 @@ import { FaGithub, FaGitlab } from "react-icons/fa"; -import { ActivityItem } from "../../types/mock-app"; +import { ActivityItem } from "@/types/mock-app"; export function ActivityList({ activities }: { activities: ActivityItem[] }) { return ( diff --git a/src/components/dashboard-overview/contribution-chart.tsx b/src/features/dashboard/components/contribution-chart.tsx similarity index 98% rename from src/components/dashboard-overview/contribution-chart.tsx rename to src/features/dashboard/components/contribution-chart.tsx index 5383de8..cbb6476 100644 --- a/src/components/dashboard-overview/contribution-chart.tsx +++ b/src/features/dashboard/components/contribution-chart.tsx @@ -4,7 +4,7 @@ import { SVGAttributes } from "react"; import CalendarHeatmap, { ReactCalendarHeatmapValue } from "react-calendar-heatmap"; import "react-calendar-heatmap/dist/styles.css"; import { Tooltip } from "react-tooltip"; -import { DailyContribution } from "../../types/mock-app"; +import { DailyContribution } from "@/types/mock-app"; type CalendarContribution = ReactCalendarHeatmapValue & Omit; diff --git a/src/components/dashboard-overview/keep-going-card.tsx b/src/features/dashboard/components/keep-going-card.tsx similarity index 100% rename from src/components/dashboard-overview/keep-going-card.tsx rename to src/features/dashboard/components/keep-going-card.tsx diff --git a/src/components/dashboard-overview/metric-card.tsx b/src/features/dashboard/components/metric-card.tsx similarity index 91% rename from src/components/dashboard-overview/metric-card.tsx rename to src/features/dashboard/components/metric-card.tsx index 49d6f16..6e3bc78 100644 --- a/src/components/dashboard-overview/metric-card.tsx +++ b/src/features/dashboard/components/metric-card.tsx @@ -1,4 +1,4 @@ -import { DashboardMetric } from "../../types/mock-app"; +import { DashboardMetric } from "@/types/mock-app"; export function MetricCard({ metric }: { metric: DashboardMetric }) { return ( diff --git a/src/components/dashboard-overview/repository-table.tsx b/src/features/dashboard/components/repository-table.tsx similarity index 97% rename from src/components/dashboard-overview/repository-table.tsx rename to src/features/dashboard/components/repository-table.tsx index ca80b63..c2666bb 100644 --- a/src/components/dashboard-overview/repository-table.tsx +++ b/src/features/dashboard/components/repository-table.tsx @@ -1,5 +1,5 @@ import { FaGithub, FaGitlab } from "react-icons/fa"; -import { RepositorySummary } from "../../types/mock-app"; +import { RepositorySummary } from "@/types/mock-app"; export function RepositoryTable({ repositories }: { repositories: RepositorySummary[] }) { return ( diff --git a/src/components/accounts/account-connection-card.tsx b/src/features/integrations/components/account-connection-card.tsx similarity index 94% rename from src/components/accounts/account-connection-card.tsx rename to src/features/integrations/components/account-connection-card.tsx index 9c65fa4..92368fe 100644 --- a/src/components/accounts/account-connection-card.tsx +++ b/src/features/integrations/components/account-connection-card.tsx @@ -1,7 +1,7 @@ "use client"; import { FaGithub, FaGitlab } from "react-icons/fa"; -import { ConnectedAccount } from "../../types/mock-app"; +import { ConnectedAccount } from "@/types/mock-app"; type AccountConnectionCardProps = { account: ConnectedAccount; @@ -39,7 +39,7 @@ export function AccountConnectionCard({ account, onConnect, onDisconnect, compac : onConnect(account.provider) } disabled={isConnecting} - className={`w-full rounded-md px-3 py-2 text-sm font-extrabold text-white transition disabled:cursor-not-allowed disabled:opacity-60 sm:w-auto ${ + className={`w-full rounded-md px-3 py-2 text-sm font-extrabold text-white transition cursor-pointer disabled:cursor-not-allowed disabled:opacity-60 sm:w-auto ${ isConnected ? "bg-rose-500 hover:bg-rose-600" : "bg-emerald-500 hover:bg-emerald-600" diff --git a/src/components/accounts/integration-accounts-panel.tsx b/src/features/integrations/components/integration-accounts-panel.tsx similarity index 97% rename from src/components/accounts/integration-accounts-panel.tsx rename to src/features/integrations/components/integration-accounts-panel.tsx index a6c3e0b..821a6e8 100644 --- a/src/components/accounts/integration-accounts-panel.tsx +++ b/src/features/integrations/components/integration-accounts-panel.tsx @@ -2,10 +2,10 @@ import Link from "next/link"; import { useCallback, useEffect, useState } from "react"; -import { readApiJson } from "../../lib/api/response"; -import { notify } from "../../lib/notifications/toast"; -import { createSupabaseBrowserClient, isSupabaseConfigured } from "../../lib/supabase/client"; -import { AccountProvider, ConnectedAccount } from "../../types/mock-app"; +import { readApiJson } from "@/lib/api/response"; +import { notify } from "@/lib/notifications/toast"; +import { createSupabaseBrowserClient, isSupabaseConfigured } from "@/lib/supabase/client"; +import { AccountProvider, ConnectedAccount } from "@/types/mock-app"; import { AccountConnectionCard } from "./account-connection-card"; import { TbLayoutDashboard } from "react-icons/tb"; diff --git a/src/components/landing/aurora-background.tsx b/src/features/landing/components/aurora-background.tsx similarity index 100% rename from src/components/landing/aurora-background.tsx rename to src/features/landing/components/aurora-background.tsx diff --git a/src/components/landing/hero-content.tsx b/src/features/landing/components/hero-content.tsx similarity index 100% rename from src/components/landing/hero-content.tsx rename to src/features/landing/components/hero-content.tsx diff --git a/src/components/landing/hero-highlights.tsx b/src/features/landing/components/hero-highlights.tsx similarity index 100% rename from src/components/landing/hero-highlights.tsx rename to src/features/landing/components/hero-highlights.tsx diff --git a/src/components/landing/hero-illustration.tsx b/src/features/landing/components/hero-illustration.tsx similarity index 99% rename from src/components/landing/hero-illustration.tsx rename to src/features/landing/components/hero-illustration.tsx index 6eb36d2..48b880b 100644 --- a/src/components/landing/hero-illustration.tsx +++ b/src/features/landing/components/hero-illustration.tsx @@ -1,7 +1,7 @@ import Image from "next/image"; import { FaGithub, FaGitlab } from "react-icons/fa6"; import { FiGitPullRequest, FiGrid, FiRefreshCw, FiSettings } from "react-icons/fi"; -import { AppLogo } from "../ui/app-logo"; +import { AppLogo } from "@/shared/components/app-logo"; const metrics = [ { label: "Total contributions", value: "2,482", helper: "GitHub 1,420 ยท GitLab 1,062", trend: "312 active days" }, diff --git a/src/components/landing/landing-navbar.tsx b/src/features/landing/components/landing-navbar.tsx similarity index 96% rename from src/components/landing/landing-navbar.tsx rename to src/features/landing/components/landing-navbar.tsx index e6426be..b49e281 100644 --- a/src/components/landing/landing-navbar.tsx +++ b/src/features/landing/components/landing-navbar.tsx @@ -1,7 +1,7 @@ import Link from "next/link"; import { FiLogOut } from "react-icons/fi"; import type { LandingSessionUser } from "./landing-page"; -import { AppLogo } from "../ui/app-logo"; +import { AppLogo } from "@/shared/components/app-logo"; type LandingNavbarProps = { user: LandingSessionUser | null; @@ -46,7 +46,7 @@ export function LandingNavbar({ user, isCheckingSession, onSignOut }: LandingNav <> -

-
-
diff --git a/src/components/settings/settings-form.tsx b/src/features/settings/components/settings-form.tsx similarity index 96% rename from src/components/settings/settings-form.tsx rename to src/features/settings/components/settings-form.tsx index 1dbeece..7482a1e 100644 --- a/src/components/settings/settings-form.tsx +++ b/src/features/settings/components/settings-form.tsx @@ -1,10 +1,10 @@ "use client"; import { ChangeEvent, FormEvent, useEffect, useMemo, useState } from "react"; -import { IntegrationAccountsPanel } from "../accounts/integration-accounts-panel"; -import { notify } from "../../lib/notifications/toast"; -import { uploadUserAvatar } from "../../lib/supabase/avatar"; -import { createSupabaseBrowserClient, isSupabaseConfigured } from "../../lib/supabase/client"; +import { IntegrationAccountsPanel } from "@/features/integrations/components/integration-accounts-panel"; +import { notify } from "@/lib/notifications/toast"; +import { uploadUserAvatar } from "@/lib/supabase/avatar"; +import { createSupabaseBrowserClient, isSupabaseConfigured } from "@/lib/supabase/client"; type ProfileFormState = { name: string; @@ -202,7 +202,7 @@ export function SettingsForm() {
-
diff --git a/src/components/app-shell/authenticated-layout.tsx b/src/shared/app-shell/authenticated-layout.tsx similarity index 59% rename from src/components/app-shell/authenticated-layout.tsx rename to src/shared/app-shell/authenticated-layout.tsx index 94da00a..4ae3824 100644 --- a/src/components/app-shell/authenticated-layout.tsx +++ b/src/shared/app-shell/authenticated-layout.tsx @@ -2,13 +2,15 @@ import Link from "next/link"; import { usePathname, useRouter } from "next/navigation"; -import { ReactNode, useEffect, useState } from "react"; -import { FiAward, FiBarChart2, FiChevronLeft, FiChevronRight, FiGitPullRequest, FiGrid, FiLogOut, FiMenu, FiSettings, FiX } from "react-icons/fi"; -import { createSupabaseBrowserClient, isSupabaseConfigured } from "../../lib/supabase/client"; -import { SidebarItem } from "../../types/mock-app"; -import { ThemeToggle } from "../layout/theme-toggle"; +import { ReactNode, useEffect, useRef, useState } from "react"; +import { FaGithub, FaGitlab } from "react-icons/fa"; +import { FiAlertCircle, FiAward, FiBarChart2, FiCalendar, FiCheckCircle, FiChevronDown, FiChevronLeft, FiChevronRight, FiClock, FiGitPullRequest, FiGrid, FiLogOut, FiMenu, FiSettings, FiX } from "react-icons/fi"; +import { createSupabaseBrowserClient, isSupabaseConfigured } from "@/lib/supabase/client"; +import { AccountProvider, SidebarItem } from "@/types/mock-app"; +// import { ThemeToggle } from "@/shared/components/theme-toggle"; import { Avatar } from "@heroui/react"; -import { AppLogo } from "../ui/app-logo"; +import { AppLogo } from "@/shared/components/app-logo"; +import { DashboardSyncStatus } from "@/types/dashboard"; const sidebarItems: SidebarItem[] = [ { label: "Dashboard", href: "/dashboard", icon: FiGrid }, @@ -24,9 +26,12 @@ type AuthenticatedLayoutProps = { description: string; children: ReactNode; actions?: ReactNode; + syncActions?: ReactNode; + syncStatus?: DashboardSyncStatus | null; + syncProviders?: AccountProvider[]; }; -export function AuthenticatedLayout({ title, description, children, actions }: AuthenticatedLayoutProps) { +export function AuthenticatedLayout({ title, description, children, actions, syncActions, syncStatus, syncProviders }: AuthenticatedLayoutProps) { const router = useRouter(); const [isOpen, setIsOpen] = useState(false); const [isSidebarCollapsed, setIsSidebarCollapsed] = useState(false); @@ -79,13 +84,19 @@ export function AuthenticatedLayout({ title, description, children, actions }: A
-
+

Dashboard

{title}

{description}

-
{actions}
+
+ +
+ {actions} + {/* */} +
+
{children}
@@ -95,6 +106,182 @@ export function AuthenticatedLayout({ title, description, children, actions }: A ); } +function SyncStatusPanel({ sync, providers, actions }: { sync: DashboardSyncStatus | null; providers: AccountProvider[]; actions?: ReactNode }) { + const [isOpen, setIsOpen] = useState(false); + const panelRef = useRef(null); + + useEffect(() => { + if (!isOpen) { + return; + } + + const handlePointerDown = (event: PointerEvent) => { + if (!panelRef.current?.contains(event.target as Node)) { + setIsOpen(false); + } + }; + + const handleKeyDown = (event: KeyboardEvent) => { + if (event.key === "Escape") { + setIsOpen(false); + } + }; + + document.addEventListener("pointerdown", handlePointerDown); + document.addEventListener("keydown", handleKeyDown); + + return () => { + document.removeEventListener("pointerdown", handlePointerDown); + document.removeEventListener("keydown", handleKeyDown); + }; + }, [isOpen]); + + if (!sync || sync.status === "idle") { + return actions ? ( +
+ {actions} +
+ ) : null; + } + + const summary = getSyncSummary(sync); + const shownProviders = providers.length ? providers : (["github", "gitlab"] satisfies AccountProvider[]); + + return ( +
+
+ + {actions && ( +
+ {actions} +
+ )} +
+ + {isOpen && ( +
+
+

Last sync

+ +
+ +
+ {shownProviders.map((provider) => ( + + ))} +
+ +
+ + {summary.finishedDetail} +
+
+ )} +
+ ); +} + +function ProviderSyncRow({ provider, sync }: { provider: AccountProvider; sync: DashboardSyncStatus }) { + const summary = getSyncSummary(sync); + const Icon = provider === "github" ? FaGithub : FaGitlab; + + return ( +
+
+ + + + {formatProviderName(provider)} +
+ + + {summary.title} + +
+ ); +} + +function getSyncSummary(sync: DashboardSyncStatus) { + const isSyncing = sync.status === "syncing"; + const isSynced = sync.status === "synced"; + const Icon = isSyncing ? FiClock : isSynced ? FiCheckCircle : FiAlertCircle; + const title = isSyncing ? "Syncing" : isSynced ? "Synced" : "Failed"; + const detail = isSyncing + ? sync.startedAt + ? "Started " + formatSyncDate(sync.startedAt) + : "Sync in progress" + : isSynced + ? sync.finishedAt + ? "Updated " + formatSyncDate(sync.finishedAt) + : "Updated just now" + : sync.errorMessage || "Last sync failed"; + const finishedDetail = isSyncing + ? detail + : sync.finishedAt + ? "Finished " + formatSyncDate(sync.finishedAt) + : detail; + + return { + Icon, + title, + detail, + finishedDetail, + iconClassName: isSyncing + ? "bg-blue-500/10 text-blue-500" + : isSynced + ? "bg-emerald-500/10 text-emerald-500" + : "bg-rose-500/10 text-rose-500", + statusClassName: isSyncing + ? "text-blue-500" + : isSynced + ? "text-emerald-500" + : "text-rose-500", + }; +} + +function formatProviderName(provider: AccountProvider) { + return provider === "github" ? "GitHub" : "GitLab"; +} + +function formatSyncDate(value: string) { + return new Intl.DateTimeFormat(undefined, { + dateStyle: "medium", + timeStyle: "short", + }).format(new Date(value)); +} + function MobileTopbar({ onOpen }: { onOpen: () => void }) { const [displayAvatarUrl, setDisplayAvatarUrl] = useState(null); const [displayName, setDisplayName] = useState("Git Fusion user"); @@ -225,7 +412,7 @@ function Sidebar({ onNavigate, collapsed = false, onToggleCollapse }: { onNaviga ) : onToggleCollapse ? ( - ) : null} @@ -302,7 +489,7 @@ function Sidebar({ onNavigate, collapsed = false, onToggleCollapse }: { onNaviga