diff --git a/front/.env.development b/front/.env.development index a0d265a..f3f699a 100644 --- a/front/.env.development +++ b/front/.env.development @@ -1,2 +1,2 @@ -VITE_CLIENT_API_URL=http://127.0.0.1:5000/api -VITE_SERVER_API_URL=http://127.0.0.1:5000/api \ No newline at end of file +VITE_CLIENT_API_URL=http://127.0.0.1:5000 +VITE_SERVER_API_URL=http://127.0.0.1:5000 \ No newline at end of file diff --git a/front/.gitignore b/front/.gitignore index 230a6d8..81d7c37 100644 --- a/front/.gitignore +++ b/front/.gitignore @@ -132,3 +132,5 @@ dist /.svelte-kit/ /.svelte-kit/ /.svelte-kit/ +/.idea/ +/.idea/ diff --git a/front/.idea/unluckiest.iml b/front/.idea/unluckiest.iml deleted file mode 100644 index d6ebd48..0000000 --- a/front/.idea/unluckiest.iml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/front/.svelte-kit/generated/server/internal.js b/front/.svelte-kit/generated/server/internal.js index dc6322c..7369d3a 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" + head + "\n\t\n\t\n\t\t
" + body + "
\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: "3iwm3b" + version_hash: "1y8hue" }; export async function get_hooks() { diff --git a/front/src/app.d.ts b/front/src/app.d.ts index 743f07b..f0b4d45 100644 --- a/front/src/app.d.ts +++ b/front/src/app.d.ts @@ -1,5 +1,6 @@ // See https://kit.svelte.dev/docs/types#app // for information about these interfaces + declare global { namespace App { // interface Error {} diff --git a/front/src/app.html b/front/src/app.html index 1e34ab3..057804d 100644 --- a/front/src/app.html +++ b/front/src/app.html @@ -16,13 +16,19 @@ - + + + + %sveltekit.head% + +
%sveltekit.body%
+ diff --git a/front/src/lib/assets/about.svg b/front/src/lib/assets/about.svg new file mode 100644 index 0000000..09fd08b --- /dev/null +++ b/front/src/lib/assets/about.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/front/src/lib/assets/dice.svg b/front/src/lib/assets/dice.svg new file mode 100644 index 0000000..d578a1f --- /dev/null +++ b/front/src/lib/assets/dice.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/front/src/lib/assets/leaderboard.svg b/front/src/lib/assets/leaderboard.svg new file mode 100644 index 0000000..457af63 --- /dev/null +++ b/front/src/lib/assets/leaderboard.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 de6253d..e0bec72 100644 --- a/front/src/lib/components/LeaderBoard.svelte +++ b/front/src/lib/components/LeaderBoard.svelte @@ -12,7 +12,7 @@ {#each scores as score, i}
  • -
    {score.owner}
    {score.value} pts.
    +
    {score.owner}
    {score.value} pts.
    • {/each} @@ -37,27 +37,34 @@ display: none; } - li + .item { display: flex; justify-content: space-around; padding: 1.25vh; margin: 1.5vh; - border: 2px solid #A1674A; + background-color: #fcdcab; + border: 3px solid #4b0611; border-radius: 10px; - background-color: #f1ecec; - box-shadow: 0 0 10px #343232; + box-shadow: 5px 5px #4b0611; + text-align: left; + outline: none; } - li:hover + div.item { + width: 55vw; + } + + .item:hover + { + background-color: #dd3328; transform: scale(1.075); - background-color: #F5F5F5; } .name, .score { - color: black; + color: #4b0611; margin-left: 3vh; } diff --git a/front/src/lib/components/SplashScreen.svelte b/front/src/lib/components/SplashScreen.svelte new file mode 100644 index 0000000..20ab96c --- /dev/null +++ b/front/src/lib/components/SplashScreen.svelte @@ -0,0 +1,47 @@ + + +
    + +
    + + \ No newline at end of file diff --git a/front/src/routes/+layout.svelte b/front/src/routes/+layout.svelte index 6fd30d7..5f081d8 100644 --- a/front/src/routes/+layout.svelte +++ b/front/src/routes/+layout.svelte @@ -1,33 +1,57 @@ -
    + + +
    +
    + +
    @@ -35,7 +59,13 @@
    \ No newline at end of file diff --git a/front/src/routes/+page.server.ts b/front/src/routes/+page.server.ts index 0f22321..9192f6a 100644 --- a/front/src/routes/+page.server.ts +++ b/front/src/routes/+page.server.ts @@ -5,6 +5,5 @@ export const load = async ( {fetch} ) => { const res = await fetch(`${api_url}/leaderboard`) const leaderboard = await res.json() - return { leaderboard }; } \ No newline at end of file diff --git a/front/src/routes/+page.svelte b/front/src/routes/+page.svelte index ce51a3a..468f502 100644 --- a/front/src/routes/+page.svelte +++ b/front/src/routes/+page.svelte @@ -7,9 +7,21 @@ onMount(async () => { scoreStore.load(data.leaderboard) - } ) + }) + + +

    Phrase d'accroche

    + \ No newline at end of file diff --git a/front/src/routes/play/+page.svelte b/front/src/routes/play/+page.svelte index 459e55a..d0b096f 100644 --- a/front/src/routes/play/+page.svelte +++ b/front/src/routes/play/+page.svelte @@ -1,7 +1,7 @@