misc: Improve error handling
This commit is contained in:
1 parent
98b5e4b5c1
commit
a5460a03b4
23 files changed
+285
-202
No files matched your search
@@ -1 +0,0 @@
|
||||
<slot />
|
||||
@@ -1,5 +0,0 @@
|
||||
import { getClient } from '$lib/lemmy.js'
|
||||
|
||||
export function load({ params }) {
|
||||
return getClient().getCommunity({ name: params.name })
|
||||
}
|
||||
@@ -0,0 +1,120 @@
|
||||
<script lang="ts">
|
||||
import { page } from '$app/stores'
|
||||
import Link from '$lib/components/Link.svelte'
|
||||
import MultiSelect from '$lib/components/MultiSelect.svelte'
|
||||
import SvelteMarkdown from 'svelte-markdown'
|
||||
import Avatar from '../../post/[id]/Avatar.svelte'
|
||||
import Post from '../../post/[id]/Post.svelte'
|
||||
import { goto } from '$app/navigation'
|
||||
import RelativeDate from '$lib/components/RelativeDate.svelte'
|
||||
import {
|
||||
Calendar,
|
||||
ChatBubbleOvalLeftEllipsis,
|
||||
Icon,
|
||||
Newspaper,
|
||||
PencilSquare,
|
||||
UserGroup,
|
||||
} from 'svelte-hero-icons'
|
||||
import FormattedNumber from '$lib/components/FormattedNumber.svelte'
|
||||
import Card from '$lib/components/Card.svelte'
|
||||
|
||||
export let data
|
||||
</script>
|
||||
|
||||
<div class="flex flex-row gap-4 justify-between">
|
||||
<div class="flex flex-col gap-4 max-w-full">
|
||||
<div class="flex flex-col sm:flex-row gap-4 max-w-full">
|
||||
<MultiSelect
|
||||
options={['Active', 'TopWeek', 'TopAll', 'New']}
|
||||
optionNames={['Active', 'Top (Week)', 'Top (All)', 'New']}
|
||||
selected={$page.url.searchParams.get('sort') ?? 'Active'}
|
||||
on:select={(e) => {
|
||||
const url = $page.url
|
||||
url.searchParams.set('sort', e.detail)
|
||||
url.searchParams.delete('page')
|
||||
goto(url, {
|
||||
invalidateAll: true,
|
||||
})
|
||||
}}
|
||||
/>
|
||||
</div>
|
||||
{#each data.posts.posts as post}
|
||||
<Post {post} />
|
||||
{/each}
|
||||
<div>
|
||||
<Link
|
||||
href={(function () {
|
||||
$page.url.searchParams.set(
|
||||
'page',
|
||||
((Number($page.url.searchParams.get('page')) || 1) + 1).toString()
|
||||
)
|
||||
|
||||
return $page.url.toString()
|
||||
})()}
|
||||
>
|
||||
Next
|
||||
</Link>
|
||||
</div>
|
||||
</div>
|
||||
<Card>
|
||||
{#await data.streamed.community}
|
||||
<div
|
||||
class="w-[64px] h-[64px] rounded-full bg-slate-200
|
||||
dark:bg-zinc-700 animate-pulse"
|
||||
/>
|
||||
<div
|
||||
class="w-32 h-3 bg-slate-200 dark:bg-zinc-700 animate-pulse
|
||||
rounded-md"
|
||||
/>
|
||||
<div
|
||||
class="w-64 h-3 bg-slate-200 dark:bg-zinc-700 animate-pulse
|
||||
rounded-md"
|
||||
/>
|
||||
<div
|
||||
class="w-36 h-4 bg-slate-200 dark:bg-zinc-700 animate-pulse
|
||||
rounded-md"
|
||||
/>
|
||||
<div
|
||||
class="w-full h-4 bg-slate-200 dark:bg-zinc-700 animate-pulse
|
||||
rounded-md"
|
||||
/>
|
||||
<div
|
||||
class="w-24 h-4 bg-slate-200 dark:bg-zinc-700 animate-pulse
|
||||
rounded-md"
|
||||
/>
|
||||
{:then community}
|
||||
<Avatar
|
||||
width={48}
|
||||
url={community.community_view.community.icon ??
|
||||
`https://api.dicebear.com/6.x/initials/svg?seed=${community.community_view.community.name}`}
|
||||
alt={community.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.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.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.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.community_view.counts.comments} />
|
||||
</span>
|
||||
</div>
|
||||
<h1 class="font-bold text-lg">
|
||||
{community.community_view.community.name}
|
||||
</h1>
|
||||
<SvelteMarkdown source={community.community_view.community.description} />
|
||||
{/await}
|
||||
</Card>
|
||||
</div>
|
||||
@@ -1,5 +1,23 @@
|
||||
import { redirect } from '@sveltejs/kit';
|
||||
import { getClient } from '$lib/lemmy.js'
|
||||
import type { ListingType, SortType } from 'lemmy-js-client'
|
||||
|
||||
export function load({ params }) {
|
||||
throw redirect(300, `/c/${params.name}/posts`)
|
||||
}
|
||||
export function load(req: any) {
|
||||
const page = Number(req.url.searchParams.get('page') || 1) || 1
|
||||
|
||||
const sort: SortType =
|
||||
(req.url.searchParams.get('sort') as SortType) || 'Active'
|
||||
|
||||
return {
|
||||
posts: getClient().getPosts({
|
||||
limit: 40,
|
||||
community_name: req.params.name,
|
||||
page: page,
|
||||
sort: sort,
|
||||
}),
|
||||
streamed: {
|
||||
community: getClient().getCommunity({
|
||||
name: req.params.name,
|
||||
}),
|
||||
},
|
||||
}
|
||||
}
|
||||
@@ -1,16 +0,0 @@
|
||||
import { getClient } from '$lib/lemmy.js'
|
||||
import type { ListingType, SortType } from 'lemmy-js-client'
|
||||
|
||||
export function load(req: any) {
|
||||
const page = Number(req.url.searchParams.get('page') || 1) || 1
|
||||
|
||||
const sort: SortType =
|
||||
(req.url.searchParams.get('sort') as SortType) || 'Active'
|
||||
|
||||
return getClient(req.cookies.get('instance_url')).getPosts({
|
||||
limit: 40,
|
||||
community_name: req.params.name,
|
||||
page: page,
|
||||
sort: sort,
|
||||
})
|
||||
}
|
||||
@@ -1,90 +0,0 @@
|
||||
<script lang="ts">
|
||||
import { page } from '$app/stores'
|
||||
import Link from '$lib/components/Link.svelte'
|
||||
import MultiSelect from '$lib/components/MultiSelect.svelte'
|
||||
import SvelteMarkdown from 'svelte-markdown'
|
||||
import Avatar from '../../../post/[id]/Avatar.svelte'
|
||||
import Post from '../../../post/[id]/Post.svelte'
|
||||
import { goto } from '$app/navigation'
|
||||
import RelativeDate from '$lib/components/RelativeDate.svelte'
|
||||
import {
|
||||
Calendar,
|
||||
ChatBubbleOvalLeftEllipsis,
|
||||
Icon,
|
||||
Newspaper,
|
||||
PencilSquare,
|
||||
UserGroup,
|
||||
} from 'svelte-hero-icons'
|
||||
import FormattedNumber from '$lib/components/FormattedNumber.svelte'
|
||||
|
||||
export let data
|
||||
</script>
|
||||
|
||||
<div class="flex flex-row gap-4 justify-between">
|
||||
<div class="flex flex-col gap-4 max-w-full">
|
||||
<div class="flex flex-col sm:flex-row gap-4 max-w-full">
|
||||
<MultiSelect
|
||||
options={['Active', 'TopWeek', 'TopAll', 'New']}
|
||||
optionNames={['Active', 'Top (Week)', 'Top (All)', 'New']}
|
||||
selected={$page.url.searchParams.get('sort') ?? 'Active'}
|
||||
on:select={(e) => {
|
||||
const url = $page.url
|
||||
url.searchParams.set('sort', e.detail)
|
||||
url.searchParams.delete('page')
|
||||
goto(url, {
|
||||
invalidateAll: true,
|
||||
})
|
||||
}}
|
||||
/>
|
||||
</div>
|
||||
{#each data.posts as post}
|
||||
<Post {post} />
|
||||
{/each}
|
||||
<div>
|
||||
<Link
|
||||
href={(function () {
|
||||
$page.url.searchParams.set(
|
||||
'page',
|
||||
((Number($page.url.searchParams.get('page')) || 1) + 1).toString()
|
||||
)
|
||||
|
||||
return $page.url.toString()
|
||||
})()}
|
||||
>
|
||||
Next
|
||||
</Link>
|
||||
</div>
|
||||
</div>
|
||||
<div
|
||||
class="sticky top-4 bg-white border 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"
|
||||
>
|
||||
<Avatar
|
||||
width={48}
|
||||
url={data.community_view.community.icon ??
|
||||
`https://api.dicebear.com/6.x/initials/svg?seed=${data.community_view.community.name}`}
|
||||
alt={data.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(data.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={data.community_view.counts.subscribers} />
|
||||
</span>
|
||||
<span class="flex flex-row items-center gap-1">
|
||||
<Icon src={PencilSquare} width={16} height={16} mini />
|
||||
<FormattedNumber number={data.community_view.counts.posts} />
|
||||
</span>
|
||||
<span class="flex flex-row items-center gap-1">
|
||||
<Icon src={ChatBubbleOvalLeftEllipsis} width={16} height={16} mini />
|
||||
<FormattedNumber number={data.community_view.counts.comments} />
|
||||
</span>
|
||||
</div>
|
||||
<h1 class="font-bold text-lg">{data.community_view.community.name}</h1>
|
||||
<SvelteMarkdown source={data.community_view.community.description} />
|
||||
</div>
|
||||
</div>
|
||||
Reference in new issue
Block a user