rparodi/ft_transcendence
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
547 commits 1 branch 0 tags 2.6 MiB
Commit graph

25 commits

Author SHA1 Message Date
Maieul BOYER
9e431e9c6c fixes: cleanup things and added a title on every page 2026-01-13 15:50:44 +01:00
Alessandro Petitcollin
ca618d64ca Now using variable to define time before result message disappears to avoid magic numbers in this case. 2026-01-12 17:02:30 +01:00
Alessandro Petitcollin
35a7438e83 Instead of toast, result message is now displayed on top of tic-tac-toe grid and disappear after a timeout period. 
# Conflicts:
#	frontend/src/pages/ttt/ttt.ts

diff --git c/frontend/src/pages/ttt/ttt.html i/frontend/src/pages/ttt/ttt.html
index 82b0f8f..0ea49e1 100644
--- c/frontend/src/pages/ttt/ttt.html
+++ i/frontend/src/pages/ttt/ttt.html
@@ -1,6 +1,6 @@
 <div class="displaybox">
-    <div id="mainbox" class="mainboxDisplay">
-        <button id="JoinQueueBtn" class="btn-style absolute top-4 right-6">Join Queue</button>
+    <div class="mainboxDisplay" id="mainbox">
+        <button class="btn-style absolute top-4 right-6" id="JoinQueueBtn">Join Queue</button>
         <h1 class="text-3xl font-bold text-gray-800">
             Tic-tac-toe Box<span id="t-username"></span>
         </h1><br>
@@ -14,7 +14,7 @@
             </div>

             <div class="text-center text-sm text-gray-800 px-4 whitespace-nowrap">
-                <div id="currentPlayer" class='text-7xl font-bold'></div>
+                <div class='text-7xl font-bold' id="currentPlayer"></div>
                 <div id="currentPlayerTimer">Waiting for match...</div>
             </div>

@@ -27,17 +27,21 @@
             </div>
         </div>
         <div class="grid-box mt-2">
-            <div class="grid-layout">
-                <div id="cell1" class="ttt-cell"></div>
-                <div id="cell2" class="ttt-cell"></div>
-                <div id="cell3" class="ttt-cell"></div>
-                <div id="cell4" class="ttt-cell"></div>
-                <div id="cell5" class="ttt-cell"></div>
-                <div id="cell6" class="ttt-cell"></div>
-                <div id="cell7" class="ttt-cell"></div>
-                <div id="cell8" class="ttt-cell"></div>
-                <div id="cell9" class="ttt-cell"></div>
+            <div class="grid-layout relative rounded-lg overflow-hidden">
+                <div class="absolute inset-0 flex flex-col items-center justify-center z-10 bg-gray-900/85 text-white hidden"
+                     id="ttt-end-screen">
+                    outcome
+                </div>
+                <div class="ttt-cell" id="cell1"></div>
+                <div class="ttt-cell" id="cell2"></div>
+                <div class="ttt-cell" id="cell3"></div>
+                <div class="ttt-cell" id="cell4"></div>
+                <div class="ttt-cell" id="cell5"></div>
+                <div class="ttt-cell" id="cell6"></div>
+                <div class="ttt-cell" id="cell7"></div>
+                <div class="ttt-cell" id="cell8"></div>
+                <div class="ttt-cell" id="cell9"></div>
             </div>
-        </div>
+        </div>
     </div>
 </div>
\ No newline at end of file
diff --git c/frontend/src/pages/ttt/ttt.ts i/frontend/src/pages/ttt/ttt.ts
index 2c22add..a111624 100644
--- c/frontend/src/pages/ttt/ttt.ts
+++ i/frontend/src/pages/ttt/ttt.ts
@@ -1,7 +1,7 @@
 import "./ttt.css"
 import {addRoute, type RouteHandlerReturn} from "@app/routing";
 import tttPage from "./ttt.html?raw";
-import {showError, showInfo, showSuccess, showWarn} from "@app/toast";
+import {showError, showInfo} from "@app/toast";
 import {io} from "socket.io-client";
 import type {CSocket as Socket, GameUpdate} from "./socket";
 import {updateUser} from "@app/auth";
