Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 3 additions & 1 deletion src/lib/components/organizer/sidebar/sidebar-toggle.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,9 @@
>
<Tooltip.Root>
<Tooltip.Trigger>
<Sidebar.Trigger />
{#snippet child({ props })}
<Sidebar.Trigger {...props} />
{/snippet}
</Tooltip.Trigger>
<Tooltip.Content collisionPadding={16}>
<KbdGroup>
Expand Down
23 changes: 16 additions & 7 deletions src/lib/components/organizer/sidebar/user.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
import { goto } from '$app/navigation';
import { useQuery } from 'convex-svelte';
import { useAuth } from '@mmailaender/convex-better-auth-svelte/svelte';
import { cn } from '$lib/utils';

const {
data
Expand All @@ -34,13 +35,21 @@
<Sidebar.MenuItem>
<DropdownMenu.Root>
<DropdownMenu.Trigger class="w-full">
<Sidebar.MenuButton size="lg" class="cursor-pointer border shadow-xs">
<Avatar.Root>
<Avatar.Fallback>{user.data?.name?.charAt(0) || ''}</Avatar.Fallback>
</Avatar.Root>
{user.data?.name}
<ChevronUpIcon class="mr-1 ml-auto transition-transform in-data-[state=open]:rotate-180" />
</Sidebar.MenuButton>
{#snippet child({ props })}
<Sidebar.MenuButton
size="lg"
{...props}
class={cn('cursor-pointer border shadow-xs' + props.class)}
>
<Avatar.Root>
<Avatar.Fallback>{user.data?.name?.charAt(0) || ''}</Avatar.Fallback>
</Avatar.Root>
{user.data?.name}
<ChevronUpIcon
class="mr-1 ml-auto transition-transform in-data-[state=open]:rotate-180"
/>
</Sidebar.MenuButton>
{/snippet}
</DropdownMenu.Trigger>
<DropdownMenu.Content align="end">
<DropdownMenu.Group>
Expand Down