Skip to content

v2.1 cont. #71

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lucasdoell merged 4 commits into from
Feb 27, 2026
Merged

v2.1 cont. #71

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
89549c9
Add FeatureFlagsProvider component for managing feature flags in the …
lucasdoell Feb 27, 2026
2061b53
Wrap DashboardLayout component with FeatureFlagsProvider to manage fe…
lucasdoell Feb 27, 2026
5cc0071
Integrate feature flag for scouting in ScrimCreationForm to condition…
lucasdoell Feb 27, 2026
b9b84d5
Refactor MainNav component to replace NavigationMenu with a custom dr…
lucasdoell Feb 27, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
83 changes: 43 additions & 40 deletions src/components/dashboard-layout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { MainNav } from "@/components/dashboard/main-nav";
import { Search } from "@/components/dashboard/search";
import { TeamSwitcher } from "@/components/dashboard/team-switcher";
import { FeatureFlagsProvider } from "@/components/feature-flags-provider";
import { Footer } from "@/components/footer";
import { GuestNav } from "@/components/guest-nav";
import { LocaleSwitcher } from "@/components/locale-switcher";
Expand All @@ -26,49 +27,51 @@ export async function DashboardLayout({
const scoutingEnabled = await scoutingTool();

return (
<TeamSwitcherProvider>
<div className="min-h-[90vh] flex-col md:flex">
<div className="border-b">
<div className="hidden h-16 items-center px-4 md:flex">
<TeamSwitcher session={session} />
<MainNav
scoutingEnabled={scoutingEnabled}
className="mx-6 hidden lg:block"
/>
<MobileNav className="block pl-2 lg:hidden" session={session} />
<div className="ml-auto flex items-center space-x-4">
<Search user={user} />
<ModeToggle />
<LocaleSwitcher />
{session ? (
<>
<Notifications />
<UserNav />
</>
) : (
<GuestNav guestMode={guestMode ?? false} />
)}
<FeatureFlagsProvider scoutingEnabled={scoutingEnabled}>
<TeamSwitcherProvider>
<div className="min-h-[90vh] flex-col md:flex">
<div className="border-b">
<div className="hidden h-16 items-center px-4 md:flex">
<TeamSwitcher session={session} />
<MainNav
scoutingEnabled={scoutingEnabled}
className="mx-6 hidden lg:block"
/>
<MobileNav className="block pl-2 lg:hidden" session={session} />
<div className="ml-auto flex items-center space-x-4">
<Search user={user} />
<ModeToggle />
<LocaleSwitcher />
{session ? (
<>
<Notifications />
<UserNav />
</>
) : (
<GuestNav guestMode={guestMode ?? false} />
)}
</div>
</div>
</div>
<div className="flex h-16 items-center px-4 md:hidden">
<MobileNav session={session} />
<div className="ml-auto flex items-center space-x-4">
<ModeToggle />
<LocaleSwitcher />
{session ? (
<>
<Notifications />
<UserNav />
</>
) : (
<GuestNav guestMode={guestMode ?? false} />
)}
<div className="flex h-16 items-center px-4 md:hidden">
<MobileNav session={session} />
<div className="ml-auto flex items-center space-x-4">
<ModeToggle />
<LocaleSwitcher />
{session ? (
<>
<Notifications />
<UserNav />
</>
) : (
<GuestNav guestMode={guestMode ?? false} />
)}
</div>
</div>
</div>
{children}
</div>
{children}
</div>
<Footer />
</TeamSwitcherProvider>
<Footer />
</TeamSwitcherProvider>
</FeatureFlagsProvider>
);
}
Loading
Loading