Removed streaming for blogs load

davidlin2k · Oct 28, 2023 · f48f385 · f48f385
1 parent afa3f43
commit f48f385
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 28 deletions.
diff --git 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<any> = 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
@@ -11,12 +11,6 @@
 
 <div class="p-4">
 	<div class="container m-auto">
-		{#await data.streamed.blogs}
-			Loading...
-		{:then value}
-			<BlogCardGrid blogs={value.data} />
-		{:catch error}
-			Error :(
-		{/await}
+		<BlogCardGrid blogs={data.blogs} />
 	</div>
 </div>
diff --git 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<any> = 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
@@ -7,12 +7,6 @@
 
 <div class="p-4">
     <div class="container m-auto">
-        {#await data.streamed.blogs}
-            Loading...
-        {:then value}
-            <BlogCardGrid blogs={value.data} />
-        {:catch error}
-            Error :(
-        {/await}
+        <BlogCardGrid blogs={data.blogs} />
     </div>
 </div>