fix: Fix #10
This commit is contained in:
1 parent
7ea6d141be
commit
90587cfa26
5 files changed
+19
-8
No files matched your search
@@ -8,6 +8,10 @@
|
|||||||
|
|
||||||
<div class="flex flex-col mx-auto gap-4 justify-center items-center">
|
<div class="flex flex-col mx-auto gap-4 justify-center items-center">
|
||||||
<h1 class="font-black text-5xl">{$page.status}</h1>
|
<h1 class="font-black text-5xl">{$page.status}</h1>
|
||||||
|
<p>
|
||||||
|
The <strong>server</strong>
|
||||||
|
failed to fetch the data. Click "retry" to have the client load it.
|
||||||
|
</p>
|
||||||
<Button href={$page.url.toString()}>Retry</Button>
|
<Button href={$page.url.toString()}>Retry</Button>
|
||||||
<Button
|
<Button
|
||||||
on:click={() => {
|
on:click={() => {
|
||||||
|
|||||||
+8
-1
@@ -2,6 +2,7 @@ import { authData, getClient } from '$lib/lemmy.js'
|
|||||||
import { userSettings } from '$lib/settings.js'
|
import { userSettings } from '$lib/settings.js'
|
||||||
import type { ListingType, SortType } from 'lemmy-js-client'
|
import type { ListingType, SortType } from 'lemmy-js-client'
|
||||||
import { get } from 'svelte/store'
|
import { get } from 'svelte/store'
|
||||||
|
import { error } from '@sveltejs/kit'
|
||||||
|
|
||||||
export async function load({ url }) {
|
export async function load({ url }) {
|
||||||
const page = Number(url.searchParams.get('page') || 1) || 1
|
const page = Number(url.searchParams.get('page') || 1) || 1
|
||||||
@@ -13,8 +14,9 @@ export async function load({ url }) {
|
|||||||
(url.searchParams.get('type') as ListingType) ||
|
(url.searchParams.get('type') as ListingType) ||
|
||||||
get(userSettings).defaultSort.feed
|
get(userSettings).defaultSort.feed
|
||||||
|
|
||||||
|
try {
|
||||||
return {
|
return {
|
||||||
posts: getClient().getPosts({
|
posts: await getClient().getPosts({
|
||||||
limit: 20,
|
limit: 20,
|
||||||
page: page,
|
page: page,
|
||||||
sort: sort,
|
sort: sort,
|
||||||
@@ -25,4 +27,9 @@ export async function load({ url }) {
|
|||||||
site: getClient().getSite({}),
|
site: getClient().getSite({}),
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
} catch (err) {
|
||||||
|
throw error(500, {
|
||||||
|
message: 'Failed to fetch homepage.',
|
||||||
|
})
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@@ -11,14 +11,14 @@ export async function load(req: any) {
|
|||||||
get(userSettings).defaultSort.sort
|
get(userSettings).defaultSort.sort
|
||||||
|
|
||||||
return {
|
return {
|
||||||
posts: getClient().getPosts({
|
posts: await getClient().getPosts({
|
||||||
limit: 40,
|
limit: 40,
|
||||||
community_name: req.params.name,
|
community_name: req.params.name,
|
||||||
page: page,
|
page: page,
|
||||||
sort: sort,
|
sort: sort,
|
||||||
auth: get(authData)?.token,
|
auth: get(authData)?.token,
|
||||||
}),
|
}),
|
||||||
community: getClient().getCommunity({
|
community: await getClient().getCommunity({
|
||||||
name: req.params.name,
|
name: req.params.name,
|
||||||
auth: get(authData)?.token,
|
auth: get(authData)?.token,
|
||||||
}),
|
}),
|
||||||
|
|||||||
@@ -2,13 +2,13 @@ import { authData, getClient } from '$lib/lemmy.js'
|
|||||||
import type { ListingType } from 'lemmy-js-client'
|
import type { ListingType } from 'lemmy-js-client'
|
||||||
import { get } from 'svelte/store'
|
import { get } from 'svelte/store'
|
||||||
|
|
||||||
export function load({ url }) {
|
export async function load({ url }) {
|
||||||
const type = url.searchParams.get('type') as ListingType
|
const type = url.searchParams.get('type') as ListingType
|
||||||
const page = Number(url.searchParams.get('page')) || 1
|
const page = Number(url.searchParams.get('page')) || 1
|
||||||
const query = url.searchParams.get('q')
|
const query = url.searchParams.get('q')
|
||||||
|
|
||||||
if (query) {
|
if (query) {
|
||||||
return getClient().search({
|
return await getClient().search({
|
||||||
limit: 40,
|
limit: 40,
|
||||||
page: page,
|
page: page,
|
||||||
sort: 'TopAll',
|
sort: 'TopAll',
|
||||||
@@ -18,7 +18,7 @@ export function load({ url }) {
|
|||||||
auth: get(authData)?.token,
|
auth: get(authData)?.token,
|
||||||
})
|
})
|
||||||
} else {
|
} else {
|
||||||
return getClient().listCommunities({
|
return await getClient().listCommunities({
|
||||||
limit: 40,
|
limit: 40,
|
||||||
page: page,
|
page: page,
|
||||||
sort: 'TopAll',
|
sort: 'TopAll',
|
||||||
|
|||||||
@@ -1,9 +1,9 @@
|
|||||||
import { authData, getClient } from '$lib/lemmy.js'
|
import { authData, getClient } from '$lib/lemmy.js'
|
||||||
import { get } from 'svelte/store'
|
import { get } from 'svelte/store'
|
||||||
|
|
||||||
export function load({ params }) {
|
export async function load({ params }) {
|
||||||
return {
|
return {
|
||||||
user: getClient().getPersonDetails({
|
user: await getClient().getPersonDetails({
|
||||||
limit: 40,
|
limit: 40,
|
||||||
page: 1,
|
page: 1,
|
||||||
username: params.name,
|
username: params.name,
|
||||||
|
|||||||
Reference in new issue
Block a user