diff --git a/back/src/main/resources/application.properties b/back/src/main/resources/application.properties index 92c9394..2c5bbe2 100644 --- a/back/src/main/resources/application.properties +++ b/back/src/main/resources/application.properties @@ -12,7 +12,7 @@ sec.cors.authorizedHeader=Authorization,Content-type #=============DATABASE============= spring.datasource.url=jdbc:${DB_URL} spring.datasource.username=${DB_USER} -spring.datasource.password=${DB_PASSWORD} +spring.datasource.password= spring.jpa.database-platform=org.hibernate.dialect.MariaDBDialect spring.jpa.show-sql=true diff --git a/front/.svelte-kit/ambient.d.ts b/front/.svelte-kit/ambient.d.ts index 2b1b9e0..afaa3b9 100644 --- a/front/.svelte-kit/ambient.d.ts +++ b/front/.svelte-kit/ambient.d.ts @@ -42,10 +42,8 @@ declare module '$env/static/private' { export const DB_USER: string; export const DriverData: string; export const EDITOR: string; - export const EFC_9904: string; + export const EFC_10880: string; export const ffmpeg: string; - export const FPS_BROWSER_APP_PROFILE_STRING: string; - export const FPS_BROWSER_USER_PROFILE_STRING: string; export const HOME: string; export const HOMEDRIVE: string; export const HOMEPATH: string; @@ -150,10 +148,8 @@ declare module '$env/dynamic/private' { DB_USER: string; DriverData: string; EDITOR: string; - EFC_9904: string; + EFC_10880: string; ffmpeg: string; - FPS_BROWSER_APP_PROFILE_STRING: string; - FPS_BROWSER_USER_PROFILE_STRING: string; HOME: string; HOMEDRIVE: string; HOMEPATH: string; diff --git a/front/.svelte-kit/generated/server/internal.js b/front/.svelte-kit/generated/server/internal.js index da1c1c3..5398a78 100644 --- a/front/.svelte-kit/generated/server/internal.js +++ b/front/.svelte-kit/generated/server/internal.js @@ -21,7 +21,7 @@ export const options = { app: ({ head, body, assets, nonce, env }) => "\n\n\t\n\t\tUnluckiest\n\n\t\t\n\t\t\n\n\t\t\n\t\t\n\n\t\t\n\t\t\n\n\t\t\n\n\t\t\n\t\t\n\n\t\t" + head + "\n\t\n\n\t\n\n\t\t
" + body + "
\n\n\t\n\n", error: ({ status, message }) => "\n\n\t\n\t\t\n\t\t" + message + "\n\n\t\t\n\t\n\t\n\t\t
\n\t\t\t" + status + "\n\t\t\t
\n\t\t\t\t

" + message + "

\n\t\t\t
\n\t\t
\n\t\n\n" }, - version_hash: "w4m36h" + version_hash: "1bdcmwq" }; export async function get_hooks() { diff --git a/front/src/lib/components/PageTitle.svelte b/front/src/lib/components/PageTitle.svelte new file mode 100644 index 0000000..a1de26d --- /dev/null +++ b/front/src/lib/components/PageTitle.svelte @@ -0,0 +1,11 @@ +

+ +

+ + \ No newline at end of file diff --git a/front/src/routes/+layout.svelte b/front/src/routes/+layout.svelte index c14b932..72aff1f 100644 --- a/front/src/routes/+layout.svelte +++ b/front/src/routes/+layout.svelte @@ -9,6 +9,7 @@ import {onMount} from "svelte"; import SplashScreen from "$lib/components/SplashScreen.svelte"; + import PageTitle from "$lib/components/PageTitle.svelte"; onMount(async () => { window.$(".expander").click(function () { @@ -19,7 +20,6 @@ -
@@ -57,7 +57,6 @@
-
diff --git a/front/src/routes/+page.svelte b/front/src/routes/+page.svelte index 15efb08..b38081b 100644 --- a/front/src/routes/+page.svelte +++ b/front/src/routes/+page.svelte @@ -2,6 +2,7 @@ import LeaderBoard from "$lib/components/LeaderBoard.svelte"; import {scoreStore} from "$lib/stores/scoreStore.ts"; import {onMount} from "svelte"; + import PageTitle from "$lib/components/PageTitle.svelte"; let { data } = $props() @@ -11,5 +12,5 @@ -

Qui va y passer ?

+Qui va y passer ? \ No newline at end of file diff --git a/front/src/routes/about/+page.svelte b/front/src/routes/about/+page.svelte index 1b00494..f401e03 100644 --- a/front/src/routes/about/+page.svelte +++ b/front/src/routes/about/+page.svelte @@ -1 +1,49 @@ -

It was revealed to me in a dream

\ No newline at end of file + +A propos + +
+
+

Design

+

Arwen Hirsoux

+
+ +
+ +
+

Développement

+

Laurent Crema

+
+ +
+ + + \ No newline at end of file diff --git a/front/src/routes/play/+page.svelte b/front/src/routes/play/+page.svelte index 97a105f..446b5e3 100644 --- a/front/src/routes/play/+page.svelte +++ b/front/src/routes/play/+page.svelte @@ -2,6 +2,7 @@ import bomb from '$lib/assets/bomb.svg'; import {Game, GameState} from "$lib/models/game.ts"; import {scoreStore} from "$lib/stores/scoreStore.ts"; + import PageTitle from "$lib/components/PageTitle.svelte"; let game = new Game(); @@ -15,7 +16,6 @@ timer = setTimeout(() => { try{ validate(inputValue) - clearError(); game.playerName = inputValue; } catch (e){ displayError(e.message) @@ -23,14 +23,6 @@ }, 150); } - function validate(data){ - if(!data) throw new Error("Veuillez indiquer votre nom."); - $scoreStore.forEach(v => { - if(v.owner && v.owner.toLowerCase() === data.toLowerCase()) throw new Error("Ce joueur existe déjà"); - }) - - } - async function roll(){ try{ @@ -45,8 +37,18 @@ } } + function validate(data){ + if(!data) throw new Error("Veuillez indiquer votre nom."); + $scoreStore.forEach(v => { + if(v.owner && v.owner.toLowerCase() === data.toLowerCase()) throw new Error("Cette personne a déjà été évaluée."); + }) + } + function displayError(message){ window.$(".player").attr('tooltip', message) + setTimeout(() => { + clearError(); + }, 3000) } function clearError(){ @@ -55,6 +57,7 @@ +Évaluez vos chance de survie
{#if isRunning} @@ -67,20 +70,17 @@ {/if} {#if !isRunning && !hasBeenPlayed} -

Evaluez vos chances de survie

debounce(value)} on:blur={({ target: { value } }) => debounce(value)} /> - + Bomb
- Bomb {/if} @@ -92,7 +92,17 @@