Skip to content

Fix tab making two requests #377

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
lucascanna merged 1 commit into from
Jan 2, 2026
Merged

Fix tab making two requests #377

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
42 changes: 23 additions & 19 deletions src/app/(logged-in)/settings/layout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,16 @@
'use client';

import { Bell, Palette, Shield, User } from 'lucide-react';
import { usePathname, useRouter } from 'next/navigation';
import { usePathname } from 'next/navigation';
import { Suspense } from 'react';

import { Tabs, TabsList, TabsTrigger } from '@/components/ui/tabs';
import Link from 'next/link';

export default function SettingsLayout({ children }: { children: React.ReactNode }) {
const pathname = usePathname();
const router = useRouter();
const currentTab = pathname === '/settings' ? 'account' : pathname.split('/').pop() || 'account';

const handleTabChange = (value: string) => {
router.push(`/settings/${value === 'account' ? '' : value}`);
};

return (
<div className="container mx-auto py-6 px-4">
<div className="flex flex-col space-y-6">
Expand All @@ -25,23 +21,31 @@ export default function SettingsLayout({ children }: { children: React.ReactNode
</p>
</div>

<Tabs value={currentTab} onValueChange={handleTabChange} className="w-full">
<Tabs value={currentTab} className="w-full">
<TabsList className="w-full max-w-3xl">
<TabsTrigger value="account" className="flex items-center gap-2">
<User className="h-4 w-4" />
<span>Account</span>
<TabsTrigger value="account" className="flex items-center gap-2" asChild>
<Link href="/settings">
<User className="h-4 w-4" />
<span>Account</span>
</Link>
</TabsTrigger>
<TabsTrigger value="notifications" className="flex items-center gap-2">
<Bell className="h-4 w-4" />
<span>Notifications</span>
<TabsTrigger value="notifications" className="flex items-center gap-2" asChild>
<Link href="/settings/notifications">
<Bell className="h-4 w-4" />
<span>Notifications</span>
</Link>
</TabsTrigger>
<TabsTrigger value="security" className="flex items-center gap-2">
<Shield className="h-4 w-4" />
<span>Security</span>
<TabsTrigger value="security" className="flex items-center gap-2" asChild>
<Link href="/settings/security">
<Shield className="h-4 w-4" />
<span>Security</span>
</Link>
</TabsTrigger>
<TabsTrigger value="appearance" className="flex items-center gap-2">
<Palette className="h-4 w-4" />
<span>Appearance</span>
<TabsTrigger value="appearance" className="flex items-center gap-2" asChild>
<Link href="/settings/appearance">
<Palette className="h-4 w-4" />
<span>Appearance</span>
</Link>
</TabsTrigger>
</TabsList>
</Tabs>
Expand Down