Revert "Unify workspace dropdowns; Update layouts (#458)"

This reverts commit 4bc8448a1d.

apps/dev-tool/components/app-layout.tsx

@@ -1,6 +1,6 @@
 import { DevToolSidebar } from '@/components/app-sidebar';
 
-import { SidebarInset, SidebarProvider } from '@kit/ui/sidebar';
+import { SidebarInset, SidebarProvider } from '@kit/ui/shadcn-sidebar';
 
 export function DevToolLayout(props: React.PropsWithChildren) {
   return (

apps/dev-tool/components/app-sidebar.tsx

@@ -24,7 +24,7 @@ import {
   SidebarMenuSub,
   SidebarMenuSubButton,
   SidebarMenuSubItem,
-} from '@kit/ui/sidebar';
+} from '@kit/ui/shadcn-sidebar';
 import { isRouteActive } from '@kit/ui/utils';
 
 const routes = [
@@ -92,14 +92,14 @@ export function DevToolSidebar({
                     {route.children.map((child) => (
                       <SidebarMenuSubItem key={child.path}>
                         <SidebarMenuSubButton
-                          render={
-                            <Link href={child.path}>
-                              <child.Icon className="h-4 w-4" />
-                              <span>{child.label}</span>
-                            </Link>
-                          }
+                          asChild
                           isActive={isRouteActive(child.path, pathname, false)}
-                        />
+                        >
+                          <Link href={child.path}>
+                            <child.Icon className="h-4 w-4" />
+                            <span>{child.label}</span>
+                          </Link>
+                        </SidebarMenuSubButton>
                       </SidebarMenuSubItem>
                     ))}
                   </SidebarMenuSub>
@@ -107,13 +107,13 @@ export function DevToolSidebar({
               ) : (
                 <SidebarMenuButton
                   isActive={isRouteActive(route.path, pathname, false)}
-                  render={
-                    <Link href={route.path}>
-                      <route.Icon className="h-4 w-4" />
-                      <span>{route.label}</span>
-                    </Link>
-                  }
-                />
+                  asChild
+                >
+                  <Link href={route.path}>
+                    <route.Icon className="h-4 w-4" />
+                    <span>{route.label}</span>
+                  </Link>
+                </SidebarMenuButton>
               )}
             </SidebarMenuItem>
           ))}

apps/dev-tool/components/root-providers.tsx

@@ -3,18 +3,18 @@
 import { useState } from 'react';
 
 import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
-import type { AbstractIntlMessages } from 'next-intl';
 
-import { I18nClientProvider } from '@kit/i18n/provider';
+import { I18nProvider } from '@kit/i18n/provider';
 import { Toaster } from '@kit/ui/sonner';
 
-export function RootProviders(
-  props: React.PropsWithChildren<{ messages: AbstractIntlMessages }>,
-) {
+import { i18nResolver } from '../lib/i18n/i18n.resolver';
+import { getI18nSettings } from '../lib/i18n/i18n.settings';
+
+export function RootProviders(props: React.PropsWithChildren) {
   return (
-    <I18nClientProvider locale="en" messages={props.messages}>
+    <I18nProvider settings={getI18nSettings('en')} resolver={i18nResolver}>
       <ReactQueryProvider>{props.children}</ReactQueryProvider>
-    </I18nClientProvider>
+    </I18nProvider>
   );
 }
 

apps/dev-tool/components/status-tile.tsx

@@ -33,7 +33,7 @@ interface ServiceCardProps {
 export const ServiceCard = ({ name, status }: ServiceCardProps) => {
   return (
     <Card className="w-full max-w-2xl">
-      <CardContent>
+      <CardContent className="p-4">
         <div className="space-y-4">
           <div className="flex items-center justify-between">
             <div className="flex items-center space-x-4">