From a19533a20f6d56aaadc16ba10e98a832f4040d69 Mon Sep 17 00:00:00 2001 From: Laurent <58115082+naaturel@users.noreply.github.com> Date: Tue, 29 Oct 2024 22:54:00 +0100 Subject: [PATCH] Fixed splashscreen and changed the way results are handled by front and back --- .../unluckiest/entities/ScoreEntity.java | 4 +- .../be/naaturel/unluckiest/models/Score.java | 6 +- front/.svelte-kit/ambient.d.ts | 4 +- .../.svelte-kit/generated/server/internal.js | 4 +- front/src/app.html | 2 +- front/src/lib/assets/plain_arrow_left.svg | 1 + front/src/lib/assets/plain_arrow_right.svg | 1 + front/src/lib/components/LeaderBoard.svelte | 56 +++++++++++++++---- front/src/lib/components/SplashScreen.svelte | 6 +- front/src/lib/stores/scoreStore.ts | 2 +- front/src/routes/+layout.svelte | 8 +-- front/src/routes/play/+page.svelte | 15 ++++- front/static/style/app.css | 33 +++++++++-- 13 files changed, 104 insertions(+), 38 deletions(-) create mode 100644 front/src/lib/assets/plain_arrow_left.svg create mode 100644 front/src/lib/assets/plain_arrow_right.svg diff --git a/back/src/main/java/be/naaturel/unluckiest/entities/ScoreEntity.java b/back/src/main/java/be/naaturel/unluckiest/entities/ScoreEntity.java index 678caea..3461486 100644 --- a/back/src/main/java/be/naaturel/unluckiest/entities/ScoreEntity.java +++ b/back/src/main/java/be/naaturel/unluckiest/entities/ScoreEntity.java @@ -2,6 +2,8 @@ package be.naaturel.unluckiest.entities; import jakarta.persistence.*; +import java.math.BigDecimal; + @Entity(name = "Score") public class ScoreEntity { @@ -13,6 +15,6 @@ public class ScoreEntity { public String owner; @Column - public int value; + public float value; } \ No newline at end of file diff --git a/back/src/main/java/be/naaturel/unluckiest/models/Score.java b/back/src/main/java/be/naaturel/unluckiest/models/Score.java index 1566ddf..67d9c3f 100644 --- a/back/src/main/java/be/naaturel/unluckiest/models/Score.java +++ b/back/src/main/java/be/naaturel/unluckiest/models/Score.java @@ -3,9 +3,9 @@ package be.naaturel.unluckiest.models; public class Score { private String owner; - private int value; + private float value; - public Score(String owner, int value){ + public Score(String owner, float value){ this.owner = owner; this.value = value; } @@ -14,7 +14,7 @@ public class Score { return this.owner; } - public int getValue(){ + public float getValue(){ return this.value; } diff --git a/front/.svelte-kit/ambient.d.ts b/front/.svelte-kit/ambient.d.ts index f57c813..2b1b9e0 100644 --- a/front/.svelte-kit/ambient.d.ts +++ b/front/.svelte-kit/ambient.d.ts @@ -42,7 +42,7 @@ declare module '$env/static/private' { export const DB_USER: string; export const DriverData: string; export const EDITOR: string; - export const EFC_10388: string; + export const EFC_9904: string; export const ffmpeg: string; export const FPS_BROWSER_APP_PROFILE_STRING: string; export const FPS_BROWSER_USER_PROFILE_STRING: string; @@ -150,7 +150,7 @@ declare module '$env/dynamic/private' { DB_USER: string; DriverData: string; EDITOR: string; - EFC_10388: string; + EFC_9904: string; ffmpeg: string; FPS_BROWSER_APP_PROFILE_STRING: string; FPS_BROWSER_USER_PROFILE_STRING: string; diff --git a/front/.svelte-kit/generated/server/internal.js b/front/.svelte-kit/generated/server/internal.js index 7369d3a..da1c1c3 100644 --- a/front/.svelte-kit/generated/server/internal.js +++ b/front/.svelte-kit/generated/server/internal.js @@ -18,10 +18,10 @@ export const options = { root, service_worker: false, templates: { - 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", + 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: "1y8hue" + version_hash: "w4m36h" }; export async function get_hooks() { diff --git a/front/src/app.html b/front/src/app.html index 057804d..f6fc628 100644 --- a/front/src/app.html +++ b/front/src/app.html @@ -13,7 +13,7 @@ - + diff --git a/front/src/lib/assets/plain_arrow_left.svg b/front/src/lib/assets/plain_arrow_left.svg new file mode 100644 index 0000000..817bbc4 --- /dev/null +++ b/front/src/lib/assets/plain_arrow_left.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/front/src/lib/assets/plain_arrow_right.svg b/front/src/lib/assets/plain_arrow_right.svg new file mode 100644 index 0000000..da082da --- /dev/null +++ b/front/src/lib/assets/plain_arrow_right.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/front/src/lib/components/LeaderBoard.svelte b/front/src/lib/components/LeaderBoard.svelte index e0bec72..47f510c 100644 --- a/front/src/lib/components/LeaderBoard.svelte +++ b/front/src/lib/components/LeaderBoard.svelte @@ -11,13 +11,33 @@ {/if} {#each scores as score, i} -
  • -
    {score.owner}
    {score.value} pts.
    -
    • + {#if i <= 100} +
  • +
    {i+1}
    +
    {score.owner}
    +
    {score.value}%
    +
    • + {/if} {/each} + \ No newline at end of file diff --git a/front/src/lib/components/SplashScreen.svelte b/front/src/lib/components/SplashScreen.svelte index 20ab96c..e9f4785 100644 --- a/front/src/lib/components/SplashScreen.svelte +++ b/front/src/lib/components/SplashScreen.svelte @@ -1,10 +1,10 @@
    - +