diff --git a/package.json b/package.json index dacec74c..98ac75b5 100644 --- a/package.json +++ b/package.json @@ -42,7 +42,7 @@ "@dicebear/initials": "^6.0.4", "lemmy-js-client": "^0.18.0-rc.2", "markdown-it": "^13.0.1", - "mono-svelte": "^0.2.8" + "mono-svelte": "^0.2.15" }, "type": "module" } diff --git a/src/lib/components/lemmy/ObjectAutocomplete.svelte b/src/lib/components/lemmy/ObjectAutocomplete.svelte index af239ea1..e89e71ae 100644 --- a/src/lib/components/lemmy/ObjectAutocomplete.svelte +++ b/src/lib/components/lemmy/ObjectAutocomplete.svelte @@ -1,9 +1,8 @@ - + {#if ($profile?.user && amMod($profile.user, item.community)) || ($profile?.user && isAdmin($profile.user))} -
  • + Moderation {#if !item.community.local && !amMod($profile.user, item.community)} (Instance Only) {/if} -
  • - remove(item)}> + + remove(item)}> {#if isCommentView(item)} {item.comment.removed ? 'Restore' : 'Remove'} @@ -46,13 +35,13 @@ {/if} {#if $profile?.user && $profile.user?.local_user_view.person.id != item.creator.id} - + User {#if !item.community.local && !amMod($profile.user, item.community)} (Instance Only) {/if} - + ban(item.creator_banned_from_community, item.creator, item.community)} > @@ -65,11 +54,9 @@ {/if} {#if $profile?.user && isAdmin($profile.user)} -
  • - Admin -
  • - remove(item, true)}> - + Admin + remove(item, true)}> + Purge {/if} diff --git a/src/lib/components/lemmy/moderation/ModerationMenu.svelte b/src/lib/components/lemmy/moderation/ModerationMenu.svelte index dc055922..77d93d52 100644 --- a/src/lib/components/lemmy/moderation/ModerationMenu.svelte +++ b/src/lib/components/lemmy/moderation/ModerationMenu.svelte @@ -1,22 +1,18 @@ - + {#if ($profile?.user && amMod($profile.user, item.community)) || ($profile?.user && isAdmin($profile.user))} - + Moderation {#if !item.community.local && !amMod($profile.user, item.community)} (Instance Only) {/if} - + lock(!item.post.locked)} loading={locking} disabled={locking} @@ -130,13 +124,13 @@ src={item.post.locked ? LockOpen : LockClosed} size="16" mini - slot="icon" + slot="prefix" /> {item.post.locked ? 'Unlock' : 'Lock'} pin(isPostView(item) ? !item.post.featured_community : false)} loading={pinning} @@ -152,7 +146,7 @@ {/if} - remove(item)}> + remove(item)}> {#if isCommentView(item)} {item.comment.removed ? 'Restore' : 'Remove'} @@ -161,13 +155,13 @@ {/if} {#if $profile?.user && $profile.user.local_user_view.person.id != item.creator.id} - + User {#if !item.community.local && !amMod($profile.user, item.community)} (Instance Only) {/if} - + ban(item.creator_banned_from_community, item.creator, item.community)} > @@ -179,11 +173,9 @@ {/if} {/if} {#if $profile?.user && isAdmin($profile.user)} - - Admin - + Admin pin(isPostView(item) ? !item.post.featured_local : false, true)} > @@ -195,7 +187,7 @@ Instance - remove(item, true)}> + remove(item, true)}> Purge diff --git a/src/lib/components/lemmy/post/PostActions.svelte b/src/lib/components/lemmy/post/PostActions.svelte index d75a6e37..11f413a2 100644 --- a/src/lib/components/lemmy/post/PostActions.svelte +++ b/src/lib/components/lemmy/post/PostActions.svelte @@ -20,8 +20,6 @@ UserCircle, } from 'svelte-hero-icons' import FormattedNumber from '$lib/components/util/FormattedNumber.svelte' - import Menu from '$lib/components/ui/menu/Menu.svelte' - import MenuButton from '$lib/components/ui/menu/MenuButton.svelte' import { createEventDispatcher } from 'svelte' import { amMod, @@ -34,7 +32,14 @@ import { setSessionStorage } from '$lib/session.js' import { goto } from '$app/navigation' import { userSettings } from '$lib/settings.js' - import { Button, Modal, Spinner } from 'mono-svelte' + import { + Button, + Menu, + MenuButton, + MenuDivider, + Modal, + Spinner, + } from 'mono-svelte' export let post: PostView @@ -109,21 +114,20 @@ {/if} -
  • Creator
  • + Creator {post.community.title}
    -
  • Actions
  • + Actions {#if $profile?.user && $profile?.jwt && $profile.user.local_user_view.person.id == post.creator.id} (editing = true)}> @@ -210,14 +214,14 @@ $profile.jwt ) }} - color="dangerSecondary" + color="danger-subtle" > {post.post.deleted ? 'Restore' : 'Delete'} {/if} {#if $profile.user?.local_user_view.person.id != post.creator.id} - report(post)} color="dangerSecondary"> + report(post)} color="danger-subtle"> Report diff --git a/src/lib/components/lemmy/post/PostForm.svelte b/src/lib/components/lemmy/post/PostForm.svelte index daf63a2e..8879e69e 100644 --- a/src/lib/components/lemmy/post/PostForm.svelte +++ b/src/lib/components/lemmy/post/PostForm.svelte @@ -9,7 +9,6 @@ import { placeholders } from '$lib/util.js' import { Checkbox, TextInput } from 'mono-svelte' import { getSessionStorage, setSessionStorage } from '$lib/session.js' - import MenuButton from '$lib/components/ui/menu/MenuButton.svelte' import ObjectAutocomplete from '$lib/components/lemmy/ObjectAutocomplete.svelte' import { Button } from 'mono-svelte' diff --git a/src/lib/components/ui/Navbar.svelte b/src/lib/components/ui/Navbar.svelte index d5fc2d22..cc5c18dc 100644 --- a/src/lib/components/ui/Navbar.svelte +++ b/src/lib/components/ui/Navbar.svelte @@ -8,14 +8,18 @@ } from '$lib/components/lemmy/moderation/moderation.js' import Avatar from '$lib/components/ui/Avatar.svelte' import Logo from '$lib/components/ui/Logo.svelte' - import Menu from '$lib/components/ui/menu/Menu.svelte' - import MenuButton from '$lib/components/ui/menu/MenuButton.svelte' import { LINKED_INSTANCE_URL, instance } from '$lib/instance.js' import { site } from '$lib/lemmy.js' import { theme } from '$lib/ui/colors.js' - import { Button, Select, Spinner } from 'mono-svelte' import { - ArrowLeftOnRectangle, + Button, + Menu, + MenuButton, + MenuDivider, + Select, + Spinner, + } from 'mono-svelte' + import { Bars3, Bookmark, Cog6Tooth, @@ -135,19 +139,17 @@ - + -
  • Create
  • + Create -
  • + {$profile?.user ? $profile.user.local_user_view.person.name : 'Profile'} -
  • + {#if $profile?.user} Profile @@ -238,7 +239,7 @@
    -
  • App
  • + App Settings diff --git a/src/lib/components/ui/menu/Menu.svelte b/src/lib/components/ui/menu/Menu.svelte deleted file mode 100644 index c9e92d9d..00000000 --- a/src/lib/components/ui/menu/Menu.svelte +++ /dev/null @@ -1,79 +0,0 @@ - - - { - if (!element.contains(e.target)) { - open = false - } - }} -/> - - -
    - - {#if open} - - {#if open} -
    - -
    - {/if} -
    - {/if} -
    diff --git a/src/lib/components/ui/menu/MenuButton.svelte b/src/lib/components/ui/menu/MenuButton.svelte deleted file mode 100644 index 047f96e5..00000000 --- a/src/lib/components/ui/menu/MenuButton.svelte +++ /dev/null @@ -1,55 +0,0 @@ - - -
  • - {#if link} - - - - {:else} - - {/if} -
  • diff --git a/src/lib/components/ui/menu/menu.ts b/src/lib/components/ui/menu/menu.ts deleted file mode 100644 index d2e58408..00000000 --- a/src/lib/components/ui/menu/menu.ts +++ /dev/null @@ -1,7 +0,0 @@ -export type Alignment = - | 'top-right' - | 'top-left' - | 'bottom-right' - | 'bottom-left' - | 'bottom-center' - | 'top-center' diff --git a/src/routes/accounts/+page.svelte b/src/routes/accounts/+page.svelte index c153b32a..0c429c31 100644 --- a/src/routes/accounts/+page.svelte +++ b/src/routes/accounts/+page.svelte @@ -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 @@
    - + moveProfile(profile.id, true)}> - + Move Up moveProfile(profile.id, false)}> - + Move Down (profile.color = undefined)} > - + Reset Color {#if $userSettings.debugInfo} @@ -203,7 +199,7 @@ debugging = !debugging }} > - + Debug Info {/if} diff --git a/src/routes/u/[name]/+page.svelte b/src/routes/u/[name]/+page.svelte index ad62667f..67093318 100644 --- a/src/routes/u/[name]/+page.svelte +++ b/src/routes/u/[name]/+page.svelte @@ -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 @@
    {#if isAdmin($profile?.user)} - - ban(data.person_view.person.banned, data.person_view.person)} > - + {data.person_view.person.banned ? 'Unban' : 'Ban'} diff --git a/yarn.lock b/yarn.lock index 56c73452..c7c9a7fb 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2977,10 +2977,10 @@ mlly@^1.2.0, mlly@^1.4.0: pkg-types "^1.0.3" ufo "^1.1.2" -mono-svelte@^0.2.8: - version "0.2.8" - resolved "https://registry.yarnpkg.com/mono-svelte/-/mono-svelte-0.2.8.tgz#30f6e83089a1f2517dfede8bba2cf36a6f26161c" - integrity sha512-M9KveQgHjBIp0xBPYJTPiDlNAFPIOeEQcq0H7ZokKfiyeDS+ZYCvNyyWC15ziJYWOtErKQd2e0cG7OVdE1ppPA== +mono-svelte@^0.2.15: + version "0.2.15" + resolved "https://registry.yarnpkg.com/mono-svelte/-/mono-svelte-0.2.15.tgz#efc8be5f484499ca93e16f8853a24a3114dff712" + integrity sha512-ImItUKzapM9NOKnOgEZqg0x7ykUIuTdM8NAoG8rSnZejrFQVXsjdA6K1TRcj3MQlSx1scr4VbEnByQBDbpVYWw== mri@^1.1.0: version "1.2.0"