feat: make comment items and posts consistent
This commit is contained in:
1 parent
30d5dc9bf2
commit
ae09c5ab92
5 files changed
+39
-27
No files matched your search
@@ -2,13 +2,21 @@
|
||||
import Comment from '$lib/components/lemmy/comment/Comment.svelte'
|
||||
import PostMeta from '$lib/components/lemmy/post/PostMeta.svelte'
|
||||
import { getInstance } from '$lib/lemmy.js'
|
||||
import { userSettings } from '$lib/settings.js'
|
||||
import type { CommentView } from 'lemmy-js-client'
|
||||
import { Button, Material } from 'mono-svelte'
|
||||
|
||||
export let comment: CommentView
|
||||
export let view = $userSettings.view
|
||||
</script>
|
||||
|
||||
<Material class="flex flex-col flex-1 gap-1" color="distinct" padding="lg">
|
||||
<Material
|
||||
class="flex flex-col flex-1 gap-1 {view == 'list' || view == 'compact'
|
||||
? '!bg-transparent !border-0 rounded-none'
|
||||
: 'p-5'} {view == 'list' ? 'py-5' : view == 'compact' ? 'py-4' : ''}"
|
||||
color="distinct"
|
||||
padding="none"
|
||||
>
|
||||
<div class="flex flex-row justify-between items-center">
|
||||
<PostMeta
|
||||
community={comment.community}
|
||||
|
||||
@@ -16,7 +16,7 @@
|
||||
export let post: PostView
|
||||
export let actions: boolean = true
|
||||
export let hideCommunity = false
|
||||
export let view: 'card' | 'list' | 'compact' = 'card'
|
||||
export let view: 'card' | 'list' | 'compact' = $userSettings.view
|
||||
|
||||
let loaded = false
|
||||
|
||||
@@ -151,25 +151,21 @@
|
||||
<div class="flex-none w-24 h-24">
|
||||
{#if !$userSettings.expandImages || (post.post.thumbnail_url && !isImage(post.post.url))}
|
||||
<a href={postLink(post.post)}>
|
||||
{#if post.post.thumbnail_url}
|
||||
<!-- svelte-ignore a11y-missing-attribute -->
|
||||
<img
|
||||
src={bestImageURL(post.post, true)}
|
||||
loading="lazy"
|
||||
class="object-cover bg-slate-100 rounded-md h-24 w-24 border border-slate-200 dark:border-zinc-700"
|
||||
/>
|
||||
{/if}
|
||||
<!-- svelte-ignore a11y-missing-attribute -->
|
||||
<img
|
||||
src={bestImageURL(post.post, true)}
|
||||
loading="lazy"
|
||||
class="object-cover bg-slate-100 rounded-md h-24 w-24 border border-slate-200 dark:border-zinc-700"
|
||||
/>
|
||||
</a>
|
||||
{:else}
|
||||
<ExpandableImage url={bestImageURL(post.post, false, 2048)}>
|
||||
{#if post.post.thumbnail_url}
|
||||
<!-- svelte-ignore a11y-missing-attribute -->
|
||||
<img
|
||||
src={bestImageURL(post.post, true)}
|
||||
loading="lazy"
|
||||
class="object-cover bg-slate-100 rounded-md h-24 w-24 border border-slate-200 dark:border-zinc-700"
|
||||
/>
|
||||
{/if}
|
||||
<!-- svelte-ignore a11y-missing-attribute -->
|
||||
<img
|
||||
src={bestImageURL(post.post, true)}
|
||||
loading="lazy"
|
||||
class="object-cover bg-slate-100 rounded-md h-24 w-24 border border-slate-200 dark:border-zinc-700"
|
||||
/>
|
||||
</ExpandableImage>
|
||||
{/if}
|
||||
</div>
|
||||
|
||||
@@ -17,7 +17,9 @@
|
||||
</svelte:head>
|
||||
|
||||
<h1 class="text-2xl font-bold">Saved</h1>
|
||||
<div class="flex flex-col gap-4 list-none my-4">
|
||||
<div
|
||||
class="flex flex-col gap-4 list-none my-4 !divide-y divide-slate-200 dark:divide-zinc-800"
|
||||
>
|
||||
{#if !data.data || (data.data?.length ?? 0) == 0}
|
||||
<p class="text-center opacity-60 text-lg mx-4">
|
||||
Wow, it's quite empty in here.
|
||||
|
||||
@@ -118,7 +118,9 @@
|
||||
</div>
|
||||
{/if}
|
||||
{/await}
|
||||
<div class="flex flex-col gap-4 mt-4">
|
||||
<div
|
||||
class="flex flex-col mt-4 !divide-y divide-slate-200 dark:divide-zinc-800"
|
||||
>
|
||||
{#each data.results as result}
|
||||
{#if isPostView(result)}
|
||||
<Post post={result} />
|
||||
|
||||
@@ -127,13 +127,17 @@
|
||||
description="This user has no submissions that match this filter."
|
||||
/>
|
||||
{:else}
|
||||
{#each data.items as item (item.counts.id)}
|
||||
{#if isCommentView(item) && (data.type == 'all' || data.type == 'comments')}
|
||||
<CommentItem comment={item} />
|
||||
{:else if !isCommentView(item) && (data.type == 'all' || data.type == 'posts')}
|
||||
<Post post={item} />
|
||||
{/if}
|
||||
{/each}
|
||||
<div
|
||||
class="!divide-y divide-slate-200 dark:divide-zinc-800 flex flex-col"
|
||||
>
|
||||
{#each data.items as item (item.counts.id)}
|
||||
{#if isCommentView(item) && (data.type == 'all' || data.type == 'comments')}
|
||||
<CommentItem comment={item} />
|
||||
{:else if !isCommentView(item) && (data.type == 'all' || data.type == 'posts')}
|
||||
<Post post={item} />
|
||||
{/if}
|
||||
{/each}
|
||||
</div>
|
||||
{/if}
|
||||
<Pageination
|
||||
page={data.page}
|
||||
|
||||
Reference in new issue
Block a user