diff --git a/htdocs/index.js b/htdocs/index.js
index a58bbd6ba40531e0cccad04abcdce7e1e13de7f1..7538cd386199250fc6efad855d1cd4e95fa504d5 100644
--- a/htdocs/index.js
+++ b/htdocs/index.js
@@ -791,6 +791,7 @@ function estEchecEtMat(pieceAttack , rowPiece, colPiece) {
if (player.isBlackPlayer===true){
[kingRow, kingCol] = find_pieces("K", board);
}
+<<<<<<< Updated upstream
else{
[kingRow, kingCol] = find_pieces("k", board);
}
@@ -901,3 +902,12 @@ function peutIntercepter(kingRow, kingCol, board, attaquant, movesAttaquant) {
}
return false;
}
+=======
+
+
+socket.on('update-timer', (gameState) => {
+ document.getElementById('player1-time').textContent = gameState.player1.time;
+ document.getElementById('player2-time').textContent = gameState.player2.time;
+ });
+
+>>>>>>> Stashed changes
diff --git a/htdocs/page_acceuil2.html b/htdocs/page_acceuil2.html
index 9e7a4c5f333dc6469115bd78562319ab690af377..d274cdb35746b8d188cf97d4349c0dcf6fcda265 100644
--- a/htdocs/page_acceuil2.html
+++ b/htdocs/page_acceuil2.html
@@ -4,6 +4,8 @@
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
+ <link href="https://fonts.googleapis.com/css2?family=Libre+Baskerville&display=swap" rel="stylesheet"> <!-- Ajout de la police Libre Baskerville -->
+ <link href="https://fonts.googleapis.com/css2?family=Anton&display=swap" rel="stylesheet">
<link rel="stylesheet" href="./bootstrap/css/bootstrap.min.css">
<link rel="stylesheet" href="style.css">
<title>Jeu d'échecs</title>
@@ -11,7 +13,7 @@
<body>
- <nav class="navbar navbar-expand-lg navbar-dark bg-dark">
+ <nav class="navbar navbar-expand-lg navbar-dark bg-dark fixed-top">
<div class="container-fluid">
<a class="navbar-brand" href="/">Échec ECL</a>
<button class="navbar-toggler" type="button" data-bs-toggle="collapse"
@@ -30,7 +32,7 @@
Jeux
</a>
<ul class="dropdown-menu" aria-labelledby="navbarDropdown">
- <li><a class="dropdown-item" href="page_jeu.html">Echecs</a></li>
+ <li><a class="dropdown-item" href="page_acceuil2.html">Echecs contre un ordinateur</a></li>
</ul>
</li>
</ul>
@@ -43,7 +45,7 @@
<div class="col-sm-12 col-md-6 offset-md-3">
<div class="alert d-none" role="alert" id="turn-message"></div>
-
+ <div id="echec-message" role ="alert" class="card mb-3 d-none text-black">Échec !</div>
<div class="card mb-3" id="user-card">
<div class="card-body">
@@ -54,7 +56,7 @@
<input type="text" class="form-control" id="username" minlength="2" maxlength="20"
placeholder="Saisir votre nom d'utilisateur" required>
</div>
- <button class="btn btn-primary" id="start" type="submit">Créer un salon privée</button>
+ <button class="btn btn-primary" id="start" type="submit">Créer un salon privé</button>
</form>
</div>
@@ -85,12 +87,22 @@
<div class="text-center d-none mt-2" id="restart-area">
<input class="btn btn-primary" id="restart" type="button" value="Rejouer">
</div>
+ <canvas id="chessboard" class="board" width="550" height="550"></canvas>
</div>
</div>
+
+</div>
+
+ <div id="timer" class="text-white">
+ <h2>Joueur 1 : <span id="player1-time">300</span> secondes</h2>
+ <h2>Joueur 2 : <span id="player2-time">300</span> secondes</h2>
</div>
+<<<<<<< Updated upstream
<div id="echec-message" class="d-none">Échec !</div>
<div id="echec-et-mat-message" class="d-none">Échec et mat !</div>
<canvas id="chessboard" class="board" width="480" height="480"></canvas>
+=======
+>>>>>>> Stashed changes
<script src="./jquery/jquery.min.js"></script>
<script src="./bootstrap/js/bootstrap.min.js"></script>
<script src="/socket.io/socket.io.js"></script>