{#if wishlists.length === 0}
-
You have no wishlists
+
You have no wishlistsTable
{:else}
{#each wishlists as wishlist}
diff --git a/src/routes/(app)/(protected)/wishlists/[cuid]/+page.server.ts b/src/routes/(app)/(protected)/wishlists/[cuid]/+page.server.ts
index 5093585..2ec8923 100644
--- a/src/routes/(app)/(protected)/wishlists/[cuid]/+page.server.ts
+++ b/src/routes/(app)/(protected)/wishlists/[cuid]/+page.server.ts
@@ -7,7 +7,7 @@ import { and, eq } from 'drizzle-orm'
import { redirect } from 'sveltekit-flash-message/server'
import { zod } from 'sveltekit-superforms/adapters'
import { superValidate } from 'sveltekit-superforms/server'
-import { games, wishlist_items, wishlists } from '../../../../../lib/server/api/databases/tables'
+import { gamesTable, wishlist_items, wishlistsTable } from '../../../../../lib/server/api/databases/tables'
export async function load(event) {
const { params, locals } = event
@@ -24,8 +24,8 @@ export async function load(event) {
param: { cuid },
})
.then(locals.parseApiResponse)
- // const wishlist = await db.query.wishlists.findMany({
- // where: and(eq(wishlists.user_id, authedUser.id), eq(wishlists.cuid, cuid)),
+ // const wishlist = await db.query.wishlistsTable.findMany({
+ // where: and(eq(wishlistsTable.user_id, authedUser.id), eq(wishlistsTable.cuid, cuid)),
// });
if (errors) {
return error(500, 'Failed to fetch wishlist')
@@ -51,15 +51,16 @@ export const actions: Actions = {
// Add game to a wishlist
add: async (event) => {
const { locals } = event
- const { user, session } = locals
- if (userNotAuthenticated(user, session)) {
- return fail(401)
+
+ const authedUser = await locals.getAuthedUser()
+ if (!authedUser) {
+ throw redirect(302, '/login', notSignedInMessage, event)
}
const form = await superValidate(event, zod(modifyListGameSchema))
try {
- const game = await db.query.games.findFirst({
- where: eq(games.id, form.data.id),
+ const game = await db.query.gamesTable.findFirst({
+ where: eq(gamesTable.id, form.data.id),
})
if (!game) {
@@ -73,8 +74,8 @@ export const actions: Actions = {
}
if (game) {
- const wishlist = await db.query.wishlists.findFirst({
- where: eq(wishlists.user_id, user!.id!),
+ const wishlist = await db.query.wishlistsTable.findFirst({
+ where: eq(wishlistsTable.user_id, authedUser.id),
})
if (!wishlist) {
@@ -99,33 +100,36 @@ export const actions: Actions = {
// Create new wishlist
create: async (event) => {
const { locals } = event
- const { user, session } = locals
- if (userNotAuthenticated(user, session)) {
- return fail(401)
+
+ const authedUser = await locals.getAuthedUser()
+ if (!authedUser) {
+ throw redirect(302, '/login', notSignedInMessage, event)
}
return error(405, 'Method not allowed')
},
// Delete a wishlist
delete: async (event) => {
const { locals } = event
- const { user, session } = locals
- if (userNotAuthenticated(user, session)) {
- return fail(401)
+
+ const authedUser = await locals.getAuthedUser()
+ if (!authedUser) {
+ throw redirect(302, '/login', notSignedInMessage, event)
}
return error(405, 'Method not allowed')
},
// Remove game from a wishlist
remove: async (event) => {
const { locals } = event
- const { user, session } = locals
- if (userNotAuthenticated(user, session)) {
- return fail(401)
+
+ const authedUser = await locals.getAuthedUser()
+ if (!authedUser) {
+ throw redirect(302, '/login', notSignedInMessage, event)
}
const form = await superValidate(event, zod(modifyListGameSchema))
try {
- const game = await db.query.games.findFirst({
- where: eq(games.id, form.data.id),
+ const game = await db.query.gamesTable.findFirst({
+ where: eq(gamesTable.id, form.data.id),
})
if (!game) {
@@ -139,8 +143,8 @@ export const actions: Actions = {
}
if (game) {
- const wishlist = await db.query.wishlists.findFirst({
- where: eq(wishlists.user_id, user!.id!),
+ const wishlist = await db.query.wishlistsTable.findFirst({
+ where: eq(wishlistsTable.user_id, authedUser.id),
})
if (!wishlist) {
diff --git a/src/routes/(app)/(protected)/wishlists/[cuid]/+page.svelte b/src/routes/(app)/(protected)/wishlists/[cuid]/+page.svelte
index 12ea5c4..4eb0cca 100644
--- a/src/routes/(app)/(protected)/wishlists/[cuid]/+page.svelte
+++ b/src/routes/(app)/(protected)/wishlists/[cuid]/+page.svelte
@@ -1,9 +1,9 @@
@@ -18,7 +18,7 @@
{/each}
{:else}
- Sorry no games found!
+ Sorry no gamesTable found!
{/if}
diff --git a/src/routes/(app)/+page.server.ts b/src/routes/(app)/+page.server.ts
index ad7d0cc..e8606fe 100644
--- a/src/routes/(app)/+page.server.ts
+++ b/src/routes/(app)/+page.server.ts
@@ -2,7 +2,7 @@ import { db } from '$lib/server/api/packages/drizzle'
import { fail } from '@sveltejs/kit'
import { eq } from 'drizzle-orm'
import type { MetaTagsProps } from 'svelte-meta-tags'
-import { collections, usersTable, wishlists } from '../../lib/server/api/databases/tables'
+import { collections, usersTable, wishlistsTable } from '../../lib/server/api/databases/tables'
import type { PageServerLoad } from './$types'
// import { userFullyAuthenticated } from '$lib/server/auth-utils';
@@ -24,7 +24,7 @@ export const load: PageServerLoad = async (event) => {
url: new URL(url.pathname, url.origin).href,
locale: 'en_US',
title: 'Home',
- description: 'Bored Game, keep track of your games',
+ description: 'Bored Game, keep track of your gamesTable',
images: [image],
siteName: 'Bored Game',
},
@@ -33,7 +33,7 @@ export const load: PageServerLoad = async (event) => {
site: '@boredgame',
cardType: 'summary_large_image',
title: 'Home | Bored Game',
- description: 'Bored Game, keep track of your games',
+ description: 'Bored Game, keep track of your gamesTable',
image: `${new URL(url.pathname, url.origin).href}og?header=Bored Game&page=Home&content=Keep track of your games`,
imageAlt: 'Home | Bored Game',
},
@@ -44,7 +44,7 @@ export const load: PageServerLoad = async (event) => {
const { data: collectionsData, error: collectionsError } = await locals.api.collections.$get().then(locals.parseApiResponse)
if (wishlistsError || collectionsError) {
- return fail(500, 'Failed to fetch wishlists or collections')
+ return fail(500, 'Failed to fetch wishlistsTable or collections')
}
console.log('Wishlists', wishlistsData.wishlists)
diff --git a/src/routes/(app)/+page.svelte b/src/routes/(app)/+page.svelte
index d2a5055..63d16cb 100644
--- a/src/routes/(app)/+page.svelte
+++ b/src/routes/(app)/+page.svelte
@@ -1,31 +1,31 @@
{#if user}
Welcome, {welcomeName}!
-
You wishlists:
+
You wishlistsTable:
{#each wishlists as wishlist}
{wishlist.name}
{/each}
@@ -38,7 +38,7 @@
{:else}
Welcome to Bored Game!
-
Track the board games you own, the ones you want, and whether you play them enough.
+
Track the board gamesTable you own, the ones you want, and whether you play them enough.
Get started by joining the wait list or log in if you already have an account.
{/if}
diff --git a/src/routes/(app)/about/+page.svelte b/src/routes/(app)/about/+page.svelte
index 9dd3f37..f2b6915 100644
--- a/src/routes/(app)/about/+page.svelte
+++ b/src/routes/(app)/about/+page.svelte
@@ -6,7 +6,7 @@
About Bored Game
- One day we were bored and wanted to play one of our board games.
+ One day we were bored and wanted to play one of our board gamesTable.
Our problem was that we didn't know which one to play.
Rather than just pick a game I decided to make this overcomplicated solution.
I hope you enjoy using it!
diff --git a/src/routes/(app)/game/[id]/+page.server.ts b/src/routes/(app)/game/[id]/+page.server.ts
index 8fd02b9..7e37c23 100644
--- a/src/routes/(app)/game/[id]/+page.server.ts
+++ b/src/routes/(app)/game/[id]/+page.server.ts
@@ -1,4 +1,4 @@
-import { collection_items, collections, expansions, games, wishlist_items, wishlists } from '$lib/server/api/databases/tables'
+import { collection_items, collections, expansionsTable, gamesTable, wishlist_items, wishlistsTable } from '$lib/server/api/databases/tables'
import { db } from '$lib/server/api/packages/drizzle'
import { createCategory } from '$lib/utils/db/categoryUtils'
import { createExpansion } from '$lib/utils/db/expansionUtils'
@@ -15,7 +15,7 @@ export const load: PageServerLoad = async ({ params, locals, fetch }) => {
const { user } = locals
const { id } = params
const game = await db.query.games.findFirst({
- where: eq(games.id, id),
+ where: eq(gamesTable.id, id),
with: {
publishers_to_games: {
with: {
@@ -62,7 +62,7 @@ export const load: PageServerLoad = async ({ params, locals, fetch }) => {
}
const gameExpansions = await db.query.expansions.findMany({
- where: eq(expansions.base_game_id, game.id),
+ where: eq(expansionsTable.base_game_id, game.id),
with: {
game: {
columns: {
@@ -78,7 +78,7 @@ export const load: PageServerLoad = async ({ params, locals, fetch }) => {
let wishlistItem
if (user) {
const wishlist = await db.query.wishlists.findFirst({
- where: eq(wishlists.user_id, user.id),
+ where: eq(wishlistsTable.user_id, user.id),
})
// TODO: Select wishlist items based on wishlist
@@ -155,7 +155,7 @@ async function syncGameAndConnectedData(locals: App.Locals, game: Game, eventFet
boredGame.categories = categories
boredGame.mechanics = mechanics
boredGame.publishers = publishers
- // boredGame.expansions = expansions;
+ // boredGame.expansionsTable = expansionsTable;
return createOrUpdateGame(locals, boredGame, externalGame.external_id)
}
}
diff --git a/src/routes/(app)/search/+error.svelte b/src/routes/(app)/search/+error.svelte
index f26c443..808e9a2 100644
--- a/src/routes/(app)/search/+error.svelte
+++ b/src/routes/(app)/search/+error.svelte
@@ -1,5 +1,5 @@
-There was an error searching for games! 🤦♂️
-Please try again later. 🙇🏼
+There was an error searching for gamesTable! 🤦
+Please try again later. 🙇