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

This reverts commit 4bc8448a1d.

packages/features/accounts/src/components/personal-account-dropdown.tsx

@@ -10,7 +10,6 @@ import {
   LogOut,
   MessageCircleQuestion,
   Shield,
-  User,
 } from 'lucide-react';
 
 import { JWTUserData } from '@kit/supabase/types';
@@ -50,7 +49,6 @@ export function PersonalAccountDropdown({
 
   paths: {
     home: string;
-    profileSettings: string;
   };
 
   features: {
@@ -89,10 +87,11 @@ export function PersonalAccountDropdown({
         aria-label="Open your profile menu"
         data-test={'account-dropdown-trigger'}
         className={cn(
-          'group/trigger fade-in focus:outline-primary flex cursor-pointer items-center group-data-[collapsible=icon]:px-0',
+          'group/trigger fade-in focus:outline-primary flex cursor-pointer items-center group-data-[minimized=true]/sidebar:px-0',
           className ?? '',
           {
-            ['active:bg-secondary/50 group-data-[collapsible=none]:hover:bg-secondary items-center gap-4 rounded-md border-dashed p-2 transition-colors group-data-[collapsible=none]:border']:
+            ['active:bg-secondary/50 items-center gap-4 rounded-md' +
+            ' hover:bg-secondary border border-dashed p-2 transition-colors']:
               showProfileName,
           },
         )}
@@ -109,7 +108,7 @@ export function PersonalAccountDropdown({
         <If condition={showProfileName}>
           <div
             className={
-              'fade-in flex w-full flex-col truncate text-left group-data-[collapsible=icon]:hidden'
+              'fade-in flex w-full flex-col truncate text-left group-data-[minimized=true]/sidebar:hidden'
             }
           >
             <span
@@ -129,7 +128,7 @@ export function PersonalAccountDropdown({
 
           <ChevronsUpDown
             className={
-              'text-muted-foreground mr-1 h-8 group-data-[collapsible=icon]:hidden'
+              'text-muted-foreground mr-1 h-8 group-data-[minimized=true]/sidebar:hidden'
             }
           />
         </If>
@@ -141,7 +140,7 @@ export function PersonalAccountDropdown({
             className={'flex flex-col justify-start truncate text-left text-xs'}
           >
             <div className={'text-muted-foreground'}>
-              <Trans i18nKey={'common.signedInAs'} />
+              <Trans i18nKey={'common:signedInAs'} />
             </div>
 
             <div>
@@ -152,69 +151,48 @@ export function PersonalAccountDropdown({
 
         <DropdownMenuSeparator />
 
-        <DropdownMenuItem
-          render={
-            <Link
-              className={'s-full flex cursor-pointer items-center space-x-2'}
-              href={paths.home}
-            />
-          }
-        >
-          <Home className={'h-5'} />
+        <DropdownMenuItem asChild>
+          <Link
+            className={'s-full flex cursor-pointer items-center space-x-2'}
+            href={paths.home}
+          >
+            <Home className={'h-5'} />
 
-          <span>
-            <Trans i18nKey={'common.routes.home'} />
-          </span>
-        </DropdownMenuItem>
-
-        <DropdownMenuItem
-          render={
-            <Link
-              className={'s-full flex cursor-pointer items-center space-x-2'}
-              href={paths.profileSettings}
-            />
-          }
-        >
-          <User className={'h-5'} />
-
-          <span>
-            <Trans i18nKey={'common.routes.profile'} />
-          </span>
+            <span>
+              <Trans i18nKey={'common:routes.home'} />
+            </span>
+          </Link>
         </DropdownMenuItem>
 
         <DropdownMenuSeparator />
 
-        <DropdownMenuItem
-          render={
-            <Link
-              className={'s-full flex cursor-pointer items-center space-x-2'}
-              href={'/docs'}
-            />
-          }
-        >
-          <MessageCircleQuestion className={'h-5'} />
+        <DropdownMenuItem asChild>
+          <Link
+            className={'s-full flex cursor-pointer items-center space-x-2'}
+            href={'/docs'}
+          >
+            <MessageCircleQuestion className={'h-5'} />
 
-          <span>
-            <Trans i18nKey={'common.documentation'} />
-          </span>
+            <span>
+              <Trans i18nKey={'common:documentation'} />
+            </span>
+          </Link>
         </DropdownMenuItem>
 
         <If condition={isSuperAdmin}>
           <DropdownMenuSeparator />
 
-          <DropdownMenuItem
-            render={
-              <Link
-                className={
-                  's-full flex cursor-pointer items-center space-x-2 text-yellow-700 dark:text-yellow-500'
-                }
-                href={'/admin'}
-              />
-            }
-          >
-            <Shield className={'h-5'} />
+          <DropdownMenuItem asChild>
+            <Link
+              className={
+                's-full flex cursor-pointer items-center space-x-2 text-yellow-700 dark:text-yellow-500'
+              }
+              href={'/admin'}
+            >
+              <Shield className={'h-5'} />
 
-            <span>Super Admin</span>
+              <span>Super Admin</span>
+            </Link>
           </DropdownMenuItem>
         </If>
 
@@ -236,7 +214,7 @@ export function PersonalAccountDropdown({
             <LogOut className={'h-5'} />
 
             <span>
-              <Trans i18nKey={'auth.signOut'} />
+              <Trans i18nKey={'auth:signOut'} />
             </span>
           </span>
         </DropdownMenuItem>