diff --git a/src/lib/components/Card.svelte b/src/lib/components/Card.svelte
index 6d6dd71..0c1856d 100644
--- a/src/lib/components/Card.svelte
+++ b/src/lib/components/Card.svelte
@@ -1,32 +1,44 @@
-
-
-
-
+
+
+
+
+
+
-
-
-
{description}
-
Points: {points}
+
+
+
{cardData.description}
+
Pisteet: {cardData.point_value}
+
diff --git a/src/lib/components/MovieDetails.svelte b/src/lib/components/MovieDetails.svelte
index 930901d..d1009c3 100644
--- a/src/lib/components/MovieDetails.svelte
+++ b/src/lib/components/MovieDetails.svelte
@@ -1,14 +1,14 @@
{movie.name}
-
-
+
+
diff --git a/src/lib/index.ts b/src/lib/index.ts
index 395f39d..8a15b92 100644
--- a/src/lib/index.ts
+++ b/src/lib/index.ts
@@ -6,4 +6,24 @@ export function decodeUSerCookie(userCookie: string) {
const decodedCookie = decodeURIComponent(userCookie);
const parsedCookie = JSON.parse(decodedCookie);
return parsedCookie;
+}
+
+export function getNextMovie() {
+ const get_next_movie_url = `${api_url}/movie/next`;
+ return fetch(get_next_movie_url)
+ .then(response => response.json())
+ .then(data => {
+ const year = new Date(data.release_date).getFullYear();
+ data.release_date = `${year}`;
+ return data;
+ });
+}
+
+export function getCards() {
+ const get_cards_url = `${api_url}/card`;
+ return fetch(get_cards_url)
+ .then(response => response.json())
+ .then(data => {
+ return data;
+ });
}
\ No newline at end of file
diff --git a/src/lib/types.ts b/src/lib/types.ts
new file mode 100644
index 0000000..319ac7c
--- /dev/null
+++ b/src/lib/types.ts
@@ -0,0 +1,18 @@
+export type movie = {
+ id: string;
+ name: string;
+ imdb_id: string;
+ actors: Array
;
+ plot: string;
+ poster_url: string;
+ release_date: string;
+ showtime: string;
+ is_watched: boolean;
+}
+
+export type Cliche = {
+ id: number;
+ title: string;
+ description: string;
+ point_value: number;
+};
\ No newline at end of file
diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte
index 0aa12c8..bd65f7f 100644
--- a/src/routes/+layout.svelte
+++ b/src/routes/+layout.svelte
@@ -12,7 +12,7 @@
-
+
{@render children()}
diff --git a/src/routes/+page.server.ts b/src/routes/+page.server.ts
index 9feb028..ac26fd4 100644
--- a/src/routes/+page.server.ts
+++ b/src/routes/+page.server.ts
@@ -1,30 +1,9 @@
import type { PageServerLoad } from "./$types";
-import { api_url } from "$lib";
-
-type movie = {
- id: string;
- name: string;
- imdb_id: string;
- actors: Array;
- plot: string;
- poster_url: string;
- release_date: string;
- showtime: string;
- is_watched: boolean;
-}
+import { getNextMovie } from "$lib";
export const load: PageServerLoad = async (event) => {
-
-
- const get_next_movie_url = `${api_url}/movie/next`;
- const response = await fetch(get_next_movie_url);
- const data: movie = await response.json();
-
-
- const year = new Date(data.release_date).getFullYear();
- data.release_date = `${year}`;
-
+ const data = await getNextMovie();
return {
movie: data,
diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte
index bde5050..c3a58d6 100644
--- a/src/routes/+page.svelte
+++ b/src/routes/+page.svelte
@@ -2,5 +2,3 @@
import MovieDetails from '$lib/components/MovieDetails.svelte';
let data = $props();
-
-
diff --git a/src/routes/gameroom/+page.server.ts b/src/routes/gameroom/+page.server.ts
index 6f21cb3..76b004f 100644
--- a/src/routes/gameroom/+page.server.ts
+++ b/src/routes/gameroom/+page.server.ts
@@ -1,7 +1,13 @@
import type { PageServerLoad } from "./$types";
+import { getNextMovie, getCards } from "$lib";
+
export const load: PageServerLoad = async (event) => {
+ const cards = await getCards();
+ const movies = await getNextMovie();
return {
+ movie: movies,
+ cards: cards,
user: event.locals.user
};
};
\ No newline at end of file
diff --git a/src/routes/gameroom/+page.svelte b/src/routes/gameroom/+page.svelte
index e7272b9..e14ea29 100644
--- a/src/routes/gameroom/+page.svelte
+++ b/src/routes/gameroom/+page.svelte
@@ -1,6 +1,24 @@
-gameroom
+
+
+