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