diff --git a/package.json b/package.json index 28fe061..fff92a6 100644 --- a/package.json +++ b/package.json @@ -27,7 +27,7 @@ }, "devDependencies": { "@melt-ui/pp": "^0.1.4", - "@melt-ui/svelte": "^0.66.3", + "@melt-ui/svelte": "^0.66.4", "@playwright/test": "^1.40.1", "@resvg/resvg-js": "^2.4.1", "@sveltejs/adapter-auto": "^3.0.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 78d1a31..db1cbb6 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -105,10 +105,10 @@ dependencies: devDependencies: '@melt-ui/pp': specifier: ^0.1.4 - version: 0.1.4(@melt-ui/svelte@0.66.3)(svelte@4.2.8) + version: 0.1.4(@melt-ui/svelte@0.66.4)(svelte@4.2.8) '@melt-ui/svelte': - specifier: ^0.66.3 - version: 0.66.3(svelte@4.2.8) + specifier: ^0.66.4 + version: 0.66.4(svelte@4.2.8) '@playwright/test': specifier: ^1.40.1 version: 1.40.1 @@ -1035,14 +1035,14 @@ packages: - supports-color dev: true - /@melt-ui/pp@0.1.4(@melt-ui/svelte@0.66.3)(svelte@4.2.8): + /@melt-ui/pp@0.1.4(@melt-ui/svelte@0.66.4)(svelte@4.2.8): resolution: {integrity: sha512-zR+Kl3CZJPJBHW8V7YcdQCMI/dVcnW9Ct3yGbVaIywYVStVRS7F9uEDOea3xLLT2WTGodQePzPlUn53yKFu87g==} engines: {pnpm: '>=8.6.3'} peerDependencies: '@melt-ui/svelte': '>= 0.29.0' svelte: ^3.55.0 || ^4.0.0 || ^5.0.0-next.1 dependencies: - '@melt-ui/svelte': 0.66.3(svelte@4.2.8) + '@melt-ui/svelte': 0.66.4(svelte@4.2.8) estree-walker: 3.0.3 svelte: 4.2.8 dev: true @@ -1061,8 +1061,8 @@ packages: svelte: 4.2.8 dev: false - /@melt-ui/svelte@0.66.3(svelte@4.2.8): - resolution: {integrity: sha512-inwvI+YjvMWykK8PEYIg9sAx0sQHI29XeX9hfrdtP47mFVa61pQLqrLoADBpTSb5gO9ZzuL01agXGFfzjK1iPw==} + /@melt-ui/svelte@0.66.4(svelte@4.2.8): + resolution: {integrity: sha512-RYzgje5/0WQiN8YYAoeuHP7Ua/Ew2oPqBVOkMqlqRquARyiD1gP1RsfXWH637i06q+T5S+UuIiVkc4b/pbcZ4g==} peerDependencies: svelte: '>=3 <5' dependencies: diff --git a/src/hooks.server.ts b/src/hooks.server.ts index 22da92b..907d0e0 100644 --- a/src/hooks.server.ts +++ b/src/hooks.server.ts @@ -7,7 +7,8 @@ import { lucia } from '$lib/server/auth'; Sentry.init({ dsn: 'https://742e43279df93a3c4a4a78c12eb1f879@o4506057768632320.ingest.sentry.io/4506057770401792', tracesSampleRate: 1, - environment: dev ? 'development' : 'production' + environment: dev ? 'development' : 'production', + enabled: !dev }); export const authentication: Handle = async function ({ event, resolve }) { diff --git a/src/lib/components/analytics.svelte b/src/lib/components/Analytics.svelte similarity index 100% rename from src/lib/components/analytics.svelte rename to src/lib/components/Analytics.svelte diff --git a/src/lib/components/footer.svelte b/src/lib/components/Footer.svelte similarity index 100% rename from src/lib/components/footer.svelte rename to src/lib/components/Footer.svelte diff --git a/src/lib/components/Game.svelte b/src/lib/components/Game.svelte new file mode 100644 index 0000000..33950ba --- /dev/null +++ b/src/lib/components/Game.svelte @@ -0,0 +1,64 @@ + + +
+ + + + + {game.name} + {#if game?.year_published} + ({game?.year_published}) + {/if} + + + + + + {`Image +
+ {#if game?.players} +

Players: {game.players}

+

Time: {game.playtime} minutes

+ {#if isGameType(game) && game?.min_age} +

Min Age: {game.min_age}

+ {/if} + {#if detailed && isGameType(game) && game?.description} +
{@html game.description}
+ {/if} + {/if} +
+ + + +
+ + diff --git a/src/lib/components/game/index.svelte b/src/lib/components/game/index.svelte deleted file mode 100644 index 2f45eb4..0000000 --- a/src/lib/components/game/index.svelte +++ /dev/null @@ -1,134 +0,0 @@ - - -
- - - {game.name} - - - - {`Image -
- {#if game?.players} -

Players: {game.players}

-

Time: {game.playtime} minutes

- {#if isGameType(game) && game?.min_age} -

Min Age: {game.min_age}

- {/if} - {#if detailed && isGameType(game) && game?.description} -
{@html game.description}
- {/if} - {/if} -
- - - -
- - - - - - - - - - diff --git a/src/lib/components/ui/card/Card.svelte b/src/lib/components/ui/card/Card.svelte deleted file mode 100644 index 88576d9..0000000 --- a/src/lib/components/ui/card/Card.svelte +++ /dev/null @@ -1,21 +0,0 @@ - - -
- -
diff --git a/src/lib/components/ui/card/CardContent.svelte b/src/lib/components/ui/card/CardContent.svelte deleted file mode 100644 index 9dcf30b..0000000 --- a/src/lib/components/ui/card/CardContent.svelte +++ /dev/null @@ -1,10 +0,0 @@ - - -
- -
diff --git a/src/lib/components/ui/card/CardDescription.svelte b/src/lib/components/ui/card/CardDescription.svelte deleted file mode 100644 index 81dc138..0000000 --- a/src/lib/components/ui/card/CardDescription.svelte +++ /dev/null @@ -1,10 +0,0 @@ - - -

- -

diff --git a/src/lib/components/ui/card/CardFooter.svelte b/src/lib/components/ui/card/CardFooter.svelte deleted file mode 100644 index d46c7f0..0000000 --- a/src/lib/components/ui/card/CardFooter.svelte +++ /dev/null @@ -1,10 +0,0 @@ - - -
- -
diff --git a/src/lib/components/ui/card/CardHeader.svelte b/src/lib/components/ui/card/CardHeader.svelte deleted file mode 100644 index 9cd2ab1..0000000 --- a/src/lib/components/ui/card/CardHeader.svelte +++ /dev/null @@ -1,10 +0,0 @@ - - -
- -
diff --git a/src/lib/components/ui/card/CardTitle.svelte b/src/lib/components/ui/card/CardTitle.svelte deleted file mode 100644 index 0b122e0..0000000 --- a/src/lib/components/ui/card/CardTitle.svelte +++ /dev/null @@ -1,16 +0,0 @@ - - - - - diff --git a/src/routes/(app)/(protected)/collection/+page.svelte b/src/routes/(app)/(protected)/collection/+page.svelte index 66abb82..063f830 100644 --- a/src/routes/(app)/(protected)/collection/+page.svelte +++ b/src/routes/(app)/(protected)/collection/+page.svelte @@ -1,6 +1,6 @@ diff --git a/src/routes/(app)/+page.server.ts b/src/routes/(app)/+page.server.ts index da4bb60..5a1c3cb 100644 --- a/src/routes/(app)/+page.server.ts +++ b/src/routes/(app)/+page.server.ts @@ -44,15 +44,8 @@ export const load: PageServerLoad = async ({ fetch, url }) => { const form = await superValidate(formData, search_schema); console.log('form', form); - const count = 5; - const ids: { id: string }[] = await prisma.$queryRaw`SELECT id FROM games ORDER BY RAND() LIMIT ${count}`; - const randomGames: Game[] = await prisma.game.findMany({ - where: { - id: { - in: ids.map(id => id.id) - } - } - }); + const randomGames: Game[] = await fetch('/api/game/random?limit=6').then(res => res.json()); + console.log('randomGames', randomGames); return { form, metaTagsChild: metaTags, randomGames }; }; diff --git a/src/routes/(app)/+page.svelte b/src/routes/(app)/+page.svelte index 0f77ae0..baac444 100644 --- a/src/routes/(app)/+page.svelte +++ b/src/routes/(app)/+page.svelte @@ -1,7 +1,7 @@
@@ -64,7 +77,19 @@
-

Games Found:

+
+

Games Found:

+
+
+ + +
+
+
{#if totalCount > 0} {#each games as game (game.id)} @@ -75,7 +100,7 @@ {/if}
{#if showPagination} -