Revert: Team Settings Tabbar layout and improve Sidebar NavItems (#177)

<!-- CURSOR_SUMMARY -->
> [!NOTE]
> Replaces the tabbed `/settings` route with standalone `/general` and
`/keys` pages and updates redirects, URLs, layout config, and sidebar
structure.
> 
> - **Routing & URLs**:
> - Remove `settings` parallel routes; add dedicated `pages` at
`.../[teamIdOrSlug]/general/page.tsx` and
`.../[teamIdOrSlug]/keys/page.tsx`.
> - Update `PROTECTED_URLS` to include `GENERAL` and `KEYS` (remove
`SETTINGS`).
> - Adjust `TAB_URL_MAP` in `src/app/dashboard/route.ts` to point
`settings/team` to `GENERAL` and add `keys` mapping.
> - Update layout configs to add `/dashboard/*/general` and
`/dashboard/*/keys` (remove `/dashboard/*/settings`).
> - **Sidebar**:
> - Replace `Settings` link with separate `General` and `API Keys`
links; reorder `Members`; update `activeMatch` patterns.
> - Allow `SidebarNavItem.icon` to accept custom function components;
use `SettingsIcon` for General.
>   - Regroup billing links under `billing` group and adjust ordering.
> - **UI Pages**:
> - Implement `General` (profile, name, info cards) and `API Keys`
(table and create dialog) pages within `Frame` wrappers.
> 
> <sup>Written by [Cursor
Bugbot](https://cursor.com/dashboard?tab=bugbot) for commit
cef069b. This will update automatically
on new commits. Configure
[here](https://cursor.com/dashboard?tab=bugbot).</sup>
<!-- /CURSOR_SUMMARY -->

Author: ben-fornefeld

src/app/dashboard/[teamIdOrSlug]/settings/@general/page.tsx renamed to src/app/dashboard/[teamIdOrSlug]/general/page.tsx

@@ -12,9 +12,9 @@ const TAB_URL_MAP: Record<string, (teamId: string) => string> = {
   usage: (teamId) => PROTECTED_URLS.USAGE(teamId),
   billing: (teamId) => PROTECTED_URLS.BILLING(teamId),
   budget: (teamId) => PROTECTED_URLS.BUDGET(teamId),
-  keys: (teamId) => PROTECTED_URLS.SETTINGS(teamId, 'keys'),
-  settings: (teamId) => PROTECTED_URLS.SETTINGS(teamId, 'general'),
-  team: (teamId) => PROTECTED_URLS.SETTINGS(teamId, 'general'),
+  keys: (teamId) => PROTECTED_URLS.KEYS(teamId),
+  settings: (teamId) => PROTECTED_URLS.GENERAL(teamId),
+  team: (teamId) => PROTECTED_URLS.GENERAL(teamId),
   members: (teamId) => PROTECTED_URLS.MEMBERS(teamId),
   account: (_) => PROTECTED_URLS.ACCOUNT_SETTINGS,
   personal: (_) => PROTECTED_URLS.ACCOUNT_SETTINGS,

src/app/dashboard/[teamIdOrSlug]/settings/@keys/page.tsx renamed to src/app/dashboard/[teamIdOrSlug]/keys/page.tsx

@@ -30,9 +30,13 @@ const DASHBOARD_LAYOUT_CONFIGS: Record<string, DashboardLayoutConfig> = {
     title: 'Members',
     type: 'default',
   },
-  '/dashboard/*/settings': {
-    title: 'Settings',
-    type: 'custom',
+  '/dashboard/*/keys': {
+    title: 'API Keys',
+    type: 'default',
+  },
+  '/dashboard/*/general': {
+    title: 'General',
+    type: 'default',
   },
   '/dashboard/*/billing': {
     title: 'Billing',

src/app/dashboard/[teamIdOrSlug]/settings/layout.tsx

@@ -1,3 +1,4 @@
+import { SettingsIcon } from '@/ui/primitives/icons'
 import {
   Activity,
   Box,
@@ -9,7 +10,7 @@ import {
   UserRoundCog,
   Users,
 } from 'lucide-react'
-import { ForwardRefExoticComponent, RefAttributes } from 'react'
+import { ForwardRefExoticComponent, JSX, RefAttributes } from 'react'
 import { INCLUDE_BILLING } from './flags'
 import { PROTECTED_URLS } from './urls'
 
@@ -20,9 +21,12 @@ type SidebarNavArgs = {
 export type SidebarNavItem = {
   label: string
   href: (args: SidebarNavArgs) => string
-  icon: ForwardRefExoticComponent<
-    Omit<LucideProps, 'ref'> & RefAttributes<SVGSVGElement>
-  >
+  icon:
+    | ForwardRefExoticComponent<
+        Omit<LucideProps, 'ref'> & RefAttributes<SVGSVGElement>
+      >
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    | ((...args: any[]) => JSX.Element)
   group?: string
   activeMatch?: string
 }
@@ -40,49 +44,55 @@ export const SIDEBAR_MAIN_LINKS: SidebarNavItem[] = [
     icon: Container,
     activeMatch: `/dashboard/*/templates`,
   },
-  ...(INCLUDE_BILLING
-    ? [
-        {
-          label: 'Usage',
-          href: (args: SidebarNavArgs) =>
-            PROTECTED_URLS.USAGE(args.teamIdOrSlug!),
-          icon: Activity,
-          activeMatch: `/dashboard/*/usage/**`,
-        },
-      ]
-    : []),
+
   {
-    label: 'Members',
-    href: (args) => PROTECTED_URLS.MEMBERS(args.teamIdOrSlug!),
-    icon: Users,
+    label: 'General',
+    href: (args) => PROTECTED_URLS.GENERAL(args.teamIdOrSlug!),
+    icon: SettingsIcon,
     group: 'team',
-    activeMatch: `/dashboard/*/members/**`,
+    activeMatch: `/dashboard/*/general`,
   },
   {
-    label: 'Settings',
-    href: (args) => PROTECTED_URLS.SETTINGS(args.teamIdOrSlug!, 'general'),
+    label: 'API Keys',
+    href: (args) => PROTECTED_URLS.KEYS(args.teamIdOrSlug!),
     icon: Key,
     group: 'team',
-    activeMatch: `/dashboard/*/settings/**`,
+    activeMatch: `/dashboard/*/keys`,
   },
+  {
+    label: 'Members',
+    href: (args) => PROTECTED_URLS.MEMBERS(args.teamIdOrSlug!),
+    icon: Users,
+    group: 'team',
+    activeMatch: `/dashboard/*/members`,
+  },
+
   ...(INCLUDE_BILLING
     ? [
         {
-          label: 'Billing',
+          label: 'Usage',
           href: (args: SidebarNavArgs) =>
-            PROTECTED_URLS.BILLING(args.teamIdOrSlug!),
-          icon: CreditCard,
-          group: 'expenses',
-          activeMatch: `/dashboard/*/billing/**`,
+            PROTECTED_URLS.USAGE(args.teamIdOrSlug!),
+          icon: Activity,
+          group: 'billing',
+          activeMatch: `/dashboard/*/usage/**`,
         },
         {
           label: 'Budget',
           href: (args: SidebarNavArgs) =>
             PROTECTED_URLS.BUDGET(args.teamIdOrSlug!),
-          group: 'expenses',
+          group: 'billing',
           icon: DollarSign,
           activeMatch: `/dashboard/*/budget/**`,
         },
+        {
+          label: 'Billing',
+          href: (args: SidebarNavArgs) =>
+            PROTECTED_URLS.BILLING(args.teamIdOrSlug!),
+          icon: CreditCard,
+          group: 'billing',
+          activeMatch: `/dashboard/*/billing/**`,
+        },
       ]
     : []),
 ]

src/app/dashboard/[teamIdOrSlug]/settings/page.tsx

@@ -12,8 +12,8 @@ export const PROTECTED_URLS = {
   NEW_TEAM: '/dashboard/teams/new',
   TEAMS: '/dashboard/teams',
 
-  SETTINGS: (teamIdOrSlug: string, tab?: 'general' | 'keys') =>
-    `/dashboard/${teamIdOrSlug}/settings${tab ? `?tab=${tab}` : ''}`,
+  GENERAL: (teamIdOrSlug: string) => `/dashboard/${teamIdOrSlug}/general`,
+  KEYS: (teamIdOrSlug: string) => `/dashboard/${teamIdOrSlug}/keys`,
   MEMBERS: (teamIdOrSlug: string) => `/dashboard/${teamIdOrSlug}/members`,
 
   SANDBOXES: (teamIdOrSlug: string, tab?: 'list' | 'monitoring') =>