Peer-at-Code/peer-at-code-web
5
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Update dev branch #29

Merged
glazk0 merged 14 commits from main into dev 2024-11-25 21:37:01 +01:00
Conversation 0 Commits 14 Files changed 20 +24 -15
3 changed files with 24 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 625bcc3882 - Show all commits

12
src/hooks.client.ts Normal file
View file

@ -0,0 +1,12 @@
import type { HandleClientError } from "@sveltejs/kit";
export const handleError: HandleClientError = ({ error, status }) => {
const errorId = crypto.randomUUID();
console.error(`Client - Error ID: ${errorId} - Status: ${status} - ${error}`);
return {
message: 'Whoops!',
errorId,
};
};

14
src/hooks.server.ts
View file

@ -5,12 +5,11 @@ import { API_URL } from '$env/static/private';
import type { User } from '$lib/types'; import type { User } from '$lib/types';
export const handle: Handle = async ({ event, resolve }) => { export const handle: Handle = async ({ event, resolve }) => {
const session = event.cookies.get('session'); const session = event.cookies.get('session');
if (!session) { if (!session) {
event.locals.user = undefined; event.locals.user = undefined;
return resolve(event); return await resolve(event);
} }
const res = await fetch(`${API_URL}/player/`, { const res = await fetch(`${API_URL}/player/`, {
@ -22,7 +21,7 @@ export const handle: Handle = async ({ event, resolve }) => {
if (!res.ok) { if (!res.ok) {
event.locals.user = undefined; event.locals.user = undefined;
event.cookies.delete('session', { path: '/' }); event.cookies.delete('session', { path: '/' });
return resolve(event); return await resolve(event);
} }
try { try {
@ -33,11 +32,10 @@ export const handle: Handle = async ({ event, resolve }) => {
event.cookies.delete('session', { path: '/' }); event.cookies.delete('session', { path: '/' });
} }
return resolve(event); return await resolve(event);
}; };
export const handleFetch: HandleFetch = async ({ request, fetch, event: { cookies } }) => { export const handleFetch: HandleFetch = ({ request, fetch, event: { cookies } }) => {
const session = cookies.get('session'); const session = cookies.get('session');
if (!session) { if (!session) {
@ -53,10 +51,10 @@ export const handleFetch: HandleFetch = async ({ request, fetch, event: { cookie
return fetch(request); return fetch(request);
} }
export const handleError: HandleServerError = async ({ error, status }) => { export const handleError: HandleServerError = ({ error, status }) => {
const errorId = crypto.randomUUID(); const errorId = crypto.randomUUID();
console.error(`Error ID: ${errorId} - Status: ${status} - ${error}`); console.error(`Server - Error ID: ${errorId} - Status: ${status} - ${error}`);
return { return {
message: 'Whoops!', message: 'Whoops!',

13
src/routes/+error.svelte
View file

@ -1,15 +1,14 @@
<script lang="ts"> <script lang="ts">
import { page } from '$app/stores'; import { page } from '$app/stores';
import Button from '$lib/components/ui/button/button.svelte'; import { Button } from '$lib/components/ui/button';
</script> </script>
<div class="flex min-h-screen items-center justify-center"> <div class="flex min-h-screen items-center justify-center">
<div class="text-center"> <div class="flex flex-col gap-4 text-center">
<h1 class="text-6xl font-bold text-red-500">Oops!</h1> <h1 class="text-6xl font-bold text-red-500">Oops!</h1>
<p class="mt-4 text-xl">Apparement tu as navigué en eau trouble...</p> <p class="text-xl">Apparement tu as navigué en eau trouble...</p>
<Button class="mt-4" href="/">Retour au port</Button> <Button href="/">Retour au port</Button>
<p class="mt-4 text-xs text-muted-foreground">{$page.error?.message}</p> <span class="text-xs text-muted-foreground">Error ID: {$page.error?.errorId}</span>
<p class="mt-4 text-xs text-muted-foreground">{$page.error?.errorId}</p>
</div> </div>
</div> </div>