Update UI elements and import paths in multiple files

This commit includes a series of UI improvements and import path adjustments across several files. Changes include using a different icon and adjusting the styling in mode-toggle.tsx, modifying class names in personal-account-dropdown.tsx, and updating the import paths in multiple files following the renaming of the 'personal-account-dropdown' to 'personal-account-dropdown-container'.
This commit is contained in:
giancarlo
2024-03-29 01:11:03 +08:00
parent 1d977fdde3
commit 7495dae062
7 changed files with 8 additions and 9 deletions

View File

@@ -17,7 +17,7 @@ import {
import { Trans } from '@kit/ui/trans'; import { Trans } from '@kit/ui/trans';
import { cn } from '@kit/ui/utils'; import { cn } from '@kit/ui/utils';
import { ProfileAccountDropdownContainer } from '~/(dashboard)/home/_components/personal-account-dropdown'; import { ProfileAccountDropdownContainer } from '~/(dashboard)/home/_components/personal-account-dropdown-container';
import featureFlagsConfig from '~/config/feature-flags.config'; import featureFlagsConfig from '~/config/feature-flags.config';
import pathsConfig from '~/config/paths.config'; import pathsConfig from '~/config/paths.config';

View File

@@ -5,7 +5,7 @@ import { cookies } from 'next/headers';
import { Sidebar, SidebarContent, SidebarNavigation } from '@kit/ui/sidebar'; import { Sidebar, SidebarContent, SidebarNavigation } from '@kit/ui/sidebar';
import { HomeSidebarAccountSelector } from '~/(dashboard)/home/_components/home-sidebar-account-selector'; import { HomeSidebarAccountSelector } from '~/(dashboard)/home/_components/home-sidebar-account-selector';
import { ProfileAccountDropdownContainer } from '~/(dashboard)/home/_components/personal-account-dropdown'; import { ProfileAccountDropdownContainer } from '~/(dashboard)/home/_components/personal-account-dropdown-container';
import { loadUserWorkspace } from '~/(dashboard)/home/_lib/load-user-workspace'; import { loadUserWorkspace } from '~/(dashboard)/home/_lib/load-user-workspace';
import { personalAccountSidebarConfig } from '~/config/personal-account-sidebar.config'; import { personalAccountSidebarConfig } from '~/config/personal-account-sidebar.config';

View File

@@ -35,11 +35,11 @@ function SignUpPage({ searchParams }: Props) {
<SignUpMethodsContainer <SignUpMethodsContainer
providers={authConfig.providers} providers={authConfig.providers}
inviteToken={inviteToken}
paths={{ paths={{
callback: pathsConfig.auth.callback, callback: pathsConfig.auth.callback,
appHome: pathsConfig.app.home, appHome: pathsConfig.app.home,
}} }}
inviteToken={inviteToken}
/> />
<div className={'justify-centers flex'}> <div className={'justify-centers flex'}>

View File

@@ -99,10 +99,10 @@ export function AccountSelector({
<PopoverTrigger asChild> <PopoverTrigger asChild>
<Button <Button
size={collapsed ? 'icon' : 'default'} size={collapsed ? 'icon' : 'default'}
variant="outline" variant="ghost"
role="combobox" role="combobox"
aria-expanded={open} aria-expanded={open}
className={cn('w-full', { className={cn('w-full shadow', {
'justify-between': !collapsed, 'justify-between': !collapsed,
'justify-center': collapsed, 'justify-center': collapsed,
})} })}
@@ -208,7 +208,6 @@ export function AccountSelector({
<If condition={features.enableTeamCreation}> <If condition={features.enableTeamCreation}>
<CommandGroup> <CommandGroup>
<Button <Button
size={'sm'}
variant="ghost" variant="ghost"
className="w-full justify-start" className="w-full justify-start"
onClick={() => { onClick={() => {

View File

@@ -72,7 +72,7 @@ export function PersonalAccountDropdown({
'animate-in fade-in group flex cursor-pointer items-center focus:outline-none', 'animate-in fade-in group flex cursor-pointer items-center focus:outline-none',
className ?? '', className ?? '',
{ {
['items-center space-x-2.5 rounded-lg border' + ['active:bg-muted/50 items-center space-x-2.5 rounded-md' +
' hover:bg-muted p-2 transition-colors']: showProfileName, ' hover:bg-muted p-2 transition-colors']: showProfileName,
}, },
)} )}

View File

@@ -2,7 +2,7 @@
import { useMemo } from 'react'; import { useMemo } from 'react';
import { Check, Moon, Sun } from 'lucide-react'; import { CheckCircle, Moon, Sun } from 'lucide-react';
import { useTheme } from 'next-themes'; import { useTheme } from 'next-themes';
import { Button } from '../shadcn/button'; import { Button } from '../shadcn/button';
@@ -69,7 +69,7 @@ export function SubMenuModeToggle() {
<Trans i18nKey={`common:${item}Theme`} /> <Trans i18nKey={`common:${item}Theme`} />
<If condition={theme === item}> <If condition={theme === item}>
<Check className={'mr-2 h-4'} /> <CheckCircle className={'mr-2 h-3'} />
</If> </If>
</DropdownMenuItem> </DropdownMenuItem>
); );