From d02d8556d55049f7679127a895b06afa0dc4ed00 Mon Sep 17 00:00:00 2001 From: Xyphyn Date: Sun, 3 Sep 2023 17:05:45 -0700 Subject: [PATCH] switch to mono-svelte Button component --- package.json | 7 +- src/lib/components/input/Button.svelte | 163 ------------------ src/lib/components/input/MultiSelect.svelte | 2 +- src/lib/components/input/SelectMenu.svelte | 5 +- .../lemmy/ObjectAutocomplete.svelte | 2 +- src/lib/components/lemmy/SiteCard.svelte | 2 +- .../components/lemmy/comment/Comment.svelte | 2 +- .../lemmy/comment/CommentActions.svelte | 13 +- .../lemmy/comment/CommentForm.svelte | 2 +- .../lemmy/comment/CommentItem.svelte | 2 +- .../lemmy/comment/CommentVote.svelte | 2 +- .../components/lemmy/comment/Comments.svelte | 4 +- .../lemmy/community/CommunityCard.svelte | 8 +- .../lemmy/community/CommunityForm.svelte | 2 +- .../lemmy/community/CommunityItem.svelte | 2 +- .../lemmy/modal/ImageUploadModal.svelte | 2 +- .../lemmy/moderation/BanModal.svelte | 2 +- .../moderation/CommentModerationMenu.svelte | 13 +- .../lemmy/moderation/ModerationMenu.svelte | 15 +- .../lemmy/moderation/RemoveModal.svelte | 6 +- .../lemmy/moderation/ReportModal.svelte | 2 +- .../components/lemmy/post/PostActions.svelte | 15 +- src/lib/components/lemmy/post/PostFeed.svelte | 4 +- src/lib/components/lemmy/post/PostForm.svelte | 4 +- src/lib/components/lemmy/post/PostVote.svelte | 2 +- .../components/markdown/MarkdownEditor.svelte | 2 +- src/lib/components/ui/Navbar.svelte | 15 +- src/lib/components/ui/Pageination.svelte | 2 +- src/lib/components/ui/menu/MenuButton.svelte | 2 +- src/lib/components/ui/modal/Modal.svelte | 2 +- .../ui/sidebar/CommunityList.svelte | 4 +- .../ui/sidebar/ProfileButton.svelte | 4 +- src/lib/components/ui/sidebar/Sidebar.svelte | 2 +- .../ui/sidebar/SidebarButton.svelte | 2 +- src/lib/components/ui/toasts/Toast.svelte | 1 - src/routes/+error.svelte | 2 +- src/routes/+page.svelte | 2 +- src/routes/accounts/+page.svelte | 14 +- src/routes/admin/applications/+page.svelte | 5 - src/routes/admin/config/+page.svelte | 4 +- src/routes/admin/taglines/+page.svelte | 10 +- src/routes/admin/team/+page.svelte | 3 +- src/routes/c/[name]/+page.svelte | 12 +- .../c/[name]/settings/team/+page.svelte | 4 +- src/routes/communities/+page.svelte | 3 +- src/routes/inbox/+page.svelte | 12 +- src/routes/inbox/InboxItem.svelte | 4 +- src/routes/login/+page.svelte | 3 +- src/routes/moderation/+page.svelte | 2 +- src/routes/moderation/Report.svelte | 6 +- .../post/[instance]/[id=integer]/+page.svelte | 7 +- .../profile/(local_user)/blocks/+page.svelte | 6 +- .../(local_user)/settings/+page.svelte | 2 +- src/routes/saved/+page.svelte | 5 +- src/routes/search/+page.svelte | 4 +- src/routes/settings/+page.svelte | 9 +- src/routes/signup/+page.svelte | 2 +- src/routes/signup/[instance]/+page.svelte | 2 +- src/routes/u/[name]/+page.svelte | 18 +- tailwind.config.js | 30 ++-- yarn.lock | 156 +++++++++++++++-- 61 files changed, 298 insertions(+), 348 deletions(-) delete mode 100644 src/lib/components/input/Button.svelte diff --git a/package.json b/package.json index 62e75abf..4bf9d0ab 100644 --- a/package.json +++ b/package.json @@ -14,7 +14,7 @@ "devDependencies": { "@sveltejs/adapter-auto": "^2.0.0", "@sveltejs/adapter-node": "^1.3.1", - "@sveltejs/kit": "^1.5.0", + "@sveltejs/kit": "^1.24.0", "@types/markdown-it": "^12.2.3", "@types/markdown-it-container": "^2.0.6", "@types/nprogress": "^0.2.0", @@ -26,7 +26,7 @@ "markdown-it-sup": "^1.0.0", "nprogress": "^0.2.0", "postcss": "^8.4.24", - "svelte": "^3.54.0", + "svelte": "^4.2.0", "svelte-check": "^3.0.1", "svelte-hero-icons": "^5.0.0", "tailwindcss": "^3.3.2", @@ -41,7 +41,8 @@ "@dicebear/core": "^6.0.4", "@dicebear/initials": "^6.0.4", "lemmy-js-client": "^0.18.0-rc.2", - "markdown-it": "^13.0.1" + "markdown-it": "^13.0.1", + "mono-svelte": "^0.1.3" }, "type": "module" } diff --git a/src/lib/components/input/Button.svelte b/src/lib/components/input/Button.svelte deleted file mode 100644 index 53adfd30..00000000 --- a/src/lib/components/input/Button.svelte +++ /dev/null @@ -1,163 +0,0 @@ - - -{#if href} - -
- {#if loading} - - {:else if $$slots.icon} - - {:else if icon} - - {/if} - -
-
-{:else} - -{/if} diff --git a/src/lib/components/input/MultiSelect.svelte b/src/lib/components/input/MultiSelect.svelte index 8a61a682..8c93a7f2 100644 --- a/src/lib/components/input/MultiSelect.svelte +++ b/src/lib/components/input/MultiSelect.svelte @@ -1,7 +1,7 @@ {#if type == 'community'} diff --git a/src/lib/components/lemmy/SiteCard.svelte b/src/lib/components/lemmy/SiteCard.svelte index 52995f41..4d2f4f12 100644 --- a/src/lib/components/lemmy/SiteCard.svelte +++ b/src/lib/components/lemmy/SiteCard.svelte @@ -1,5 +1,4 @@ diff --git a/src/lib/components/lemmy/comment/CommentVote.svelte b/src/lib/components/lemmy/comment/CommentVote.svelte index 4cfda24a..a59a08e6 100644 --- a/src/lib/components/lemmy/comment/CommentVote.svelte +++ b/src/lib/components/lemmy/comment/CommentVote.svelte @@ -10,8 +10,8 @@ import { getClient } from '$lib/lemmy' import { userSettings } from '$lib/settings' import { profile } from '$lib/auth.js' - import Button from '$lib/components/input/Button.svelte' import FormattedNumber from '$lib/components/util/FormattedNumber.svelte' + import { Button } from 'mono-svelte' export let vote: number = 0 export let score: number diff --git a/src/lib/components/lemmy/comment/Comments.svelte b/src/lib/components/lemmy/comment/Comments.svelte index 396810b1..d568b6aa 100644 --- a/src/lib/components/lemmy/comment/Comments.svelte +++ b/src/lib/components/lemmy/comment/Comments.svelte @@ -3,13 +3,13 @@ import { buildCommentsTree, type CommentNodeI } from './comments' import { page } from '$app/stores' import { onMount, setContext } from 'svelte' - import Button from '$lib/components/input/Button.svelte' import { ChevronDown, Icon, Plus, PlusCircle } from 'svelte-hero-icons' import { getClient } from '$lib/lemmy.js' import type { CommentView, Post } from 'lemmy-js-client' import { fly } from 'svelte/transition' import { toast } from '$lib/components/ui/toasts/toasts.js' import { profile } from '$lib/auth.js' + import { Button } from 'mono-svelte' export let nodes: CommentNodeI[] export let isParent: boolean @@ -131,7 +131,7 @@ fetchChildren(node).then(() => (node.loading = false)) }} > - + {node.comment_view.counts.child_count} more diff --git a/src/lib/components/lemmy/community/CommunityCard.svelte b/src/lib/components/lemmy/community/CommunityCard.svelte index 3df3e9d6..854d2598 100644 --- a/src/lib/components/lemmy/community/CommunityCard.svelte +++ b/src/lib/components/lemmy/community/CommunityCard.svelte @@ -1,6 +1,5 @@ diff --git a/src/lib/components/lemmy/modal/ImageUploadModal.svelte b/src/lib/components/lemmy/modal/ImageUploadModal.svelte index fc8690bf..68394847 100644 --- a/src/lib/components/lemmy/modal/ImageUploadModal.svelte +++ b/src/lib/components/lemmy/modal/ImageUploadModal.svelte @@ -1,10 +1,10 @@ - +