@@ -57,7 +57,8 @@ async function handleTTT(): Promise<RouteHandlerReturn> {
             const currentPlayerIndicator = document.getElementById("currentPlayer");
             const joinQueueBtn = document.getElementById("JoinQueueBtn");
             const currentPlayerTimer = document.getElementById("currentPlayerTimer")
-            if (!userXString || !userOString || !currentPlayerIndicator || !joinQueueBtn || !currentPlayerTimer) {
+            const result_message = document.getElementById("ttt-end-screen");
+            if (!userXString || !userOString || !currentPlayerIndicator || !joinQueueBtn || !currentPlayerTimer || !result_message) {
                 return showError('fatal error');
             }

@@ -128,9 +129,12 @@ async function handleTTT(): Promise<RouteHandlerReturn> {
             };

             const makeEnd = (type: 'win' | 'conceded' | 'draw', player: 'X' | 'O') => {
-                // TODO: Enhance the draw notification
                 if (type === 'draw') {
-                    showWarn('It\'s a draw !')
+                    result_message.innerText = "It's a draw! :/";
+                    result_message.classList.remove("hidden");
+                    setTimeout(() => {
+                        result_message.classList.add("hidden");
+                    }, 3 * 1000);
                 }

                 if (type === 'win') {
@@ -145,11 +149,19 @@ async function handleTTT(): Promise<RouteHandlerReturn> {
                         default:
                             return;
                     }
-                    // TODO: Enhance the win/loss notification
-                    if (youWin)
-                        showSuccess('You won the game !');
-                    else
-                        showError('You lost the game :(');
+                    if (youWin) {
+                        result_message.innerText = "You won the game! :)";
+                        result_message.classList.remove("hidden");
+                        setTimeout(() => {
+                            result_message.classList.add("hidden");
+                        }, 3 * 1000);
+                    } else {
+                        result_message.innerText = "You lost the game! :(";
+                        result_message.classList.remove("hidden");
+                        setTimeout(() => {
+                            result_message.classList.add("hidden");
+                        }, 3 * 1000);
+                    }
                 }
             };
 2026-01-12 17:02:30 +01:00
Alessandro Petitcollin
830d733f1b Initial commit 2026-01-12 17:02:30 +01:00
Maieul BOYER
1b169fca13 added pong keepalive 2026-01-10 18:07:20 +01:00
apetitco
272c6f319c (feat): Queue/Dequeue button and waiting for match text 2026-01-09 18:23:29 +01:00
apetitco
67a277da2d cleaning code 2026-01-09 17:55:44 +01:00
apetitco
f9d11bd6fa (frontend): added player names to game page and current player turn indicator 2026-01-09 17:55:44 +01:00
apetitco
1fe5d4711a (tic-tac-toe): smol update 2026-01-09 17:55:44 +01:00
apetitco
92eb73c508 (tic-tac-toe): Erratum, it's the join/leave queue button 2026-01-09 17:55:44 +01:00
apetitco
ca9b2a7320 (tic-tac-toe): Starting work to implement "New Game" button 2026-01-09 17:55:44 +01:00
Maieul BOYER
43e6ec24f5 feat(ttt): added concede detection and move timeout 2026-01-07 21:10:31 +01:00
NigeParis
6f89e4a3e1 Fixed winx and win0 in tictactoe 2026-01-04 13:43:40 +01:00
NigeParis
4fc43cc429 dis-activated ttt.ts line 98 - does not exist 2026-01-04 13:43:40 +01:00
NigeParis
914ef550be css file added to tic tac toe 2026-01-04 13:43:40 +01:00
Maieul BOYER
b86d50f9f0 make requeuing and other stuff better 2026-01-04 13:43:40 +01:00
Maieul BOYER
972b78a1e2 feat(ttt): made proper queue and multi game handling 2026-01-04 13:43:40 +01:00
Maieul BOYER
a940447039
made the socket correctly connect to the backend 2025-12-22 15:33:54 +01:00
apetitco
fb49ba4ee9 (schism): started separating backend from frontend 2025-12-22 15:12:10 +01:00
apetitco
1ad37fc442
Update frontend/src/pages/ttt/ttt.ts 
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
 2025-12-11 16:18:04 +01:00
apetitco
ec91a55058
Update frontend/src/pages/ttt/ttt.ts 
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
 2025-12-11 16:16:17 +01:00
apetitco
7005d644ee
Apply suggestion from @Copilot 
Added spacing between operands

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
 2025-12-11 16:14:25 +01:00
Alessandro Petitcollin
fb1b69a0ae (tic-tac-toe): Added button to restart game. 2025-12-07 01:31:29 +01:00
Alessandro Petitcollin
9653b0cbe6 (tic-tac-toe): Board is now locked once game is finished. 2025-12-07 01:14:53 +01:00
apetitco
7f412c8fb5 (feat): Maieul helped starting the frontend. 2025-12-04 17:59:34 +01:00