42/42_INT_14_transcendence
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Suite intégration jeu

Browse Source
This commit is contained in:
batche
2022-12-21 10:05:36 +01:00
parent 77857a873d
commit d6da8bf70b
3 changed files with 14 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
srcs/requirements/nestjs/api_back/src/game/dto/updateGame.dto.ts
View File

@@ -1,6 +1,9 @@
import { IsBoolean, IsNotEmpty, IsNumber, IsString } from "class-validator"; import { IsBoolean, IsNotEmpty, IsNumber, IsString } from "class-validator";
export class UpdateGameDto { export class UpdateGameDto {
@IsString()
@IsNotEmpty()
gameServerIdOfTheMatch : string
@IsNumber() @IsNumber()
@IsNotEmpty() @IsNotEmpty()
playerOneUsernameResult : number playerOneUsernameResult : number

22
srcs/requirements/svelte/api_front/src/pages/game/Game.svelte
View File

@@ -74,6 +74,7 @@
console.log("Response.ok : " + responseFromServer.ok ) console.log("Response.ok : " + responseFromServer.ok )
console.log("//") console.log("//")
const responseInjson = await responseFromServer.json() const responseInjson = await responseFromServer.json()
showWaitPage = false
if (!responseFromServer.ok || !responseInjson.token) if (!responseFromServer.ok || !responseInjson.token)
{ {
errorMessageWhenAttemptingToGetATicket = responseInjson.message; errorMessageWhenAttemptingToGetATicket = responseInjson.message;
@@ -88,8 +89,6 @@
} }
else else
{ {
showError = false
showWaitPage = false
const token = responseInjson.token const token = responseInjson.token
console.log("Token === " + token) console.log("Token === " + token)
if (sound === "off") { if (sound === "off") {
@@ -179,15 +178,6 @@
</div> </div>
{/if} {/if}
{#if showWaitPage === true}
<div id="div_game">
<fieldset>
<legend>Connecting to the game...</legend>
<p>{waitingMessage}</p>
</fieldset>
</div>
{/if}
{#if optionsAreNotSet} {#if optionsAreNotSet}
{#if showGameOption === true} {#if showGameOption === true}
<form on:submit|preventDefault={init}> <form on:submit|preventDefault={init}>
@@ -251,9 +241,19 @@
</div> </div>
{/if} {/if}
{/if} {/if}
<div id="canvas_container"> <div id="canvas_container">
{#if showWaitPage === true}
<div id="div_game">
<fieldset>
<legend>Connecting to the game...</legend>
<p>{waitingMessage}</p>
</fieldset>
</div>
{/if}
<canvas id="gameArea"></canvas> <canvas id="gameArea"></canvas>
</div> </div>
</body> </body>

4
srcs/requirements/svelte/api_front/src/pages/game/client/class/GameArea.ts
View File

@@ -10,10 +10,6 @@ export class GameArea {
ctx: CanvasRenderingContext2D; ctx: CanvasRenderingContext2D;
constructor() { constructor() {
this.canvas = document.getElementById("gameArea"); this.canvas = document.getElementById("gameArea");
if (this.canvas)
console.log("Le canvas a été trouvé !")
else
console.log("Le canvas a été mangé par un être mystérieux...")
this.ctx = this.canvas.getContext("2d") as CanvasRenderingContext2D; this.ctx = this.canvas.getContext("2d") as CanvasRenderingContext2D;
this.canvas.width = c.CanvasWidth; this.canvas.width = c.CanvasWidth;
this.canvas.height = c.CanvasWidth / c.CanvasRatio; this.canvas.height = c.CanvasWidth / c.CanvasRatio;