mirror of
https://github.com/BradNut/boredgame
synced 2025-09-08 17:40:22 +00:00
Cleanup random API and create named action for a random search.
This commit is contained in:
parent
3f9759aef1
commit
391fba7955
5 changed files with 113 additions and 212 deletions
|
|
@ -5,30 +5,12 @@
|
||||||
import { ToastType } from '$root/lib/types';
|
import { ToastType } from '$root/lib/types';
|
||||||
import { toast } from '../../toast/toast';
|
import { toast } from '../../toast/toast';
|
||||||
|
|
||||||
// async function handleSubmit(event: SubmitEvent) {
|
|
||||||
// // submitting = true;
|
|
||||||
// boredState.update((n) => ({ ...n, loading: true }));
|
|
||||||
// const form = event.target as HTMLFormElement;
|
|
||||||
// console.log('form', form);
|
|
||||||
// const response = await fetch('/api/games', {
|
|
||||||
// method: 'POST',
|
|
||||||
// headers: { accept: 'application/json' },
|
|
||||||
// body: new FormData(form)
|
|
||||||
// });
|
|
||||||
// const responseData = await response.json();
|
|
||||||
// // submitting = false;
|
|
||||||
// boredState.update((n) => ({ ...n, loading: false }));
|
|
||||||
// gameStore.removeAll();
|
|
||||||
// gameStore.addAll(responseData?.games);
|
|
||||||
// // games = responseData?.games;
|
|
||||||
// }
|
|
||||||
|
|
||||||
let submitting = $boredState?.loading;
|
let submitting = $boredState?.loading;
|
||||||
let checked = true;
|
let checked = true;
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<form
|
<form
|
||||||
action="/search"
|
action="/search?/random"
|
||||||
method="POST"
|
method="POST"
|
||||||
use:enhance={() => {
|
use:enhance={() => {
|
||||||
gameStore.removeAll();
|
gameStore.removeAll();
|
||||||
|
|
@ -58,7 +40,7 @@
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
<fieldset aria-busy={submitting} disabled={submitting}>
|
<fieldset aria-busy={submitting} disabled={submitting}>
|
||||||
<input type="checkbox" id="random" name="random" hidden {checked} />
|
<!-- <input type="checkbox" id="random" name="random" hidden {checked} /> -->
|
||||||
<button class="btn" type="submit" disabled={submitting}>Random Game 🎲</button>
|
<button class="btn" type="submit" disabled={submitting}>Random Game 🎲</button>
|
||||||
</fieldset>
|
</fieldset>
|
||||||
</form>
|
</form>
|
||||||
|
|
|
||||||
|
|
@ -1,10 +1,10 @@
|
||||||
import type { SvelteComponent } from "svelte";
|
import type { SvelteComponent } from 'svelte';
|
||||||
|
|
||||||
export type Dialog = {
|
export type Dialog = {
|
||||||
isOpen: boolean;
|
isOpen: boolean;
|
||||||
content?: typeof SvelteComponent;
|
content?: typeof SvelteComponent;
|
||||||
additionalData?: SavedGameType | GameType;
|
additionalData?: SavedGameType | GameType;
|
||||||
}
|
};
|
||||||
|
|
||||||
export type Search = {
|
export type Search = {
|
||||||
name: string;
|
name: string;
|
||||||
|
|
@ -17,7 +17,7 @@ export type Search = {
|
||||||
skip: number;
|
skip: number;
|
||||||
currentPage: number;
|
currentPage: number;
|
||||||
limit: number;
|
limit: number;
|
||||||
}
|
};
|
||||||
|
|
||||||
export type BoredStore = {
|
export type BoredStore = {
|
||||||
loading: boolean;
|
loading: boolean;
|
||||||
|
|
@ -46,7 +46,7 @@ export type SavedGameType = {
|
||||||
thumb_url: string;
|
thumb_url: string;
|
||||||
players: string;
|
players: string;
|
||||||
playtime: string;
|
playtime: string;
|
||||||
}
|
};
|
||||||
|
|
||||||
export type GameType = {
|
export type GameType = {
|
||||||
id: string;
|
id: string;
|
||||||
|
|
|
||||||
|
|
@ -2,13 +2,7 @@ import { error } from '@sveltejs/kit';
|
||||||
import type { PageServerLoad } from './$types';
|
import type { PageServerLoad } from './$types';
|
||||||
import { boardGameApi } from '../../api';
|
import { boardGameApi } from '../../api';
|
||||||
|
|
||||||
type GamePageParams = {
|
export const load: PageServerLoad = async ({ params, setHeaders }) => {
|
||||||
params: {
|
|
||||||
id: string;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
export const load: PageServerLoad = async ({ params, setHeaders }: GamePageParams) => {
|
|
||||||
const queryParams = {
|
const queryParams = {
|
||||||
ids: `${params?.id}`
|
ids: `${params?.id}`
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -225,6 +225,7 @@
|
||||||
place-items: center;
|
place-items: center;
|
||||||
gap: 1.5rem;
|
gap: 1.5rem;
|
||||||
margin: 1rem;
|
margin: 1rem;
|
||||||
|
line-height: 1.5em;
|
||||||
}
|
}
|
||||||
|
|
||||||
.overflow-description {
|
.overflow-description {
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
import type { Actions, PageServerLoad, RequestEvent } from '../$types';
|
import type { Actions, PageServerLoad, RequestEvent } from '../$types';
|
||||||
import { BOARD_GAME_ATLAS_CLIENT_ID } from '$env/static/private';
|
import { BOARD_GAME_ATLAS_CLIENT_ID } from '$env/static/private';
|
||||||
import { error, fail } from '@sveltejs/kit';
|
import { error, fail } from '@sveltejs/kit';
|
||||||
import type { GameType, Search, SearchQuery } from '$root/lib/types';
|
import type { GameType, RandomSearch, Search, SearchQuery } from '$root/lib/types';
|
||||||
import { mapAPIGameToBoredGame } from '$root/lib/util/gameMapper';
|
import { mapAPIGameToBoredGame } from '$root/lib/util/gameMapper';
|
||||||
import { search_schema } from '$root/lib/zodValidation';
|
import { search_schema } from '$root/lib/zodValidation';
|
||||||
import { ZodError } from 'zod';
|
import { ZodError } from 'zod';
|
||||||
|
|
@ -144,90 +144,20 @@ export const load: PageServerLoad = async ({ fetch, url }) => {
|
||||||
};
|
};
|
||||||
|
|
||||||
export const actions: Actions = {
|
export const actions: Actions = {
|
||||||
default: async ({ request }: RequestEvent): Promise<any> => {
|
random: async ({ request }: RequestEvent): Promise<any> => {
|
||||||
console.log('In search action specific');
|
|
||||||
// Do things in here
|
|
||||||
const formData = Object.fromEntries(await request.formData()) as Search;
|
|
||||||
console.log('formData', formData);
|
|
||||||
console.log('passed in limit:', formData?.limit);
|
|
||||||
console.log('passed in skip:', formData?.skip);
|
|
||||||
const limit = formData?.limit || 10;
|
|
||||||
const skip = formData?.skip || 0;
|
|
||||||
|
|
||||||
const queryParams: SearchQuery = {
|
const queryParams: SearchQuery = {
|
||||||
order_by: 'rank',
|
order_by: 'rank',
|
||||||
ascending: false,
|
ascending: false,
|
||||||
limit: +limit,
|
|
||||||
skip: +skip,
|
|
||||||
client_id: BOARD_GAME_ATLAS_CLIENT_ID,
|
client_id: BOARD_GAME_ATLAS_CLIENT_ID,
|
||||||
fuzzy_match: true,
|
random: true
|
||||||
name: ''
|
|
||||||
};
|
};
|
||||||
|
|
||||||
// TODO: Check name length and not search if not advanced search
|
|
||||||
|
|
||||||
const random = formData?.random === 'on';
|
|
||||||
|
|
||||||
if (random) {
|
|
||||||
console.log('Random');
|
|
||||||
queryParams.random = random;
|
|
||||||
} else {
|
|
||||||
try {
|
|
||||||
const {
|
|
||||||
name,
|
|
||||||
minAge,
|
|
||||||
minPlayers,
|
|
||||||
maxPlayers,
|
|
||||||
exactMinAge,
|
|
||||||
exactMinPlayers,
|
|
||||||
exactMaxPlayers
|
|
||||||
} = search_schema.parse(formData);
|
|
||||||
|
|
||||||
if (minAge) {
|
|
||||||
if (exactMinAge) {
|
|
||||||
queryParams.min_age = minAge;
|
|
||||||
} else {
|
|
||||||
queryParams.gt_min_age = minAge === 1 ? 0 : minAge - 1;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (minPlayers) {
|
|
||||||
if (exactMinPlayers) {
|
|
||||||
queryParams.min_players = minPlayers;
|
|
||||||
} else {
|
|
||||||
queryParams.gt_min_players = minPlayers === 1 ? 0 : minPlayers - 1;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (maxPlayers) {
|
|
||||||
if (exactMaxPlayers) {
|
|
||||||
queryParams.max_players = maxPlayers;
|
|
||||||
} else {
|
|
||||||
queryParams.lt_max_players = maxPlayers + 1;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (name) {
|
|
||||||
queryParams.name = name;
|
|
||||||
}
|
|
||||||
} catch (error: unknown) {
|
|
||||||
if (error instanceof ZodError) {
|
|
||||||
console.log(error);
|
|
||||||
|
|
||||||
const { fieldErrors: errors } = error.flatten();
|
|
||||||
return fail(400, { data: formData, errors });
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
const newQueryParams: Record<string, string> = {};
|
const newQueryParams: Record<string, string> = {};
|
||||||
for (const key in queryParams) {
|
for (const key in queryParams) {
|
||||||
console.log('key', key);
|
|
||||||
console.log('queryParams[key]', queryParams[key as keyof SearchQuery]);
|
|
||||||
newQueryParams[key] = `${queryParams[key as keyof SearchQuery]}`;
|
newQueryParams[key] = `${queryParams[key as keyof SearchQuery]}`;
|
||||||
}
|
}
|
||||||
|
|
||||||
const urlQueryParams = new URLSearchParams(newQueryParams);
|
const urlQueryParams = new URLSearchParams(newQueryParams);
|
||||||
console.log('urlQueryParams', urlQueryParams);
|
|
||||||
|
|
||||||
try {
|
try {
|
||||||
const url = `https://api.boardgameatlas.com/api/search${
|
const url = `https://api.boardgameatlas.com/api/search${
|
||||||
|
|
@ -260,20 +190,14 @@ export const actions: Actions = {
|
||||||
// console.log('returning from search', games)
|
// console.log('returning from search', games)
|
||||||
|
|
||||||
return {
|
return {
|
||||||
games,
|
games
|
||||||
totalCount,
|
|
||||||
limit: parseInt(limit),
|
|
||||||
skip: parseInt(skip)
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
console.log(`Error searching board games ${e}`);
|
console.log(`Error searching board games ${e}`);
|
||||||
}
|
}
|
||||||
return {
|
return {
|
||||||
games: [],
|
games: []
|
||||||
totalCount: 0,
|
|
||||||
limit,
|
|
||||||
skip
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue