From d9ad87810243a57f7f9ec3cb2cbec57ac286ec54 Mon Sep 17 00:00:00 2001
From: Hazem Abdelraouf <hazemkora660@gmail.com>
Date: Tue, 13 Jan 2026 13:19:19 +0200
Subject: [PATCH 1/5] add PlayerRow model

---
 .../domain/entity/PlayerRow.java              | 39 +++++++++++++++++++
 1 file changed, 39 insertions(+)
 create mode 100644 src/main/java/com/mycompany/tictactoeserver/domain/entity/PlayerRow.java

diff --git a/src/main/java/com/mycompany/tictactoeserver/domain/entity/PlayerRow.java b/src/main/java/com/mycompany/tictactoeserver/domain/entity/PlayerRow.java
new file mode 100644
index 0000000..7b28eab
--- /dev/null
+++ b/src/main/java/com/mycompany/tictactoeserver/domain/entity/PlayerRow.java
@@ -0,0 +1,39 @@
+/*
+ * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license
+ * Click nbfs://nbhost/SystemFileSystem/Templates/Classes/Class.java to edit this template
+ */
+package com.mycompany.tictactoeserver.domain.entity;
+
+/**
+ *
+ * @author Hazem
+ */
+public class PlayerRow {
+    private final String username ; 
+    private final String status ;
+
+    public PlayerRow(String username, String Status) {
+        this.username = username;
+        this.status = Status;
+    }
+
+
+    public String getUsername() {
+        return username;
+    }
+
+    public String getStatus() {
+        return status;
+    }
+
+    @Override
+    public String toString() {
+        return "PlayerRow{" + "username=" + username + ", Status=" + status + '}';
+    }
+
+    public PlayerRow(String username) {
+        this.username = username;
+        this.status = "Offline";
+    }
+   
+}

From 29d25ab3f89bf1e5006a50ef1f2e977b70f66cbe Mon Sep 17 00:00:00 2001
From: Hazem Abdelraouf <hazemkora660@gmail.com>
Date: Tue, 13 Jan 2026 13:25:35 +0200
Subject: [PATCH 2/5] update ui

---
 .../resources/presentation/dashboard.fxml     | 25 ++++++-------------
 1 file changed, 8 insertions(+), 17 deletions(-)

diff --git a/src/main/resources/presentation/dashboard.fxml b/src/main/resources/presentation/dashboard.fxml
index 787e97f..be57b0c 100644
--- a/src/main/resources/presentation/dashboard.fxml
+++ b/src/main/resources/presentation/dashboard.fxml
@@ -7,7 +7,7 @@
 <?import javafx.scene.layout.*?>
 <?import org.kordamp.ikonli.javafx.*?>
 
-<BorderPane prefHeight="900" prefWidth="1600" xmlns="http://javafx.com/javafx/17.0.12" xmlns:fx="http://javafx.com/fxml/1" fx:controller="com.mycompany.tictactoeserver.presentation.DashboardController">
+<BorderPane prefHeight="900" prefWidth="1600" xmlns="http://javafx.com/javafx/25" xmlns:fx="http://javafx.com/fxml/1" fx:controller="com.mycompany.tictactoeserver.presentation.DashboardController">
     <stylesheets>
         <URL value="@css/dashboard-base.css" />
         <URL value="@css/dashboard-header.css" />
@@ -73,10 +73,6 @@
 
                     <ToggleButton fx:id="filterAllBtn" onAction="#onFilterAll" styleClass="filter-pill filter-pill-active" text="All" />
 
-                    <ToggleButton fx:id="filterOnlineBtn" onAction="#onFilterOnline" styleClass="filter-pill" text="Online" />
-
-                    <ToggleButton fx:id="filterOfflineBtn" onAction="#onFilterOffline" styleClass="filter-pill" text="Offline" />
-
                     <ToggleButton fx:id="filterAvailableBtn" onAction="#onFilterAvailable" styleClass="filter-pill" text="Available" />
 
                     <ToggleButton fx:id="filterInGameBtn" onAction="#onFilterInGame" styleClass="filter-pill" text="In-Game" />
@@ -84,24 +80,19 @@
 
                 <TableView fx:id="playersTable" styleClass="players-table" VBox.vgrow="ALWAYS">
                     <columns>
-                        <TableColumn fx:id="userColumn" prefWidth="250" styleClass="table-col-user" text="User" />
-
-                        <TableColumn fx:id="statusColumn" prefWidth="120" styleClass="table-col-status" text="Status" />
-
-                        <TableColumn fx:id="gameStateColumn" prefWidth="150" styleClass="table-col-gamestate" text="Game State" />
+                        <TableColumn fx:id="userColumn" prefWidth="498.0" styleClass="table-col-user" text="User" />
 
-                        <TableColumn fx:id="lastSeenColumn" prefWidth="120" styleClass="table-col-lastseen" text="Last Seen" />
+                        <TableColumn fx:id="statusColumn" prefWidth="499.0" styleClass="table-col-status" text="Status" />
                     </columns>
                 </TableView>
 
                 <HBox spacing="10" styleClass="players-footer">
-                    <Label fx:id="paginationLabel" styleClass="pagination-label" text="Showing 9 of 145 players" />
 
                     <Region HBox.hgrow="ALWAYS" />
 
                     <Button fx:id="prevPageBtn" onAction="#onPreviousPage" styleClass="pagination-btn" text="Previous" />
 
-                    <Button fx:id="nextPageBtn" onAction="#onNextPage" styleClass="pagination-btn" text="Next" />
+                    <Button fx:id="nextPageBtn" onAction="#onNextPage" prefHeight="35.0" prefWidth="84.0" styleClass="pagination-btn" text="Next" />
                 </HBox>
             </VBox>
 
@@ -176,7 +167,7 @@
                             <HBox spacing="5" styleClass="button-container">
                                 <ToggleButton fx:id="range5mBtn" onAction="#onRange5m" styleClass="range-btn" text="5m">
                                     <toggleGroup>
-                                        <ToggleGroup fx:id="timeRangeGroup"/>
+                                        <ToggleGroup fx:id="timeRangeGroup" />
                                     </toggleGroup>
                                 </ToggleButton>
 
@@ -188,12 +179,12 @@
 
                         <StackPane fx:id="playersChartPane" styleClass="chart-pane" VBox.vgrow="ALWAYS">
                             <children>
-                                <LineChart fx:id="lineChart" createSymbols="false" legendVisible="false" animated="false">
+                                <LineChart fx:id="lineChart" animated="false" createSymbols="false" legendVisible="false">
                                     <xAxis>
-                                        <CategoryAxis fx:id="xAxis" label="Time" side="BOTTOM" tickLabelGap="5.0" />
+                                        <CategoryAxis label="Time" side="BOTTOM" tickLabelGap="5.0" fx:id="xAxis" />
                                     </xAxis>
                                     <yAxis>
-                                        <NumberAxis fx:id="yAxis" label="Player Count" side="LEFT" forceZeroInRange="true" />
+                                        <NumberAxis fx:id="yAxis" forceZeroInRange="true" label="Player Count" side="LEFT" />
                                     </yAxis>
                                 </LineChart>
                             </children>

From d74bdc8b370225c649c28921bc7b9432990f858d Mon Sep 17 00:00:00 2001
From: Hazem Abdelraouf <hazemkora660@gmail.com>
Date: Tue, 13 Jan 2026 13:46:34 +0200
Subject: [PATCH 3/5] add getAllPlayers Method in game server manager

---
 .../domain/server/GameServerManager.java      | 81 +++++++++++--------
 1 file changed, 46 insertions(+), 35 deletions(-)

diff --git a/src/main/java/com/mycompany/tictactoeserver/domain/server/GameServerManager.java b/src/main/java/com/mycompany/tictactoeserver/domain/server/GameServerManager.java
index 70443e4..b50eef1 100644
--- a/src/main/java/com/mycompany/tictactoeserver/domain/server/GameServerManager.java
+++ b/src/main/java/com/mycompany/tictactoeserver/domain/server/GameServerManager.java
@@ -5,9 +5,8 @@
 import com.mycompany.tictactoeserver.domain.entity.PlayerEntity;
 import com.mycompany.tictactoeserver.domain.entity.PlayerStatus;
 import com.mycompany.tictactoeserver.domain.services.communication.*;
-import com.mycompany.tictactoeserver.domain.services.playerSession.PlayerSessionService;
-import com.mycompany.tictactoeserver.domain.services.communication.MessageRouter;
 import com.mycompany.tictactoeserver.domain.services.game.GameManager;
+import com.mycompany.tictactoeserver.domain.services.playerSession.PlayerSessionService;
 import com.mycompany.tictactoeserver.domain.services.statistics.StatisticsService;
 import com.mycompany.tictactoeserver.domain.utils.callbacks.PlayerHandlerCallback;
 import com.mycompany.tictactoeserver.domain.utils.callbacks.VoidCallback;
@@ -20,6 +19,7 @@
 import java.net.SocketException;
 import java.util.List;
 import java.util.Vector;
