diff --git a/srcs/requirements/svelte/api_front/src/pages/game/Game.svelte b/srcs/requirements/svelte/api_front/src/pages/game/Game.svelte index d02e162d..97eac451 100644 --- a/srcs/requirements/svelte/api_front/src/pages/game/Game.svelte +++ b/srcs/requirements/svelte/api_front/src/pages/game/Game.svelte @@ -469,10 +469,7 @@ canvas { padding: 10px; } .avatar { - min-height: 5vw; - min-width: 5vw; - - max-width: 5vw; - max-height: 5vw; + height: 5vw; + width: 5vw; } diff --git a/srcs/requirements/svelte/api_front/src/pages/game/GameSpectator.svelte b/srcs/requirements/svelte/api_front/src/pages/game/GameSpectator.svelte index 17f5245f..157f7cf5 100644 --- a/srcs/requirements/svelte/api_front/src/pages/game/GameSpectator.svelte +++ b/srcs/requirements/svelte/api_front/src/pages/game/GameSpectator.svelte @@ -3,8 +3,8 @@ import { onMount, onDestroy } from "svelte"; import { fade, fly } from 'svelte/transition'; - import MatchListElem from "../../pieces/MatchListElem.svelte"; - import type { Match } from "../../pieces/Match"; + import MatchOngoingElem from "../../pieces/MatchOngoingElem.svelte"; + import type { MatchOngoing } from "../../pieces/Match"; import { fetchAvatar } from "../../pieces/utils"; import * as pongSpectator from "./client/pongSpectator"; @@ -22,7 +22,7 @@ //html boolean for pages let hiddenGame = true; - let matchList: Match[] = []; + let matchList: MatchOngoing[] = []; let watchGameStateInterval; const watchGameStateIntervalRate = 142; let timeoutArr = []; @@ -51,7 +51,7 @@ resetPage(); }; - async function initGameSpectator(match: Match) + async function initGameSpectator(match: MatchOngoing) { watchGameStateInterval = setInterval(watchGameState, watchGameStateIntervalRate); pongSpectator.init(match.gameOptions, sound, gameAreaId, match.gameServerIdOfTheMatch); @@ -173,7 +173,7 @@ {#if matchList.length !== 0}
{:else} @@ -268,10 +268,7 @@ canvas { font-size: 1vw; } .avatar { - min-height: 5vw; - min-width: 5vw; - - max-width: 5vw; - max-height: 5vw; + height: 5vw; + width: 5vw; } diff --git a/srcs/requirements/svelte/api_front/src/pages/profile/ProfileDisplay.svelte b/srcs/requirements/svelte/api_front/src/pages/profile/ProfileDisplay.svelte index f351e1cc..d73a8a65 100644 --- a/srcs/requirements/svelte/api_front/src/pages/profile/ProfileDisplay.svelte +++ b/srcs/requirements/svelte/api_front/src/pages/profile/ProfileDisplay.svelte @@ -2,6 +2,7 @@ import { onMount } from 'svelte'; import GenerateUserDisplay from '../../pieces/GenerateUserDisplay.svelte'; + import MatchHistory from '../../pieces/MatchHistory.svelte'; import { push } from 'svelte-spa-router'; import Chat from '../../pieces/chat/Chat.svelte'; @@ -18,9 +19,9 @@| # | +Player One | ++ | VS | ++ | Player Two | +Result | +||
|---|---|---|---|---|---|---|---|---|
| {i + 1} | + {#await fetchAvatar(match.playerOneUsername) then avatar} +
+ + {match.playerOneUsername} + |
+ {/await}
+ {match.playerOneResult} | +VS | +{match.playerTwoResult} | + {#await fetchAvatar(match.playerTwoUsername) then avatar} +
+ + {match.playerTwoUsername} + |
+ {/await}
+ {#if match.playerOneResult === match.playerTwoResult}
+ DRAW | + {:else if (user.username === match.playerOneUsername && match.playerOneResult > match.playerTwoResult) + || (user.username === match.playerTwoUsername && match.playerTwoResult > match.playerOneResult)} +WIN | + {:else} +LOSE | + {/if} +