From e243848e17e6904d9f2ab86131d9342f882e3cc5 Mon Sep 17 00:00:00 2001 From: Xyphyn Date: Wed, 19 Jul 2023 13:43:18 -0700 Subject: [PATCH] misc: Change the way buttons are handled --- package.json | 1 + src/app.html | 2 +- .../components/community/CommunityCard.svelte | 8 +- src/lib/components/input/Button.svelte | 112 +++++++++++++----- src/lib/components/input/FileInput.svelte | 7 +- src/lib/components/input/Link.svelte | 11 +- src/lib/components/input/TextArea.svelte | 6 +- src/lib/components/input/TextInput.svelte | 30 ++--- src/lib/components/lemmy/SiteCard.svelte | 3 +- .../components/lemmy/comment/Comment.svelte | 6 +- .../lemmy/comment/CommentForm.svelte | 9 +- .../components/lemmy/comment/Comments.svelte | 3 +- .../components/lemmy/post/PostActions.svelte | 18 ++- src/lib/components/lemmy/post/PostLink.svelte | 12 +- src/lib/components/lemmy/post/PostVote.svelte | 8 +- src/lib/components/ui/Card.svelte | 2 +- src/lib/components/ui/Logo.svelte | 21 ++-- src/lib/components/ui/Navbar.svelte | 28 ++--- src/lib/components/ui/StickyCard.svelte | 2 +- .../ui/loader/{Loading.svelte => Dots.svelte} | 0 src/lib/components/ui/loader/Spinner.svelte | 12 +- src/routes/+error.svelte | 2 +- src/routes/communities/+page.svelte | 20 ++-- src/routes/create/post/+page.svelte | 10 +- src/routes/inbox/InboxItem.svelte | 6 +- src/routes/login/+page.svelte | 6 +- src/routes/saved/+page.svelte | 5 +- src/routes/settings/+page.svelte | 2 +- src/routes/u/[name]/+page.svelte | 10 +- yarn.lock | 5 + 30 files changed, 215 insertions(+), 152 deletions(-) rename src/lib/components/ui/loader/{Loading.svelte => Dots.svelte} (100%) diff --git a/package.json b/package.json index c30a5d59..c85b57d5 100644 --- a/package.json +++ b/package.json @@ -22,6 +22,7 @@ "svelte": "^3.54.0", "svelte-check": "^3.0.1", "svelte-hero-icons": "^5.0.0", + "tailwind-merge": "^1.14.0", "tailwindcss": "^3.3.2", "tslib": "^2.4.1", "typescript": "^5.0.0", diff --git a/src/app.html b/src/app.html index 828bde5f..e4239698 100644 --- a/src/app.html +++ b/src/app.html @@ -11,6 +11,6 @@ %sveltekit.head% -
%sveltekit.body%
+
%sveltekit.body%
diff --git a/src/lib/components/community/CommunityCard.svelte b/src/lib/components/community/CommunityCard.svelte index 5776e542..22348634 100644 --- a/src/lib/components/community/CommunityCard.svelte +++ b/src/lib/components/community/CommunityCard.svelte @@ -108,8 +108,8 @@ +
+ {#if loading} + + {:else} + + {/if} + +
+ +{/if} diff --git a/src/lib/components/input/FileInput.svelte b/src/lib/components/input/FileInput.svelte index 5b2fe8ab..613c25e3 100644 --- a/src/lib/components/input/FileInput.svelte +++ b/src/lib/components/input/FileInput.svelte @@ -15,9 +15,12 @@ diff --git a/src/lib/components/input/TextInput.svelte b/src/lib/components/input/TextInput.svelte index ad758f5f..7609ee5f 100644 --- a/src/lib/components/input/TextInput.svelte +++ b/src/lib/components/input/TextInput.svelte @@ -3,26 +3,26 @@ export let label: string = '' export let type: 'text' | 'password' | 'email' | null | undefined = 'text' - export let placeholder: string = '' export let value: string = '' - export let maxlength: number = -1 export let required = false - export let id = '' - export let pattern: string | undefined = undefined - export let minlength: number = 0 function typeAction(node: Node) { // @ts-ignore node.type = type } - let clazz = '' - export { clazz as class } - const dispatcher = createEventDispatcher() + + let className = ` + ${value.length != 0 ? 'invalid:border-red-400' : ''} + w-full px-3 text-sm py-2.5 bg-white dark:bg-zinc-950 + border border-slate-300 dark:border-zinc-700 dark:focus:border-white + focus:outline-none focus:border-black transition-colors rounded-md + ${$$props.class} + ` -
  • -
    +
    diff --git a/src/lib/components/lemmy/comment/Comments.svelte b/src/lib/components/lemmy/comment/Comments.svelte index cf5c809c..36a845be 100644 --- a/src/lib/components/lemmy/comment/Comments.svelte +++ b/src/lib/components/lemmy/comment/Comments.svelte @@ -17,6 +17,7 @@ if (isParent && $page.url.hash) { document.getElementById($page.url.hash)?.scrollIntoView({ behavior: 'smooth', + block: 'center', }) } }) @@ -80,7 +81,7 @@ disabled={loadingChildren} on:click={() => fetchChildren(node)} > - + {node.comment_view.counts.child_count} more
    diff --git a/src/lib/components/lemmy/post/PostActions.svelte b/src/lib/components/lemmy/post/PostActions.svelte index 87877a5f..7f036052 100644 --- a/src/lib/components/lemmy/post/PostActions.svelte +++ b/src/lib/components/lemmy/post/PostActions.svelte @@ -62,13 +62,23 @@
    - + -
  • Creator
  • {new URL(url).hostname} diff --git a/src/lib/components/lemmy/post/PostVote.svelte b/src/lib/components/lemmy/post/PostVote.svelte index 5f62afb1..9e8e42c4 100644 --- a/src/lib/components/lemmy/post/PostVote.svelte +++ b/src/lib/components/lemmy/post/PostVote.svelte @@ -1,4 +1,5 @@ - + diff --git a/src/lib/components/ui/Navbar.svelte b/src/lib/components/ui/Navbar.svelte index 984a8cdf..c4c83f32 100644 --- a/src/lib/components/ui/Navbar.svelte +++ b/src/lib/components/ui/Navbar.svelte @@ -3,6 +3,7 @@ import Button from '$lib/components/input/Button.svelte' import Link from '$lib/components/input/Link.svelte' import Logo from '$lib/components/ui/Logo.svelte' + import Spinner from '$lib/components/ui/loader/Spinner.svelte' import Menu from '$lib/components/ui/menu/Menu.svelte' import MenuButton from '$lib/components/ui/menu/MenuButton.svelte' import { authData, getInstance, instance, user } from '$lib/lemmy.js' @@ -23,7 +24,7 @@
    - - - - +
  • Create
  • diff --git a/src/lib/components/ui/StickyCard.svelte b/src/lib/components/ui/StickyCard.svelte index 886f62fb..d7542918 100644 --- a/src/lib/components/ui/StickyCard.svelte +++ b/src/lib/components/ui/StickyCard.svelte @@ -1,7 +1,7 @@