feat: use new menu component

This commit is contained in:
Xyphyn committed 2023-09-04 12:31:14 -07:00
1 parent 3b87091484
commit 2d1cd8c607
14 files changed
+89 -271

No files matched your search

+7 -11
View File
@@ -9,9 +9,7 @@
profile,
} from '$lib/auth.js'
import EditableList from '$lib/components/ui/list/EditableList.svelte'
import Menu from '$lib/components/ui/menu/Menu.svelte'
import MenuButton from '$lib/components/ui/menu/MenuButton.svelte'
import { toast } from 'mono-svelte'
import { Menu, MenuButton, toast } from 'mono-svelte'
import DebugObject from '$lib/components/util/debug/DebugObject.svelte'
import {
DEFAULT_INSTANCE_URL,
@@ -172,28 +170,26 @@
</div>
</div>
<div class="ml-auto" />
<Menu alignment="bottom-right">
<Menu origin="bottom-right">
<Button
let:toggleOpen
on:click={toggleOpen}
size="square-md"
slot="button"
slot="target"
>
<Icon src={EllipsisHorizontal} mini size="16" slot="prefix" />
</Button>
<MenuButton on:click={() => moveProfile(profile.id, true)}>
<Icon src={ChevronUp} size="16" mini slot="icon" />
<Icon src={ChevronUp} size="16" mini slot="prefix" />
Move Up
</MenuButton>
<MenuButton on:click={() => moveProfile(profile.id, false)}>
<Icon src={ChevronDown} size="16" mini slot="icon" />
<Icon src={ChevronDown} size="16" mini slot="prefix" />
Move Down
</MenuButton>
<MenuButton
disabled={!profile.color}
on:click={() => (profile.color = undefined)}
>
<Icon src={ArrowUturnLeft} size="16" mini slot="icon" />
<Icon src={ArrowUturnLeft} size="16" mini slot="prefix" />
Reset Color
</MenuButton>
{#if $userSettings.debugInfo}
@@ -203,7 +199,7 @@
debugging = !debugging
}}
>
<Icon src={BugAnt} size="16" mini slot="icon" />
<Icon src={BugAnt} size="16" mini slot="prefix" />
Debug Info
</MenuButton>
{/if}
+5 -12
View File
@@ -24,13 +24,11 @@
import { isCommentView } from '$lib/lemmy/item.js'
import { getClient } from '$lib/lemmy.js'
import { isBlocked } from '$lib/lemmy/user.js'
import { toast } from 'mono-svelte'
import { Menu, MenuButton, toast } from 'mono-svelte'
import UserLink from '$lib/components/lemmy/user/UserLink.svelte'
import { profile } from '$lib/auth.js'
import { ban, isAdmin } from '$lib/components/lemmy/moderation/moderation.js'
import Menu from '$lib/components/ui/menu/Menu.svelte'
import ShieldIcon from '$lib/components/lemmy/moderation/ShieldIcon.svelte'
import MenuButton from '$lib/components/ui/menu/MenuButton.svelte'
import { searchParam } from '$lib/util.js'
import Placeholder from '$lib/components/ui/Placeholder.svelte'
import { Button, Modal, Select } from 'mono-svelte'
@@ -255,21 +253,16 @@
</Button>
</div>
{#if isAdmin($profile?.user)}
<Menu class="ml-auto" alignment="bottom-right">
<Button
let:toggleOpen
size="square-md"
on:click={toggleOpen}
slot="button"
>
<Menu class="ml-auto" origin="bottom-right">
<Button size="square-md" slot="target">
<ShieldIcon width={16} filled />
</Button>
<MenuButton
color="dangerSecondary"
color="danger-subtle"
on:click={() =>
ban(data.person_view.person.banned, data.person_view.person)}
>
<Icon slot="icon" mini size="16" src={ShieldExclamation} />
<Icon slot="prefix" mini size="16" src={ShieldExclamation} />
{data.person_view.person.banned ? 'Unban' : 'Ban'}
</MenuButton>
</Menu>