diff --git a/src/routes/+page.server.ts b/src/routes/+page.server.ts index 0cb7b11..187d1ca 100644 --- a/src/routes/+page.server.ts +++ b/src/routes/+page.server.ts @@ -4,14 +4,16 @@ import { redirect, error } from '@sveltejs/kit'; import * as api from '$lib/api'; /** @type {import('./$types').PageServerLoad} */ -export const load: PageServerLoad = ({ locals }) => { - const res: Promise = api.get('blogs', locals.token).then((res) => res.json()); +export const load: PageServerLoad = async ({ locals }) => { + const res = await api.get('blogs', locals.token); - return { - streamed : { - blogs: res - } - }; + if (!res.ok) { + throw error(res.status, 'Failed to load blogs'); + } + + const body = await res.json(); + + return { blogs: body.data }; }; /** @type {import('./$types').Actions} */ diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte index a7333e8..4dcfc59 100644 --- a/src/routes/+page.svelte +++ b/src/routes/+page.svelte @@ -11,12 +11,6 @@
- {#await data.streamed.blogs} - Loading... - {:then value} - - {:catch error} - Error :( - {/await} +
diff --git a/src/routes/blogs/+page.server.ts b/src/routes/blogs/+page.server.ts index 0cb7b11..187d1ca 100644 --- a/src/routes/blogs/+page.server.ts +++ b/src/routes/blogs/+page.server.ts @@ -4,14 +4,16 @@ import { redirect, error } from '@sveltejs/kit'; import * as api from '$lib/api'; /** @type {import('./$types').PageServerLoad} */ -export const load: PageServerLoad = ({ locals }) => { - const res: Promise = api.get('blogs', locals.token).then((res) => res.json()); +export const load: PageServerLoad = async ({ locals }) => { + const res = await api.get('blogs', locals.token); - return { - streamed : { - blogs: res - } - }; + if (!res.ok) { + throw error(res.status, 'Failed to load blogs'); + } + + const body = await res.json(); + + return { blogs: body.data }; }; /** @type {import('./$types').Actions} */ diff --git a/src/routes/blogs/+page.svelte b/src/routes/blogs/+page.svelte index 0cd22c1..8e140e5 100644 --- a/src/routes/blogs/+page.svelte +++ b/src/routes/blogs/+page.svelte @@ -7,12 +7,6 @@
- {#await data.streamed.blogs} - Loading... - {:then value} - - {:catch error} - Error :( - {/await} +