From 1842139af94c5377afd7d56730c1dd5e318be033 Mon Sep 17 00:00:00 2001 From: Xyphyn Date: Wed, 5 Jul 2023 12:58:36 -0700 Subject: [PATCH] feat: Add post uploading --- src/hooks.server.ts | 17 +- .../components/community/CommunityCard.svelte | 51 ++++++ .../components/community/CommunityLink.svelte | 5 +- src/lib/components/input/Button.svelte | 2 + src/lib/components/input/FileInput.svelte | 44 +++++ src/lib/components/input/SelectMenu.svelte | 33 ++++ src/lib/components/input/TextArea.svelte | 34 ++++ src/lib/components/input/TextInput.svelte | 4 + src/lib/components/lemmy/Post.svelte | 115 +++++++------ src/lib/components/lemmy/PostVote.svelte | 70 ++++---- .../components/lemmy/comment/Comment.svelte | 5 +- .../lemmy/comment/CommentForm.svelte | 6 +- src/lib/components/markdown/Markdown.svelte | 10 +- .../components/markdown/MarkdownLink.svelte | 5 + src/lib/components/ui/Card.svelte | 4 +- src/lib/components/ui/Navbar.svelte | 27 +++- src/lib/components/ui/StickyCard.svelte | 2 +- src/lib/components/ui/menu/Menu.svelte | 10 +- src/lib/lemmy.ts | 10 +- src/routes/+page.svelte | 30 ++-- src/routes/c/[name]/+page.svelte | 48 ++---- src/routes/c/[name]/+page.ts | 4 +- src/routes/communities/+page.svelte | 22 ++- src/routes/communities/+page.ts | 9 +- src/routes/create/post/+page.svelte | 153 ++++++++++++++++++ src/routes/inbox/+page.svelte | 4 + src/routes/instance/+page.svelte | 28 ---- src/routes/instance_url/+server.ts | 15 -- src/routes/login/+page.svelte | 3 + src/routes/post/[instance]/[id]/+page.svelte | 8 +- src/routes/u/[name]/+page.svelte | 7 +- 31 files changed, 560 insertions(+), 225 deletions(-) create mode 100644 src/lib/components/community/CommunityCard.svelte create mode 100644 src/lib/components/input/FileInput.svelte create mode 100644 src/lib/components/input/SelectMenu.svelte create mode 100644 src/lib/components/input/TextArea.svelte create mode 100644 src/lib/components/markdown/MarkdownLink.svelte create mode 100644 src/routes/create/post/+page.svelte delete mode 100644 src/routes/instance/+page.svelte delete mode 100644 src/routes/instance_url/+server.ts diff --git a/src/hooks.server.ts b/src/hooks.server.ts index 5ff6f710..941fe430 100644 --- a/src/hooks.server.ts +++ b/src/hooks.server.ts @@ -17,7 +17,6 @@ export function handleError({ error, event }) { export async function handle({ event, resolve }) { // annoying hack to fix lemmy's CORS if (event.url.pathname.startsWith('/cors')) { - // cut off the 1st slash (empty), and remove the /cors event.request.headers.delete('origin') event.request.headers.delete('host') @@ -55,19 +54,11 @@ export async function handle({ event, resolve }) { ) } - try { - const json = await data.json() + const json = await data.json() - return new Response(JSON.stringify(json), { - status: data.status, - }) - } catch (error) { - console.log('Caught the thing') - - return new Response(JSON.stringify({ message: 'i hate everything' }), { - status: 500, - }) - } + return new Response(JSON.stringify(json), { + status: data.status, + }) } catch (error) { return new Response( JSON.stringify({ diff --git a/src/lib/components/community/CommunityCard.svelte b/src/lib/components/community/CommunityCard.svelte new file mode 100644 index 00000000..26ece59d --- /dev/null +++ b/src/lib/components/community/CommunityCard.svelte @@ -0,0 +1,51 @@ + + + + + + + + +
+ + + + + + + + + + + + +
+

+ {community_view.community.name} +

+ +
diff --git a/src/lib/components/community/CommunityLink.svelte b/src/lib/components/community/CommunityLink.svelte index dd7ac010..e3d97089 100644 --- a/src/lib/components/community/CommunityLink.svelte +++ b/src/lib/components/community/CommunityLink.svelte @@ -3,6 +3,7 @@ export let community: Community export let avatar: boolean = false + export let avatarSize: number = 24 function linkFromCommunity(community: Community) { const domain = new URL(community.actor_id).hostname @@ -19,8 +20,8 @@ src={community.icon ?? `https://api.dicebear.com/6.x/initials/svg?seed=${community.name}`} alt="" - width={24} - height={24} + width={avatarSize} + height={avatarSize} class="rounded-full aspect-square object-cover" loading="lazy" /> diff --git a/src/lib/components/input/Button.svelte b/src/lib/components/input/Button.svelte index 79e9ef53..7c958ba8 100644 --- a/src/lib/components/input/Button.svelte +++ b/src/lib/components/input/Button.svelte @@ -7,6 +7,7 @@ export let loading = false export let large = false export let disabled = false + export let submit = false const dispatch = createEventDispatcher() @@ -19,6 +20,7 @@ : 'px-3 py-1.5'} rounded-md {color} text-sm transition-all {disabled ? 'opacity-50 pointer-events-none' : ''}" + type={submit ? 'submit' : 'button'} >
+ import { DocumentPlus, Icon } from 'svelte-hero-icons' + + export let accept = 'image/*,video/*' + export let multiple = false + export let files: FileList | null | undefined = null + export let image = false + + let previewURL = '' + let dragover = false + + $: if (files) { + previewURL = URL.createObjectURL(files[0]) + } + + + diff --git a/src/lib/components/input/SelectMenu.svelte b/src/lib/components/input/SelectMenu.svelte new file mode 100644 index 00000000..d1e61f08 --- /dev/null +++ b/src/lib/components/input/SelectMenu.svelte @@ -0,0 +1,33 @@ + + + + + {#each options as option} + (selected = option)}> + {optionNames.get(option) || option} + + {/each} + diff --git a/src/lib/components/input/TextArea.svelte b/src/lib/components/input/TextArea.svelte new file mode 100644 index 00000000..de05e6bb --- /dev/null +++ b/src/lib/components/input/TextArea.svelte @@ -0,0 +1,34 @@ + + +