feat: Add post uploading

This commit is contained in:
Xyphyn committed 2023-07-05 12:58:36 -07:00
1 parent 5f674d4691
commit 1842139af9
31 files changed
+560 -225

No files matched your search

@@ -0,0 +1,51 @@
<script lang="ts">
import Markdown from '$lib/components/markdown/Markdown.svelte'
import Avatar from '$lib/components/ui/Avatar.svelte'
import Card from '$lib/components/ui/Card.svelte'
import StickyCard from '$lib/components/ui/StickyCard.svelte'
import FormattedNumber from '$lib/components/util/FormattedNumber.svelte'
import RelativeDate from '$lib/components/util/RelativeDate.svelte'
import type { CommunityView } from 'lemmy-js-client'
import {
Calendar,
ChatBubbleOvalLeftEllipsis,
Icon,
PencilSquare,
UserGroup,
} from 'svelte-hero-icons'
import SvelteMarkdown from 'svelte-markdown'
export let community_view: CommunityView
</script>
<StickyCard>
<Avatar
width={48}
url={community_view.community.icon ??
`https://api.dicebear.com/6.x/initials/svg?seed=${community_view.community.name}`}
alt={community_view.community.name}
/>
<span class="flex flex-row items-center gap-1 text-sm">
<Icon src={Calendar} width={16} height={16} mini />
<RelativeDate date={new Date(community_view.community.published)} />
</span>
<div class="text-sm flex flex-row flex-wrap gap-3">
<span class="flex flex-row items-center gap-1">
<Icon src={UserGroup} width={16} height={16} mini />
<FormattedNumber number={community_view.counts.subscribers} />
</span>
<span class="flex flex-row items-center gap-1">
<Icon src={PencilSquare} width={16} height={16} mini />
<FormattedNumber number={community_view.counts.posts} />
</span>
<span class="flex flex-row items-center gap-1">
<Icon src={ChatBubbleOvalLeftEllipsis} width={16} height={16} mini />
<FormattedNumber number={community_view.counts.comments} />
</span>
</div>
<h1 class="font-bold text-lg">
{community_view.community.name}
</h1>
<Markdown source={community_view.community.description} />
</StickyCard>
@@ -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"
/>
+2
View File
@@ -7,6 +7,7 @@
export let loading = false
export let large = false
export let disabled = false
export let submit = false
const dispatch = createEventDispatcher()
</script>
@@ -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'}
>
<div
class="flex flex-row items-center justify-center gap-2"
+44
View File
@@ -0,0 +1,44 @@
<script lang="ts">
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])
}
</script>
<label
class="flex flex-col items-center px-8 py-4 mx-auto w-full rounded-lg border border-black border-dashed cursor-pointer min-h-36 transition-colors dark:border-white {dragover
? 'border-sky-500 text-sky-500'
: ''}"
on:drop|preventDefault={(event) => (files = event.dataTransfer?.files)}
on:dragover|preventDefault={(event) => {
if (event.dataTransfer) {
event.dataTransfer.dropEffect = 'copy'
dragover = true
}
}}
on:dragleave|preventDefault={() => (dragover = false)}
>
{#if image && files}
<!-- svelte-ignore a11y-missing-attribute -->
<img
src={previewURL}
on:load={() => {
if (previewURL) URL.revokeObjectURL(previewURL)
}}
class="w-full max-w-sm h-full rounded-lg"
/>
{:else}
<Icon src={DocumentPlus} class="opacity-50" size="36" />
<p class="text-sm opacity-50">Attach a file</p>
{/if}
<input type="file" bind:files {accept} class="hidden" {multiple} />
</label>
@@ -0,0 +1,33 @@
<script lang="ts">
import { Color } from '$lib/ui/colors'
import Menu from '$lib/components/ui/menu/Menu.svelte'
import MenuButton from '$lib/components/ui/menu/MenuButton.svelte'
type T = $$Generic
export let options: T[]
export let optionNames: Map<any, string> = new Map()
export let selected: T
let open = false
optionNames.set(null, 'None')
</script>
<Menu rtl={false} preventDefault>
<button
class="flex flex-row gap-2 items-center px-3 py-1.5 w-full text-sm
transition-all max-w-64 rounded-md bg-slate-100 border border-slate-200
dark:bg-zinc-800 dark:border-zinc-700"
slot="button"
type="button"
on:click|preventDefault
>
{optionNames.get(selected) || selected}
</button>
{#each options as option}
<MenuButton on:click={() => (selected = option)}>
{optionNames.get(option) || option}
</MenuButton>
{/each}
</Menu>
+34
View File
@@ -0,0 +1,34 @@
<script lang="ts">
import { createEventDispatcher } from 'svelte'
export let label: string = ''
export let placeholder: string = ''
export let value: string = ''
export let maxlength: number = -1
export let rows: number = 3
let clazz = ''
export { clazz as class }
const dispatcher = createEventDispatcher()
</script>
<label class="flex flex-col items-center {clazz}">
{#if label != ''}
<span
class="font-bold text-sm text-left mb-1 cursor-pointer w-max self-start"
>
{label}
</span>
{/if}
<textarea
bind:value
on:input={(e) => dispatcher('input', e)}
{placeholder}
{maxlength}
{rows}
class="w-full px-3 text-sm py-2.5 bg-transparent border border-black/20
dark:border-white/20 dark:focus:border-white focus:outline-none
focus:border-black transition-colors rounded-md {clazz}"
/>
</label>
@@ -6,6 +6,7 @@
export let placeholder: string = ''
export let value: string = ''
export let maxlength: number = -1
export let required = false
function typeAction(node: Node) {
// @ts-ignore
@@ -24,6 +25,9 @@
class="font-bold text-sm text-left mb-1 cursor-pointer w-max self-start"
>
{label}
{#if required}
<span class="text-red-500">*</span>
{/if}
</span>
{/if}
<input
+65 -50
View File
@@ -1,76 +1,64 @@
<script lang="ts">
import type {
CommentView,
GetPostResponse,
PostView,
Comment,
} from 'lemmy-js-client'
import type { PostView } from 'lemmy-js-client'
import {
ArrowDown,
ArrowUp,
ChatBubbleLeft,
ChatBubbleOvalLeft,
ChatBubbleOvalLeftEllipsis,
ChevronDown,
ChevronUp,
EllipsisHorizontal,
Icon,
Square2Stack,
Trash,
} from 'svelte-hero-icons'
import RelativeDate from '$lib/components/util/RelativeDate.svelte'
import CommunityLink from '$lib/components/community/CommunityLink.svelte'
import { isImage, isVideo } from '$lib/ui/image.js'
import { authData, getClient } from '$lib/lemmy.js'
import PostVote from '$lib/components/lemmy/PostVote.svelte'
import FormattedNumber from '$lib/components/util/FormattedNumber.svelte'
import UserLink from '$lib/components/user/UserLink.svelte'
import Card from '$lib/components/ui/Card.svelte'
import {
DEFAULT_INSTANCE_URL,
authData,
getClient,
user,
} from '$lib/lemmy.js'
import Menu from '$lib/components/ui/menu/Menu.svelte'
import Button from '$lib/components/input/Button.svelte'
import MenuButton from '$lib/components/ui/menu/MenuButton.svelte'
import { Color } from '$lib/ui/colors.js'
import { page } from '$app/stores'
let postRes: PostView
export { postRes as post }
let vote = postRes.my_vote
let deleting = false
async function upvote() {
async function deletePost() {
if (!$authData) return
const upvoted = postRes.my_vote == 1
deleting = true
await getClient()
.likePost({
score: upvoted ? 0 : 1,
auth: $authData.token,
post_id: postRes.post.id,
})
.catch((_) => undefined)
}
await getClient().deletePost({
auth: $authData.token,
deleted: true,
post_id: postRes.post.id,
})
async function downvote() {
if (!$authData) return
const upvoted = postRes.my_vote == -1
await getClient()
.likePost({
score: upvoted ? 0 : -1,
auth: $authData.token,
post_id: postRes.post.id,
})
.catch((_) => undefined)
deleting = false
}
</script>
<div
class="bg-white dark:bg-zinc-900 border dark:border-zinc-800 border-slate-200
rounded-md flex flex-col overflow-hidden max-w-xl w-full"
>
<Card class="bg-white flex flex-col overflow-hidden max-w-xl w-full relative">
<div class="flex flex-col gap-2 bg-white dark:bg-zinc-900 p-4 rounded-md">
<span class="flex flex-row gap-2 text-sm opacity-80 items-center">
<CommunityLink avatar community={postRes.community} />
<span class="flex flex-row gap-2 text-xs items-center">
<CommunityLink avatarSize={20} avatar community={postRes.community} />
<span class="opacity-60">
<UserLink user={postRes.creator} />
</span>
<div class="ml-auto" />
<UserLink user={postRes.creator} />
<span class="opacity-50">
<span class="opacity-50 capitalize">
<RelativeDate date={new Date(postRes.post.published)} />
</span>
</span>
<a href="/post/{postRes.post.id}" class="font-bold text-lg">
<a href="/post/{postRes.post.id}" class="font-bold">
{postRes.post.name}
</a>
{#if postRes.post.url}
@@ -100,7 +88,10 @@
</a>
{/if}
{#if postRes.post.body}
<p class="text-sm max-h-24 line-clamp-3">
<p
class="text-sm max-h-[74px] line-clamp-3 bg-slate-100 dark:bg-zinc-800 border
border-slate200 dark:border-zinc-700 rounded-md p-2 mt-2"
>
{postRes.post.body}
</p>
{/if}
@@ -113,10 +104,10 @@
/>
<a
class="flex flex-row items-center gap-1 p-1.5 px-3 rounded-md
bg-slate-100 dark:bg-zinc-900 hover:bg-slate-200
class="flex flex-row items-center gap-1 p-1 px-3 rounded-md
bg-slate-100 dark:bg-zinc-800 hover:bg-slate-200
dark:hover:bg-zinc-700 transition-colors border border-slate-200
dark:border-zinc-800"
dark:border-zinc-700"
href="/post/{postRes.post.id}"
>
<Icon src={ChatBubbleOvalLeft} mini width={16} height={16} />
@@ -124,5 +115,29 @@
<FormattedNumber number={postRes.counts.comments} />
</span>
</a>
<Menu top absolute class="bottom-0 right-0 m-5 z-40">
<Button slot="button">
<Icon src={EllipsisHorizontal} width={16} mini />
</Button>
<span class="mx-4 text-xs opacity-80 text-left my-2">Post Actions</span>
<MenuButton
on:click={() => {
navigator.clipboard.writeText(
`${$page.url.origin}/post/${
$authData?.instance ?? DEFAULT_INSTANCE_URL
}/${postRes.post.id}`
)
}}
>
<Icon src={Square2Stack} width={16} mini />
Copy Link
</MenuButton>
{#if $user?.person_view.person.id == postRes.post.creator_id}
<MenuButton on:click={deletePost} color={Color.dangerSecondary}>
<Icon src={Trash} width={16} mini />
Delete
</MenuButton>
{/if}
</Menu>
</div>
</div>
</Card>
+36 -34
View File
@@ -37,39 +37,41 @@
}
</script>
<div
class="flex flex-row items-center gap-1 rounded-md transition-colors
cursor-pointer border border-slate-200 dark:border-zinc-800
<slot {upvote} {downvote} {vote} {score}>
<div
class="flex flex-row items-center gap-1 rounded-md transition-colors
cursor-pointer border border-slate-200 dark:border-zinc-700 px-1 py-[2px]
{// upvote
vote == 1
? 'bg-orange-600/20 text-orange-500'
: // downvote
vote == -1
? 'bg-blue-600/40 text-blue-400'
: // no vote
'bg-slate-100 dark:bg-zinc-900 hover:bg-slate-200 dark:hover:bg-zinc-700'}"
>
<button
aria-label="Upvote"
class="p-1 px-1.5"
on:click={() => {
vote = vote == 1 ? 0 : 1
upvote()
}}
vote == 1
? 'bg-orange-600/20 text-orange-500'
: // downvote
vote == -1
? 'bg-blue-600/40 text-blue-400'
: // no vote
'bg-slate-100 dark:bg-zinc-800 hover:bg-slate-200 dark:hover:bg-zinc-700'}"
>
<Icon src={ChevronUp} mini width={20} height={20} />
</button>
<span class="text-sm">
<FormattedNumber number={score} />
</span>
<button
aria-label="Downvote"
class="p-1 px-1.5"
on:click={() => {
vote = vote == -1 ? 0 : -1
downvote()
}}
>
<Icon src={ChevronDown} mini width={20} height={20} />
</button>
</div>
<button
aria-label="Upvote"
class="p-0.5 px-1"
on:click={() => {
vote = vote == 1 ? 0 : 1
upvote()
}}
>
<Icon src={ChevronUp} mini width={20} height={20} />
</button>
<span class="text-sm">
<FormattedNumber number={score} />
</span>
<button
aria-label="Downvote"
class="p-0.5 px-1"
on:click={() => {
vote = vote == -1 ? 0 : -1
downvote()
}}
>
<Icon src={ChevronDown} mini width={20} height={20} />
</button>
</div>
</slot>
@@ -16,6 +16,7 @@
import CommentForm from './CommentForm.svelte'
import { page } from '$app/stores'
import UserLink from '$lib/components/user/UserLink.svelte'
import Markdown from '$lib/components/markdown/Markdown.svelte'
export let node: CommentNodeI
@@ -59,7 +60,7 @@
<li
class="py-3 {$page.url.hash == `#${node.comment_view.comment.id}`
? 'bg-slate-300 dark:bg-zinc-800'
? 'bg-slate-200 dark:bg-zinc-800'
: ''}"
id="#{node.comment_view.comment.id.toString()}"
>
@@ -105,7 +106,7 @@
max-w-full"
>
<div class="max-w-full break-words">
<SvelteMarkdown source={node.comment_view.comment.content} />
<Markdown source={node.comment_view.comment.content} />
</div>
<div class="flex flex-row gap-2 items-center">
<div class="flex flex-row gap-2 items-center">
@@ -35,7 +35,11 @@
ToastType.success
)
} catch (err) {
addToast('Error', 'Failed to comment.', ToastType.error)
addToast(
'Error',
'Failed to comment. (Sometimes this error appears even when successful.)',
ToastType.error
)
}
loading = false
+8 -2
View File
@@ -1,7 +1,13 @@
<script lang="ts">
import MarkdownLink from '$lib/components/markdown/MarkdownLink.svelte'
import SvelteMarkdown from 'svelte-markdown'
export let source: string
export let source: string | undefined
</script>
<SvelteMarkdown {source} />
<SvelteMarkdown
{source}
renderers={{
link: MarkdownLink,
}}
/>
@@ -0,0 +1,5 @@
<script lang="ts">
export let href: string
</script>
<a {href} class="text-sky-400 hover:underline"><slot /></a>
+2 -2
View File
@@ -4,9 +4,9 @@
</script>
<div
class="bg-white border border-slate-200
class="bg-white shadow-lg border-slate-200
dark:border-zinc-800 dark:bg-zinc-900 break-words
flex-col gap-4 p-4 rounded-md {clazz}"
flex-col p-1 rounded-md {clazz}"
>
<slot />
</div>
+24 -3
View File
@@ -1,5 +1,6 @@
<script lang="ts">
import { goto } from '$app/navigation'
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 Menu from '$lib/components/ui/menu/Menu.svelte'
@@ -15,8 +16,11 @@
ArrowLeftOnRectangle,
ArrowRightOnRectangle,
Cog6Tooth,
GlobeAlt,
Icon,
Inbox,
PencilSquare,
Plus,
UserCircle,
} from 'svelte-hero-icons'
</script>
@@ -28,7 +32,7 @@
<div class="flex flex-row gap-2 items-center mr-auto">
<a href="/" class="flex flex-row items-center gap-2">
<Logo width={40} />
<div class="flex flex-col">
<div class="sm:flex flex-col hidden">
<span class="font-bold">Xylemmy</span>
<span
class="text-xs opacity-50
@@ -43,10 +47,27 @@
</div>
</a>
</div>
<Link href="/communities">Communities</Link>
<div class="flex flex-row gap-2">
<Link href="/communities">
<Icon src={GlobeAlt} width={16} />
<span class="hidden sm:inline ml-1">Communities</span>
</Link>
<Menu>
<Button color={Color.accent} slot="button">
<Icon src={Plus} width={16} />
<span class="hidden sm:inline">Create</span>
</Button>
<span class="text-xs opacity-80 text-left mx-4 my-2">Create</span>
<MenuButton link href="/create/post">
<Icon src={PencilSquare} mini width={16} />
Post
</MenuButton>
</Menu>
</div>
<Menu>
<button
class="w-8 h-8 rounded-full ring-1 ring-slate-300 bg-slate-100 dark:bg-zinc-800"
class="w-8 h-8 rounded-full ring-1 ring-slate-300 bg-slate-100
dark:bg-zinc-800"
aria-label="Profile"
slot="button"
>
+1 -1
View File
@@ -1,5 +1,5 @@
<div
class="sticky top-4 bg-white border border-slate-200
class="sticky top-4 bg-white shadow-lg border-slate-200
dark:border-zinc-800 dark:bg-zinc-900 break-words hidden lg:flex
flex-col gap-4 p-8 max-w-sm rounded-md h-max max-h-[calc(100vh-2rem)] overflow-auto"
>
+8 -2
View File
@@ -14,6 +14,8 @@
export let top = false
let element: any
export let preventDefault = false
</script>
<svelte:body
@@ -31,7 +33,11 @@
class="overflow-visible z-30 {absolute
? 'absolute'
: 'relative'} cursor-auto {clazz}"
on:click={() => (open = !open)}
on:click={(e) => {
if (preventDefault) e.preventDefault()
open = !open
}}
bind:this={element}
>
<slot name="button" />
@@ -42,7 +48,7 @@
start: 0.95,
easing: expoOut,
}}
class="absolute {rtl
class="absolute max-h-64 overflow-auto {rtl
? 'origin-top-right right-0'
: 'origin-top-left left-0'}
{top ? 'bottom-[100%] origin-bottom-left' : 'top-[100%]'}