+
 public class GameServerManager {
 
     private final Vector<PlayerConnectionHandler> players = new Vector<>();
@@ -55,13 +55,14 @@ public PlayerConnectionHandler getPlayerById(String playerId) {
         synchronized (lock) {
             for (PlayerConnectionHandler player : players) {
                 if (player.getPlayer() != null
-                        &&player.getPlayer().getId().equals(playerId)) {
+                        && player.getPlayer().getId().equals(playerId)) {
                     return player;
                 }
             }
         }
         return null;
     }
+
     public Vector<Player> getAvailablePlayerData() {
         Vector<Player> available = new Vector<>();
         synchronized (lock) {
@@ -76,37 +77,37 @@ public Vector<Player> getAvailablePlayerData() {
 
     public Message getLeaderboardMessage() {
         StatisticsService statsService = new StatisticsService();
-    
+
         List<PlayerEntity> topPlayersList = statsService.getLeaderboard();
-    
-    Vector<PlayerEntity> leaderboardVector = new Vector<>(topPlayersList);
 
-    AvailablePlayersInfo info = new AvailablePlayersInfo(leaderboardVector, null, null);
-    
-    return Message.createMessage(MessageType.RESPONSE, Action.GET_LEADERBOARD, info);
-}
+        Vector<PlayerEntity> leaderboardVector = new Vector<>(topPlayersList);
 
-public void broadcastLeaderboard() {
-    Message msg = getLeaderboardMessage();
-    String jsonMsg = gson.toJson(msg);
-    
-    synchronized (lock) {
-        for (PlayerConnectionHandler player : players) {
-            try {
-                if (player.getPlayer() != null) { 
-                    player.sendMessageToPlayer(jsonMsg);
+        AvailablePlayersInfo info = new AvailablePlayersInfo(leaderboardVector, null, null);
+
+        return Message.createMessage(MessageType.RESPONSE, Action.GET_LEADERBOARD, info);
+    }
+
+    public void broadcastLeaderboard() {
+        Message msg = getLeaderboardMessage();
+        String jsonMsg = gson.toJson(msg);
+
+        synchronized (lock) {
+            for (PlayerConnectionHandler player : players) {
+                try {
+                    if (player.getPlayer() != null) {
+                        player.sendMessageToPlayer(jsonMsg);
+                    }
+                } catch (Exception e) {
+                    System.out.println("Error broadcasting leaderboard: " + e.getMessage());
                 }
-            } catch (Exception e) {
-                System.out.println("Error broadcasting leaderboard: " + e.getMessage());
             }
         }
     }
-}
 
-public Message getAvailablePlayersMessage(PlayerConnectionHandler requester) {
-    Vector<PlayerEntity> online = new Vector<>();
-    Vector<PlayerEntity> inGame = new Vector<>();
-    Vector<PlayerEntity> pending = new Vector<>();
+    public Message getAvailablePlayersMessage(PlayerConnectionHandler requester) {
+        Vector<PlayerEntity> online = new Vector<>();
+        Vector<PlayerEntity> inGame = new Vector<>();
+        Vector<PlayerEntity> pending = new Vector<>();
 
         synchronized (lock) {
             for (PlayerConnectionHandler handler : players) {
@@ -115,7 +116,7 @@ public Message getAvailablePlayersMessage(PlayerConnectionHandler requester) {
                 }
 
                 if (requester.getPlayer() != null
-                        &&handler.getPlayer().getId().equals(requester.getPlayer().getId())) {
+                        && handler.getPlayer().getId().equals(requester.getPlayer().getId())) {
                     continue;
                 }
                 PlayerEntity player = new PlayerEntity(handler.getPlayer().getId(), handler.getPlayer().getUsername(), handler.getPlayer().getScore());
@@ -134,7 +135,7 @@ public Message getAvailablePlayersMessage(PlayerConnectionHandler requester) {
         AvailablePlayersInfo info = new AvailablePlayersInfo(online, inGame, pending);
         return Message.createMessage(MessageType.RESPONSE, Action.GET_AVAILABLE_PLAYERS, info);
 
-}
+    }
 
     public void start() {
         synchronized (lock) {
@@ -142,6 +143,7 @@ public void start() {
             runnable.toggleRunning();
         }
     }
+
     public void stop() {
         System.out.println("Stopping GameServerManager");
         runnable.toggleRunning();
@@ -157,7 +159,7 @@ public void stop() {
         }
     }
 
-    public void terminate(){
+    public void terminate() {
         stop();
         thread.interrupt();
     }
@@ -175,7 +177,17 @@ public void broadcastPlayerList() {
                     }
                 }
             }
+        } 
+    }
+
+    public java.util.Vector<PlayerConnectionHandler> getAllPlayers() {
+        
+        synchronized (lock) { 
+            
+            return new java.util.Vector<>(players);
+            
         }
+        
     }
 
     public void broadcastMessage(String message) throws PlayerSendMessageException {
@@ -195,8 +207,8 @@ public void sendMessage(String message, PlayerConnectionHandler player) throws P
     public void onReceiveMessage(String message, PlayerConnectionHandler sender) {
         try {
             MessageRouter router = MessageRouter.getInstance();
-            System.out.println("testingggggggggg");
-            router.navigateMessage(message, sender);
+            
+                        router.navigateMessage(message, sender);
         } catch (PlayerSendMessageException ex) {
             System.getLogger(GameServerManager.class.getName()).log(System.Logger.Level.ERROR, (String) null, ex);
         }
@@ -212,9 +224,8 @@ public void addPlayer(PlayerConnectionHandler player) {
     public void removePlayer(PlayerConnectionHandler player) {
         GameManager.getInstance().handlePlayerDisconnect(player);
         synchronized (lock) {
-            
-            if(player.getPlayer() != null)
-            {
+
+            if (player.getPlayer() != null) {
                 System.out.println("Player is not nulll-----------------------------------------------");
                 String playerID = player.getPlayer().getId();
                 playerSessionService.endPlayerSession(playerID);
@@ -282,7 +293,7 @@ public boolean isPlayerOnline(String username) {
         synchronized (lock) {
             for (PlayerConnectionHandler player : players) {
 
-                if (player.getPlayer()!=null&&username.equals(player.getPlayer().getUsername())) {
+                if (player.getPlayer() != null && username.equals(player.getPlayer().getUsername())) {
                     return true;
                 }
             }

From fec6d43e4eee11d39f08e6e1c7104c7d9c786830 Mon Sep 17 00:00:00 2001
From: Hazem Abdelraouf <hazemkora660@gmail.com>
Date: Tue, 13 Jan 2026 14:38:54 +0200
Subject: [PATCH 4/5] add style and update fxml

---
 .../presentation/css/dashboard-players.css    | 92 +++++++++++++++++++
 .../resources/presentation/dashboard.fxml     | 37 ++------
 2 files changed, 101 insertions(+), 28 deletions(-)

diff --git a/src/main/resources/presentation/css/dashboard-players.css b/src/main/resources/presentation/css/dashboard-players.css
index e69de29..9887653 100644
--- a/src/main/resources/presentation/css/dashboard-players.css
+++ b/src/main/resources/presentation/css/dashboard-players.css
@@ -0,0 +1,92 @@
+
+.players-table {
+    -fx-background-color: transparent;
+    -fx-base: transparent;
+    -fx-control-inner-background: transparent;
+    -fx-background-insets: 0;
+    -fx-padding: 0;
+}
+
+.players-table .virtual-flow .clipped-container .sheet {
+    -fx-background-color: transparent;
+}
+
+
+.players-table .column-header-background {
+    -fx-background-color: #111827; 
+    -fx-border-color: transparent transparent #1f2937 transparent;
+    -fx-border-width: 0 0 1px 0;
+}
+
+.players-table .column-header {
+    -fx-background-color: transparent;
+    -fx-size: 45px; 
+    -fx-border-width: 0;
+    -fx-padding: 0 10 0 10;
+}
+
+.players-table .column-header .label {
+    -fx-text-fill: #9ca3af; 
+    -fx-font-weight: 600;
+    -fx-font-size: 13px;
+    -fx-alignment: CENTER_LEFT;
+}
+
+.players-table .table-row-cell {
+    -fx-background-color: transparent; 
+    -fx-border-width: 0 0 1px 0;
+    -fx-border-color: #1f2937; 
+    -fx-cell-size: 50px; 
+}
+
+.players-table .table-row-cell:hover {
+    -fx-background-color: #1a2332; 
+    -fx-cursor: hand;
+}
+
+.players-table .table-row-cell:selected {
+    -fx-background-color: rgba(6, 182, 212, 0.15); /* Cyan tint */
+}
+
+.players-table .table-cell {
+    -fx-alignment: CENTER_LEFT;
+    -fx-padding: 0 0 0 15px;
+    -fx-border-color: transparent;
+    -fx-text-fill: #f9fafb; 
+}
+
+.players-table .table-cell .text {
+    -fx-fill: #f9fafb; 
+    -fx-font-size: 14px;
+}
+
+.table-col-status .text {
+    -fx-font-weight: 500;
+}
+
+.players-table .placeholder .label {
+    -fx-text-fill: #6b7280; 
+    -fx-font-size: 14px;
+}
+
+.players-table .scroll-bar:vertical,
+.players-table .scroll-bar:horizontal {
+    -fx-background-color: transparent;
+}
+
+.players-table .scroll-bar .track {
+    -fx-background-color: transparent;
+}
+
+.players-table .scroll-bar .thumb {
+    -fx-background-color: #374151; 
+    -fx-background-radius: 4px;
+}
+
+.players-table .scroll-bar .thumb:hover {
+    -fx-background-color: #4b5563; 
+}
+
+.players-table .corner {
+    -fx-background-color: transparent;
+}
\ No newline at end of file
diff --git a/src/main/resources/presentation/dashboard.fxml b/src/main/resources/presentation/dashboard.fxml
index be57b0c..44de4a6 100644
--- a/src/main/resources/presentation/dashboard.fxml
+++ b/src/main/resources/presentation/dashboard.fxml
@@ -7,7 +7,8 @@
 <?import javafx.scene.layout.*?>
 <?import org.kordamp.ikonli.javafx.*?>
 
-<BorderPane prefHeight="900" prefWidth="1600" xmlns="http://javafx.com/javafx/25" xmlns:fx="http://javafx.com/fxml/1" fx:controller="com.mycompany.tictactoeserver.presentation.DashboardController">
+
+<BorderPane prefHeight="900" prefWidth="1600" xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1" fx:controller="com.mycompany.tictactoeserver.presentation.DashboardController">
     <stylesheets>
         <URL value="@css/dashboard-base.css" />
         <URL value="@css/dashboard-header.css" />
@@ -40,14 +41,11 @@
                 <Label styleClass="server-power-label" text="Server Power" />
 
                 <StackPane>
-
                     <ToggleButton fx:id="serverToggle" contentDisplay="GRAPHIC_ONLY" onAction="#onToggleServer" selected="false" styleClass="toggle-switch">
                         <graphic>
                             <Region mouseTransparent="true" styleClass="thumb" />
                         </graphic>
-
                     </ToggleButton>
-
                 </StackPane>
             </HBox>
         </HBox>
@@ -72,28 +70,20 @@
                     <Region HBox.hgrow="ALWAYS" />
 
                     <ToggleButton fx:id="filterAllBtn" onAction="#onFilterAll" styleClass="filter-pill filter-pill-active" text="All" />
-
                     <ToggleButton fx:id="filterAvailableBtn" onAction="#onFilterAvailable" styleClass="filter-pill" text="Available" />
-
                     <ToggleButton fx:id="filterInGameBtn" onAction="#onFilterInGame" styleClass="filter-pill" text="In-Game" />
                 </HBox>
 
                 <TableView fx:id="playersTable" styleClass="players-table" VBox.vgrow="ALWAYS">
                     <columns>
-                        <TableColumn fx:id="userColumn" prefWidth="498.0" styleClass="table-col-user" text="User" />
-
-                        <TableColumn fx:id="statusColumn" prefWidth="499.0" styleClass="table-col-status" text="Status" />
+                        <TableColumn fx:id="userColumn" prefWidth="250.0" styleClass="table-col-user" text="User" />
+                        <TableColumn fx:id="statusColumn" prefWidth="150.0" styleClass="table-col-status" text="Status" />
                     </columns>
+                    <columnResizePolicy>
+                        <TableView fx:constant="CONSTRAINED_RESIZE_POLICY" />
+                    </columnResizePolicy>
                 </TableView>
 
-                <HBox spacing="10" styleClass="players-footer">
-
-                    <Region HBox.hgrow="ALWAYS" />
-
-                    <Button fx:id="prevPageBtn" onAction="#onPreviousPage" styleClass="pagination-btn" text="Previous" />
-
-                    <Button fx:id="nextPageBtn" onAction="#onNextPage" prefHeight="35.0" prefWidth="84.0" styleClass="pagination-btn" text="Next" />
-                </HBox>
             </VBox>
 
             <ScrollPane fx:id="monitoringScrollPane" fitToWidth="true" styleClass="monitoring-scroll">
@@ -103,7 +93,6 @@
                     </padding>
 
                     <VBox spacing="15" styleClass="card, server-overview-card">
-
                         <HBox>
                             <Label fx:id="serverOverviewLabel" styleClass="card-title" text="Server Overview" />
                             <Region HBox.hgrow="ALWAYS" />
@@ -111,7 +100,6 @@
                         </HBox>
 
                         <GridPane fx:id="overviewGrid" hgap="15" styleClass="overview-grid" vgap="15">
-
                             <columnConstraints>
                                 <ColumnConstraints hgrow="ALWAYS" percentWidth="50" />
                                 <ColumnConstraints hgrow="ALWAYS" percentWidth="50" />
@@ -152,27 +140,20 @@
                                 </HBox>
                                 <Label fx:id="inGameCountLabel" styleClass="stat-value" text="0" />
                             </VBox>
-
                         </GridPane>
                     </VBox>
 
-
                     <VBox spacing="15" styleClass="card, chart-card">
-
                         <HBox alignment="CENTER_LEFT" spacing="10" styleClass="card-header">
                             <Label fx:id="playersOverTimeLabel" styleClass="card-title" text="Players Over Time" />
-
                             <Region HBox.hgrow="ALWAYS" />
-
                             <HBox spacing="5" styleClass="button-container">
                                 <ToggleButton fx:id="range5mBtn" onAction="#onRange5m" styleClass="range-btn" text="5m">
                                     <toggleGroup>
                                         <ToggleGroup fx:id="timeRangeGroup" />
                                     </toggleGroup>
                                 </ToggleButton>
-
                                 <ToggleButton fx:id="range30mBtn" onAction="#onRange30m" selected="true" styleClass="range-btn" text="30m" toggleGroup="$timeRangeGroup" />
-
                                 <ToggleButton fx:id="range24hBtn" onAction="#onRange24h" styleClass="range-btn" text="24h" toggleGroup="$timeRangeGroup" />
                             </HBox>
                         </HBox>
@@ -181,7 +162,7 @@
                             <children>
                                 <LineChart fx:id="lineChart" animated="false" createSymbols="false" legendVisible="false">
                                     <xAxis>
-                                        <CategoryAxis label="Time" side="BOTTOM" tickLabelGap="5.0" fx:id="xAxis" />
+                                        <CategoryAxis fx:id="xAxis" label="Time" side="BOTTOM" tickLabelGap="5.0" />
                                     </xAxis>
                                     <yAxis>
                                         <NumberAxis fx:id="yAxis" forceZeroInRange="true" label="Player Count" side="LEFT" />
@@ -197,4 +178,4 @@
         </SplitPane>
     </center>
 
-</BorderPane>
+</BorderPane>
\ No newline at end of file

From 1eb6dc01b67ad880dff1d4a562102f7a8f6d2c12 Mon Sep 17 00:00:00 2001
From: Hazem Abdelraouf <hazemkora660@gmail.com>
Date: Tue, 13 Jan 2026 14:39:29 +0200
Subject: [PATCH 5/5] Add logic that link players connected with table viewer

---
 .../presentation/DashboardController.java     | 179 ++++++++++++------
 1 file changed, 123 insertions(+), 56 deletions(-)

diff --git a/src/main/java/com/mycompany/tictactoeserver/presentation/DashboardController.java b/src/main/java/com/mycompany/tictactoeserver/presentation/DashboardController.java
index 6ad6e0e..57c1c7e 100644
--- a/src/main/java/com/mycompany/tictactoeserver/presentation/DashboardController.java
+++ b/src/main/java/com/mycompany/tictactoeserver/presentation/DashboardController.java
@@ -1,13 +1,27 @@
 package com.mycompany.tictactoeserver.presentation;
 
+import com.mycompany.tictactoeserver.datasource.model.Player;
 import com.mycompany.tictactoeserver.domain.entity.ActivityPoint;
+import com.mycompany.tictactoeserver.domain.entity.PlayerRow;
 import com.mycompany.tictactoeserver.domain.server.GameServerManager;
+import com.mycompany.tictactoeserver.domain.server.PlayerConnectionHandler;
 import com.mycompany.tictactoeserver.domain.services.statistics.StatisticsService;
 import com.mycompany.tictactoeserver.domain.utils.BackgroundTaskScheduler;
 import com.mycompany.tictactoeserver.domain.utils.DeviceManager;
+import java.net.SocketException;
+import java.net.URL;
+import java.util.Arrays;
+import java.util.List;
+import java.util.ResourceBundle;
+import java.util.Vector;
+import java.util.concurrent.TimeUnit;
 import javafx.application.Platform;
 import javafx.beans.property.IntegerProperty;
 import javafx.beans.property.SimpleIntegerProperty;
+import javafx.beans.property.SimpleStringProperty;
+import javafx.collections.FXCollections;
+import javafx.collections.ObservableList;
+import javafx.collections.transformation.FilteredList;
 import javafx.fxml.FXML;
 import javafx.fxml.Initializable;
 import javafx.scene.chart.CategoryAxis;
@@ -18,12 +32,6 @@
 import javafx.scene.layout.GridPane;
 import javafx.scene.layout.Pane;
 
-import java.net.SocketException;
-import java.net.URL;
-import java.util.Arrays;
-import java.util.List;
-import java.util.ResourceBundle;
-import java.util.concurrent.TimeUnit;
 
 public class DashboardController implements Initializable {
 
@@ -46,33 +54,20 @@ public class DashboardController implements Initializable {
 
     @FXML
     private ToggleButton filterAllBtn;
-    @FXML
-    private ToggleButton filterOnlineBtn;
-    @FXML
-    private ToggleButton filterOfflineBtn;
+
     @FXML
     private ToggleButton filterAvailableBtn;
     @FXML
     private ToggleButton filterInGameBtn;
 
     @FXML
-    private TableView<?> playersTable;
-    @FXML
-    private TableColumn<?, ?> userColumn;
-    @FXML
-    private TableColumn<?, ?> statusColumn;
-    @FXML
-    private TableColumn<?, ?> gameStateColumn;
-    @FXML
-    private TableColumn<?, ?> lastSeenColumn;
-
-    @FXML
-    private Label paginationLabel;
+    private TableView<PlayerRow> playersTable;
     @FXML
-    private Button prevPageBtn;
+    private TableColumn<PlayerRow, String> userColumn;
     @FXML
-    private Button nextPageBtn;
+    private TableColumn<PlayerRow, String> statusColumn;
 
+   
     @FXML
     private ScrollPane monitoringScrollPane;
 
@@ -118,11 +113,18 @@ public class DashboardController implements Initializable {
     IntegerProperty connectedPlayers = new SimpleIntegerProperty(0);
     IntegerProperty inGamePlayers = new SimpleIntegerProperty(0);
 
+    private final ObservableList<PlayerRow> playersList = FXCollections.observableArrayList();
+    
+    private FilteredList<PlayerRow> filteredData;
+    
+    private final ToggleGroup filterGroup = new ToggleGroup();
+
     @Override
     public void initialize(URL location, ResourceBundle resources) {
         serverManager = GameServerManager.getInstance();
         statsService = new StatisticsService();
-
+        setupFilters();
+        setupTable();
         try {
             String ip = DeviceManager.getIpv4Address();
             subtitleLabel.setText("IP Address: " + ip);
@@ -130,7 +132,6 @@ public void initialize(URL location, ResourceBundle resources) {
             System.out.println("Failed to get ipv4 address in main controller");
         }
 
-
         availablePlayers.addListener((observable, oldValue, newValue) -> availableCountLabel.setText(newValue + ""));
         offlinePlayers.addListener((observable, oldValue, newValue) -> offlineCountLabel.setText(newValue + ""));
         connectedPlayers.addListener((observable, oldValue, newValue) -> connectedCountLabel.setText(newValue + ""));
@@ -138,8 +139,9 @@ public void initialize(URL location, ResourceBundle resources) {
 
         offlinePlayers.addListener((observable, oldValue, newValue) -> notifyChart());
         connectedPlayers.addListener((observable, oldValue, newValue) -> {
-            if (oldValue.intValue() > newValue.intValue())
+            if (oldValue.intValue() > newValue.intValue()) {
                 notifyChart();
+            }
         });
 
         serverManager.addPlayerCountListener(this::updateMonitorStats);
@@ -161,7 +163,6 @@ private void onToggleServer() {
                 return;
             }
 
-
             serverManager.stop();
             serverStatusLabel.setText("STOPPED");
             serverStatusLabel.getStyleClass().removeAll("status-running");
@@ -169,7 +170,6 @@ private void onToggleServer() {
                 serverStatusLabel.getStyleClass().add("status-stopped");
             }
 
-
         } catch (Exception e) {
             System.out.println("Msg: " + e.getMessage());
             System.out.println("Trace: " + Arrays.toString(e.getStackTrace()));
@@ -246,7 +246,7 @@ private void updateMonitorStats() {
             offlinePlayers.set(statsService.getOfflinePlayersCount());
             connectedPlayers.set(statsService.getConnectedPlayersCount());
             inGamePlayers.set(statsService.getInGamePlayersCount());
-
+            refreshTableData();
         });
     }
 
@@ -255,22 +255,26 @@ private void notifyChart() {
 
         int selectedMode = 30;
 
-        if (range5mBtn.isSelected())
+        if (range5mBtn.isSelected()) {
             selectedMode = 5;
-        else if (range24hBtn.isSelected())
+        } else if (range24hBtn.isSelected()) {
             selectedMode = 24;
-
+        }
 
         points = switch (selectedMode) {
-            case 5 -> statsService.getLast5MinutesPoints();
-            case 24 -> statsService.getLast24HoursPoints();
-            default -> statsService.getLast30MinutesPoints();
+            case 5 ->
+                statsService.getLast5MinutesPoints();
+            case 24 ->
+                statsService.getLast24HoursPoints();
+            default ->
+                statsService.getLast30MinutesPoints();
         };
 
         mapDataToChart(points);
 
-        if (chartUpdater != null)
+        if (chartUpdater != null) {
             chartUpdater.stopTask();
+        }
         setChartUpdater(selectedMode);
         startChartUpdater(selectedMode);
     }
@@ -312,24 +316,27 @@ private void updatePlayersCount(List<ActivityPoint> points) {
     private void setChartUpdater(int selectedMode) {
         Runnable task;
         task = switch (selectedMode) {
-            case 5 -> () -> {
-                Platform.runLater(() -> {
-                    List<ActivityPoint> points = statsService.getLast5MinutesPoints();
-                    mapDataToChart(points);
-                });
-            };
-            case 24 -> () -> {
-                Platform.runLater(() -> {
-                    List<ActivityPoint> points = statsService.getLast24HoursPoints();
-                    mapDataToChart(points);
-                });
-            };
-            default -> () -> {
-                Platform.runLater(() -> {
-                    List<ActivityPoint> points = statsService.getLast30MinutesPoints();
-                    mapDataToChart(points);
-                });
-            };
+            case 5 ->
+                () -> {
+                    Platform.runLater(() -> {
+                        List<ActivityPoint> points = statsService.getLast5MinutesPoints();
+                        mapDataToChart(points);
+                    });
+                };
+            case 24 ->
+                () -> {
+                    Platform.runLater(() -> {
+                        List<ActivityPoint> points = statsService.getLast24HoursPoints();
+                        mapDataToChart(points);
+                    });
+                };
+            default ->
+                () -> {
+                    Platform.runLater(() -> {
+                        List<ActivityPoint> points = statsService.getLast30MinutesPoints();
+                        mapDataToChart(points);
+                    });
+                };
         };
 
         if (chartUpdater == null) {
@@ -354,4 +361,64 @@ private void startChartUpdater(int selectedMode) {
         }
         ;
     }
-}
\ No newline at end of file
+
+    private void setupFilters() {
+
+        filterAllBtn.setToggleGroup(filterGroup);
+        filterAvailableBtn.setToggleGroup(filterGroup);
+        filterInGameBtn.setToggleGroup(filterGroup);
+
+        filterAllBtn.setSelected(true);
+
+        filterGroup.selectedToggleProperty().addListener((obs, oldVal, newVal) -> applyFilters());
+        searchField.textProperty().addListener((obs, oldVal, newVal) -> applyFilters());
+    }
+
+    private void applyFilters() {
+        String searchText = searchField.getText().toLowerCase().trim();
+        Toggle selectedBtn = filterGroup.getSelectedToggle();
+        filteredData.setPredicate(player -> {
+            if (!searchText.isEmpty() && !player.getUsername().toLowerCase().contains(searchText)) {
+                return false;
+            }
+            if (selectedBtn == filterAvailableBtn) {
+                return player.getStatus().equalsIgnoreCase("ONLINE");
+            }
+            if (selectedBtn == filterInGameBtn) {
+                return player.getStatus().equalsIgnoreCase("IN_GAME");
+            }
+            return true;
+        });
+    }
+
+    private void refreshTableData() {
+        playersList.clear();
+
+        Vector<PlayerConnectionHandler> connections = serverManager.getAllPlayers();
+
+        for (PlayerConnectionHandler handler : connections) {
+            Player p = handler.getPlayer();
+
+            String username = (p != null) ? p.getUsername() : "Someone connecting 😀";
+            String status = handler.getStatus().toString();
+
+            playersList.add(new PlayerRow(username, status));
+        }
+
+    }
+
+   private void setupTable() {
+        
+       
+     userColumn.setCellValueFactory(cellData -> 
+            new SimpleStringProperty(cellData.getValue().getUsername()));
+
+        statusColumn.setCellValueFactory(cellData -> 
+            new SimpleStringProperty(cellData.getValue().getStatus()));
+
+        filteredData = new FilteredList<>(playersList, p -> true);
+
+        playersTable.setItems(filteredData);
+        playersTable.setPlaceholder(new Label("No players found"));
+    }
+}