From b172ac02f4e0fce9894a20a4a9ae0e4be5b7ad7a Mon Sep 17 00:00:00 2001
From: Bradley Shellnut
Date: Thu, 25 Aug 2022 22:06:39 -0700
Subject: [PATCH] Migrating to page server data.
---
src/routes/game/[id]/+page.server.ts | 8 +++++---
src/routes/game/[id]/+page.svelte | 6 ++++--
src/routes/todos/+page.svelte | 3 ++-
3 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/src/routes/game/[id]/+page.server.ts b/src/routes/game/[id]/+page.server.ts
index b3ae1fc..67bf9be 100644
--- a/src/routes/game/[id]/+page.server.ts
+++ b/src/routes/game/[id]/+page.server.ts
@@ -1,3 +1,4 @@
+import { error } from '@sveltejs/kit';
import type { PageServerLoad } from './$types'
import { boardGameApi } from '../../_api';
@@ -16,7 +17,7 @@ export const load: PageServerLoad = async ({ params }: GamePageParams) => {
const response = await boardGameApi('get', `search`, queryParams);
if (response.status === 404) {
return {
- games: []
+ game: []
};
}
@@ -24,11 +25,12 @@ export const load: PageServerLoad = async ({ params }: GamePageParams) => {
const gameResponse = await response.json();
// console.log('gameResponse', gameResponse);
// const games = gameResponse?.games;
- console.log('game', gameResponse?.games[0]);
+ console.log('game response', gameResponse?.games[0]);
return {
game: gameResponse?.games[0]
};
}
- throw new Error("@migration task: Migrate this return statement (https://github.com/sveltejs/kit/discussions/5774#discussioncomment-3292699)");
+ throw error(response.status);
+ // throw new Error("@migration task: Migrate this return statement (https://github.com/sveltejs/kit/discussions/5774#discussioncomment-3292699)");
};
diff --git a/src/routes/game/[id]/+page.svelte b/src/routes/game/[id]/+page.svelte
index 6d27094..3b686a1 100644
--- a/src/routes/game/[id]/+page.svelte
+++ b/src/routes/game/[id]/+page.svelte
@@ -14,10 +14,12 @@
import { collectionStore } from '$lib/stores/collectionStore';
import type { GameType, SavedGameType } from '$lib/types';
import { addToCollection, removeFromCollection } from '$lib/util/manipulateCollection';
+ import type { PageData } from './$types';
$: existsInCollection = $collectionStore.find((item: SavedGameType) => item.id === game.id);
- export let game: GameType;
- export const data;
+ export let data: PageData;
+ export let game: GameType = data.game;
+ console.log('page game', game);
let seeMore: boolean = false;
console.log(game?.description?.indexOf('
'));
let firstParagraphEnd = 0;
diff --git a/src/routes/todos/+page.svelte b/src/routes/todos/+page.svelte
index c73ab3c..74f59b1 100644
--- a/src/routes/todos/+page.svelte
+++ b/src/routes/todos/+page.svelte
@@ -15,8 +15,9 @@
pending_delete: boolean;
};
- export let data;
+ // export let data;
export let todos: Todo[];
+ console.log('todos', todos);