mirror of
https://github.com/BradNut/boredgame
synced 2025-09-08 17:40:22 +00:00
Adding server side validations.
This commit is contained in:
parent
503b4d9e6d
commit
a8ed73ebc0
4 changed files with 151 additions and 158 deletions
|
|
@ -1,6 +1,8 @@
|
||||||
<script lang="ts">
|
<script lang="ts">
|
||||||
import { boredState } from '$lib/stores/boredState';
|
import { boredState } from '$lib/stores/boredState';
|
||||||
|
|
||||||
|
export let form: ActionData;
|
||||||
|
console.log('form', form);
|
||||||
let submitting = $boredState?.loading;
|
let submitting = $boredState?.loading;
|
||||||
let minAge = 1;
|
let minAge = 1;
|
||||||
let minPlayers = 1;
|
let minPlayers = 1;
|
||||||
|
|
@ -9,12 +11,11 @@
|
||||||
let exactMaxPlayers = false;
|
let exactMaxPlayers = false;
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<!-- <form on:submit|preventDefault={handleSubmit} method="post"> -->
|
|
||||||
<fieldset class="advanced-search" aria-busy={submitting} disabled={submitting}>
|
<fieldset class="advanced-search" aria-busy={submitting} disabled={submitting}>
|
||||||
<div>
|
<div>
|
||||||
<label for="minAge">
|
<label for="minAge">
|
||||||
Min Age
|
Min Age
|
||||||
<input id="minAge" name="minAge" bind:value={minAge} type="number" min={1} max={120} />
|
<input id="minAge" name="minAge" bind:value={minAge} type="number" min="1" max="120" />
|
||||||
</label>
|
</label>
|
||||||
</div>
|
</div>
|
||||||
<div>
|
<div>
|
||||||
|
|
@ -25,8 +26,8 @@
|
||||||
name="minPlayers"
|
name="minPlayers"
|
||||||
bind:value={minPlayers}
|
bind:value={minPlayers}
|
||||||
type="number"
|
type="number"
|
||||||
min={0}
|
min="1"
|
||||||
max={50}
|
max="50"
|
||||||
/>
|
/>
|
||||||
</label>
|
</label>
|
||||||
<label for="exactMinPlayers" style="display: flex; gap: 1rem; place-items: center;">
|
<label for="exactMinPlayers" style="display: flex; gap: 1rem; place-items: center;">
|
||||||
|
|
@ -38,6 +39,9 @@
|
||||||
bind:checked={exactMinPlayers}
|
bind:checked={exactMinPlayers}
|
||||||
/>
|
/>
|
||||||
</label>
|
</label>
|
||||||
|
{#if form?.error?.id === 'minPlayers'}
|
||||||
|
{form.error.message}
|
||||||
|
{/if}
|
||||||
</div>
|
</div>
|
||||||
<div>
|
<div>
|
||||||
<label for="maxPlayers">
|
<label for="maxPlayers">
|
||||||
|
|
@ -47,8 +51,8 @@
|
||||||
name="maxPlayers"
|
name="maxPlayers"
|
||||||
bind:value={maxPlayers}
|
bind:value={maxPlayers}
|
||||||
type="number"
|
type="number"
|
||||||
min={0}
|
min="1"
|
||||||
max={50}
|
max="50"
|
||||||
/>
|
/>
|
||||||
</label>
|
</label>
|
||||||
<label for="exactMaxPlayers" style="display: flex; gap: 1rem; place-items: center;">
|
<label for="exactMaxPlayers" style="display: flex; gap: 1rem; place-items: center;">
|
||||||
|
|
|
||||||
|
|
@ -7,12 +7,12 @@
|
||||||
|
|
||||||
export let showButton: boolean = false;
|
export let showButton: boolean = false;
|
||||||
export let advancedSearch: boolean = false;
|
export let advancedSearch: boolean = false;
|
||||||
|
export let form: ActionData;
|
||||||
|
|
||||||
let submitting = $boredState?.loading;
|
let submitting = $boredState?.loading;
|
||||||
let name = '';
|
let name = '';
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<!-- <form on:submit|preventDefault={handleSearch} method="post"> -->
|
|
||||||
<div class="search">
|
<div class="search">
|
||||||
<fieldset class="text-search" aria-busy={submitting} disabled={submitting}>
|
<fieldset class="text-search" aria-busy={submitting} disabled={submitting}>
|
||||||
<label for="name">
|
<label for="name">
|
||||||
|
|
@ -44,7 +44,7 @@
|
||||||
<!-- Using `static`, `DisclosurePanel` is always rendered,
|
<!-- Using `static`, `DisclosurePanel` is always rendered,
|
||||||
and ignores the `open` state -->
|
and ignores the `open` state -->
|
||||||
<DisclosurePanel static>
|
<DisclosurePanel static>
|
||||||
<AdvancedSearch />
|
<AdvancedSearch form />
|
||||||
</DisclosurePanel>
|
</DisclosurePanel>
|
||||||
</div>
|
</div>
|
||||||
{/if}
|
{/if}
|
||||||
|
|
|
||||||
|
|
@ -14,28 +14,13 @@
|
||||||
|
|
||||||
export let data: PageData;
|
export let data: PageData;
|
||||||
export let form: ActionData;
|
export let form: ActionData;
|
||||||
|
console.log('form routesss', form);
|
||||||
console.log('Formed data:', JSON.stringify(data));
|
console.log('Formed data:', JSON.stringify(data));
|
||||||
let pageSize: number;
|
let pageSize: number;
|
||||||
let currentPage: number;
|
let currentPage: number;
|
||||||
$: totalItems = 0;
|
$: totalItems = 0;
|
||||||
console.log('totalItems', totalItems);
|
console.log('totalItems', totalItems);
|
||||||
|
|
||||||
async function handleSearch(event: SubmitEvent) {
|
|
||||||
boredState.update((n) => ({ ...n, loading: true }));
|
|
||||||
const form = event.target as HTMLFormElement;
|
|
||||||
console.log('form', form);
|
|
||||||
const response = await fetch('/api/game', {
|
|
||||||
method: 'POST',
|
|
||||||
headers: { accept: 'application/json' },
|
|
||||||
body: new FormData(form)
|
|
||||||
});
|
|
||||||
const responseData = await response.json();
|
|
||||||
boredState.update((n) => ({ ...n, loading: false }));
|
|
||||||
gameStore.removeAll();
|
|
||||||
gameStore.addAll(responseData?.games);
|
|
||||||
totalItems = responseData?.totalCount;
|
|
||||||
}
|
|
||||||
|
|
||||||
// async function handleItemsPerPageChange(event) {
|
// async function handleItemsPerPageChange(event) {
|
||||||
// const perPage = event?.detail;
|
// const perPage = event?.detail;
|
||||||
// if ($gameStore.length )
|
// if ($gameStore.length )
|
||||||
|
|
@ -113,11 +98,12 @@
|
||||||
await applyAction(result);
|
await applyAction(result);
|
||||||
} else {
|
} else {
|
||||||
console.log('Invalid');
|
console.log('Invalid');
|
||||||
|
await applyAction(result);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
<TextSearch showButton advancedSearch />
|
<TextSearch showButton advancedSearch {form} />
|
||||||
</form>
|
</form>
|
||||||
<section>
|
<section>
|
||||||
<p>Or pick a random game!</p>
|
<p>Or pick a random game!</p>
|
||||||
|
|
|
||||||
|
|
@ -44,15 +44,18 @@ export const actions: Actions = {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (minPlayers) {
|
if (minPlayers && maxPlayers) {
|
||||||
|
if (minPlayers > maxPlayers) {
|
||||||
|
return invalid(400, { minPlayers, error: { id: 'minPlayers', message: 'Min must be less than max' } });
|
||||||
|
} else if (maxPlayers < minPlayers) {
|
||||||
|
return invalid(400, { maxPlayers, error: { id: 'maxPlayers', message: 'Max must be greater than min' } });
|
||||||
|
}
|
||||||
if (exactMinPlayers) {
|
if (exactMinPlayers) {
|
||||||
queryParams.min_players = +minPlayers;
|
queryParams.min_players = +minPlayers;
|
||||||
} else {
|
} else {
|
||||||
queryParams.gt_min_players = +minPlayers === 1 ? 0 : +minPlayers - 1;
|
queryParams.gt_min_players = +minPlayers === 1 ? 0 : +minPlayers - 1;
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
if (maxPlayers) {
|
|
||||||
if (exactMaxPlayers) {
|
if (exactMaxPlayers) {
|
||||||
queryParams.max_players = +maxPlayers;
|
queryParams.max_players = +maxPlayers;
|
||||||
} else {
|
} else {
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue